diff --git a/.eslintrc.json b/.eslintrc.json
index af1b97849b..cb5775ef1f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,7 +8,10 @@
     "eslint-plugin-deprecation",
     "unused-imports",
     "eslint-plugin-lodash",
-    "eslint-plugin-jsonc"
+    "eslint-plugin-jsonc",
+    "eslint-plugin-rxjs",
+    "eslint-plugin-simple-import-sort",
+    "eslint-plugin-import-newlines"
   ],
   "overrides": [
     {
@@ -27,17 +30,29 @@
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
         "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:rxjs/recommended"
       ],
       "rules": {
+        "indent": [
+          "error",
+          2,
+          {
+            "SwitchCase": 1
+          }
+        ],
         "max-classes-per-file": [
           "error",
           1
         ],
         "comma-dangle": [
-          "off",
+          "error",
           "always-multiline"
         ],
+        "object-curly-spacing": [
+          "error",
+          "always"
+        ],
         "eol-last": [
           "error",
           "always"
@@ -104,15 +119,13 @@
             "allowTernary": true
           }
         ],
-        "prefer-const": "off",            // todo: re-enable & fix errors (more strict than it used to be in TSLint)
+        "prefer-const": "error",
+        "no-case-declarations": "error",
+        "no-extra-boolean-cast": "error",
         "prefer-spread": "off",
         "no-underscore-dangle": "off",
-
-        // todo: disabled rules from eslint:recommended, consider re-enabling & fixing
         "no-prototype-builtins": "off",
         "no-useless-escape": "off",
-        "no-case-declarations": "off",
-        "no-extra-boolean-cast": "off",
 
         "@angular-eslint/directive-selector": [
           "error",
@@ -183,7 +196,7 @@
         ],
         "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/unified-signatures": "error",
-        "@typescript-eslint/ban-types": "warn",  // todo: deal with {} type issues & re-enable
+        "@typescript-eslint/ban-types": "error",
         "@typescript-eslint/no-floating-promises": "warn",
         "@typescript-eslint/no-misused-promises": "warn",
         "@typescript-eslint/restrict-plus-operands": "warn",
@@ -203,14 +216,45 @@
 
         "deprecation/deprecation": "warn",
 
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
         "import/order": "off",
+        "import/first": "error",
+        "import/newline-after-import": "error",
+        "import/no-duplicates": "error",
         "import/no-deprecated": "warn",
         "import/no-namespace": "error",
+        "import-newlines/enforce": [
+          "error",
+          {
+            "items": 1,
+            "semi": true,
+            "forceSingleLine": true
+          }
+        ],
+
         "unused-imports/no-unused-imports": "error",
         "lodash/import-scope": [
           "error",
           "method"
-        ]
+        ],
+
+        "rxjs/no-nested-subscribe": "off"     // todo: go over _all_ cases
+      }
+    },
+    {
+      "files": [
+        "*.spec.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "./tsconfig.json",
+          "./cypress/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "rules": {
+        "prefer-const": "off"
       }
     },
     {
@@ -219,12 +263,7 @@
       ],
       "extends": [
         "plugin:@angular-eslint/template/recommended"
-      ],
-      "rules": {
-        // todo: re-enable & fix errors
-        "@angular-eslint/template/no-negated-async": "off",
-        "@angular-eslint/template/eqeqeq": "off"
-      }
+      ]
     },
     {
       "files": [
diff --git a/.github/disabled-workflows/pull_request_opened.yml b/.github/disabled-workflows/pull_request_opened.yml
deleted file mode 100644
index 0dc718c0b9..0000000000
--- a/.github/disabled-workflows/pull_request_opened.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# This workflow runs whenever a new pull request is created
-# TEMPORARILY DISABLED. Unfortunately this doesn't work for PRs created from forked repositories (which is how we tend to create PRs).
-# There is no known workaround yet. See https://github.community/t/how-to-use-github-token-for-prs-from-forks/16818
-name: Pull Request opened
-
-# Only run for newly opened PRs against the "main" branch
-on: 
-  pull_request:
-    types: [opened]
-    branches: 
-      - main
-
-jobs:
-  automation:
-    runs-on: ubuntu-latest
-    steps:
-    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
-    # See https://github.com/marketplace/actions/pull-request-assigner
-    - name: Assign PR to creator
-      uses: thomaseizinger/assign-pr-creator-action@v1.0.0
-      # Note, this authentication token is created automatically
-      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-      # Ignore errors. It is possible the PR was created by someone who cannot be assigned
-      continue-on-error: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 219074780e..52f20470a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,8 @@ jobs:
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
+      # Project name to use when running docker-compose prior to e2e tests
+      COMPOSE_PROJECT_NAME: 'ci'
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -43,11 +45,11 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://github.com/actions/setup-node
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -118,7 +120,7 @@ jobs:
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
@@ -191,7 +193,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Download artifacts from previous 'tests' job
       - name: Download coverage artifacts
@@ -203,10 +205,14 @@ jobs:
       # Retry action: https://github.com/marketplace/actions/retry-action
       # Codecov action: https://github.com/codecov/codecov-action
       - name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3
-          # Try upload 5 times max
+          # Ensure codecov-action throws an error when it fails to upload
+          # This allows us to auto-restart the action if an error is thrown
+          with: |
+            fail_ci_if_error: true
+          # Try re-running action 5 times max
           attempt_limit: 5
           # Run again in 30 seconds
           attempt_delay: 30000
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
index 35a2e2d24a..d96e786cc3 100644
--- a/.github/workflows/codescan.yml
+++ b/.github/workflows/codescan.yml
@@ -5,12 +5,16 @@
 # because CodeQL requires a fresh build with all tests *disabled*.
 name: "Code Scanning"
 
-# Run this code scan for all pushes / PRs to main branch. Also run once a week.
+# Run this code scan for all pushes / PRs to main or maintenance branches. Also run once a week.
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
     # Don't run if PR is only updating static documentation
     paths-ignore:
       - '**/*.md'
@@ -31,7 +35,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9a2c838d83..85a7216113 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,9 @@ name: Docker images
 
 # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
+# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
+# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml
+# 
 on:
   push:
     branches:
@@ -16,105 +19,41 @@ permissions:
   contents: read  #  to fetch code (actions/checkout)
 
 jobs:
-  docker:
+  #############################################################
+  # Build/Push the 'dspace/dspace-angular' image
+  #############################################################
+  dspace-angular:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-    runs-on: ubuntu-latest
-    env:
-      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
-      # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=tag
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-      # Architectures / Platforms for which we will build Docker images
-      # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-      # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
-      PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    with:
+      build_id: dspace-angular
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v3
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v2
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'dspace/dspace-angular' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
-        id: meta_build
-        uses: docker/metadata-action@v4
-        with:
-          images: dspace/dspace-angular
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'dspace-angular' image
-        id: docker_build
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{ env.PLATFORMS }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
-
-      #####################################################
-      # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
-      #####################################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build_dist step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
-        id: meta_build_dist
-        uses: docker/metadata-action@v4
-        with:
-          images: dspace/dspace-angular
-          tags: ${{ env.IMAGE_TAGS }}
-          # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-          # tagging logic as the primary 'dspace/dspace-angular' image above.
-          flavor: ${{ env.TAGS_FLAVOR }}
-            suffix=-dist
-
-      - name: Build and push 'dspace-angular-dist' image
-        id: docker_build_dist
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile.dist
-          platforms: ${{ env.PLATFORMS }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build_dist.outputs.tags }}
-          labels: ${{ steps.meta_build_dist.outputs.labels }}
+  #############################################################
+  # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
+  #############################################################
+  dspace-angular-dist:
+    # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
+    if: github.repository == 'dspace/dspace-angular'
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    with:
+      build_id: dspace-angular-dist
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile.dist
+      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
+      tags_flavor: suffix=-dist
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      # Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
+      # these sites as specified in reusable-docker-build.xml
+      REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
+      REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}
\ No newline at end of file
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
index c1396b6f45..ccc6c401c0 100644
--- a/.github/workflows/label_merge_conflicts.yml
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -1,11 +1,12 @@
 # This workflow checks open PRs for merge conflicts and labels them when conflicts are found
 name: Check for merge conflicts
 
-# Run whenever the "main" branch is updated
-# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
+# Run this for all pushes (i.e. merges) to 'main' or maintenance branches
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
   # So that the `conflict_label_name` is removed if conflicts are resolved,
   # we allow this to run for `pull_request_target` so that github secrets are available.
   pull_request_target:
@@ -24,6 +25,8 @@ jobs:
       # See: https://github.com/prince-chrismc/label-merge-conflicts-action
       - name: Auto-label PRs with merge conflicts
         uses: prince-chrismc/label-merge-conflicts-action@v3
+        # Ignore any failures -- may occur (randomly?) for older, outdated PRs.
+        continue-on-error: true
         # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
         # Note, the authentication token is created automatically
         # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
diff --git a/.github/workflows/port_merged_pull_request.yml b/.github/workflows/port_merged_pull_request.yml
new file mode 100644
index 0000000000..857f22755e
--- /dev/null
+++ b/.github/workflows/port_merged_pull_request.yml
@@ -0,0 +1,46 @@
+# This workflow will attempt to port a merged pull request to
+# the branch specified in a "port to" label (if exists)
+name: Port merged Pull Request
+
+# Only run for merged PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ closed ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  contents: write      # so action can add comments
+  pull-requests: write # so action can create pull requests
+
+jobs:
+  port_pr:
+    runs-on: ubuntu-latest
+    # Don't run on closed *unmerged* pull requests
+    if: github.event.pull_request.merged
+    steps:
+      # Checkout code
+      - uses: actions/checkout@v4
+      # Port PR to other branch (ONLY if labeled with "port to")
+      # See https://github.com/korthout/backport-action
+      - name: Create backport pull requests
+        uses: korthout/backport-action@v2
+        with:
+          # Trigger based on a "port to [branch]" label on PR
+          # (This label must specify the branch name to port to)
+          label_pattern: '^port to ([^ ]+)$'
+          # Title to add to the (newly created) port PR
+          pull_title: '[Port ${target_branch}] ${pull_title}'
+          # Description to add to the (newly created) port PR
+          pull_description: 'Port of #${pull_number} by @${pull_author} to `${target_branch}`.'
+          # Copy all labels from original PR to (newly created) port PR
+          # NOTE: The labels matching 'label_pattern' are automatically excluded
+          copy_labels_pattern: '.*'
+          # Skip any merge commits in the ported PR. This means only non-merge commits are cherry-picked to the new PR
+          merge_commits: 'skip'
+          # Use a personal access token (PAT) to create PR as 'dspace-bot' user.
+          # A PAT is required in order for the new PR to trigger its own actions (for CI checks)
+          github_token: ${{ secrets.PR_PORT_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/pull_request_opened.yml b/.github/workflows/pull_request_opened.yml
new file mode 100644
index 0000000000..f16e81c9fd
--- /dev/null
+++ b/.github/workflows/pull_request_opened.yml
@@ -0,0 +1,24 @@
+# This workflow runs whenever a new pull request is created
+name: Pull Request opened
+
+# Only run for newly opened PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required to assign a PR back to the creator when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ opened ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  pull-requests: write
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
+    # See https://github.com/toshimaru/auto-author-assign
+    - name: Assign PR to creator
+      uses: toshimaru/auto-author-assign@v2.0.1
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 2a6a66fc06..e4b467ae26 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -2,7 +2,7 @@
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
 # Test build:
-# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
+# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
 FROM node:18-alpine as build
 
diff --git a/README.md b/README.md
index 689c64a292..ebc24f8b91 100644
--- a/README.md
+++ b/README.md
@@ -157,8 +157,8 @@ DSPACE_UI_SSL => DSPACE_SSL
 
 The same settings can also be overwritten by setting system environment variables instead, E.g.:
 ```bash
-export DSPACE_HOST=api7.dspace.org
-export DSPACE_UI_PORT=4200
+export DSPACE_HOST=demo.dspace.org
+export DSPACE_UI_PORT=4000
 ```
 
 The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides external config set by `DSPACE_APP_CONFIG_PATH` overrides **`config.(prod or dev).yml`**
@@ -288,7 +288,7 @@ E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Con
 The test files can be found in the `./cypress/integration/` folder.
 
 Before you can run e2e tests, two things are REQUIRED:
-1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo REST API (https://api7.dspace.org/server/), as that server is uncontrolled and may have content added/removed at any time.
+1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo/sandbox REST API (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/), as those sites may have content added/removed at any time.
     * After starting up your backend on localhost, make sure either your `config.prod.yml` or `config.dev.yml` has its `rest` settings defined to use that localhost backend.
 	* If you'd prefer, you may instead use environment variables as described at [Configuring](#configuring). For example:
        ```
diff --git a/config/config.example.yml b/config/config.example.yml
index ea38303fa3..36d6a009d3 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -22,7 +22,7 @@ ui:
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: sandbox.dspace.org
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
@@ -75,7 +75,7 @@ cache:
     anonymousCache:
       # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
       # As all pages are cached in server memory, increasing this value will increase memory needs.
-      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory.
       max: 0
       # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
       # copy is automatically refreshed on the next request.
@@ -131,12 +131,16 @@ submission:
     # NOTE: after how many time (milliseconds) submission is saved automatically
     # eg. timer: 5 * (1000 * 60); // 5 minutes
     timer: 0
+  # Always show the duplicate detection section if enabled, even if there are no potential duplicates detected
+  # (a message will be displayed to indicate no matches were found)
+  duplicateDetection:
+    alwaysShowSection: false
   icons:
     metadata:
       # NOTE: example of configuration
       #   # NOTE: metadata name
       # - name: dc.author
-      #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+      #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
       #   style: fas fa-user
       - name: dc.author
         style: fas fa-user
@@ -147,18 +151,40 @@ submission:
       confidence:
         # NOTE: example of configuration
         #   # NOTE: confidence value
-        # - name: dc.author
-        #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
-        #   style: fa-user
+        # - value: 600
+        #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
+        #   style: text-success
+        #   icon: fa-circle-check
+        #   # NOTE: the class configured in property style is used by default, the icon property could be used in component
+        #           configured to use a 'icon mode' display (mainly in edit-item page)
         - value: 600
           style: text-success
+          icon: fa-circle-check
         - value: 500
           style: text-info
+          icon: fa-gear
         - value: 400
           style: text-warning
+          icon: fa-circle-question
+        - value: 300
+          style: text-muted
+          icon: fa-thumbs-down
+        - value: 200
+          style: text-muted
+          icon: fa-circle-exclamation
+        - value: 100
+          style: text-muted
+          icon: fa-circle-stop
+        - value: 0
+          style: text-muted
+          icon: fa-ban
+        - value: -1
+          style: text-muted
+          icon: fa-circle-xmark
         # default configuration
         - value: default
           style: text-muted
+          icon: fa-circle-xmark
 
 #  Default Language in which the UI will be rendered if the user's browser language is not an active language
 defaultLanguage: en
@@ -208,6 +234,9 @@ languages:
   - code: pt-BR
     label: Português do Brasil
     active: true
+  - code: sr-lat
+    label: Srpski (lat)
+    active: true
   - code: fi
     label: Suomi
     active: true
@@ -232,6 +261,9 @@ languages:
   - code: el
     label: Ελληνικά
     active: true
+  - code: sr-cyr
+    label: Српски
+    active: true
   - code: uk
     label: Yкраї́нська
     active: true
@@ -266,6 +298,8 @@ homePage:
     # No. of communities to list per page on the home page
     # This will always round to the nearest number from the list of page sizes. e.g. if you set it to 7 it'll use 10
     pageSize: 5
+  # Enable or disable the Discover filters on the homepage
+  showDiscoverFilters: false
 
 # Item Config
 item:
@@ -279,8 +313,17 @@ item:
     # settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 5
 
+# Community Page Config
+community:
+  # Search tab config
+  searchSection:
+    showSidebar: true
+
 # Collection Page Config
 collection:
+  # Search tab config
+  searchSection:
+    showSidebar: true
   edit:
     undoTimeout: 10000 # 10 seconds
 
@@ -292,33 +335,33 @@ themes:
   #
   # # A theme with a handle property will match the community, collection or item with the given
   # # handle, and all collections and/or items within it
-  # - name: 'custom',
-  #   handle: '10673/1233'
+  # - name: custom
+  #   handle: 10673/1233
   #
   # # A theme with a regex property will match the route using a regular expression. If it
   # # matches the route for a community or collection it will also apply to all collections
   # # and/or items within it
-  # - name: 'custom',
-  #   regex: 'collections\/e8043bc2.*'
+  # - name: custom
+  #   regex: collections\/e8043bc2.*
   #
   # # A theme with a uuid property will match the community, collection or item with the given
   # # ID, and all collections and/or items within it
-  # - name: 'custom',
-  #   uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
+  # - name: custom
+  #   uuid: 0958c910-2037-42a9-81c7-dca80e3892b4
   #
   # # The extends property specifies an ancestor theme (by name). Whenever a themed component is not found
   # # in the current theme, its ancestor theme(s) will be checked recursively before falling back to default.
-  # - name: 'custom-A',
-  #   extends: 'custom-B',
+  # - name: custom-A
+  #   extends: custom-B
   #   # Any of the matching properties above can be used
-  #   handle: '10673/34'
+  #   handle: 10673/34
   #
-  # - name: 'custom-B',
-  #   extends: 'custom',
-  #   handle: '10673/12'
+  # - name: custom-B
+  #   extends: custom
+  #   handle: 10673/12
   #
   # # A theme with only a name will match every route
-  # name: 'custom'
+  # name: custom
   #
   # # This theme will use the default bootstrap styling for DSpace components
   # - name: BASE_THEME_NAME
@@ -376,7 +419,79 @@ vocabularies:
     vocabulary: 'srsc'
     enabled: true
 
-# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
+# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query.
 comcolSelectionSort:
   sortField: 'dc.title'
-  sortDirection: 'ASC'
\ No newline at end of file
+  sortDirection: 'ASC'
+
+# Example of fallback collection for suggestions import
+# suggestion:
+  # - collectionId: 8f7df5ca-f9c2-47a4-81ec-8a6393d6e5af
+    # source: "openaire"
+
+
+# Search settings
+search:
+  # Settings to enable/disable or configure advanced search filters.
+  advancedFilters:
+    enabled: false
+    # List of filters to enable in "Advanced Search" dropdown
+    filter: [ 'title', 'author', 'subject', 'entityType' ]
+
+
+# Notify metrics
+# Configuration for Notify Admin Dashboard for metrics visualization
+notifyMetrics:
+  # Configuration for received messages
+- title: 'admin-notify-dashboard.received-ldn'
+  boxes:
+  - color: '#B8DAFF'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.accepted'
+    config: 'NOTIFY.incoming.accepted'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description'
+  - color: '#D4EDDA'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.processed'
+    config: 'NOTIFY.incoming.processed'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.failure'
+    config: 'NOTIFY.incoming.failure'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted'
+    config: 'NOTIFY.incoming.untrusted'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description'
+  - color: '#43515F'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems'
+    textColor: '#fff'
+    config: 'NOTIFY.incoming.involvedItems'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description'
+# Configuration for outgoing messages
+- title: 'admin-notify-dashboard.generated-ldn'
+  boxes:
+  - color: '#B8DAFF'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.queued'
+    config: 'NOTIFY.outgoing.queued'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description'
+  - color: '#FDEEBB'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry'
+    config: 'NOTIFY.outgoing.queued_for_retry'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.failure'
+    config: 'NOTIFY.outgoing.failure'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description'
+  - color: '#43515F'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems'
+    textColor: '#fff'
+    config: 'NOTIFY.outgoing.involvedItems'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description'
+  - color: '#D4EDDA'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered'
+    config: 'NOTIFY.outgoing.delivered'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
+
+
+
+
+
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..109db60ca9 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,5 +1,5 @@
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: sandbox.dspace.org
   port: 443
   nameSpace: /server
diff --git a/cypress.config.ts b/cypress.config.ts
index 91eeb9838b..458b035a48 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -9,8 +9,9 @@ export default defineConfig({
     openMode: 0,
   },
   env: {
-    // Global constants used in DSpace e2e tests (see also ./cypress/support/e2e.ts)
-    // May be overridden in our cypress.json config file using specified environment variables.
+    // Global DSpace environment variables used in all our Cypress e2e tests
+    // May be modified in this config, or overridden in a variety of ways.
+    // See Cypress environment variable docs: https://docs.cypress.io/guides/guides/environment-variables
     // Default values listed here are all valid for the Demo Entities Data set available at
     // https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
     // (This is the data set used in our CI environment)
@@ -21,12 +22,14 @@ export default defineConfig({
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
     DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
-    DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
+    DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
     // Search term (should return results) used in search tests
     DSPACE_TEST_SEARCH_TERM: 'test',
-    // Collection used for submission tests
+    // Main Collection used for submission tests. Should be able to accept normal Item objects
     DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
     DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
+    // Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
+    DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts
new file mode 100644
index 0000000000..7612eb5313
--- /dev/null
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -0,0 +1,28 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Sidebar', () => {
+    beforeEach(() => {
+        // Must login as an Admin for sidebar to appear
+        cy.visit('/login');
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    });
+
+    it('should be pinnable and pass accessibility tests', () => {
+        // Pin the sidebar open
+        cy.get('#sidebar-collapse-toggle').click();
+
+        // Click on every expandable section to open all menus
+        cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
+
+        // Analyze <ds-admin-sidebar> for accessibility
+        testA11y('ds-admin-sidebar',
+        {
+            rules: {
+                // Currently all expandable sections have nested interactive elements
+                // See https://github.com/DSpace/dspace-angular/issues/2178
+                'nested-interactive': { enabled: false },
+            }
+        } as Options);
+    });
+});
diff --git a/cypress/e2e/breadcrumbs.cy.ts b/cypress/e2e/breadcrumbs.cy.ts
index ea6acdafcd..0cddbc723c 100644
--- a/cypress/e2e/breadcrumbs.cy.ts
+++ b/cypress/e2e/breadcrumbs.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Breadcrumbs', () => {
     it('should pass accessibility tests', () => {
         // Visit an Item, as those have more breadcrumbs
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
 
         // Wait for breadcrumbs to be visible
         cy.get('ds-breadcrumbs').should('be.visible');
diff --git a/cypress/e2e/browse-by-author.cy.ts b/cypress/e2e/browse-by-author.cy.ts
index 07c20ad7c9..32c470231d 100644
--- a/cypress/e2e/browse-by-author.cy.ts
+++ b/cypress/e2e/browse-by-author.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Author', () => {
         cy.visit('/browse/author');
 
         // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata-page').should('be.visible');
+        cy.get('ds-browse-by-metadata').should('be.visible');
 
         // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata-page');
+        testA11y('ds-browse-by-metadata');
     });
 });
diff --git a/cypress/e2e/browse-by-dateissued.cy.ts b/cypress/e2e/browse-by-dateissued.cy.ts
index 4d22420227..7966f1c82e 100644
--- a/cypress/e2e/browse-by-dateissued.cy.ts
+++ b/cypress/e2e/browse-by-dateissued.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Date Issued', () => {
         cy.visit('/browse/dateissued');
 
         // Wait for <ds-browse-by-date-page> to be visible
-        cy.get('ds-browse-by-date-page').should('be.visible');
+        cy.get('ds-browse-by-date').should('be.visible');
 
         // Analyze <ds-browse-by-date-page> for accessibility
-        testA11y('ds-browse-by-date-page');
+        testA11y('ds-browse-by-date');
     });
 });
diff --git a/cypress/e2e/browse-by-subject.cy.ts b/cypress/e2e/browse-by-subject.cy.ts
index 89b791f03c..57ca88d103 100644
--- a/cypress/e2e/browse-by-subject.cy.ts
+++ b/cypress/e2e/browse-by-subject.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Subject', () => {
         cy.visit('/browse/subject');
 
         // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata-page').should('be.visible');
+        cy.get('ds-browse-by-metadata').should('be.visible');
 
         // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata-page');
+        testA11y('ds-browse-by-metadata');
     });
 });
diff --git a/cypress/e2e/browse-by-title.cy.ts b/cypress/e2e/browse-by-title.cy.ts
index e4e027586a..09195c30df 100644
--- a/cypress/e2e/browse-by-title.cy.ts
+++ b/cypress/e2e/browse-by-title.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Title', () => {
         cy.visit('/browse/title');
 
         // Wait for <ds-browse-by-title-page> to be visible
-        cy.get('ds-browse-by-title-page').should('be.visible');
+        cy.get('ds-browse-by-title').should('be.visible');
 
         // Analyze <ds-browse-by-title-page> for accessibility
-        testA11y('ds-browse-by-title-page');
+        testA11y('ds-browse-by-title');
     });
 });
diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
new file mode 100644
index 0000000000..63d873db3e
--- /dev/null
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -0,0 +1,128 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COLLECTION_EDIT_PAGE = '/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Collection Page
+    cy.visit(COLLECTION_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Collection > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-collection> tag must be loaded
+        cy.get('ds-edit-collection').should('be.visible');
+
+        // Analyze <ds-edit-collection> for accessibility issues
+        testA11y('ds-edit-collection');
+    });
+});
+
+describe('Edit Collection > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-collection-roles> tag must be loaded
+        cy.get('ds-collection-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-roles');
+    });
+});
+
+describe('Edit Collection > Content Source tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="source"]').click();
+
+        // <ds-collection-source> tag must be loaded
+        cy.get('ds-collection-source').should('be.visible');
+
+        // Check the external source checkbox (to display all fields on the page)
+        cy.get('#externalSourceCheck').check();
+
+        // Wait for the source controls to appear
+        // cy.get('ds-collection-source-controls').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-source');
+    });
+});
+
+describe('Edit Collection > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-collection-curate> tag must be loaded
+        cy.get('ds-collection-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-curate');
+    });
+});
+
+describe('Edit Collection > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-collection-access-control> tag must be loaded
+        cy.get('ds-collection-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-access-control');
+    });
+});
+
+describe('Edit Collection > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-collection-authorizations> tag must be loaded
+        cy.get('ds-collection-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-authorizations');
+    });
+});
+
+describe('Edit Collection > Item Mapper tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="mapper"]').click();
+
+        // <ds-collection-item-mapper> tag must be loaded
+        cy.get('ds-collection-item-mapper').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-item-mapper');
+
+        // Click on the "Map new Items" tab
+        cy.get('li[data-test="mapTab"] a').click();
+
+        // Make sure search form is now visible
+        cy.get('ds-search-form').should('be.visible');
+
+        // Analyze entire page (again) for accessibility issues
+        testA11y('ds-collection-item-mapper');
+    });
+});
+
+
+describe('Edit Collection > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-collection> tag must be loaded
+        cy.get('ds-delete-collection').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-collection');
+    });
+});
diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index a034b4361d..55c10cc6e2 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_COLLECTION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
         // <ds-collection-page> tag must be loaded
         cy.get('ds-collection-page').should('be.visible');
diff --git a/cypress/e2e/collection-statistics.cy.ts b/cypress/e2e/collection-statistics.cy.ts
index 6df4e9a454..a08f8cb198 100644
--- a/cypress/e2e/collection-statistics.cy.ts
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COLLECTION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Statistics Page', () => {
-    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(TEST_COLLECTION);
+    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'));
 
     it('should load if you click on "Statistics" from a Collection page', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
     });
 
@@ -18,7 +18,7 @@ describe('Collection Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COLLECTIONSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COLLECTION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
new file mode 100644
index 0000000000..8fc1a7733e
--- /dev/null
+++ b/cypress/e2e/community-edit.cy.ts
@@ -0,0 +1,86 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COMMUNITY_EDIT_PAGE = '/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Community Page
+    cy.visit(COMMUNITY_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Community > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-community> tag must be loaded
+        cy.get('ds-edit-community').should('be.visible');
+
+        // Analyze <ds-edit-community> for accessibility issues
+        testA11y('ds-edit-community');
+    });
+});
+
+describe('Edit Community > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-community-roles> tag must be loaded
+        cy.get('ds-community-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-roles');
+    });
+});
+
+describe('Edit Community > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-community-curate> tag must be loaded
+        cy.get('ds-community-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-curate');
+    });
+});
+
+describe('Edit Community > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-community-access-control> tag must be loaded
+        cy.get('ds-community-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-access-control');
+    });
+});
+
+describe('Edit Community > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-community-authorizations> tag must be loaded
+        cy.get('ds-community-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-authorizations');
+    });
+});
+
+describe('Edit Community > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-community> tag must be loaded
+        cy.get('ds-delete-community').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-community');
+    });
+});
diff --git a/cypress/e2e/community-list.cy.ts b/cypress/e2e/community-list.cy.ts
index 7b60b59dbc..c371f6ceae 100644
--- a/cypress/e2e/community-list.cy.ts
+++ b/cypress/e2e/community-list.cy.ts
@@ -1,4 +1,3 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community List Page', () => {
@@ -13,13 +12,6 @@ describe('Community List Page', () => {
         cy.get('[data-test="expand-button"]').click({ multiple: true });
 
         // Analyze <ds-community-list-page> for accessibility issues
-        // Disable heading-order checks until it is fixed
-        testA11y('ds-community-list-page',
-            {
-                rules: {
-                    'heading-order': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-community-list-page');
     });
 });
diff --git a/cypress/e2e/community-page.cy.ts b/cypress/e2e/community-page.cy.ts
index 6c628e21ce..386bb592a0 100644
--- a/cypress/e2e/community-page.cy.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -1,15 +1,14 @@
-import { TEST_COMMUNITY } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
 
         // <ds-community-page> tag must be loaded
         cy.get('ds-community-page').should('be.visible');
 
         // Analyze <ds-community-page> for accessibility issues
-        testA11y('ds-community-page',);
+        testA11y('ds-community-page');
     });
 });
diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts
index 710450e797..6cafed0350 100644
--- a/cypress/e2e/community-statistics.cy.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COMMUNITY } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Statistics Page', () => {
-    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(TEST_COMMUNITY);
+    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'));
 
     it('should load if you click on "Statistics" from a Community page', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
     });
 
@@ -18,7 +18,7 @@ describe('Community Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COMMUNITYSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COMMUNITY).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 236208db68..9852216e43 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -8,12 +8,6 @@ describe('Header', () => {
         cy.get('ds-header').should('be.visible');
 
         // Analyze <ds-header> for accessibility
-        testA11y({
-            include: ['ds-header'],
-            exclude: [
-                ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174
-                ['.dropdownLogin']            // "Log in" link has color contrast issues. Will be fixed in #1149
-            ],
-        });
+        testA11y('ds-header');
     });
 });
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index 2a1ab9785a..ece38686b9 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -1,18 +1,18 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 import '../support/commands';
 
 describe('Site Statistics Page', () => {
     it('should load if you click on "Statistics" from homepage', () => {
         cy.visit('/');
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', '/statistics');
     });
 
     it('should pass accessibility tests', () => {
         // generate 2 view events on an Item's page
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
 
         cy.visit('/statistics');
 
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
new file mode 100644
index 0000000000..b4c01a1a94
--- /dev/null
+++ b/cypress/e2e/item-edit.cy.ts
@@ -0,0 +1,135 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Item Page
+    cy.visit(ITEM_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Item > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="metadata"]').click();
+
+        // <ds-edit-item-page> tag must be loaded
+        cy.get('ds-edit-item-page').should('be.visible');
+
+        // Analyze <ds-edit-item-page> for accessibility issues
+        testA11y('ds-edit-item-page');
+    });
+});
+
+describe('Edit Item > Status tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="status"]').click();
+
+        // <ds-item-status> tag must be loaded
+        cy.get('ds-item-status').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-status');
+    });
+});
+
+describe('Edit Item > Bitstreams tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="bitstreams"]').click();
+
+        // <ds-item-bitstreams> tag must be loaded
+        cy.get('ds-item-bitstreams').should('be.visible');
+
+        // Table of item bitstreams must also be loaded
+        cy.get('div.item-bitstreams').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-bitstreams',
+            {
+                rules: {
+                    // Currently Bitstreams page loads a pagination component per Bundle
+                    // and they all use the same 'id="p-dad"'.
+                    'duplicate-id': { enabled: false },
+                }
+            } as Options
+        );
+    });
+});
+
+describe('Edit Item > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-item-curate> tag must be loaded
+        cy.get('ds-item-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-curate');
+    });
+});
+
+describe('Edit Item > Relationships tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="relationships"]').click();
+
+        // <ds-item-relationships> tag must be loaded
+        cy.get('ds-item-relationships').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-relationships');
+    });
+});
+
+describe('Edit Item > Version History tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="versionhistory"]').click();
+
+        // <ds-item-version-history> tag must be loaded
+        cy.get('ds-item-version-history').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-version-history');
+    });
+});
+
+describe('Edit Item > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-item-access-control> tag must be loaded
+        cy.get('ds-item-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-access-control');
+    });
+});
+
+describe('Edit Item > Collection Mapper tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="mapper"]').click();
+
+        // <ds-item-collection-mapper> tag must be loaded
+        cy.get('ds-item-collection-mapper').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-item-collection-mapper');
+
+        // Click on the "Map new collections" tab
+        cy.get('li[data-test="mapTab"] a').click();
+
+        // Make sure search form is now visible
+        cy.get('ds-search-form').should('be.visible');
+
+        // Analyze entire page (again) for accessibility issues
+        testA11y('ds-item-collection-mapper');
+    });
+});
diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index 9eed711776..a6a208e9f4 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -1,10 +1,8 @@
-import { Options } from 'cypress-axe';
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item  Page', () => {
-    const ITEMPAGE = '/items/'.concat(TEST_ENTITY_PUBLICATION);
-    const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMPAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
+    const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid]
     it('should redirect to the entity page when navigating to an item page', () => {
@@ -19,13 +17,16 @@ describe('Item  Page', () => {
         cy.get('ds-item-page').should('be.visible');
 
         // Analyze <ds-item-page> for accessibility issues
-        // Disable heading-order checks until it is fixed
-        testA11y('ds-item-page',
-            {
-                rules: {
-                    'heading-order': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-item-page');
+    });
+
+    it('should pass accessibility tests on full item page', () => {
+        cy.visit(ENTITYPAGE + '/full');
+
+        // <ds-full-item-page> tag must be loaded
+        cy.get('ds-full-item-page').should('be.visible');
+
+        // Analyze <ds-full-item-page> for accessibility issues
+        testA11y('ds-full-item-page');
     });
 });
diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index 9b90cb24af..6caeacae8e 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item Statistics Page', () => {
-    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
 
@@ -24,7 +24,7 @@ describe('Item Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(ITEMSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_ENTITY_PUBLICATION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index b169634cfa..673041e9f3 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,33 +1,33 @@
-import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { testA11y } from 'cypress/support/utils';
 
 const page = {
     openLoginMenu() {
         // Click the "Log In" dropdown menu in header
-        cy.get('ds-themed-navbar [data-test="login-menu"]').click();
+        cy.get('ds-themed-header [data-test="login-menu"]').click();
     },
     openUserMenu() {
         // Once logged in, click the User menu in header
-        cy.get('ds-themed-navbar [data-test="user-menu"]').click();
+        cy.get('ds-themed-header [data-test="user-menu"]').click();
     },
     submitLoginAndPasswordByPressingButton(email, password) {
         // Enter email
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="email"]').type(email);
         // Enter password
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
         // Click login button
-        cy.get('ds-themed-navbar [data-test="login-button"]').click();
+        cy.get('ds-themed-header [data-test="login-button"]').click();
     },
     submitLoginAndPasswordByPressingEnter(email, password) {
         // In opened Login modal, fill out email & password, then click Enter
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
-        cy.get('ds-themed-navbar [data-test="password"]').type('{enter}');
+        cy.get('ds-themed-header [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
+        cy.get('ds-themed-header [data-test="password"]').type('{enter}');
     },
     submitLogoutByPressingButton() {
         // This is the POST command that will actually log us out
         cy.intercept('POST', '/server/api/authn/logout').as('logout');
         // Click logout button
-        cy.get('ds-themed-navbar [data-test="logout-button"]').click();
+        cy.get('ds-themed-header [data-test="logout-button"]').click();
         // Wait until above POST command responds before continuing
         // (This ensures next action waits until logout completes)
         cy.wait('@logout');
@@ -36,7 +36,7 @@ const page = {
 
 describe('Login Modal', () => {
     it('should login when clicking button & stay on same page', () => {
-        const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+        const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
         cy.visit(ENTITYPAGE);
 
         // Login menu should exist
@@ -46,7 +46,7 @@ describe('Login Modal', () => {
         page.openLoginMenu();
         cy.get('.form-login').should('be.visible');
 
-        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('ds-log-in').should('not.exist');
 
         // Verify we are still on the same page
@@ -66,7 +66,7 @@ describe('Login Modal', () => {
         cy.get('.form-login').should('be.visible');
 
         // Login, and the <ds-log-in> tag should no longer exist
-        page.submitLoginAndPasswordByPressingEnter(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('.form-login').should('not.exist');
 
         // Verify we are still on homepage
@@ -80,7 +80,7 @@ describe('Login Modal', () => {
 
     it('should support logout', () => {
         // First authenticate & access homepage
-        cy.login(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.login(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.visit('/');
 
         // Verify ds-log-in tag doesn't exist, but ds-log-out tag does exist
@@ -102,12 +102,15 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Registration link should be visible
-        cy.get('ds-themed-navbar [data-test="register"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="register"]').should('be.visible');
 
         // Click registration link & you should go to registration page
-        cy.get('ds-themed-navbar [data-test="register"]').click();
+        cy.get('ds-themed-header [data-test="register"]').click();
         cy.location('pathname').should('eq', '/register');
         cy.get('ds-register-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-register-email');
     });
 
     it('should allow forgot password', () => {
@@ -116,11 +119,32 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Forgot password link should be visible
-        cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="forgot"]').should('be.visible');
 
         // Click link & you should go to Forgot Password page
-        cy.get('ds-themed-navbar [data-test="forgot"]').click();
+        cy.get('ds-themed-header [data-test="forgot"]').click();
         cy.location('pathname').should('eq', '/forgot');
         cy.get('ds-forgot-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-forgot-email');
+    });
+
+    it('should pass accessibility tests in menus', () => {
+        cy.visit('/');
+
+        // Open login menu & verify accessibility
+        page.openLoginMenu();
+        cy.get('ds-log-in').should('exist');
+        testA11y('ds-log-in');
+
+        // Now login
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+        cy.get('ds-log-in').should('not.exist');
+
+        // Open user menu, verify user menu accesibility
+        page.openUserMenu();
+        cy.get('ds-user-menu').should('be.visible');
+        testA11y('ds-user-menu');
     });
 });
diff --git a/cypress/e2e/my-dspace.cy.ts b/cypress/e2e/my-dspace.cy.ts
index 79786c298a..c48656ffcc 100644
--- a/cypress/e2e/my-dspace.cy.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,5 +1,3 @@
-import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('My DSpace page', () => {
@@ -7,7 +5,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -19,28 +17,14 @@ describe('My DSpace page', () => {
         cy.get('.filter-toggle').click({ multiple: true });
 
         // Analyze <ds-my-dspace-page> for accessibility issues
-        testA11y(
-            {
-                include: ['ds-my-dspace-page'],
-                exclude: [
-                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
-                ],
-            },
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-my-dspace-page');
     });
 
     it('should have a working detailed view that passes accessibility tests', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -49,16 +33,8 @@ describe('My DSpace page', () => {
 
         cy.get('ds-object-detail').should('be.visible');
 
-        // Analyze <ds-search-page> for accessibility issues
-        testA11y('ds-my-dspace-page',
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        // Analyze <ds-my-dspace-page> for accessibility issues
+        testA11y('ds-my-dspace-page');
     });
 
     // NOTE: Deleting existing submissions is exercised by submission.spec.ts
@@ -66,7 +42,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Submission dropdown
         cy.get('button[data-test="submission-dropdown"]').click();
@@ -77,10 +53,10 @@ describe('My DSpace page', () => {
         cy.get('ds-create-item-parent-selector').should('be.visible');
 
         // Type in a known Collection name in the search box
-        cy.get('ds-authorized-collection-selector input[type="search"]').type(TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Click on the button matching that known Collection name
-        cy.get('ds-authorized-collection-selector button[title="'.concat(TEST_SUBMIT_COLLECTION_NAME).concat('"]')).click();
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')).concat('"]')).click();
 
         // New URL should include /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -89,7 +65,7 @@ describe('My DSpace page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & its value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Now that we've created a submission, we'll test that we can go back and Edit it.
         // Get our Submission URL, to parse out the ID of this new submission
@@ -138,7 +114,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Import dropdown
         cy.get('button[data-test="import-dropdown"]').click();
@@ -150,6 +126,9 @@ describe('My DSpace page', () => {
 
         // The external import searchbox should be visible
         cy.get('ds-submission-import-external-searchbar').should('be.visible');
+
+        // Test for accessibility issues
+        testA11y('ds-submission-import-external');
     });
 
 });
diff --git a/cypress/e2e/pagenotfound.cy.ts b/cypress/e2e/pagenotfound.cy.ts
index 43e3c3af24..d02aa8541c 100644
--- a/cypress/e2e/pagenotfound.cy.ts
+++ b/cypress/e2e/pagenotfound.cy.ts
@@ -1,8 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
 describe('PageNotFound', () => {
     it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
         // request an invalid page (UUIDs at root path aren't valid)
         cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
         cy.get('ds-pagenotfound').should('be.visible');
+
+        // Analyze <ds-pagenotfound> for accessibility issues
+        testA11y('ds-pagenotfound');
     });
 
     it('should not contain element ds-pagenotfound when navigating to existing page', () => {
diff --git a/cypress/e2e/search-navbar.cy.ts b/cypress/e2e/search-navbar.cy.ts
index 648db17fe6..28a72bcc78 100644
--- a/cypress/e2e/search-navbar.cy.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,23 +1,21 @@
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
-
 const page = {
     fillOutQueryInNavBar(query) {
         // Click the magnifying glass
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
         // Fill out a query in input that appears
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query);
+        cy.get('ds-themed-header [data-test="header-search-box"]').type(query);
     },
     submitQueryByPressingEnter() {
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}');
+        cy.get('ds-themed-header [data-test="header-search-box"]').type('{enter}');
     },
     submitQueryByPressingIcon() {
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
     }
 };
 
 describe('Search from Navigation Bar', () => {
     // NOTE: these tests currently assume this query will return results!
-    const query = TEST_SEARCH_TERM;
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
 
     it('should go to search page with correct query if submitted (from home)', () => {
         cy.visit('/');
diff --git a/cypress/e2e/search-page.cy.ts b/cypress/e2e/search-page.cy.ts
index 24519cc236..429f4e6da4 100644
--- a/cypress/e2e/search-page.cy.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,8 +1,10 @@
 import { Options } from 'cypress-axe';
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Search Page', () => {
+    // NOTE: these tests currently assume this query will return results!
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
+
     it('should redirect to the correct url when query was set and submit button was triggered', () => {
         const queryString = 'Another interesting query string';
         cy.visit('/search');
@@ -13,8 +15,8 @@ describe('Search Page', () => {
     });
 
     it('should load results and pass accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
-        cy.get('[data-test="search-box"]').should('have.value', TEST_SEARCH_TERM);
+        cy.visit('/search?query='.concat(query));
+        cy.get('[data-test="search-box"]').should('have.value', query);
 
         // <ds-search-page> tag must be loaded
         cy.get('ds-search-page').should('be.visible');
@@ -27,25 +29,11 @@ describe('Search Page', () => {
         cy.get('[data-test="filter-toggle"]').click({ multiple: true });
 
         // Analyze <ds-search-page> for accessibility issues
-        testA11y(
-            {
-                include: ['ds-search-page'],
-                exclude: [
-                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
-                ],
-            },
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-search-page');
     });
 
     it('should have a working grid view that passes accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
+        cy.visit('/search?query='.concat(query));
 
         // Click button in sidebar to display grid view
         cy.get('ds-search-sidebar [data-test="grid-view"]').click();
@@ -60,9 +48,8 @@ describe('Search Page', () => {
         testA11y('ds-search-page',
             {
                 rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
+                    // Card titles fail this test currently
+                    'heading-order': { enabled: false }
                 }
             } as Options
         );
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index ed10b2d13a..4402410f23 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -1,14 +1,16 @@
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support/e2e';
+import { testA11y } from 'cypress/support/utils';
+//import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
+import { Options } from 'cypress-axe';
 
 describe('New Submission page', () => {
-    // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
 
+    // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts
     it('should create a new submission when using /submit path & pass accessibility', () => {
         // Test that calling /submit with collection & entityType will create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Should redirect to /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -17,7 +19,7 @@ describe('New Submission page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & it's value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // 4 sections should be visible by default
         cy.get('div#section_traditionalpageone').should('be.visible');
@@ -25,6 +27,25 @@ describe('New Submission page', () => {
         cy.get('div#section_upload').should('be.visible');
         cy.get('div#section_license').should('be.visible');
 
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // Author & Subject fields have invalid "aria-multiline" attrs.
+                    // See https://github.com/DSpace/dspace-angular/issues/1272
+                    'aria-allowed-attr': { enabled: false },
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                    // All select boxes fail to have a name / aria-label.
+                    // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
+                    'select-name': { enabled: false },
+                }
+
+            } as Options
+        );
+
         // Discard button should work
         // Clicking it will display a confirmation, which we will confirm with another click
         cy.get('button#discard').click();
@@ -33,10 +54,10 @@ describe('New Submission page', () => {
 
     it('should block submission & show errors if required fields are missing', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Attempt an immediate deposit without filling out any fields
         cy.get('button#deposit').click();
@@ -93,10 +114,10 @@ describe('New Submission page', () => {
 
     it('should allow for deposit if all required fields completed & file uploaded', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Fill out all required fields (Title, Date)
         cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
@@ -131,4 +152,76 @@ describe('New Submission page', () => {
         cy.get('ds-notification div.alert-success').should('be.visible');
     });
 
+    it('is possible to submit a new "Person" and that form passes accessibility', () => {
+        // To submit a different entity type, we'll start from MyDSpace
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        // NOTE: At this time, we MUST login as admin to submit Person objects
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+        // Open the New Submission dropdown
+        cy.get('button[data-test="submission-dropdown"]').click();
+        // Click on the "Person" type in that dropdown
+        cy.get('#entityControlsDropdownMenu button[title="Person"]').click();
+
+        // This should display the <ds-create-item-parent-selector> (popup window)
+        cy.get('ds-create-item-parent-selector').should('be.visible');
+
+        // Type in a known Collection name in the search box
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
+        // Click on the button matching that known Collection name
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME')).concat('"]')).click();
+
+        // New URL should include /workspaceitems, as we've started a new submission
+        cy.url().should('include', '/workspaceitems');
+
+        // The Submission edit form tag should be visible
+        cy.get('ds-submission-edit').should('be.visible');
+
+        // A Collection menu button should exist & its value should be the selected collection
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
+        // 3 sections should be visible by default
+        cy.get('div#section_personStep').should('be.visible');
+        cy.get('div#section_upload').should('be.visible');
+        cy.get('div#section_license').should('be.visible');
+
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                }
+
+            } as Options
+        );
+
+        // Click the lookup button next to "Publication" field
+        cy.get('button[data-test="lookup-button"]').click();
+
+        // A popup modal window should be visible
+        cy.get('ds-dynamic-lookup-relation-modal').should('be.visible');
+
+        // Popup modal should also pass accessibility tests
+        //testA11y('ds-dynamic-lookup-relation-modal');
+        testA11y({
+            include: ['ds-dynamic-lookup-relation-modal'],
+            exclude: [
+                ['ul.nav-tabs'] // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
+            ],
+        });
+
+        // Close popup window
+        cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+
+        // Back on the form, click the discard button to remove new submission
+        // Clicking it will display a confirmation, which we will confirm with another click
+        cy.get('button#discard').click();
+        cy.get('button#discard_submit').click();
+    });
 });
diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts
index ead38afb92..cc3dccba38 100644
--- a/cypress/plugins/index.ts
+++ b/cypress/plugins/index.ts
@@ -1,5 +1,11 @@
 const fs = require('fs');
 
+// These two global variables are used to store information about the REST API used
+// by these e2e tests. They are filled out prior to running any tests in the before()
+// method of e2e.ts. They can then be accessed by any tests via the getters below.
+let REST_BASE_URL: string;
+let REST_DOMAIN: string;
+
 // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
 // For more info, visit https://on.cypress.io/plugins-api
 module.exports = (on, config) => {
@@ -30,6 +36,24 @@ module.exports = (on, config) => {
             }
 
             return null;
+        },
+        // Save value of REST Base URL, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseURL() below.
+        saveRestBaseURL(url: string) {
+            return (REST_BASE_URL = url);
+        },
+        // Retrieve currently saved value of REST Base URL
+        getRestBaseURL() {
+            return REST_BASE_URL ;
+        },
+        // Save value of REST Domain, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseDomain() below.
+        saveRestBaseDomain(domain: string) {
+            return (REST_DOMAIN = domain);
+        },
+        // Retrieve currently saved value of REST Domain
+        getRestBaseDomain() {
+            return REST_DOMAIN ;
         }
     });
 };
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c70c4e37e1..7da454e2d0 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -5,11 +5,7 @@
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
 import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
-
-// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
-// from the Angular UI's config.json. See 'login()'.
-export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
-export const FALLBACK_TEST_REST_DOMAIN = 'localhost';
+import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
 // ALL custom commands MUST be listed here for code completion to work
@@ -41,6 +37,13 @@ declare global {
              * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
              */
             generateViewEvent(uuid: string, dsoType: string): typeof generateViewEvent;
+
+            /**
+             * Create a new CSRF token and add to required Cookie. CSRF Token is returned
+             * in chainable in order to allow it to be sent also in required CSRF header.
+             * @returns Chainable reference to allow CSRF token to also be sent in header.
+             */
+            createCSRFCookie(): Chainable<any>;
         }
     }
 }
@@ -54,59 +57,32 @@ declare global {
  * @param password password to login as
  */
 function login(email: string, password: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send login POST request including that CSRF token
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/authn/login',
+                headers: { [XSRF_REQUEST_HEADER]: csrfToken},
+                form: true, // indicates the body should be form urlencoded
+                body: { user: email, password: password }
+            }).then((resp) => {
+                // We expect a successful login
+                expect(resp.status).to.eq(200);
+                // We expect to have a valid authorization header returned (with our auth token)
+                expect(resp.headers).to.have.property('authorization');
 
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            //console.log("Found 'rest.baseUrl' in config.json. Using this REST API for login: ".concat(config.rest.baseUrl));
-            baseRestUrl = config.rest.baseUrl;
-        }
+                // Initialize our AuthTokenInfo object from the authorization header.
+                const authheader = resp.headers.authorization as string;
+                const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
 
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeLoginCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send login POST request including that CSRF token
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/authn/login',
-            headers: { [XSRF_REQUEST_HEADER]: csrfToken},
-            form: true, // indicates the body should be form urlencoded
-            body: { user: email, password: password }
-        }).then((resp) => {
-            // We expect a successful login
-            expect(resp.status).to.eq(200);
-            // We expect to have a valid authorization header returned (with our auth token)
-            expect(resp.headers).to.have.property('authorization');
-
-            // Initialize our AuthTokenInfo object from the authorization header.
-            const authheader = resp.headers.authorization as string;
-            const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
-
-            // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
-            // This ensures the UI will recognize we are logged in on next "visit()"
-            cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+                // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
+                // This ensures the UI will recognize we are logged in on next "visit()"
+                cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.login')
@@ -141,54 +117,53 @@ Cypress.Commands.add('loginViaForm', loginViaForm);
  * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
  */
 function generateViewEvent(uuid: string, dsoType: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
-
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            baseRestUrl = config.rest.baseUrl;
-        }
-
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeGenerateViewEventCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/statistics/viewevents',
-            headers: {
-                [XSRF_REQUEST_HEADER] : csrfToken,
-                // use a known public IP address to avoid being seen as a "bot"
-                'X-Forwarded-For': '1.1.1.1',
-            },
-            //form: true, // indicates the body should be form urlencoded
-            body: { targetId: uuid, targetType: dsoType },
-        }).then((resp) => {
-            // We expect a 201 (which means statistics event was created)
-            expect(resp.status).to.eq(201);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/statistics/viewevents',
+                headers: {
+                    [XSRF_REQUEST_HEADER] : csrfToken,
+                    // use a known public IP address to avoid being seen as a "bot"
+                    'X-Forwarded-For': '1.1.1.1',
+                    // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot"
+                    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0',
+                },
+                //form: true, // indicates the body should be form urlencoded
+                body: { targetId: uuid, targetType: dsoType },
+            }).then((resp) => {
+                // We expect a 201 (which means statistics event was created)
+                expect(resp.status).to.eq(201);
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.generateViewEvent')
 Cypress.Commands.add('generateViewEvent', generateViewEvent);
 
+
+/**
+ * Can be used by tests to generate a random XSRF/CSRF token and save it to
+ * the required XSRF/CSRF cookie for usage when sending POST requests or similar.
+ * The generated CSRF token is returned in a Chainable to allow it to be also sent
+ * in the CSRF HTTP Header.
+ * @returns a Cypress Chainable which can be used to get the generated CSRF Token
+ */
+function createCSRFCookie(): Cypress.Chainable {
+    // Generate a new token which is a random UUID
+    const csrfToken: string = uuidv4();
+
+    // Save it to our required cookie
+    cy.task('getRestBaseDomain').then((baseDomain: string) => {
+        // Create a fake CSRF Token.  Set it in the required server-side cookie
+        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
+    });
+
+    // return the generated token wrapped in a chainable
+    return cy.wrap(csrfToken);
+}
+// Add as a Cypress command (i.e. assign to 'cy.createCSRFCookie')
+Cypress.Commands.add('createCSRFCookie', createCSRFCookie);
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index dd7ee1824c..b2255a7da6 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -19,45 +19,53 @@ import './commands';
 // Import Cypress Axe tools for all tests
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
+import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+
+// Runs once before all tests
+before(() => {
+  // Cypress doesn't have access to the running application in Node.js.
+  // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
+  // Instead, we'll read our running application's config.json, which contains the configs &
+  // is regenerated at runtime each time the Angular UI application starts up.
+  cy.task('readUIConfig').then((str: string) => {
+    // Parse config into a JSON object
+    const config = JSON.parse(str);
+
+    // Find URL of our REST API & save to global variable via task
+    let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
+    if (!config.rest.baseUrl) {
+        console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
+    } else {
+        baseRestUrl = config.rest.baseUrl;
+    }
+    cy.task('saveRestBaseURL', baseRestUrl);
+
+    // Find domain of our REST API & save to global variable via task.
+    let baseDomain = FALLBACK_TEST_REST_DOMAIN;
+    if (!config.rest.host) {
+        console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
+    } else {
+        baseDomain = config.rest.host;
+    }
+    cy.task('saveRestBaseDomain', baseDomain);
+
+  });
+});
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
     // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
     // This just ensures it doesn't get in the way of matching other objects in the page.
     cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+
+    // Remove any CSRF cookies saved from prior tests
+    cy.clearCookie(DSPACE_XSRF_COOKIE);
 });
 
-// For better stability between tests, we visit "about:blank" (i.e. blank page) after each test.
-// This ensures any remaining/outstanding XHR requests are killed, so they don't affect the next test.
-// Borrowed from: https://glebbahmutov.com/blog/visit-blank-page-between-tests/
-/*afterEach(() => {
-    cy.window().then((win) => {
-      win.location.href = 'about:blank';
-    });
-});*/
-
-
-// Global constants used in tests
-// May be overridden in our cypress.json config file using specified environment variables.
-// Default values listed here are all valid for the Demo Entities Data set available at
-// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-// (This is the data set used in our CI environment)
-
-// Admin account used for administrative tests
-export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com';
-export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace';
-// Community/collection/publication used for view/edit tests
-export const TEST_COLLECTION = Cypress.env('DSPACE_TEST_COLLECTION') || '282164f5-d325-4740-8dd1-fa4d6d3e7200';
-export const TEST_COMMUNITY = Cypress.env('DSPACE_TEST_COMMUNITY') || '0958c910-2037-42a9-81c7-dca80e3892b4';
-export const TEST_ENTITY_PUBLICATION = Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION') || 'e98b0f27-5c19-49a0-960d-eb6ad5287067';
-// Search term (should return results) used in search tests
-export const TEST_SEARCH_TERM = Cypress.env('DSPACE_TEST_SEARCH_TERM') || 'test';
-// Collection used for submission tests
-export const TEST_SUBMIT_COLLECTION_NAME = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME') || 'Sample Collection';
-export const TEST_SUBMIT_COLLECTION_UUID = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID') || '9d8334e9-25d3-4a67-9cea-3dffdef80144';
-export const TEST_SUBMIT_USER = Cypress.env('DSPACE_TEST_SUBMIT_USER') || 'dspacedemo+submit@gmail.com';
-export const TEST_SUBMIT_USER_PASSWORD = Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD') || 'dspace';
-
+// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
+// from the Angular UI's config.json. See 'before()' above.
+const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
+const FALLBACK_TEST_REST_DOMAIN = 'localhost';
 
 // USEFUL REGEX for testing
 
diff --git a/docker/README.md b/docker/README.md
index 42deb793f9..d0cee3f52a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -23,14 +23,14 @@ the Docker compose scripts in this 'docker' folder.
 This Dockerfile is used to build a *development* DSpace 7 Angular UI image, published as 'dspace/dspace-angular'
 
 ```
-docker build -t dspace/dspace-angular:dspace-7_x .
+docker build -t dspace/dspace-angular:latest .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:dspace-7_x
+docker push dspace/dspace-angular:latest
 ```
 
 ### Dockerfile.dist
@@ -39,7 +39,7 @@ The `Dockerfile.dist` is used to generate a *production* build and runtime envir
 
 ```bash
 # build the latest image
-docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
+docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 ```
 
 A default/demo version of this image is built *automatically*.
@@ -101,8 +101,8 @@ and the backend at http://localhost:8080/server/
 
 ## Run DSpace Angular dist build with DSpace Demo site backend
 
-This allows you to run the Angular UI in *production* mode, pointing it at the demo backend
-(https://api7.dspace.org/server/).
+This allows you to run the Angular UI in *production* mode, pointing it at the demo or sandbox backend
+(https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
 
 ```
 docker-compose -f docker/docker-compose-dist.yml pull
diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c..31bc53f64d 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -14,13 +14,8 @@
 # Therefore, it should be kept in sync with that file
 version: "3.7"
 
-networks:
-  dspacenet:
-
 services:
   dspace-cli:
-    networks:
-      dspacenet: {}
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
diff --git a/docker/cli.yml b/docker/cli.yml
index 54b83d4503..cc266b186f 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -13,10 +13,16 @@
 #
 # Therefore, it should be kept in sync with that file
 version: "3.7"
-
+networks:
+  # Default to using network named 'dspacenet' from docker-compose-rest.yml.
+  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
+  default:
+    name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
+    external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
@@ -30,16 +36,12 @@ services:
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
     volumes:
-    - "assetstore:/dspace/assetstore"
+    # Keep DSpace assetstore directory between reboots
+    - assetstore:/dspace/assetstore
     entrypoint: /dspace/bin/dspace
     command: help
-    networks:
-      - dspacenet
     tty: true
     stdin_open: true
 
 volumes:
   assetstore:
-
-networks:
-  dspacenet:
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 9ec8fe664a..07993e20c6 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,11 +33,11 @@ services:
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -45,8 +45,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
@@ -70,21 +68,18 @@ services:
       PGDATA: /pgdata
     image: dspace/dspace-postgres-pgcrypto:loadsql
     networks:
-      dspacenet:
+      - dspacenet
     stdin_open: true
     tty: true
     volumes:
+     # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -92,9 +87,6 @@ services:
     tty: true
     working_dir: /var/solr/data
     volumes:
-    # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder)
-    # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume
-    - solr_configs:/opt/solr/server/solr/configsets/dspace
     # Keep Solr data directory between reboots
     - solr_data:/var/solr/data
     # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
@@ -103,14 +95,18 @@ services:
     - '-c'
     - |
       init-var-solr
-      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
-      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
-      precreate-core search /opt/solr/server/solr/configsets/dspace/search
-      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
+      precreate-core authority /opt/solr/server/solr/configsets/authority
+      cp -r /opt/solr/server/solr/configsets/authority/* authority
+      precreate-core oai /opt/solr/server/solr/configsets/oai
+      cp -r /opt/solr/server/solr/configsets/oai/* oai
+      precreate-core search /opt/solr/server/solr/configsets/search
+      cp -r /opt/solr/server/solr/configsets/search/* search
+      precreate-core statistics /opt/solr/server/solr/configsets/statistics
+      cp -r /opt/solr/server/solr/configsets/statistics/* statistics
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       exec solr -f
 volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:
\ No newline at end of file
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 1c75539da9..38278085cd 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -24,10 +24,10 @@ services:
       # This is because Server Side Rendering (SSR) currently requires a public URL,
       # see this bug: https://github.com/DSpace/dspace-angular/issues/1485
       DSPACE_REST_SSL: 'true'
-      DSPACE_REST_HOST: api7.dspace.org
+      DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x-dist
+    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index e5f62600e7..e1577ec837 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -39,11 +39,11 @@ services:
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -51,8 +51,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
@@ -69,25 +67,23 @@ services:
     container_name: dspacedb
     environment:
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 5432
       target: 5432
     stdin_open: true
     tty: true
     volumes:
+    # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -115,10 +111,10 @@ services:
       cp -r /opt/solr/server/solr/configsets/search/* search
       precreate-core statistics /opt/solr/server/solr/configsets/statistics
       cp -r /opt/solr/server/solr/configsets/statistics/* statistics
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       exec solr -f
 volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1387b1de39..1071b8d6ce 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: dspace/dspace-angular:${DSPACE_VER:-latest}
     build:
       context: ..
       dockerfile: Dockerfile
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 62fa444cc0..01fd83c94d 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -48,7 +48,7 @@ dspace-angular connects to your DSpace installation by using its REST endpoint.
 ```yaml
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: demo.dspace.org
   port: 443
   nameSpace: /server
 }
@@ -57,7 +57,7 @@ rest:
 Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
 ```
   DSPACE_REST_SSL=true
-  DSPACE_REST_HOST=api7.dspace.org
+  DSPACE_REST_HOST=demo.dspace.org
   DSPACE_REST_PORT=443
   DSPACE_REST_NAMESPACE=/server
 ```
diff --git a/karma.conf.js b/karma.conf.js
index 8418312b1a..f96558bfaf 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,7 +15,10 @@ module.exports = function (config) {
     ],
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
-      captureConsole: false
+      captureConsole: false,
+      jasmine: {
+        failSpecWithNoExpectations: true
+      }
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, './coverage/dspace-angular'),
diff --git a/package.json b/package.json
index 719b13b23b..c0a3843605 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.0",
+  "version": "8.0.0-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -15,14 +15,14 @@
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
-    "build:prod": "yarn run build:ssr",
+    "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
     "lint": "ng lint",
     "lint-fix": "ng lint --fix=true",
-    "e2e": "ng e2e",
+    "e2e": "cross-env NODE_ENV=production ng e2e",
     "clean:dev:config": "rimraf src/assets/config.json",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
@@ -82,7 +82,7 @@
     "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.0",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
@@ -99,6 +99,7 @@
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^1.0.5",
+    "http-terminator": "^3.2.0",
     "isbot": "^3.6.10",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
@@ -116,18 +117,18 @@
     "morgan": "^1.10.0",
     "ng-mocks": "^14.10.0",
     "ng2-file-upload": "1.4.0",
-    "ng2-nouislider": "^1.8.3",
+    "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
-    "ngx-ui-switch": "^14.0.3",
-    "nouislider": "^14.6.3",
+    "ngx-ui-switch": "^14.1.0",
+    "nouislider": "^15.7.1",
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.10.0",
+    "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
@@ -141,7 +142,7 @@
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.6",
+    "@angular/cli": "^16.0.4",
     "@angular/compiler-cli": "^15.2.8",
     "@angular/language-service": "^15.2.8",
     "@cypress/schematic": "^1.5.0",
@@ -159,19 +160,22 @@
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^5.59.1",
     "@typescript-eslint/parser": "^5.59.1",
-    "axe-core": "^4.7.0",
+    "axe-core": "^4.7.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "12.10.0",
+    "cypress": "12.17.4",
     "cypress-axe": "^1.4.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.6.4",
+    "eslint-plugin-import-newlines": "^1.3.1",
+    "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-lodash": "^7.4.0",
+    "eslint-plugin-rxjs": "^5.0.3",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "express-static-gzip": "^2.1.7",
     "jasmine-core": "^3.8.0",
diff --git a/server.ts b/server.ts
index 23327c2058..da085f372f 100644
--- a/server.ts
+++ b/server.ts
@@ -32,6 +32,7 @@ import isbot from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
+import { createHttpTerminator } from 'http-terminator';
 
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -320,22 +321,23 @@ function initCache() {
   if (botCacheEnabled()) {
     // Initialize a new "least-recently-used" item cache (where least recently used pages are removed first)
     // See https://www.npmjs.com/package/lru-cache
-    // When enabled, each page defaults to expiring after 1 day
+    // When enabled, each page defaults to expiring after 1 day (defined in default-app-config.ts)
     botCache = new LRU( {
       max: environment.cache.serverSide.botCache.max,
-      ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day
-      allowStale: environment.cache.serverSide.botCache.allowStale ?? true // if object is stale, return stale value before deleting
+      ttl: environment.cache.serverSide.botCache.timeToLive,
+      allowStale: environment.cache.serverSide.botCache.allowStale
     });
   }
 
   if (anonymousCacheEnabled()) {
     // NOTE: While caches may share SSR pages, this cache must be kept separately because the timeToLive
     // may expire pages more frequently.
-    // When enabled, each page defaults to expiring after 10 seconds (to minimize anonymous users seeing out-of-date content)
+    // When enabled, each page defaults to expiring after 10 seconds (defined in default-app-config.ts)
+    // to minimize anonymous users seeing out-of-date content
     anonymousCache = new LRU( {
       max: environment.cache.serverSide.anonymousCache.max,
-      ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds
-      allowStale: environment.cache.serverSide.anonymousCache.allowStale ?? true // if object is stale, return stale value before deleting
+      ttl: environment.cache.serverSide.anonymousCache.timeToLive,
+      allowStale: environment.cache.serverSide.anonymousCache.allowStale
     });
   }
 }
@@ -487,7 +489,7 @@ function saveToCache(req, page: any) {
  */
 function hasNotSucceeded(statusCode) {
   const rgx = new RegExp(/^20+/);
-  return !rgx.test(statusCode)
+  return !rgx.test(statusCode);
 }
 
 function retrieveHeaders(response) {
@@ -525,23 +527,46 @@ function serverStarted() {
  * @param keys SSL credentials
  */
 function createHttpsServer(keys) {
-  createServer({
+  const listener = createServer({
     key: keys.serviceKey,
     cert: keys.certificate
   }, app).listen(environment.ui.port, environment.ui.host, () => {
     serverStarted();
   });
+
+  // Graceful shutdown when signalled
+  const terminator = createHttpTerminator({server: listener});
+  process.on('SIGINT', () => {
+      void (async ()=> {
+        console.debug('Closing HTTPS server on signal');
+        await terminator.terminate().catch(e => { console.error(e); });
+        console.debug('HTTPS server closed');
+      })();
+      });
 }
 
+/**
+ * Create an HTTP server with the configured port and host.
+ */
 function run() {
   const port = environment.ui.port || 4000;
   const host = environment.ui.host || '/';
 
   // Start up the Node server
   const server = app();
-  server.listen(port, host, () => {
+  const listener = server.listen(port, host, () => {
     serverStarted();
   });
+
+  // Graceful shutdown when signalled
+  const terminator = createHttpTerminator({server: listener});
+  process.on('SIGINT', () => {
+      void (async () => {
+        console.debug('Closing HTTP server on signal');
+        await terminator.terminate().catch(e => { console.error(e); });
+        console.debug('HTTP server closed.');return undefined;
+        })();
+      });
 }
 
 function start() {
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index 259aa311e7..06ae032194 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -1,12 +1,22 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAccessControlModuleRoute } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 
-export const GROUP_EDIT_PATH = 'groups';
+export const EPERSON_PATH = 'epeople';
+
+export function getEPersonsRoute(): string {
+  return new URLCombiner(getAccessControlModuleRoute(), EPERSON_PATH).toString();
+}
+
+export function getEPersonEditRoute(id: string): string {
+  return new URLCombiner(getEPersonsRoute(), id, 'edit').toString();
+}
+
+export const GROUP_PATH = 'groups';
 
 export function getGroupsRoute() {
-  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_PATH).toString();
 }
 
 export function getGroupEditRoute(id: string) {
-  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
+  return new URLCombiner(getGroupsRoute(), id, 'edit').toString();
 }
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index 6f6de6cb26..e85961fd13 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -1,69 +1,90 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
-import { GroupFormComponent } from './group-registry/group-form/group-form.component';
-import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { GROUP_EDIT_PATH } from './access-control-routing-paths';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import {
-  GroupAdministratorGuard
-} from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import {
-  SiteAdministratorGuard
-} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+  EPERSON_PATH,
+  GROUP_PATH,
+} from './access-control-routing-paths';
 import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
+import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
+import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
+import { GroupFormComponent } from './group-registry/group-form/group-form.component';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
-        path: 'epeople',
+        path: EPERSON_PATH,
         component: EPeopleRegistryComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
-        canActivate: [SiteAdministratorGuard]
+        canActivate: [SiteAdministratorGuard],
       },
       {
-        path: GROUP_EDIT_PATH,
+        path: `${EPERSON_PATH}/create`,
+        component: EPersonFormComponent,
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: `${EPERSON_PATH}/:id/edit`,
+        component: EPersonFormComponent,
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          ePerson: EPersonResolver,
+        },
+        data: { title: 'admin.access-control.epeople.edit.title', breadcrumbKey: 'admin.access-control.epeople.edit' },
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: GROUP_PATH,
         component: GroupsRegistryComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
-        canActivate: [GroupAdministratorGuard]
+        canActivate: [GroupAdministratorGuard],
       },
       {
-        path: `${GROUP_EDIT_PATH}/newGroup`,
+        path: `${GROUP_PATH}/create`,
         component: GroupFormComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
-        canActivate: [GroupAdministratorGuard]
+        canActivate: [GroupAdministratorGuard],
       },
       {
-        path: `${GROUP_EDIT_PATH}/:groupId`,
+        path: `${GROUP_PATH}/:groupId/edit`,
         component: GroupFormComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
-        canActivate: [GroupPageGuard]
+        canActivate: [GroupPageGuard],
       },
       {
         path: 'bulk-access',
         component: BulkAccessComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' },
-        canActivate: [SiteAdministratorGuard]
+        canActivate: [SiteAdministratorGuard],
       },
-    ])
-  ]
+    ]),
+  ],
 })
 /**
  * Routing module for the AccessControl section of the admin sidebar
diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts
index 3dc4b6cedc..87737987e0 100644
--- a/src/app/access-control/access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -1,23 +1,27 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { AbstractControl } from '@angular/forms';
 import { RouterModule } from '@angular/router';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DYNAMIC_ERROR_MESSAGES_MATCHER,
+  DynamicErrorMessagesMatcher,
+} from '@ng-dynamic-forms/core';
+
+import { AccessControlFormModule } from '../shared/access-control-form-container/access-control-form.module';
+import { FormModule } from '../shared/form/form.module';
+import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
 import { AccessControlRoutingModule } from './access-control-routing.module';
+import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
+import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
 import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { FormModule } from '../shared/form/form.module';
-import { DYNAMIC_ERROR_MESSAGES_MATCHER, DynamicErrorMessagesMatcher } from '@ng-dynamic-forms/core';
-import { AbstractControl } from '@angular/forms';
-import { BulkAccessComponent } from './bulk-access/bulk-access.component';
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
-import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
-import { SearchModule } from '../shared/search/search.module';
-import { AccessControlFormModule } from '../shared/access-control-form-container/access-control-form.module';
 
 /**
  * Condition for displaying error messages on email form field
@@ -55,9 +59,9 @@ export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
   providers: [
     {
       provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
-      useValue: ValidateEmailErrorStateMatcher
+      useValue: ValidateEmailErrorStateMatcher,
     },
-  ]
+  ],
 })
 /**
  * This module handles all components related to the access control pages
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index c716aedb8b..6e967b53b5 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -1,15 +1,15 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
            data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+                [attr.aria-expanded]="acc.isExpanded('browse')"
+                aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,51 +17,53 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
-        <li [ngbNavItem]="'search'">
-          <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
-          <ng-template ngbNavContent>
-            <div class="mx-n3">
-              <ds-themed-search [configuration]="'administrativeBulkAccess'"
-                                [selectable]="true"
-                                [selectionConfig]="{ repeatable: true, listId: listId }"
-                                [showThumbnails]="false"></ds-themed-search>
-            </div>
-          </ng-template>
-        </li>
-        <li [ngbNavItem]="'selected'">
-          <a ngbNavLink>
-            {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
-          </a>
-          <ng-template ngbNavContent>
-            <ds-pagination
-              [paginationOptions]="(paginationOptions$ | async)"
-              [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
-              [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
-              [objects]="(objectsSelected$|async)"
-              [showPaginator]="false"
-              (prev)="pagePrev()"
-              (next)="pageNext()">
-              <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
-                <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                            currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
-                    class="mt-4 mb-4 d-flex"
-                    [attr.data-test]="'list-object' | dsBrowserOnly">
-                  <ds-selectable-list-item-control [index]="i"
-                                                   [object]="object"
-                                                   [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
-                  <ds-listable-object-component-loader [listID]="listId"
-                                                       [index]="i"
-                                                       [object]="object"
-                                                       [showThumbnails]="false"
-                                                       [viewMode]="'list'"></ds-listable-object-component-loader>
-                </li>
-              </ul>
-            </ds-pagination>
-          </ng-template>
-        </li>
-      </ul>
-      <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      <div id="bulk-access-browse-panel-content">
+        <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
+          <li [ngbNavItem]="'search'" role="presentation">
+            <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div class="mx-n3">
+                <ds-themed-search [configuration]="'administrativeBulkAccess'"
+                                  [selectable]="true"
+                                  [selectionConfig]="{ repeatable: true, listId: listId }"
+                                  [showThumbnails]="false"></ds-themed-search>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'selected'" role="presentation">
+            <a ngbNavLink>
+              {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
+            </a>
+            <ng-template ngbNavContent>
+              <ds-pagination
+                [paginationOptions]="(paginationOptions$ | async)"
+                [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
+                [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
+                [objects]="(objectsSelected$|async)"
+                [showPaginator]="false"
+                (prev)="pagePrev()"
+                (next)="pageNext()">
+                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
+                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
+                      class="mt-4 mb-4 d-flex"
+                      [attr.data-test]="'list-object' | dsBrowserOnly">
+                    <ds-selectable-list-item-control [index]="i"
+                                                     [object]="object"
+                                                     [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
+                    <ds-listable-object-component-loader [listID]="listId"
+                                                         [index]="i"
+                                                         [object]="object"
+                                                         [showThumbnails]="false"
+                                                         [viewMode]="'list'"></ds-listable-object-component-loader>
+                  </li>
+                </ul>
+              </ds-pagination>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      </div>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
index 87b2a8d568..e99c25a195 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
@@ -1,16 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { of } from 'rxjs';
-import { NgbAccordionModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  NgbAccordionModule,
+  NgbNavModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { BulkAccessBrowseComponent } from './bulk-access-browse.component';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { SelectableObject } from '../../../shared/object-list/selectable-list/selectable-list.service.spec';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { BulkAccessBrowseComponent } from './bulk-access-browse.component';
 
 describe('BulkAccessBrowseComponent', () => {
   let component: BulkAccessBrowseComponent;
@@ -31,13 +37,13 @@ describe('BulkAccessBrowseComponent', () => {
       imports: [
         NgbAccordionModule,
         NgbNavModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [BulkAccessBrowseComponent],
-      providers: [ { provide: SelectableListService, useValue: selectableListService }, ],
+      providers: [ { provide: SelectableListService, useValue: selectableListService } ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -72,7 +78,7 @@ describe('BulkAccessBrowseComponent', () => {
       'elementsPerPage': 5,
       'totalElements': 2,
       'totalPages': 1,
-      'currentPage': 1
+      'currentPage': 1,
     }), [selected1, selected2]) ;
     const rd = createSuccessfulRemoteDataObject(list);
 
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
index e806e729c8..6b221f107e 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -1,19 +1,32 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
-import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { hasValue } from '../../../shared/empty.util';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-bulk-access-browse',
@@ -22,9 +35,9 @@ import { hasValue } from '../../../shared/empty.util';
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
 
@@ -49,7 +62,7 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
   paginationOptions$: BehaviorSubject<PaginationComponentOptions> = new BehaviorSubject<PaginationComponentOptions>(Object.assign(new PaginationComponentOptions(), {
     id: 'bas',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   }));
 
   /**
@@ -67,20 +80,20 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
     this.subs.push(
       this.selectableListService.getSelectableList(this.listId).pipe(
         distinctUntilChanged(),
-        map((list: SelectableListState) => this.generatePaginatedListBySelectedElements(list))
-      ).subscribe(this.objectsSelected$)
+        map((list: SelectableListState) => this.generatePaginatedListBySelectedElements(list)),
+      ).subscribe(this.objectsSelected$),
     );
   }
 
   pageNext() {
     this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
-      currentPage: this.paginationOptions$.value.currentPage + 1
+      currentPage: this.paginationOptions$.value.currentPage + 1,
     }));
   }
 
   pagePrev() {
     this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
-      currentPage: this.paginationOptions$.value.currentPage - 1
+      currentPage: this.paginationOptions$.value.currentPage - 1,
     }));
   }
 
@@ -99,12 +112,12 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
       elementsPerPage: this.paginationOptions$.value.pageSize,
       totalElements: list?.selection.length,
       totalPages: this.calculatePageCount(this.paginationOptions$.value.pageSize, list?.selection.length),
-      currentPage: this.paginationOptions$.value.currentPage
+      currentPage: this.paginationOptions$.value.currentPage,
     });
     if (pageInfo.currentPage > pageInfo.totalPages) {
       pageInfo.currentPage = pageInfo.totalPages;
       this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
-        currentPage: pageInfo.currentPage
+        currentPage: pageInfo.currentPage,
       }));
     }
     return createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, list?.selection || []));
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 382caf85f4..c164cc5c31 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+  <h1>{{ 'admin.access-control.bulk-access.title' | translate }}</h1>
   <ds-bulk-access-browse [listId]="listId"></ds-bulk-access-browse>
   <div class="clearfix mb-3"></div>
   <ds-bulk-access-settings #dsBulkSettings ></ds-bulk-access-settings>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.spec.ts b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
index e9b253147d..e7ec28c132 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.spec.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
@@ -1,18 +1,20 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { BulkAccessComponent } from './bulk-access.component';
-import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { Process } from '../../process-page/processes/process.model';
-import { RouterTestingModule } from '@angular/router/testing';
+import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { BulkAccessComponent } from './bulk-access.component';
 
 describe('BulkAccessComponent', () => {
   let component: BulkAccessComponent;
@@ -31,35 +33,35 @@ describe('BulkAccessComponent', () => {
         'startDate': {
           'year': 2026,
           'month': 5,
-          'day': 31
+          'day': 31,
         },
-        'endDate': null
-      }
+        'endDate': null,
+      },
     ],
     'state': {
       'item': {
         'toggleStatus': true,
-        'accessMode': 'replace'
+        'accessMode': 'replace',
       },
       'bitstream': {
         'toggleStatus': false,
         'accessMode': '',
         'changesLimit': '',
-        'selectedBitstreams': []
-      }
-    }
+        'selectedBitstreams': [],
+      },
+    },
   };
 
   const mockFile = {
     'uuids': [
-      '1234', '5678'
+      '1234', '5678',
     ],
-    'file': {  }
+    'file': {  },
   };
 
   const mockSettings: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
     getValue: jasmine.createSpy('getValue'),
-    reset: jasmine.createSpy('reset')
+    reset: jasmine.createSpy('reset'),
   });
   const selection: any[] = [{ indexableObject: { uuid: '1234' } }, { indexableObject: { uuid: '5678' } }];
   const selectableListState: SelectableListState = { id: 'test', selection };
@@ -71,15 +73,15 @@ describe('BulkAccessComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [ BulkAccessComponent ],
       providers: [
         { provide: BulkAccessControlService, useValue: bulkAccessControlServiceMock },
         { provide: NotificationsService, useValue: NotificationsServiceStub },
-        { provide: SelectableListService, useValue: selectableListServiceMock }
+        { provide: SelectableListService, useValue: selectableListServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   });
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index 04724614cb..52faa97dbc 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -1,17 +1,26 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-
-import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';
 
 @Component({
   selector: 'ds-bulk-access',
   templateUrl: './bulk-access.component.html',
-  styleUrls: ['./bulk-access.component.scss']
+  styleUrls: ['./bulk-access.component.scss'],
 })
 export class BulkAccessComponent implements OnInit {
 
@@ -37,7 +46,7 @@ export class BulkAccessComponent implements OnInit {
 
   constructor(
     private bulkAccessControlService: BulkAccessControlService,
-    private selectableListService: SelectableListService
+    private selectableListService: SelectableListService,
   ) {
   }
 
@@ -45,8 +54,8 @@ export class BulkAccessComponent implements OnInit {
     this.subs.push(
       this.selectableListService.getSelectableList(this.listId).pipe(
         distinctUntilChanged(),
-        map((list: SelectableListState) => this.generateIdListBySelectedElements(list))
-      ).subscribe(this.objectsSelected$)
+        map((list: SelectableListState) => this.generateIdListBySelectedElements(list)),
+      ).subscribe(this.objectsSelected$),
     );
   }
 
@@ -74,12 +83,12 @@ export class BulkAccessComponent implements OnInit {
     const { file } = this.bulkAccessControlService.createPayloadFile({
       bitstreamAccess,
       itemAccess,
-      state: settings.state
+      state: settings.state,
     });
 
     this.bulkAccessControlService.executeScript(
       this.objectsSelected$.value || [],
-      file
+      file,
     ).subscribe();
   }
 
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
index 01f36ef03f..c41053874e 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -1,13 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
+                aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -15,7 +15,7 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-access-control-form-container #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
+      <ds-access-control-form-container id="bulk-access-settings-panel-content" #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
index 14e0fdefb2..f3c1cad04a 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
@@ -1,8 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+
 import { BulkAccessSettingsComponent } from './bulk-access-settings.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('BulkAccessSettingsComponent', () => {
   let component: BulkAccessSettingsComponent;
@@ -15,35 +19,35 @@ describe('BulkAccessSettingsComponent', () => {
         'startDate': {
           'year': 2026,
           'month': 5,
-          'day': 31
+          'day': 31,
         },
-        'endDate': null
-      }
+        'endDate': null,
+      },
     ],
     'state': {
       'item': {
         'toggleStatus': true,
-        'accessMode': 'replace'
+        'accessMode': 'replace',
       },
       'bitstream': {
         'toggleStatus': false,
         'accessMode': '',
         'changesLimit': '',
-        'selectedBitstreams': []
-      }
-    }
+        'selectedBitstreams': [],
+      },
+    },
   };
 
   const mockControl: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
     getFormValue: jasmine.createSpy('getFormValue'),
-    reset: jasmine.createSpy('reset')
+    reset: jasmine.createSpy('reset'),
   });
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [NgbAccordionModule, TranslateModule.forRoot()],
       declarations: [BulkAccessSettingsComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   });
 
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
index eecc016245..d0f95377eb 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -1,13 +1,15 @@
-import { Component, ViewChild } from '@angular/core';
 import {
-  AccessControlFormContainerComponent
-} from '../../../shared/access-control-form-container/access-control-form-container.component';
+  Component,
+  ViewChild,
+} from '@angular/core';
+
+import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
 
 @Component({
   selector: 'ds-bulk-access-settings',
   templateUrl: 'bulk-access-settings.component.html',
   styleUrls: ['./bulk-access-settings.component.scss'],
-  exportAs: 'dsBulkSettings'
+  exportAs: 'dsBulkSettings',
 })
 export class BulkAccessSettingsComponent {
 
diff --git a/src/app/access-control/epeople-registry/epeople-registry.actions.ts b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
index a07ea37df2..e6e7608ba3 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.actions.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { type } from '../../shared/ngrx/type';
 
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index e3a8e2c590..92968d2e28 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -2,98 +2,93 @@
   <div class="epeople-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
-        <div *ngIf="!isEPersonFormShown">
+        <div>
           <button class="mr-auto btn btn-success addEPerson-button"
-                  (click)="isEPersonFormShown = true">
+                  [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
-      <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="reset()"
-                       (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
-
-      <div *ngIf="!isEPersonFormShown">
-        <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-
-        </h3>
-        <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-          <div>
-            <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-              <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
-              <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
-            </select>
-          </div>
-          <div class="flex-grow-1 mr-3 ml-3">
-            <div class="form-group input-group">
-              <input type="text" name="query" id="query" formControlName="query"
-                    class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
-                     [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
-              <span class="input-group-append">
+      <h2 id="search" class="border-bottom pb-2">
+        {{labelPrefix + 'search.head' | translate}}
+      </h2>
+      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
+        <div>
+          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+            <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
+            <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
+          </select>
+        </div>
+        <div class="flex-grow-1 mr-3 ml-3">
+          <div class="form-group input-group">
+            <input type="text" name="query" id="query" formControlName="query"
+                   class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
+                   [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
+            <span class="input-group-append">
                 <button type="submit" class="search-button btn btn-primary">
                   <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
                 </button>
               </span>
-            </div>
           </div>
-          <div>
-            <button (click)="clearFormAndResetResult();"
-                    class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
-          </div>
-        </form>
-
-        <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
-        <ds-pagination
-          *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
-          [paginationOptions]="config"
-          [pageInfoState]="pageInfoState$"
-          [collectionSize]="(pageInfoState$ | async)?.totalElements"
-          [hideGear]="true"
-          [hidePagerWhenSinglePage]="true">
-
-          <div class="table-responsive">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-                <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-                <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-                <th>{{labelPrefix + 'table.edit' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
-                  [ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
-                <td>{{epersonDto.eperson.id}}</td>
-                <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
-                <td>{{epersonDto.eperson.email}}</td>
-                <td>
-                  <div class="btn-group edit-field">
-                    <button (click)="toggleEditEPerson(epersonDto.eperson)"
-                            class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                    <button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
-                            class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                      <i class="fas fa-trash-alt fa-fw"></i>
-                    </button>
-                  </div>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-
-        </ds-pagination>
-
-        <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-          {{labelPrefix + 'no-items' | translate}}
         </div>
+        <div>
+          <button (click)="clearFormAndResetResult();"
+                  class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
+        </div>
+      </form>
+
+      <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
+      <ds-pagination
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true"
+        [paginationOptions]="config"
+        [pageInfoState]="pageInfoState$"
+        [collectionSize]="(pageInfoState$ | async)?.totalElements"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+
+        <div class="table-responsive">
+          <table id="epeople" class="table table-striped table-hover table-bordered">
+            <thead>
+            <tr>
+              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+              <th>{{labelPrefix + 'table.edit' | translate}}</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
+                [ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
+              <td>{{epersonDto.eperson.id}}</td>
+              <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
+              <td>{{epersonDto.eperson.email}}</td>
+              <td>
+                <div class="btn-group edit-field">
+                  <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
+                          class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
+                          title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                    <i class="fas fa-edit fa-fw"></i>
+                  </button>
+                  <button *ngIf="epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
+                          class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                    <i class="fas fa-trash-alt fa-fw"></i>
+                  </button>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+
+      </ds-pagination>
+
+      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
+        {{labelPrefix + 'no-items' | translate}}
       </div>
     </div>
   </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 4a09913862..ee4d5fa603 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -1,47 +1,71 @@
-import { Router } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { EPeopleRegistryComponent } from './epeople-registry.component';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { RequestService } from '../../core/data/request.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { EPeopleRegistryComponent } from './epeople-registry.component';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
   let fixture: ComponentFixture<EPeopleRegistryComponent>;
-  let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  let mockEPeople;
+  let mockEPeople: EPerson[];
   let ePersonDataServiceStub: any;
   let authorizationService: AuthorizationDataService;
-  let modalService;
+  let modalService: NgbModal;
+  let paginationService: PaginationServiceStub;
 
-  let paginationService;
-
-  beforeEach(waitForAsync(() => {
+  beforeEach(waitForAsync(async () => {
     jasmine.getEnv().allowRespy(true);
     mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
@@ -52,7 +76,7 @@ describe('EPeopleRegistryComponent', () => {
           elementsPerPage: this.allEpeople.length,
           totalElements: this.allEpeople.length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), this.allEpeople));
       },
       getActiveEPerson(): Observable<EPerson> {
@@ -67,7 +91,7 @@ describe('EPeopleRegistryComponent', () => {
             elementsPerPage: [result].length,
             totalElements: [result].length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), [result]));
         }
         if (scope === 'metadata') {
@@ -76,7 +100,7 @@ describe('EPeopleRegistryComponent', () => {
               elementsPerPage: this.allEpeople.length,
               totalElements: this.allEpeople.length,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), this.allEpeople));
           }
           const result = this.allEpeople.find((ePerson: EPerson) => {
@@ -86,20 +110,20 @@ describe('EPeopleRegistryComponent', () => {
             elementsPerPage: [result].length,
             totalElements: [result].length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), [result]));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
           elementsPerPage: this.allEpeople.length,
           totalElements: this.allEpeople.length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), this.allEpeople));
       },
       deleteEPerson(ePerson: EPerson): Observable<boolean> {
         this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
           return (ePerson2.uuid !== ePerson.uuid);
-            });
+        });
         return observableOf(true);
       },
       editEPerson(ePerson: EPerson) {
@@ -113,23 +137,17 @@ describe('EPeopleRegistryComponent', () => {
       },
       getEPeoplePageRouterLink(): string {
         return '/access-control/epeople';
-      }
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     builderService = getMockFormBuilderService();
-    translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        TranslateModule.forRoot(),
       ],
       declarations: [EPeopleRegistryComponent],
       providers: [
@@ -139,16 +157,16 @@ describe('EPeopleRegistryComponent', () => {
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: new RouterStub() },
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EPeopleRegistryComponent);
     component = fixture.componentInstance;
-    modalService = (component as any).modalService;
+    modalService = TestBed.inject(NgbModal);
     spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
     fixture.detectChanges();
   });
@@ -158,10 +176,10 @@ describe('EPeopleRegistryComponent', () => {
   });
 
   it('should display list of ePeople', () => {
-    const ePeopleIdsFound = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
+    const ePeopleIdsFound: DebugElement[] = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
     expect(ePeopleIdsFound.length).toEqual(2);
     mockEPeople.map((ePerson: EPerson) => {
-      expect(ePeopleIdsFound.find((foundEl) => {
+      expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
         return (foundEl.nativeElement.textContent.trim() === ePerson.uuid);
       })).toBeTruthy();
     });
@@ -169,7 +187,7 @@ describe('EPeopleRegistryComponent', () => {
 
   describe('search', () => {
     describe('when searching with scope/query (scope metadata)', () => {
-      let ePeopleIdsFound;
+      let ePeopleIdsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ scope: 'metadata', query: EPersonMock2.name });
         tick();
@@ -179,14 +197,14 @@ describe('EPeopleRegistryComponent', () => {
 
       it('should display search result', () => {
         expect(ePeopleIdsFound.length).toEqual(1);
-        expect(ePeopleIdsFound.find((foundEl) => {
+        expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
           return (foundEl.nativeElement.textContent.trim() === EPersonMock2.uuid);
         })).toBeTruthy();
       });
     });
 
     describe('when searching with scope/query (scope email)', () => {
-      let ePeopleIdsFound;
+      let ePeopleIdsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ scope: 'email', query: EPersonMock.email });
         tick();
@@ -196,43 +214,13 @@ describe('EPeopleRegistryComponent', () => {
 
       it('should display search result', () => {
         expect(ePeopleIdsFound.length).toEqual(1);
-        expect(ePeopleIdsFound.find((foundEl) => {
+        expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
           return (foundEl.nativeElement.textContent.trim() === EPersonMock.uuid);
         })).toBeTruthy();
       });
     });
   });
 
-  describe('toggleEditEPerson', () => {
-    describe('when you click on first edit eperson button', () => {
-      beforeEach(fakeAsync(() => {
-        const editButtons = fixture.debugElement.queryAll(By.css('.access-control-editEPersonButton'));
-        editButtons[0].triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
-        tick();
-        fixture.detectChanges();
-      }));
-
-      it('editEPerson form is toggled', () => {
-        const ePeopleIds = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
-        ePersonDataServiceStub.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-          if (ePeopleIds[0] && activeEPerson === ePeopleIds[0].nativeElement.textContent) {
-            expect(component.isEPersonFormShown).toEqual(false);
-          } else {
-            expect(component.isEPersonFormShown).toEqual(true);
-          }
-
-        });
-      });
-
-      it('EPerson search section is hidden', () => {
-        expect(fixture.debugElement.query(By.css('#search'))).toBeNull();
-      });
-    });
-  });
-
   describe('deleteEPerson', () => {
     describe('when you click on first delete eperson button', () => {
       let ePeopleIdsFoundBeforeDelete;
@@ -242,7 +230,7 @@ describe('EPeopleRegistryComponent', () => {
         const deleteButtons = fixture.debugElement.queryAll(By.css('.access-control-deleteEPersonButton'));
         deleteButtons[0].triggerEventHandler('click', {
           preventDefault: () => {/**/
-          }
+          },
         });
         tick();
         fixture.detectChanges();
@@ -258,19 +246,12 @@ describe('EPeopleRegistryComponent', () => {
     });
   });
 
-  describe('delete EPerson button when the isAuthorized returns false', () => {
-    let ePeopleDeleteButton;
-    beforeEach(() => {
-      spyOn(authorizationService, 'isAuthorized').and.returnValue(observableOf(false));
-      component.initialisePage();
-      fixture.detectChanges();
-    });
 
-    it('should be disabled', () => {
-      ePeopleDeleteButton = fixture.debugElement.queryAll(By.css('#epeople tr td div button.delete-button'));
-      ePeopleDeleteButton.forEach((deleteButton: DebugElement) => {
-        expect(deleteButton.nativeElement.disabled).toBe(true);
-      });
-    });
+  it('should hide delete EPerson button when the isAuthorized returns false', () => {
+    spyOn(authorizationService, 'isAuthorized').and.returnValue(observableOf(false));
+    component.initialisePage();
+    fixture.detectChanges();
+
+    expect(fixture.debugElement.query(By.css('#epeople tr td div button.delete-button'))).toBeNull();
   });
 });
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index fb045ebb88..ddf5fe7bfb 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,27 +1,51 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
+import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+} from '../../core/shared/operators';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../core/data/request.service';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  getEPersonEditRoute,
+  getEPersonsRoute,
+} from '../access-control-routing-paths';
 
 @Component({
   selector: 'ds-epeople-registry',
@@ -61,14 +85,9 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'elp',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
-  /**
-   * Whether or not to show the EPerson form
-   */
-  isEPersonFormShown: boolean;
-
   // The search form
   searchForm;
 
@@ -114,26 +133,20 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   initialisePage() {
     this.searching$.next(true);
-    this.isEPersonFormShown = false;
-    this.search({scope: this.currentSearchScope, query: this.currentSearchQuery});
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      if (eperson != null && eperson.id) {
-        this.isEPersonFormShown = true;
-      }
-    }));
+    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
     this.subs.push(this.ePeople$.pipe(
       switchMap((epeople: PaginatedList<EPerson>) => {
         if (epeople.pageInfo.totalElements > 0) {
-          return combineLatest([...epeople.page.map((eperson: EPerson) => {
+          return combineLatest(epeople.page.map((eperson: EPerson) => {
             return this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined).pipe(
               map((authorized) => {
                 const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
                 epersonDtoModel.ableToDelete = authorized;
                 epersonDtoModel.eperson = eperson;
                 return epersonDtoModel;
-              })
+              }),
             );
-          })]).pipe(map((dtos: EpersonDtoModel[]) => {
+          })).pipe(map((dtos: EpersonDtoModel[]) => {
             return buildPaginatedList(epeople.pageInfo, dtos);
           }));
         } else {
@@ -157,34 +170,34 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     }
     this.findListOptionsSub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
       switchMap((findListOptions) => {
-          const query: string = data.query;
-          const scope: string = data.scope;
-          if (query != null && this.currentSearchQuery !== query) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchQuery = query;
-            this.paginationService.resetPage(this.config.id);
-          }
-          if (scope != null && this.currentSearchScope !== scope) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchScope = scope;
-            this.paginationService.resetPage(this.config.id);
-
-          }
-          return this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
-            currentPage: findListOptions.currentPage,
-            elementsPerPage: findListOptions.pageSize
+        const query: string = data.query;
+        const scope: string = data.scope;
+        if (query != null && this.currentSearchQuery !== query) {
+          void this.router.navigate([getEPersonsRoute()], {
+            queryParamsHandling: 'merge',
           });
+          this.currentSearchQuery = query;
+          this.paginationService.resetPage(this.config.id);
         }
+        if (scope != null && this.currentSearchScope !== scope) {
+          void this.router.navigate([getEPersonsRoute()], {
+            queryParamsHandling: 'merge',
+          });
+          this.currentSearchScope = scope;
+          this.paginationService.resetPage(this.config.id);
+
+        }
+        return this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
+          currentPage: findListOptions.currentPage,
+          elementsPerPage: findListOptions.pageSize,
+        });
+      },
       ),
       getAllSucceededRemoteData(),
     ).subscribe((peopleRD) => {
-        this.ePeople$.next(peopleRD.payload);
-        this.pageInfoState$.next(peopleRD.payload.pageInfo);
-      }
+      this.ePeople$.next(peopleRD.payload);
+      this.pageInfoState$.next(peopleRD.payload.pageInfo);
+    },
     );
   }
 
@@ -194,7 +207,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   isActive(eperson: EPerson): Observable<boolean> {
     return this.getActiveEPerson().pipe(
-      map((activeEPerson) => eperson === activeEPerson)
+      map((activeEPerson) => eperson === activeEPerson),
     );
   }
 
@@ -205,30 +218,13 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     return this.epersonService.getActiveEPerson();
   }
 
-  /**
-   * Start editing the selected EPerson
-   * @param ePerson
-   */
-  toggleEditEPerson(ePerson: EPerson) {
-    this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
-      if (ePerson === activeEPerson) {
-        this.epersonService.cancelEditEPerson();
-        this.isEPersonFormShown = false;
-      } else {
-        this.epersonService.editEPerson(ePerson);
-        this.isEPersonFormShown = true;
-      }
-    });
-    this.scrollToTop();
-  }
-
   /**
    * Deletes EPerson, show notification on success/failure & updates EPeople list
    */
   deleteEPerson(ePerson: EPerson) {
     if (hasValue(ePerson.id)) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = ePerson;
+      modalRef.componentInstance.name = this.dsoNameService.getName(ePerson);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
@@ -240,9 +236,9 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
           if (hasValue(ePerson.id)) {
             this.epersonService.deleteEPerson(ePerson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
               if (restResponse.hasSucceeded) {
-                this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: this.dsoNameService.getName(ePerson)}));
+                this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: this.dsoNameService.getName(ePerson) }));
               } else {
-                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
+                this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { id: ePerson.id, statusCode: restResponse.statusCode, errorMessage: restResponse.errorMessage }));
               }
             });
           }
@@ -264,16 +260,6 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
-  scrollToTop() {
-    (function smoothscroll() {
-      const currentScroll = document.documentElement.scrollTop || document.body.scrollTop;
-      if (currentScroll > 0) {
-        window.requestAnimationFrame(smoothscroll);
-        window.scrollTo(0, currentScroll - (currentScroll / 8));
-      }
-    })();
-  }
-
   /**
    * Reset all input-fields to be empty and search all search
    */
@@ -281,23 +267,10 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     this.searchForm.patchValue({
       query: '',
     });
-    this.search({query: ''});
+    this.search({ query: '' });
   }
 
-  /**
-   * This method will set everything to stale, which will cause the lists on this page to update.
-   */
-  reset(): void {
-    this.epersonService.getBrowseEndpoint().pipe(
-      take(1),
-      switchMap((href: string) => {
-        return this.requestService.setStaleByHrefSubstring(href).pipe(
-          take(1),
-        );
-      })
-    ).subscribe(()=>{
-      this.epersonService.cancelEditEPerson();
-      this.isEPersonFormShown = false;
-    });
+  getEditEPeoplePage(id: string): string {
+    return getEPersonEditRoute(id);
   }
 }
diff --git a/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
index 7158acc79b..6bee3f84e2 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
@@ -1,6 +1,12 @@
-import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from './epeople-registry.actions';
-import { ePeopleRegistryReducer, EPeopleRegistryState } from './epeople-registry.reducers';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
+import {
+  EPeopleRegistryCancelEPersonAction,
+  EPeopleRegistryEditEPersonAction,
+} from './epeople-registry.actions';
+import {
+  ePeopleRegistryReducer,
+  EPeopleRegistryState,
+} from './epeople-registry.reducers';
 
 const initialState: EPeopleRegistryState = {
   editEPerson: null,
diff --git a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
index 1e0319f3ba..3bab6769e1 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
@@ -2,7 +2,7 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
 import {
   EPeopleRegistryAction,
   EPeopleRegistryActionTypes,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from './epeople-registry.actions';
 
 /**
@@ -30,13 +30,13 @@ export function ePeopleRegistryReducer(state = initialState, action: EPeopleRegi
 
     case EPeopleRegistryActionTypes.EDIT_EPERSON: {
       return Object.assign({}, state, {
-        editEPerson: (action as EPeopleRegistryEditEPersonAction).eperson
+        editEPerson: (action as EPeopleRegistryEditEPersonAction).eperson,
       });
     }
 
     case EPeopleRegistryActionTypes.CANCEL_EDIT_EPERSON: {
       return Object.assign({}, state, {
-        editEPerson: null
+        editEPerson: null,
       });
     }
 
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 228449a8a5..9168bbaf8e 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -1,89 +1,97 @@
-<div *ngIf="epersonService.getActiveEPerson() | async; then editheader; else createHeader"></div>
+<div class="container">
+  <div class="group-form row">
+    <div class="col-12">
 
-<ng-template #createHeader>
-  <h4>{{messagePrefix + '.create' | translate}}</h4>
-</ng-template>
+      <div *ngIf="epersonService.getActiveEPerson() | async; then editHeader; else createHeader"></div>
 
-<ng-template #editheader>
-  <h4>{{messagePrefix + '.edit' | translate}}</h4>
-</ng-template>
+      <ng-template #createHeader>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
+      </ng-template>
 
-<ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [formLayout]="formLayout"
-         [displayCancel]="false"
-         [submitLabel]="submitLabel"
-         (submitForm)="onSubmit()">
-  <div before class="btn-group">
-    <button (click)="onCancel()"
-            class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
-  </div>
-  <div *ngIf="displayResetPassword" between class="btn-group">
-    <button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()">
-      <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
-    </button>
-  </div>
-  <div between class="btn-group ml-1">
-    <button *ngIf="!isImpersonated" class="btn btn-primary" [ngClass]="{'d-none' : !(canImpersonate$ | async)}" (click)="impersonate()">
-      <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
-    </button>
-    <button *ngIf="isImpersonated" class="btn btn-primary" (click)="stopImpersonating()">
-      <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
-    </button>
-  </div>
-  <button after class="btn btn-danger delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
-    <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
-  </button>
-</ds-form>
+      <ng-template #editHeader>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
+      </ng-template>
 
-<ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
+      <ds-form [formId]="formId"
+               [formModel]="formModel"
+               [formGroup]="formGroup"
+               [formLayout]="formLayout"
+               [displayCancel]="false"
+               [submitLabel]="submitLabel"
+               (submitForm)="onSubmit()">
+        <div before class="btn-group">
+          <button (click)="onCancel()" type="button" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}
+          </button>
+        </div>
+        <div *ngIf="displayResetPassword" between class="btn-group">
+          <button class="btn btn-primary" [disabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+            <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+          </button>
+        </div>
+        <div *ngIf="canImpersonate$ | async" between class="btn-group">
+          <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
+            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
+          </button>
+          <button *ngIf="isImpersonated" class="btn btn-primary" type="button" (click)="stopImpersonating()">
+            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
+          </button>
+        </div>
+        <button *ngIf="canDelete$ | async" after class="btn btn-danger delete-button" type="button" (click)="delete()">
+          <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
+        </button>
+      </ds-form>
 
-<div *ngIf="epersonService.getActiveEPerson() | async">
-  <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
+      <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
 
-  <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
+      <div *ngIf="epersonService.getActiveEPerson() | async">
+        <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
 
-  <ds-pagination
-    *ngIf="(groups | async)?.payload?.totalElements > 0"
-    [paginationOptions]="config"
-    [pageInfoState]="(groups | async)?.payload"
-    [collectionSize]="(groups | async)?.payload?.totalElements"
-    [hideGear]="true"
-    [hidePagerWhenSinglePage]="true"
-    (pageChange)="onPageChange($event)">
+        <ds-themed-loading [showMessage]="false" *ngIf="groups$ | async | dsHasNoValue"></ds-themed-loading>
 
-    <div class="table-responsive">
-      <table id="groups" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (groups | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupsDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
-            {{ dsoNameService.getName(group) }}
-          </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
+        <ds-pagination
+          *ngIf="(groups$ | async)?.payload?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="groupsPageInfoState$"
+          [collectionSize]="(groups$ | async)?.payload?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
 
-  </ds-pagination>
+          <div class="table-responsive">
+            <table id="groups" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr *ngFor="let group of (groups$ | async)?.payload?.page">
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupsDataService.startEditingNewGroup(group)"
+                     [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
 
-  <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-    <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
-    <div>
-      <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
-              class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+        </ds-pagination>
+
+        <div *ngIf="(groups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
+          <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
+          <div>
+            <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+                    class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index fb911e709c..5196eee631 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -1,36 +1,70 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RequestService } from '../../../core/data/request.service';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -43,6 +77,8 @@ describe('EPersonFormComponent', () => {
   let authorizationService: AuthorizationDataService;
   let groupsDataService: GroupDataService;
   let epersonRegistrationService: EpersonRegistrationService;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
 
   let paginationService;
 
@@ -106,70 +142,73 @@ describe('EPersonFormComponent', () => {
       },
       getEPersonByEmail(email): Observable<RemoteData<EPerson>> {
         return createSuccessfulRemoteDataObject$(null);
-      }
+      },
+      findById(_id: string, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<EPerson>> {
+        return createSuccessfulRemoteDataObject$(null);
+      },
     };
     builderService = Object.assign(getMockFormBuilderService(),{
       createFormGroup(formModel, options = null) {
         const controls = {};
         formModel.forEach( model => {
-            model.parent = parent;
-            const controlModel = model;
-            const controlState = { value: controlModel.value, disabled: controlModel.disabled };
-            const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
-            controls[model.id] = new UntypedFormControl(controlState, controlOptions);
+          model.parent = parent;
+          const controlModel = model;
+          const controlState = { value: controlModel.value, disabled: controlModel.disabled };
+          const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
+          controls[model.id] = new UntypedFormControl(controlState, controlOptions);
         });
         return new UntypedFormGroup(controls, options);
       },
       createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
         return {
-            validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
+          validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
         };
       },
       getValidators(validatorsConfig) {
-          return this.getValidatorFns(validatorsConfig);
+        return this.getValidatorFns(validatorsConfig);
       },
       getValidatorFns(validatorsConfig, validatorsToken = this._NG_VALIDATORS) {
         let validatorFns = [];
         if (this.isObject(validatorsConfig)) {
-            validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
-                const validatorConfigValue = validatorsConfig[validatorConfigKey];
-                if (this.isValidatorDescriptor(validatorConfigValue)) {
-                    const descriptor = validatorConfigValue;
-                    return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
-                }
-                return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
-            });
+          validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
+            const validatorConfigValue = validatorsConfig[validatorConfigKey];
+            if (this.isValidatorDescriptor(validatorConfigValue)) {
+              const descriptor = validatorConfigValue;
+              return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
+            }
+            return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
+          });
         }
         return validatorFns;
       },
       getValidatorFn(validatorName, validatorArgs = null, validatorsToken = this._NG_VALIDATORS) {
         let validatorFn;
         if (Validators.hasOwnProperty(validatorName)) { // Built-in Angular Validators
-            validatorFn = Validators[validatorName];
+          validatorFn = Validators[validatorName];
         } else { // Custom Validators
-            if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
-                validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
-            } else if (validatorsToken) {
-                validatorFn = validatorsToken.find(validator => validator.name === validatorName);
-            }
+          if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
+            validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
+          } else if (validatorsToken) {
+            validatorFn = validatorsToken.find(validator => validator.name === validatorName);
+          }
         }
         if (validatorFn === undefined) { // throw when no validator could be resolved
-            throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
+          throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
         }
         if (validatorArgs !== null) {
-            return validatorFn(validatorArgs);
+          return validatorFn(validatorArgs);
         }
         return validatorFn;
-    },
+      },
       isValidatorDescriptor(value) {
-          if (this.isObject(value)) {
-              return value.hasOwnProperty('name') && value.hasOwnProperty('args');
-          }
-          return false;
+        if (this.isObject(value)) {
+          return value.hasOwnProperty('name') && value.hasOwnProperty('args');
+        }
+        return false;
       },
       isObject(value) {
         return typeof value === 'object' && value !== null;
-      }
+      },
     });
     authService = new AuthServiceStub();
     authorizationService = jasmine.createSpyObj('authorizationService', {
@@ -178,20 +217,25 @@ describe('EPersonFormComponent', () => {
     });
     groupsDataService = jasmine.createSpyObj('groupsDataService', {
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-      getGroupRegistryRouterLink: ''
+      getGroupRegistryRouterLink: '',
     });
 
     paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [EPersonFormComponent],
+      declarations: [
+        EPersonFormComponent,
+        HasNoValuePipe,
+      ],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
@@ -200,16 +244,18 @@ describe('EPersonFormComponent', () => {
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])},
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
         { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
-        EPeopleRegistryComponent
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: router },
+        EPeopleRegistryComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-    registerEmail: createSuccessfulRemoteDataObject$(null)
+    registerEmail: createSuccessfulRemoteDataObject$(null),
   });
 
   beforeEach(() => {
@@ -241,12 +287,12 @@ describe('EPersonFormComponent', () => {
         metadata: {
           'eperson.firstname': [
             {
-              value: firstName
-            }
+              value: firstName,
+            },
           ],
           'eperson.lastname': [
             {
-              value: lastName
+              value: lastName,
             },
           ],
         },
@@ -263,24 +309,18 @@ describe('EPersonFormComponent', () => {
       fixture.detectChanges();
     });
     describe('firstName, lastName and email should be required', () => {
-      it('form should be invalid because the firstName is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.firstName.valid).toBeFalse();
-          expect(component.formGroup.controls.firstName.errors.required).toBeTrue();
-        });
-      }));
-      it('form should be invalid because the lastName is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.lastName.valid).toBeFalse();
-          expect(component.formGroup.controls.lastName.errors.required).toBeTrue();
-        });
-      }));
-      it('form should be invalid because the email is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.required).toBeTrue();
-        });
-      }));
+      it('form should be invalid because the firstName is required', () => {
+        expect(component.formGroup.controls.firstName.valid).toBeFalse();
+        expect(component.formGroup.controls.firstName.errors.required).toBeTrue();
+      });
+      it('form should be invalid because the lastName is required', () => {
+        expect(component.formGroup.controls.lastName.valid).toBeFalse();
+        expect(component.formGroup.controls.lastName.errors.required).toBeTrue();
+      });
+      it('form should be invalid because the email is required', () => {
+        expect(component.formGroup.controls.email.valid).toBeFalse();
+        expect(component.formGroup.controls.email.errors.required).toBeTrue();
+      });
     });
 
     describe('after inserting information firstName,lastName and email not required', () => {
@@ -290,24 +330,18 @@ describe('EPersonFormComponent', () => {
         component.formGroup.controls.email.setValue('test@test.com');
         fixture.detectChanges();
       });
-      it('firstName should be valid because the firstName is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.firstName.valid).toBeTrue();
-          expect(component.formGroup.controls.firstName.errors).toBeNull();
-        });
-      }));
-      it('lastName should be valid because the lastName is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.lastName.valid).toBeTrue();
-          expect(component.formGroup.controls.lastName.errors).toBeNull();
-        });
-      }));
-      it('email should be valid because the email is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeTrue();
-          expect(component.formGroup.controls.email.errors).toBeNull();
-        });
-      }));
+      it('firstName should be valid because the firstName is set', () => {
+        expect(component.formGroup.controls.firstName.valid).toBeTrue();
+        expect(component.formGroup.controls.firstName.errors).toBeNull();
+      });
+      it('lastName should be valid because the lastName is set', () => {
+        expect(component.formGroup.controls.lastName.valid).toBeTrue();
+        expect(component.formGroup.controls.lastName.errors).toBeNull();
+      });
+      it('email should be valid because the email is set', () => {
+        expect(component.formGroup.controls.email.valid).toBeTrue();
+        expect(component.formGroup.controls.email.errors).toBeNull();
+      });
     });
 
 
@@ -316,12 +350,10 @@ describe('EPersonFormComponent', () => {
         component.formGroup.controls.email.setValue('test@test');
         fixture.detectChanges();
       });
-      it('email should not be valid because the email pattern', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.pattern).toBeTruthy();
-        });
-      }));
+      it('email should not be valid because the email pattern', () => {
+        expect(component.formGroup.controls.email.valid).toBeFalse();
+        expect(component.formGroup.controls.email.errors.pattern).toBeTruthy();
+      });
     });
 
     describe('after already utilized email', () => {
@@ -329,19 +361,17 @@ describe('EPersonFormComponent', () => {
         const ePersonServiceWithEperson = Object.assign(ePersonDataServiceStub,{
           getEPersonByEmail(): Observable<RemoteData<EPerson>> {
             return createSuccessfulRemoteDataObject$(EPersonMock);
-          }
+          },
         });
         component.formGroup.controls.email.setValue('test@test.com');
         component.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(ePersonServiceWithEperson));
         fixture.detectChanges();
       });
 
-      it('email should not be valid because email is already taken', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.emailTaken).toBeTruthy();
-        });
-      }));
+      it('email should not be valid because email is already taken', () => {
+        expect(component.formGroup.controls.email.valid).toBeFalse();
+        expect(component.formGroup.controls.email.errors.emailTaken).toBeTruthy();
+      });
     });
 
 
@@ -366,12 +396,12 @@ describe('EPersonFormComponent', () => {
         metadata: {
           'eperson.firstname': [
             {
-              value: firstName
-            }
+              value: firstName,
+            },
           ],
           'eperson.lastname': [
             {
-              value: lastName
+              value: lastName,
             },
           ],
         },
@@ -393,11 +423,9 @@ describe('EPersonFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new eperson using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new eperson using the correct values', () => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
     });
 
     describe('with an active eperson', () => {
@@ -409,30 +437,28 @@ describe('EPersonFormComponent', () => {
           metadata: {
             'eperson.firstname': [
               {
-                value: firstName
-              }
+                value: firstName,
+              },
             ],
             'eperson.lastname': [
               {
-                value: lastName
+                value: lastName,
               },
             ],
           },
           email: email,
           canLogIn: canLogIn,
           requireCertificate: requireCertificate,
-          _links: undefined
+          _links: undefined,
         });
         spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
         component.onSubmit();
         fixture.detectChanges();
       });
 
-      it('should emit the existing eperson using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should emit the existing eperson using the correct values', () => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
     });
   });
 
@@ -443,7 +469,7 @@ describe('EPersonFormComponent', () => {
       spyOn(authService, 'impersonate').and.callThrough();
       ePersonId = 'testEPersonId';
       component.epersonInitial = Object.assign(new EPerson(), {
-        id: ePersonId
+        id: ePersonId,
       });
       component.impersonate();
     });
@@ -491,16 +517,16 @@ describe('EPersonFormComponent', () => {
 
     });
 
-    it('the delete button should be active if the eperson can be deleted', () => {
+    it('the delete button should be visible if the ePerson can be deleted', () => {
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton).not.toBeNull();
     });
 
-    it('the delete button should be disabled if the eperson cannot be deleted', () => {
+    it('the delete button should be hidden if the ePerson cannot be deleted', () => {
       component.canDelete$ = observableOf(false);
       fixture.detectChanges();
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(true);
+      expect(deleteButton).toBeNull();
     });
 
     it('should call the epersonFormComponent delete when clicked on the button', () => {
@@ -531,7 +557,7 @@ describe('EPersonFormComponent', () => {
       ePersonEmail = 'person.email@4science.it';
       component.epersonInitial = Object.assign(new EPerson(), {
         id: ePersonId,
-        email: ePersonEmail
+        email: ePersonEmail,
       });
       component.resetPassword();
     });
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index d009d56058..7eb743f1ab 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -1,43 +1,68 @@
-import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicCheckboxModel,
   DynamicFormControlModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { debounceTime, finalize, map, switchMap, take } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  finalize,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { Group } from '../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { Registration } from '../../../core/shared/registration.model';
+import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { AuthService } from '../../../core/auth/auth.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../../core/data/request.service';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { PaginationService } from '../../../core/pagination/pagination.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getEPersonsRoute } from '../../access-control-routing-paths';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import { Registration } from '../../../core/shared/registration.model';
-import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
-import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -81,28 +106,28 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     firstName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     lastName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     email: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     canLogIn: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     requireCertificate: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
   };
 
@@ -145,7 +170,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   /**
    * A list of all the groups this EPerson is a member of
    */
-  groups: Observable<RemoteData<PaginatedList<Group>>>;
+  groups$: Observable<RemoteData<PaginatedList<Group>>>;
+
+  /**
+   * The pagination of the {@link groups$} list.
+   */
+  groupsPageInfoState$: Observable<PageInfo>;
 
   /**
    * Pagination config used to display the list of groups
@@ -153,7 +183,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'gem',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -194,6 +224,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     public requestService: RequestService,
     private epersonRegistrationService: EpersonRegistrationService,
     public dsoNameService: DSONameService,
+    protected route: ActivatedRoute,
+    protected router: Router,
   ) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;
@@ -213,7 +245,9 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-
+    this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+      this.epersonService.editEPerson(ePersonRD.payload);
+    }));
     observableCombineLatest([
       this.translateService.get(`${this.messagePrefix}.firstName`),
       this.translateService.get(`${this.messagePrefix}.lastName`),
@@ -251,23 +285,23 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         required: true,
         errorMessages: {
           emailTaken: 'error.validation.emailTaken',
-          pattern: 'error.validation.NotValidEmail'
+          pattern: 'error.validation.NotValidEmail',
         },
-        hint: emailHint
+        hint: emailHint,
       });
       this.canLogIn = new DynamicCheckboxModel(
         {
           id: 'canLogIn',
           label: canLogIn,
           name: 'canLogIn',
-          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
+          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true),
         });
       this.requireCertificate = new DynamicCheckboxModel(
         {
           id: 'requireCertificate',
           label: requireCertificate,
           name: 'requireCertificate',
-          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
+          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false),
         });
       this.formModel = [
         this.firstName,
@@ -279,9 +313,9 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
         if (eperson != null) {
-          this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
+          this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, {
             currentPage: 1,
-            elementsPerPage: this.config.pageSize
+            elementsPerPage: this.config.pageSize,
           });
         }
         this.formGroup.patchValue({
@@ -289,7 +323,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
           email: eperson != null ? eperson.email : '',
           canLogIn: eperson != null ? eperson.canLogIn : true,
-          requireCertificate: eperson != null ? eperson.requireCertificate : false
+          requireCertificate: eperson != null ? eperson.requireCertificate : false,
         });
 
         if (eperson === null && !!this.formGroup.controls.email) {
@@ -302,11 +336,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
       const activeEPerson$ = this.epersonService.getActiveEPerson();
 
-      this.groups = activeEPerson$.pipe(
+      this.groups$ = activeEPerson$.pipe(
         switchMap((eperson) => {
           return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
             currentPage: 1,
-            elementsPerPage: this.config.pageSize
+            elementsPerPage: this.config.pageSize,
           })]);
         }),
         switchMap(([eperson, findListOptions]) => {
@@ -314,7 +348,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
             return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
           }
           return observableOf(undefined);
-        })
+        }),
+      );
+
+      this.groupsPageInfoState$ = this.groups$.pipe(
+        map(groupsRD => groupsRD.payload.pageInfo),
       );
 
       this.canImpersonate$ = activeEPerson$.pipe(
@@ -324,10 +362,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           } else {
             return observableOf(false);
           }
-        })
+        }),
       );
       this.canDelete$ = activeEPerson$.pipe(
-        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
+        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined)),
       );
       this.canReset$ = observableOf(true);
     });
@@ -339,6 +377,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.epersonService.cancelEditEPerson();
     this.cancelForm.emit();
+    void this.router.navigate([getEPersonsRoute()]);
   }
 
   /**
@@ -354,12 +393,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           metadata: {
             'eperson.firstname': [
               {
-                value: this.firstName.value
-              }
+                value: this.firstName.value,
+              },
             ],
             'eperson.lastname': [
               {
-                value: this.lastName.value
+                value: this.lastName.value,
               },
             ],
           },
@@ -372,7 +411,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         } else {
           this.editEPerson(ePerson, values);
         }
-      }
+      },
     );
   }
 
@@ -385,11 +424,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
     const response = this.epersonService.create(ePersonToCreate);
     response.pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<EPerson>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: this.dsoNameService.getName(ePersonToCreate) }));
         this.submitForm.emit(ePersonToCreate);
+        this.epersonService.clearEPersonRequests();
+        void this.router.navigateByUrl(getEPersonsRoute());
       } else {
         this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: this.dsoNameService.getName(ePersonToCreate) }));
         this.cancelForm.emit();
@@ -409,12 +450,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       metadata: {
         'eperson.firstname': [
           {
-            value: (this.firstName.value ? this.firstName.value : ePerson.firstMetadataValue('eperson.firstname'))
-          }
+            value: (this.firstName.value ? this.firstName.value : ePerson.firstMetadataValue('eperson.firstname')),
+          },
         ],
         'eperson.lastname': [
           {
-            value: (this.lastName.value ? this.lastName.value : ePerson.firstMetadataValue('eperson.lastname'))
+            value: (this.lastName.value ? this.lastName.value : ePerson.firstMetadataValue('eperson.lastname')),
           },
         ],
       },
@@ -429,6 +470,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: this.dsoNameService.getName(editedEperson) }));
         this.submitForm.emit(editedEperson);
+        void this.router.navigateByUrl(getEPersonsRoute());
       } else {
         this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: this.dsoNameService.getName(editedEperson) }));
         this.cancelForm.emit();
@@ -447,7 +489,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onPageChange(event) {
     this.updateGroups({
       currentPage: event,
-      elementsPerPage: this.config.pageSize
+      elementsPerPage: this.config.pageSize,
     });
   }
 
@@ -468,7 +510,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       take(1),
       switchMap((eperson: EPerson) => {
         const modalRef = this.modalService.open(ConfirmationModalComponent);
-        modalRef.componentInstance.dso = eperson;
+        modalRef.componentInstance.name = this.dsoNameService.getName(eperson);
         modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
         modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
         modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
@@ -483,18 +525,19 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
               this.canDelete$ = observableOf(false);
               return this.epersonService.deleteEPerson(eperson).pipe(
                 getFirstCompletedRemoteData(),
-                map((restResponse: RemoteData<NoContent>) => ({ restResponse, eperson }))
+                map((restResponse: RemoteData<NoContent>) => ({ restResponse, eperson })),
               );
             } else {
               return observableOf(null);
             }
           }),
-          finalize(() => this.canDelete$ = observableOf(true))
+          finalize(() => this.canDelete$ = observableOf(true)),
         );
-      })
+      }),
     ).subscribe(({ restResponse, eperson }: { restResponse: RemoteData<NoContent> | null, eperson: EPerson }) => {
       if (restResponse?.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: this.dsoNameService.getName(eperson) }));
+        void this.router.navigate([getEPersonsRoute()]);
       } else {
         this.notificationsService.error(`Error occurred when trying to delete EPerson with id: ${eperson?.id} with code: ${restResponse?.statusCode} and message: ${restResponse?.errorMessage}`);
       }
@@ -518,14 +561,14 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     if (hasValue(this.epersonInitial.email)) {
       this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_FORGOT).pipe(getFirstCompletedRemoteData())
         .subscribe((response: RemoteData<Registration>) => {
-            if (response.hasSucceeded) {
-              this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'),
-                this.translateService.get('forgot-email.form.success.content', {email: this.epersonInitial.email}));
-            } else {
-              this.notificationsService.error(this.translateService.get('forgot-email.form.error.head'),
-                this.translateService.get('forgot-email.form.error.content', {email: this.epersonInitial.email}));
-            }
+          if (response.hasSucceeded) {
+            this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'),
+              this.translateService.get('forgot-email.form.success.content', { email: this.epersonInitial.email }));
+          } else {
+            this.notificationsService.error(this.translateService.get('forgot-email.form.error.head'),
+              this.translateService.get('forgot-email.form.error.content', { email: this.epersonInitial.email }));
           }
+        },
         );
     }
   }
@@ -541,16 +584,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     }
   }
 
-  /**
-   * This method will ensure that the page gets reset and that the cache is cleared
-   */
-  reset() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
-      this.requestService.removeByHrefSubstring(eperson.self);
-    });
-    this.initialisePage();
-  }
-
   /**
    * Checks for the given ePerson if there is already an ePerson in the system with that email
    * and shows notification if this is the case
@@ -561,13 +594,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     // Relevant message for email in use
     this.subs.push(this.epersonService.searchByScope('email', ePerson.email, {
       currentPage: 1,
-      elementsPerPage: 0
+      elementsPerPage: 0,
     }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<EPerson>) => {
         if (list.totalElements > 0) {
           this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
             name: this.dsoNameService.getName(ePerson),
-            email: ePerson.email
+            email: ePerson.email,
           }));
         }
       }));
@@ -578,7 +611,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   private updateGroups(options) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
+      this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }
 }
diff --git a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
index 5153abae7c..2a689c0d72 100644
--- a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
@@ -1,9 +1,12 @@
-import { AbstractControl, ValidationErrors } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteData, } from '../../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../../core/shared/operators';
 
 export class ValidateEmailNotTaken {
 
@@ -17,8 +20,8 @@ export class ValidateEmailNotTaken {
         .pipe(
           getFirstSucceededRemoteData(),
           map(res => {
-            return !!res.payload ? { emailTaken: true } : null;
-          })
+            return res.payload ? { emailTaken: true } : null;
+          }),
         );
     };
   }
diff --git a/src/app/access-control/epeople-registry/eperson-resolver.service.ts b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
new file mode 100644
index 0000000000..33233ba7e8
--- /dev/null
+++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ResolvedAction } from '../../core/resolving/resolver.actions';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
+
+export const EPERSON_EDIT_FOLLOW_LINKS: FollowLinkConfig<EPerson>[] = [
+  followLink('groups'),
+];
+
+/**
+ * This class represents a resolver that requests a specific {@link EPerson} before the route is activated
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class EPersonResolver implements Resolve<RemoteData<EPerson>> {
+
+  constructor(
+    protected ePersonService: EPersonDataService,
+    protected store: Store<any>,
+  ) {
+  }
+
+  /**
+   * Method for resolving a {@link EPerson} based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns `Observable<<RemoteData<EPerson>>` Emits the found {@link EPerson} based on the parameters in the current
+   * route, or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<EPerson>> {
+    const ePersonRD$: Observable<RemoteData<EPerson>> = this.ePersonService.findById(route.params.id,
+      true,
+      false,
+      ...EPERSON_EDIT_FOLLOW_LINKS,
+    ).pipe(
+      getFirstCompletedRemoteData(),
+    );
+
+    ePersonRD$.subscribe((ePersonRD: RemoteData<EPerson>) => {
+      this.store.dispatch(new ResolvedAction(state.url, ePersonRD.payload));
+    });
+
+    return ePersonRD$;
+  }
+
+}
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 77a81a8daa..dc477352e5 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -2,14 +2,14 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
+      <div *ngIf="groupDataService.getActiveGroup() | async; then editHeader; else createHeader"></div>
 
       <ng-template #createHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
       </ng-template>
 
-      <ng-template #editheader>
-        <h2 class="border-bottom pb-2">
+      <ng-template #editHeader>
+        <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
               content: 'admin.access-control.groups.form.tooltip.editGroupPage',
@@ -20,12 +20,12 @@
           >
             {{messagePrefix + '.head.edit' | translate}}
           </span>
-        </h2>
+        </h1>
       </ng-template>
 
       <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
                 [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-      <ds-alert *ngIf="!(canEdit$ | async) && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
+      <ds-alert *ngIf="(canEdit$ | async) !== true && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
                 [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName((getLinkedDSO(groupBeingEdited) | async)?.payload), comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
       </ds-alert>
 
@@ -36,22 +36,21 @@
                [displayCancel]="false"
                (submitForm)="onSubmit()">
         <div before class="btn-group">
-          <button (click)="onCancel()"
+          <button (click)="onCancel()" type="button"
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
-        <div after *ngIf="groupBeingEdited != null" class="btn-group">
-          <button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
-                  (click)="delete()">
+        <div after *ngIf="(canEdit$ | async) && !groupBeingEdited?.permanent" class="btn-group">
+          <button (click)="delete()" class="btn btn-danger delete-button" type="button">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
           </button>
         </div>
       </ds-form>
 
       <div class="mb-5">
-        <ds-members-list *ngIf="groupBeingEdited != null"
+        <ds-members-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
       </div>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"
+      <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
 
 
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
index f8c5f3cd87..aca6da2a74 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
@@ -1,43 +1,73 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { DSOChangeAnalyzer } from '../../../core/data/dso-change-analyzer.service';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { UUIDService } from '../../../core/shared/uuid.service';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
-import { GroupFormComponent } from './group-form.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
-import { RouterMock } from '../../../shared/mocks/router.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { Operation } from 'fast-json-patch';
-import { ValidateGroupExists } from './validators/group-exists.validator';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../../shared/mocks/router.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
+import { GroupFormComponent } from './group-form.component';
+import { ValidateGroupExists } from './validators/group-exists.validator';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
@@ -65,8 +95,8 @@ describe('GroupFormComponent', () => {
       metadata: {
         'dc.description': [
           {
-            value: groupDescription
-          }
+            value: groupDescription,
+          },
         ],
       },
     });
@@ -105,7 +135,7 @@ describe('GroupFormComponent', () => {
       create(group: Group): Observable<RemoteData<Group>> {
         this.allGroups = [...this.allGroups, group];
         this.createdGroup = Object.assign({}, group, {
-          _links: { self: { href: 'group-selflink' } }
+          _links: { self: { href: 'group-selflink' } },
         });
         return createSuccessfulRemoteDataObject$(this.createdGroup);
       },
@@ -114,78 +144,78 @@ describe('GroupFormComponent', () => {
       },
       getGroupEditPageRouterLinkWithID(id: string) {
         return `group-edit-page-for-${id}`;
-      }
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
         return null;
-      }
+      },
     };
     builderService = Object.assign(getMockFormBuilderService(),{
       createFormGroup(formModel, options = null) {
         const controls = {};
         formModel.forEach( model => {
-            model.parent = parent;
-            const controlModel = model;
-            const controlState = { value: controlModel.value, disabled: controlModel.disabled };
-            const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
-            controls[model.id] = new UntypedFormControl(controlState, controlOptions);
+          model.parent = parent;
+          const controlModel = model;
+          const controlState = { value: controlModel.value, disabled: controlModel.disabled };
+          const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
+          controls[model.id] = new UntypedFormControl(controlState, controlOptions);
         });
         return new UntypedFormGroup(controls, options);
       },
       createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
         return {
-            validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
+          validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
         };
       },
       getValidators(validatorsConfig) {
-          return this.getValidatorFns(validatorsConfig);
+        return this.getValidatorFns(validatorsConfig);
       },
       getValidatorFns(validatorsConfig, validatorsToken = this._NG_VALIDATORS) {
         let validatorFns = [];
         if (this.isObject(validatorsConfig)) {
-            validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
-                const validatorConfigValue = validatorsConfig[validatorConfigKey];
-                if (this.isValidatorDescriptor(validatorConfigValue)) {
-                    const descriptor = validatorConfigValue;
-                    return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
-                }
-                return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
-            });
+          validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
+            const validatorConfigValue = validatorsConfig[validatorConfigKey];
+            if (this.isValidatorDescriptor(validatorConfigValue)) {
+              const descriptor = validatorConfigValue;
+              return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
+            }
+            return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
+          });
         }
         return validatorFns;
       },
       getValidatorFn(validatorName, validatorArgs = null, validatorsToken = this._NG_VALIDATORS) {
         let validatorFn;
         if (Validators.hasOwnProperty(validatorName)) { // Built-in Angular Validators
-            validatorFn = Validators[validatorName];
+          validatorFn = Validators[validatorName];
         } else { // Custom Validators
-            if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
-                validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
-            } else if (validatorsToken) {
-                validatorFn = validatorsToken.find(validator => validator.name === validatorName);
-            }
+          if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
+            validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
+          } else if (validatorsToken) {
+            validatorFn = validatorsToken.find(validator => validator.name === validatorName);
+          }
         }
         if (validatorFn === undefined) { // throw when no validator could be resolved
-            throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
+          throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
         }
         if (validatorArgs !== null) {
-            return validatorFn(validatorArgs);
+          return validatorFn(validatorArgs);
         }
         return validatorFn;
-    },
+      },
       isValidatorDescriptor(value) {
-          if (this.isObject(value)) {
-              return value.hasOwnProperty('name') && value.hasOwnProperty('args');
-          }
-          return false;
+        if (this.isObject(value)) {
+          return value.hasOwnProperty('name') && value.hasOwnProperty('args');
+        }
+        return false;
       },
       isObject(value) {
         return typeof value === 'object' && value !== null;
-      }
+      },
     });
     translateService = getMockTranslateService();
     router = new RouterMock();
@@ -195,8 +225,8 @@ describe('GroupFormComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [GroupFormComponent],
@@ -216,12 +246,12 @@ describe('GroupFormComponent', () => {
         { provide: HALEndpointService, useValue: {} },
         {
           provide: ActivatedRoute,
-          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) }
+          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) },
         },
         { provide: Router, useValue: router },
         { provide: AuthorizationDataService, useValue: authorizationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -257,8 +287,8 @@ describe('GroupFormComponent', () => {
           metadata: {
             'dc.description': [
               {
-                value: groupDescription
-              }
+                value: groupDescription,
+              },
             ],
           },
         });
@@ -273,11 +303,11 @@ describe('GroupFormComponent', () => {
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
-          value: 'testDescription'
+          value: 'testDescription',
         }, {
           op: 'replace',
           path: '/name',
-          value: 'newGroupName'
+          value: 'newGroupName',
         }];
         expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
       });
@@ -289,7 +319,7 @@ describe('GroupFormComponent', () => {
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
-          value: 'testDescription'
+          value: 'testDescription',
         }];
         expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
       });
@@ -301,7 +331,7 @@ describe('GroupFormComponent', () => {
         const operations = [{
           op: 'replace',
           path: '/name',
-          value: 'newGroupName'
+          value: 'newGroupName',
         }];
         expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
       });
@@ -338,8 +368,8 @@ describe('GroupFormComponent', () => {
         metadata: {
           'dc.description': [
             {
-              value: groupDescription
-            }
+              value: groupDescription,
+            },
           ],
         },
       });
@@ -376,7 +406,7 @@ describe('GroupFormComponent', () => {
         const groupsDataServiceStubWithGroup = Object.assign(groupsDataServiceStub,{
           searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [expected]));
-          }
+          },
         });
         component.formGroup.controls.groupName.setValue('testName');
         component.formGroup.controls.groupName.setAsyncValidators(ValidateGroupExists.createValidator(groupsDataServiceStubWithGroup));
@@ -400,7 +430,7 @@ describe('GroupFormComponent', () => {
 
       component.canEdit$ = observableOf(true);
       component.groupBeingEdited = {
-        permanent: false
+        permanent: false,
       } as Group;
 
       fixture.detectChanges();
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index 3c0547cca5..89bb4c395f 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -1,24 +1,45 @@
-import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output, ChangeDetectorRef } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  HostListener,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormControlModel,
   DynamicFormLayout,
   DynamicInputModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import {
-  ObservedValueOf,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { catchError, map, switchMap, take, filter, debounceTime } from 'rxjs/operators';
+import {
+  catchError,
+  debounceTime,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../environments/environment';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -31,27 +52,32 @@ import { Group } from '../../../core/eperson/models/group.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Community } from '../../../core/shared/community.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { Operation } from 'fast-json-patch';
+import {
+  getGroupEditRoute,
+  getGroupsRoute,
+} from '../../access-control-routing-paths';
 import { ValidateGroupExists } from './validators/group-exists.validator';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'ds-group-form',
-  templateUrl: './group-form.component.html'
+  templateUrl: './group-form.component.html',
 })
 /**
  * A form used for creating and editing groups
@@ -83,13 +109,13 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     groupName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     groupDescription: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
   };
 
@@ -165,19 +191,19 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
       hasValueOperator(),
       switchMap((group: Group) => {
-        return observableCombineLatest(
+        return observableCombineLatest([
           this.authorizationService.isAuthorized(FeatureID.CanDelete, isNotEmpty(group) ? group.self : undefined),
           this.hasLinkedDSO(group),
-          (isAuthorized: ObservedValueOf<Observable<boolean>>, hasLinkedDSO: ObservedValueOf<Observable<boolean>>) => {
-            return isAuthorized && !hasLinkedDSO;
-          });
-      })
+        ]).pipe(
+          map(([isAuthorized, hasLinkedDSO]: [boolean, boolean]) => isAuthorized && !hasLinkedDSO),
+        );
+      }),
     );
-    observableCombineLatest(
+    observableCombineLatest([
       this.translateService.get(`${this.messagePrefix}.groupName`),
       this.translateService.get(`${this.messagePrefix}.groupCommunity`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`)
-    ).subscribe(([groupName, groupCommunity, groupDescription]) => {
+      this.translateService.get(`${this.messagePrefix}.groupDescription`),
+    ]).subscribe(([groupName, groupCommunity, groupDescription]) => {
       this.groupName = new DynamicInputModel({
         id: 'groupName',
         label: groupName,
@@ -207,7 +233,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
 
-      if (!!this.formGroup.controls.groupName) {
+      if (this.formGroup.controls.groupName) {
         this.formGroup.controls.groupName.setAsyncValidators(ValidateGroupExists.createValidator(this.groupDataService));
         this.groupNameValueChangeSubscribe = this.groupName.valueChanges.pipe(debounceTime(300)).subscribe(() => {
           this.changeDetectorRef.detectChanges();
@@ -215,12 +241,12 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       }
 
       this.subs.push(
-        observableCombineLatest(
+        observableCombineLatest([
           this.groupDataService.getActiveGroup(),
           this.canEdit$,
           this.groupDataService.getActiveGroup()
-            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload())))
-        ).subscribe(([activeGroup, canEdit, linkedObject]) => {
+            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload()))),
+        ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
 
           if (activeGroup != null) {
 
@@ -230,12 +256,14 @@ export class GroupFormComponent implements OnInit, OnDestroy {
             this.groupBeingEdited = activeGroup;
 
             if (linkedObject?.name) {
-              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
-              this.formGroup.patchValue({
-                groupName: activeGroup.name,
-                groupCommunity: linkedObject?.name ?? '',
-                groupDescription: activeGroup.firstMetadataValue('dc.description'),
-              });
+              if (!this.formGroup.controls.groupCommunity) {
+                this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
+                this.formGroup.patchValue({
+                  groupName: activeGroup.name,
+                  groupCommunity: linkedObject?.name ?? '',
+                  groupDescription: activeGroup.firstMetadataValue('dc.description'),
+                });
+              }
             } else {
               this.formModel = [
                 this.groupName,
@@ -252,7 +280,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
               }
             }, 200);
           }
-        })
+        }),
       );
     });
   }
@@ -263,7 +291,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.groupDataService.cancelEditGroup();
     this.cancelForm.emit();
-    this.router.navigate([this.groupDataService.getGroupRegistryRouterLink()]);
+    void this.router.navigate([getGroupsRoute()]);
   }
 
   /**
@@ -280,9 +308,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           metadata: {
             'dc.description': [
               {
-                value: this.groupDescription.value
-              }
-            ]
+                value: this.groupDescription.value,
+              },
+            ],
           },
         };
         if (group === null) {
@@ -290,7 +318,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
         } else {
           this.editGroup(group);
         }
-      }
+      },
     );
   }
 
@@ -301,7 +329,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   createNewGroup(values) {
     const groupToCreate = Object.assign(new Group(), values);
     this.groupDataService.create(groupToCreate).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.created.success', { name: groupToCreate.name }));
@@ -310,7 +338,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           const groupSelfLink = rd.payload._links.self.href;
           this.setActiveGroupWithLink(groupSelfLink);
           this.groupDataService.clearGroupsRequests();
-          this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLinkWithID(rd.payload.uuid));
+          void this.router.navigateByUrl(getGroupEditRoute(rd.payload.uuid));
         }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.created.failure', { name: groupToCreate.name }));
@@ -330,7 +358,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     // Relevant message for group name in use
     this.subs.push(this.groupDataService.searchGroups(group.name, {
       currentPage: 1,
-      elementsPerPage: 0
+      elementsPerPage: 0,
     }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<Group>) => {
         if (list.totalElements > 0) {
@@ -352,7 +380,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       operations = [...operations, {
         op: 'add',
         path: '/metadata/dc.description',
-        value: this.groupDescription.value
+        value: this.groupDescription.value,
       }];
     }
 
@@ -360,12 +388,12 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       operations = [...operations, {
         op: 'replace',
         path: '/name',
-        value: this.groupName.value
+        value: this.groupName.value,
       }];
     }
 
     this.groupDataService.patch(group, operations).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: this.dsoNameService.getName(rd.payload) }));
@@ -418,7 +446,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   delete() {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = group;
+      modalRef.componentInstance.name = this.dsoNameService.getName(group);
       modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-group.modal.header';
       modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-group.modal.info';
       modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-group.modal.cancel';
@@ -504,7 +532,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
                 return getCollectionEditRolesRoute(rd.payload.id);
             }
           }
-        })
+        }),
       );
     }
   }
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index cc9bf34d64..85aa987605 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -1,110 +1,12 @@
 <ng-container>
-  <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
+  <h2 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h2>
 
-  <h4 id="search" class="border-bottom pb-2">
-    <span
-      *dsContextHelp="{
-        content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
-        id: 'edit-group-add-epeople',
-        iconPlacement: 'right',
-        tooltipPlacement: ['top', 'right', 'bottom']
-      }"
-    >
-      {{messagePrefix + '.search.head' | translate}}
-    </span>
-  </h4>
+  <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div>
-      <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-        <option value="metadata">{{messagePrefix + '.search.scope.metadata' | translate}}</option>
-        <option value="email">{{messagePrefix + '.search.scope.email' | translate}}</option>
-      </select>
-    </div>
-    <div class="flex-grow-1 mr-3 ml-3">
-      <div class="form-group input-group">
-        <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
-        <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
-        </span>
-      </div>
-    </div>
-    <div>
-      <button (click)="clearFormAndResetResult();"
-              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
-    </div>
-  </form>
-
-  <ds-pagination *ngIf="(ePeopleSearchDtos | async)?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [pageInfoState]="(ePeopleSearchDtos | async)"
-                 [collectionSize]="(ePeopleSearchDtos | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let ePerson of (ePeopleSearchDtos | async)?.page">
-          <td class="align-middle">{{ePerson.eperson.id}}</td>
-          <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
-              {{ dsoNameService.getName(ePerson.eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button *ngIf="ePerson.memberOfGroup"
-                      (click)="deleteMemberFromGroup(ePerson)"
-                      [disabled]="actionConfig.remove.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
-                <i [ngClass]="actionConfig.remove.icon"></i>
-              </button>
-
-              <button *ngIf="!ePerson.memberOfGroup"
-                      (click)="addMemberToGroup(ePerson)"
-                      [disabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleSearchDtos | async)?.totalElements == 0 && searchDone"
-       class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
-
-  <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
-
-  <ds-pagination *ngIf="(ePeopleMembersOfGroupDtos | async)?.totalElements > 0"
+  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
                  [paginationOptions]="config"
-                 [pageInfoState]="(ePeopleMembersOfGroupDtos | async)"
-                 [collectionSize]="(ePeopleMembersOfGroupDtos | async)?.totalElements"
+                 [pageInfoState]="(ePeopleMembersOfGroup | async)"
+                 [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
                  [hideGear]="true"
                  [hidePagerWhenSinglePage]="true">
 
@@ -119,32 +21,104 @@
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let ePerson of (ePeopleMembersOfGroupDtos | async)?.page">
-          <td class="align-middle">{{ePerson.eperson.id}}</td>
+        <tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
+          <td class="align-middle">{{eperson.id}}</td>
           <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
-              {{ dsoNameService.getName(ePerson.eperson) }}
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
+              {{ dsoNameService.getName(eperson) }}
             </a>
           </td>
           <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
+            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
           </td>
           <td class="align-middle">
             <div class="btn-group edit-field">
-              <button *ngIf="ePerson.memberOfGroup"
-                      (click)="deleteMemberFromGroup(ePerson)"
+              <button (click)="deleteMemberFromGroup(eperson)"
                       [disabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
+                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
-              <button *ngIf="!ePerson.memberOfGroup"
-                      (click)="addMemberToGroup(ePerson)"
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+
+  <div *ngIf="(ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-members-yet' | translate}}
+  </div>
+
+  <h3 id="search" class="border-bottom pb-2">
+    <span
+      *dsContextHelp="{
+        content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
+        id: 'edit-group-add-epeople',
+        iconPlacement: 'right',
+        tooltipPlacement: ['top', 'right', 'bottom']
+      }"
+    >
+      {{messagePrefix + '.search.head' | translate}}
+    </span>
+  </h3>
+
+  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
+    <div class="flex-grow-1 mr-3">
+      <div class="form-group input-group mr-3">
+        <input type="text" name="query" id="query" formControlName="query"
+               class="form-control" aria-label="Search input">
+        <span class="input-group-append">
+            <button type="submit" class="search-button btn btn-primary">
+              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
+        </span>
+      </div>
+    </div>
+    <div>
+      <button (click)="clearFormAndResetResult();"
+              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
+    </div>
+  </form>
+
+  <ds-pagination *ngIf="(ePeopleSearch | async)?.totalElements > 0"
+                 [paginationOptions]="configSearch"
+                 [pageInfoState]="(ePeopleSearch | async)"
+                 [collectionSize]="(ePeopleSearch | async)?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true">
+
+    <div class="table-responsive">
+      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
+        <thead>
+        <tr>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
+          <td class="align-middle">{{eperson.id}}</td>
+          <td class="align-middle">
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
+              {{ dsoNameService.getName(eperson) }}
+            </a>
+          </td>
+          <td class="align-middle">
+            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
+          </td>
+          <td class="align-middle">
+            <div class="btn-group edit-field">
+              <button (click)="addMemberToGroup(eperson)"
                       [disabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
               </button>
             </div>
@@ -156,9 +130,10 @@
 
   </ds-pagination>
 
-  <div *ngIf="(ePeopleMembersOfGroupDtos | async) == undefined || (ePeopleMembersOfGroupDtos | async)?.totalElements == 0" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(ePeopleSearch | async)?.totalElements === 0 && searchDone"
+       class="alert alert-info w-100 mb-2"
        role="alert">
-    {{messagePrefix + '.no-members-yet' | translate}}
+    {{messagePrefix + '.no-items' | translate}}
   </div>
 
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 7c8db399bc..c63ff40df8 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -1,35 +1,68 @@
 import { CommonModule } from '@angular/common';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-import { MembersListComponent } from './members-list.component';
-import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../../shared/testing/eperson.mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { MembersListComponent } from './members-list.component';
+
+// todo: optimize imports
 
 describe('MembersListComponent', () => {
   let component: MembersListComponent;
@@ -39,28 +72,26 @@ describe('MembersListComponent', () => {
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
   let activeGroup;
-  let allEPersons: EPerson[];
-  let allGroups: Group[];
   let epersonMembers: EPerson[];
-  let subgroupMembers: Group[];
+  let epersonNonMembers: EPerson[];
   let paginationService;
 
   beforeEach(waitForAsync(() => {
     activeGroup = GroupMock;
     epersonMembers = [EPersonMock2];
-    subgroupMembers = [GroupMock2];
-    allEPersons = [EPersonMock, EPersonMock2];
-    allGroups = [GroupMock, GroupMock2];
+    epersonNonMembers = [EPersonMock];
     ePersonDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
+      epersonNonMembers: epersonNonMembers,
+      // This method is used to get all the current members
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()));
       },
-      searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+      // This method is used to search across *non-members*
+      searchNonMembers(query: string, group: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), epersonNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
@@ -70,29 +101,26 @@ describe('MembersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
-      allGroups: allGroups,
+      epersonNonMembers: epersonNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(activeGroup);
       },
       getEPersonMembers() {
         return this.epersonMembers;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups));
-        }
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-      },
-      addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
-        this.epersonMembers = [...this.epersonMembers, eperson];
+      addMemberToGroup(parentGroup, epersonToAdd: EPerson): Observable<RestResponse> {
+        // Add eperson to list of members
+        this.epersonMembers = [...this.epersonMembers, epersonToAdd];
+        // Remove eperson from list of non-members
+        this.epersonNonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToAdd.id) {
+            this.epersonNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -105,16 +133,16 @@ describe('MembersListComponent', () => {
         return '/access-control/groups/' + group.id;
       },
       deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
-        this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => {
-          if (eperson.id !== epersonToDelete.id) {
-            return eperson;
+        // Remove eperson from list of members
+        this.epersonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToDelete.id) {
+            this.epersonMembers.splice(index, 1);
           }
         });
-        if (this.epersonMembers === undefined) {
-          this.epersonMembers = [];
-        }
+        // Add eperson to list of non-members
+        this.epersonNonMembers = [...this.epersonNonMembers, epersonToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
-      }
+      },
     };
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
@@ -125,8 +153,8 @@ describe('MembersListComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [MembersListComponent],
@@ -139,7 +167,7 @@ describe('MembersListComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         { provide: DSONameService, useValue: new DSONameServiceMock() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -160,13 +188,37 @@ describe('MembersListComponent', () => {
     expect(comp).toBeDefined();
   }));
 
-  it('should show list of eperson members of current active group', () => {
-    const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
-    expect(epersonIdsFound.length).toEqual(1);
-    epersonMembers.map((eperson: EPerson) => {
-      expect(epersonIdsFound.find((foundEl) => {
-        return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
-      })).toBeTruthy();
+  describe('current members list', () => {
+    it('should show list of eperson members of current active group', () => {
+      const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
+      expect(epersonIdsFound.length).toEqual(1);
+      epersonMembers.map((eperson: EPerson) => {
+        expect(epersonIdsFound.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
+        })).toBeTruthy();
+      });
+    });
+
+    it('should show a delete button next to each member', () => {
+      const epersonsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tbody tr'));
+      epersonsFound.map((foundEPersonRowElement: DebugElement) => {
+        const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
+        const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
+        expect(addButton).toBeNull();
+        expect(deleteButton).not.toBeNull();
+      });
+    });
+
+    describe('if first delete button is pressed', () => {
+      beforeEach(() => {
+        const deleteButton: DebugElement = fixture.debugElement.query(By.css('#ePeopleMembersOfGroup tbody .fa-trash-alt'));
+        deleteButton.nativeElement.click();
+        fixture.detectChanges();
+      });
+      it('then no ePerson remains as a member of the active group.', () => {
+        const epersonsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tbody tr'));
+        expect(epersonsFound.length).toEqual(0);
+      });
     });
   });
 
@@ -174,76 +226,40 @@ describe('MembersListComponent', () => {
     describe('when searching without query', () => {
       let epersonsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
-        spyOn(component, 'isMemberOfGroup').and.callFake((ePerson: EPerson) => {
-          return observableOf(activeGroup.epersons.includes(ePerson));
-        });
         component.search({ scope: 'metadata', query: '' });
         tick();
         fixture.detectChanges();
         epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-        // Stop using the fake spy function (because otherwise the clicking on the buttons will not change anything
-        // because they don't change the value of activeGroup.epersons)
-        jasmine.getEnv().allowRespy(true);
-        spyOn(component, 'isMemberOfGroup').and.callThrough();
       }));
 
-      it('should display all epersons', () => {
-        expect(epersonsFound.length).toEqual(2);
+      it('should display only non-members of the group', () => {
+        const epersonIdsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr td:first-child'));
+        expect(epersonIdsFound.length).toEqual(1);
+        epersonNonMembers.map((eperson: EPerson) => {
+          expect(epersonIdsFound.find((foundEl) => {
+            return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
+          })).toBeTruthy();
+        });
       });
 
-      describe('if eperson is already a eperson', () => {
-        it('should have delete button, else it should have add button', () => {
-          const memberIds: string[] = activeGroup.epersons.map((ePerson: EPerson) => ePerson.id);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const epersonId: DebugElement = foundEPersonRowElement.query(By.css('td:first-child'));
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            if (memberIds.includes(epersonId.nativeElement.textContent)) {
-              expect(addButton).toBeNull();
-              expect(deleteButton).not.toBeNull();
-            } else {
-              expect(deleteButton).toBeNull();
-              expect(addButton).not.toBeNull();
-            }
-          });
+      it('should display an add button next to non-members, not a delete button', () => {
+        epersonsFound.map((foundEPersonRowElement: DebugElement) => {
+          const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
+          const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
+          expect(addButton).not.toBeNull();
+          expect(deleteButton).toBeNull();
         });
       });
 
       describe('if first add button is pressed', () => {
-        beforeEach(fakeAsync(() => {
+        beforeEach(() => {
           const addButton: DebugElement = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus'));
           addButton.nativeElement.click();
-          tick();
           fixture.detectChanges();
-        }));
-        it('then all the ePersons are member of the active group', () => {
-          epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          expect(epersonsFound.length).toEqual(2);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            expect(addButton).toBeNull();
-            expect(deleteButton).not.toBeNull();
-          });
         });
-      });
-
-      describe('if first delete button is pressed', () => {
-        beforeEach(fakeAsync(() => {
-          const deleteButton: DebugElement = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt'));
-          deleteButton.nativeElement.click();
-          tick();
-          fixture.detectChanges();
-        }));
-        it('then no ePerson is member of the active group', () => {
+        it('then all (two) ePersons are member of the active group. No non-members left', () => {
           epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          expect(epersonsFound.length).toEqual(2);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            expect(deleteButton).toBeNull();
-            expect(addButton).not.toBeNull();
-          });
+          expect(epersonsFound.length).toEqual(0);
         });
       });
     });
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index b3e686c012..002e20524c 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -1,41 +1,49 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  Observable,
-  of as observableOf,
-  Subscription,
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
-  ObservedValueOf,
+  Observable,
+  Subscription,
 } from 'rxjs';
-import { defaultIfEmpty, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import {
-  getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData,
   getAllCompletedRemoteData,
-  getRemoteDataPayload
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { getEPersonEditRoute } from '../../../access-control-routing-paths';
+
+// todo: optimize imports
 
 /**
  * Keys to keep track of specific subscriptions
  */
 enum SubKey {
   ActiveGroup,
-  MembersDTO,
-  SearchResultsDTO,
+  Members,
+  SearchResults,
 }
 
 /**
@@ -69,7 +77,7 @@ export interface EPersonListActionConfig {
 
 @Component({
   selector: 'ds-members-list',
-  templateUrl: './members-list.component.html'
+  templateUrl: './members-list.component.html',
 })
 /**
  * The list of members in the edit group page
@@ -77,30 +85,30 @@ export interface EPersonListActionConfig {
 export class MembersListComponent implements OnInit, OnDestroy {
 
   @Input()
-  messagePrefix: string;
+    messagePrefix: string;
 
   @Input()
-  actionConfig: EPersonListActionConfig = {
-    add: {
-      css: 'btn-outline-primary',
-      disabled: false,
-      icon: 'fas fa-plus fa-fw',
-    },
-    remove: {
-      css: 'btn-outline-danger',
-      disabled: false,
-      icon: 'fas fa-trash-alt fa-fw'
-    },
-  };
+    actionConfig: EPersonListActionConfig = {
+      add: {
+        css: 'btn-outline-primary',
+        disabled: false,
+        icon: 'fas fa-plus fa-fw',
+      },
+      remove: {
+        css: 'btn-outline-danger',
+        disabled: false,
+        icon: 'fas fa-trash-alt fa-fw',
+      },
+    };
 
   /**
    * EPeople being displayed in search result, initially all members, after search result of search
    */
-  ePeopleSearchDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
+  ePeopleSearch: BehaviorSubject<PaginatedList<EPerson>> = new BehaviorSubject<PaginatedList<EPerson>>(undefined);
   /**
    * List of EPeople members of currently active group being edited
    */
-  ePeopleMembersOfGroupDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
+  ePeopleMembersOfGroup: BehaviorSubject<PaginatedList<EPerson>> = new BehaviorSubject<PaginatedList<EPerson>>(undefined);
 
   /**
    * Pagination config used to display the list of EPeople that are result of EPeople search
@@ -108,7 +116,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
   configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'sml',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
   /**
    * Pagination config used to display the list of EPerson Membes of active group being edited
@@ -116,7 +124,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'ml',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -129,7 +137,6 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   // Current search in edit group - epeople search form
   currentSearchQuery: string;
-  currentSearchScope: string;
 
   // Whether or not user has done a EPeople search yet
   searchDone: boolean;
@@ -137,6 +144,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
   // current active group being edited
   groupBeingEdited: Group;
 
+  readonly getEPersonEditRoute = getEPersonEditRoute;
+
   constructor(
     protected groupDataService: GroupDataService,
     public ePersonDataService: EPersonDataService,
@@ -148,18 +157,17 @@ export class MembersListComponent implements OnInit, OnDestroy {
     public dsoNameService: DSONameService,
   ) {
     this.currentSearchQuery = '';
-    this.currentSearchScope = 'metadata';
   }
 
   ngOnInit(): void {
     this.searchForm = this.formBuilder.group(({
-      scope: 'metadata',
       query: '',
     }));
     this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
         this.retrieveMembers(this.config.currentPage);
+        this.search({ query: '' });
       }
     }));
   }
@@ -171,14 +179,14 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @private
    */
   retrieveMembers(page: number): void {
-    this.unsubFrom(SubKey.MembersDTO);
-    this.subs.set(SubKey.MembersDTO,
+    this.unsubFrom(SubKey.Members);
+    this.subs.set(SubKey.Members,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
         switchMap((currentPagination) => {
           return this.ePersonDataService.findListByHref(this.groupBeingEdited._links.epersons.href, {
-              currentPage: currentPagination.currentPage,
-              elementsPerPage: currentPagination.pageSize
-            }
+            currentPage: currentPagination.currentPage,
+            elementsPerPage: currentPagination.pageSize,
+          },
           );
         }),
         getAllCompletedRemoteData(),
@@ -189,49 +197,12 @@ export class MembersListComponent implements OnInit, OnDestroy {
             return rd;
           }
         }),
-        switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
-            const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
-              this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
-                const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
-                epersonDtoModel.eperson = member;
-                epersonDtoModel.memberOfGroup = isMember;
-                return epersonDtoModel;
-              });
-            return dto$;
-          })]);
-          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
-            return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
-          }));
-        }))
-        .subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
-          this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
+        getRemoteDataPayload())
+        .subscribe((paginatedListOfEPersons: PaginatedList<EPerson>) => {
+          this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
         }));
   }
 
-  /**
-   * Whether the given ePerson is a member of the group currently being edited
-   * @param possibleMember  EPerson that is a possible member (being tested) of the group currently being edited
-   */
-  isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((group: Group) => {
-        if (group != null) {
-          return this.ePersonDataService.findListByHref(group._links.epersons.href, {
-            currentPage: 1,
-            elementsPerPage: 9999
-          })
-            .pipe(
-              getFirstSucceededRemoteData(),
-              getRemoteDataPayload(),
-              map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
-              map((epeople: EPerson[]) => epeople.length > 0));
-        } else {
-          return observableOf(false);
-        }
-      }));
-  }
-
   /**
    * Unsubscribe from a subscription if it's still subscribed, and remove it from the map of
    * active subscriptions
@@ -248,14 +219,18 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   /**
    * Deletes a given EPerson from the members list of the group currently being edited
-   * @param ePerson   EPerson we want to delete as member from group that is currently being edited
+   * @param eperson   EPerson we want to delete as member from group that is currently being edited
    */
-  deleteMemberFromGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = false;
+  deleteMemberFromGroup(eperson: EPerson) {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
-        const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson);
-        this.showNotifications('deleteMember', response, this.dsoNameService.getName(ePerson.eperson), activeGroup);
+        const response = this.groupDataService.deleteMemberFromGroup(activeGroup, eperson);
+        this.showNotifications('deleteMember', response, this.dsoNameService.getName(eperson), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({ query: this.currentSearchQuery });
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -264,14 +239,18 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   /**
    * Adds a given EPerson to the members list of the group currently being edited
-   * @param ePerson   EPerson we want to add as member to group that is currently being edited
+   * @param eperson   EPerson we want to add as member to group that is currently being edited
    */
-  addMemberToGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = true;
+  addMemberToGroup(eperson: EPerson) {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
-        const response = this.groupDataService.addMemberToGroup(activeGroup, ePerson.eperson);
-        this.showNotifications('addMember', response, this.dsoNameService.getName(ePerson.eperson), activeGroup);
+        const response = this.groupDataService.addMemberToGroup(activeGroup, eperson);
+        this.showNotifications('addMember', response, this.dsoNameService.getName(eperson), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({ query: this.currentSearchQuery });
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -279,37 +258,25 @@ export class MembersListComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Search in the EPeople by name, email or metadata
-   * @param data  Contains scope and query param
+   * Search all EPeople who are NOT a member of the current group by name, email or metadata
+   * @param data  Contains query param
    */
   search(data: any) {
-    this.unsubFrom(SubKey.SearchResultsDTO);
-    this.subs.set(SubKey.SearchResultsDTO,
+    this.unsubFrom(SubKey.SearchResults);
+    this.subs.set(SubKey.SearchResults,
       this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
         switchMap((paginationOptions) => {
-
           const query: string = data.query;
-          const scope: string = data.scope;
           if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) {
-            this.router.navigate([], {
-              queryParamsHandling: 'merge'
-            });
             this.currentSearchQuery = query;
             this.paginationService.resetPage(this.configSearch.id);
           }
-          if (scope != null && this.currentSearchScope !== scope && this.groupBeingEdited) {
-            this.router.navigate([], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchScope = scope;
-            this.paginationService.resetPage(this.configSearch.id);
-          }
           this.searchDone = true;
 
-          return this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
+          return this.ePersonDataService.searchNonMembers(this.currentSearchQuery, this.groupBeingEdited.id, {
             currentPage: paginationOptions.currentPage,
-            elementsPerPage: paginationOptions.pageSize
-          });
+            elementsPerPage: paginationOptions.pageSize,
+          }, false, true);
         }),
         getAllCompletedRemoteData(),
         map((rd: RemoteData<any>) => {
@@ -319,23 +286,9 @@ export class MembersListComponent implements OnInit, OnDestroy {
             return rd;
           }
         }),
-        switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
-            const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
-              this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
-                const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
-                epersonDtoModel.eperson = member;
-                epersonDtoModel.memberOfGroup = isMember;
-                return epersonDtoModel;
-              });
-            return dto$;
-          })]);
-          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
-            return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
-          }));
-        }))
-        .subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
-          this.ePeopleSearchDtos.next(paginatedListOfDTOs);
+        getRemoteDataPayload())
+        .subscribe((paginatedListOfEPersons: PaginatedList<EPerson>) => {
+          this.ePeopleSearch.next(paginatedListOfEPersons);
         }));
   }
 
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index d009f0283e..ab7bd84f6b 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -1,6 +1,55 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
+  <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
+
+  <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
+                 [paginationOptions]="config"
+                 [pageInfoState]="(subGroups$ | async)?.payload"
+                 [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true">
+
+    <div class="table-responsive">
+      <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
+        <thead>
+        <tr>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+          <th>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
+          <td class="align-middle">{{group.id}}</td>
+          <td class="align-middle">
+            <a (click)="groupDataService.startEditingNewGroup(group)"
+               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+            {{ dsoNameService.getName(group) }}
+          </a>
+          </td>
+          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
+          <td class="align-middle">
+            <div class="btn-group edit-field">
+              <button (click)="deleteSubgroupFromGroup(group)"
+                      class="btn btn-outline-danger btn-sm deleteButton"
+                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
+                <i class="fas fa-trash-alt fa-fw"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+
+  <div *ngIf="(subGroups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-subgroups-yet' | translate}}
+  </div>
+
   <h4 id="search" class="border-bottom pb-2">
     <span *dsContextHelp="{
             content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
@@ -62,17 +111,7 @@
           <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
           <td class="align-middle">
             <div class="btn-group edit-field">
-              <button *ngIf="(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
-                      (click)="deleteSubgroupFromGroup(group)"
-                      class="btn btn-outline-danger btn-sm deleteButton"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-
-              <span *ngIf="(isActiveGroup(group) | async)">{{ messagePrefix + '.table.edit.currentGroup' | translate }}</span>
-
-              <button *ngIf="!(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
-                      (click)="addSubgroupToGroup(group)"
+              <button (click)="addSubgroupToGroup(group)"
                       class="btn btn-outline-primary btn-sm addButton"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
                 <i class="fas fa-plus fa-fw"></i>
@@ -85,58 +124,9 @@
     </div>
   </ds-pagination>
 
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(searchResults$ | async)?.payload?.totalElements === 0 && searchDone" class="alert alert-info w-100 mb-2"
        role="alert">
     {{messagePrefix + '.no-items' | translate}}
   </div>
 
-  <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
-
-  <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="config"
-                 [pageInfoState]="(subGroups$ | async)?.payload"
-                 [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th>{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-            {{ dsoNameService.getName(group) }}
-          </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteSubgroupFromGroup(group)"
-                      class="btn btn-outline-danger btn-sm deleteButton"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
-
-  <div *ngIf="(subGroups$ | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-subgroups-yet' | translate}}
-  </div>
-
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
index ac5750dcac..ca50406aea 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -1,36 +1,63 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, BehaviorSubject } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-import { SubgroupsListComponent } from './subgroups-list.component';
-import {
-  createSuccessfulRemoteDataObject$,
-  createSuccessfulRemoteDataObject
-} from '../../../../shared/remote-data.utils';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { map } from 'rxjs/operators';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { SubgroupsListComponent } from './subgroups-list.component';
 
 describe('SubgroupsListComponent', () => {
   let component: SubgroupsListComponent;
@@ -39,44 +66,70 @@ describe('SubgroupsListComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
-  let activeGroup;
+  let activeGroup: Group;
   let subgroups: Group[];
-  let allGroups: Group[];
+  let groupNonMembers: Group[];
   let routerStub;
   let paginationService;
+  // Define a new mock activegroup for all tests below
+  let mockActiveGroup: Group = Object.assign(new Group(), {
+    handle: null,
+    subgroups: [GroupMock2],
+    epersons: [EPersonMock2],
+    selfRegistered: false,
+    permanent: false,
+    _links: {
+      self: {
+        href: 'https://rest.api/server/api/eperson/groups/activegroupid',
+      },
+      subgroups: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/subgroups' },
+      object: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/object' },
+      epersons: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/epersons' },
+    },
+    _name: 'activegroupname',
+    id: 'activegroupid',
+    uuid: 'activegroupid',
+    type: 'group',
+  });
 
   beforeEach(waitForAsync(() => {
-    activeGroup = GroupMock;
+    activeGroup = mockActiveGroup;
     subgroups = [GroupMock2];
-    allGroups = [GroupMock, GroupMock2];
+    groupNonMembers = [GroupMock];
     ePersonDataServiceStub = {};
     groupsDataServiceStub = {
       activeGroup: activeGroup,
-      subgroups$: new BehaviorSubject(subgroups),
+      subgroups: subgroups,
+      groupNonMembers: groupNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(this.activeGroup);
       },
       getSubgroups(): Group {
-        return this.activeGroup;
+        return this.subgroups;
       },
+      // This method is used to get all the current subgroups
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return this.subgroups$.pipe(
-          map((currentGroups: Group[]) => {
-            return createSuccessfulRemoteDataObject(buildPaginatedList<Group>(new PageInfo(), currentGroups));
-          })
-        );
+        return createSuccessfulRemoteDataObject$(buildPaginatedList<Group>(new PageInfo(), groupsDataServiceStub.getSubgroups()));
       },
       getGroupEditPageRouterLink(group: Group): string {
         return '/access-control/groups/' + group.id;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
+      // This method is used to get all groups which are NOT currently a subgroup member
+      searchNonMemberGroups(query: string, group: string): Observable<RemoteData<PaginatedList<Group>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allGroups));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
-      addSubGroupToGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
-        this.subgroups$.next([...this.subgroups$.getValue(), subgroup]);
+      addSubGroupToGroup(parentGroup, subgroupToAdd: Group): Observable<RestResponse> {
+        // Add group to list of subgroups
+        this.subgroups = [...this.subgroups, subgroupToAdd];
+        // Remove group from list of non-members
+        this.groupNonMembers.forEach( (group: Group, index: number) => {
+          if (group.id === subgroupToAdd.id) {
+            this.groupNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -85,27 +138,30 @@ describe('SubgroupsListComponent', () => {
       clearGroupLinkRequests() {
         // empty
       },
-      deleteSubGroupFromGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
-        this.subgroups$.next(this.subgroups$.getValue().filter((group: Group) => {
-          if (group.id !== subgroup.id) {
-            return group;
+      deleteSubGroupFromGroup(parentGroup, subgroupToDelete: Group): Observable<RestResponse> {
+        // Remove group from list of subgroups
+        this.subgroups.forEach( (group: Group, index: number) => {
+          if (group.id === subgroupToDelete.id) {
+            this.subgroups.splice(index, 1);
           }
-        }));
+        });
+        // Add group to list of non-members
+        this.groupNonMembers = [...this.groupNonMembers, subgroupToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
-      }
+      },
     };
     routerStub = new RouterMock();
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [SubgroupsListComponent],
@@ -117,7 +173,7 @@ describe('SubgroupsListComponent', () => {
         { provide: Router, useValue: routerStub },
         { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -137,30 +193,38 @@ describe('SubgroupsListComponent', () => {
     expect(comp).toBeDefined();
   }));
 
-  it('should show list of subgroups of current active group', () => {
-    const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
-    expect(groupIdsFound.length).toEqual(1);
-    activeGroup.subgroups.map((group: Group) => {
-      expect(groupIdsFound.find((foundEl) => {
-        return (foundEl.nativeElement.textContent.trim() === group.uuid);
-      })).toBeTruthy();
-    });
-  });
-
-  describe('if first group delete button is pressed', () => {
-    let groupsFound: DebugElement[];
-    beforeEach(fakeAsync(() => {
-      const addButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
-      addButton.triggerEventHandler('click', {
-        preventDefault: () => {/**/
-        }
+  describe('current subgroup list', () => {
+    it('should show list of subgroups of current active group', () => {
+      const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
+      expect(groupIdsFound.length).toEqual(1);
+      subgroups.map((group: Group) => {
+        expect(groupIdsFound.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === group.uuid);
+        })).toBeTruthy();
+      });
+    });
+
+    it('should show a delete button next to each subgroup', () => {
+      const subgroupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
+      subgroupsFound.map((foundGroupRowElement: DebugElement) => {
+        const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
+        const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
+        expect(addButton).toBeNull();
+        expect(deleteButton).not.toBeNull();
+      });
+    });
+
+    describe('if first group delete button is pressed', () => {
+      let groupsFound: DebugElement[];
+      beforeEach(() => {
+        const deleteButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
+        deleteButton.nativeElement.click();
+        fixture.detectChanges();
+      });
+      it('then no subgroup remains as a member of the active group', () => {
+        groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
+        expect(groupsFound.length).toEqual(0);
       });
-      tick();
-      fixture.detectChanges();
-    }));
-    it('one less subgroup in list from 1 to 0 (of 2 total groups)', () => {
-      groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
-      expect(groupsFound.length).toEqual(0);
     });
   });
 
@@ -169,54 +233,38 @@ describe('SubgroupsListComponent', () => {
       let groupsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ query: '' });
+        fixture.detectChanges();
         groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
       }));
 
-      it('should display all groups', () => {
-        fixture.detectChanges();
-        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-        expect(groupsFound.length).toEqual(2);
-        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+      it('should display only non-member groups (i.e. groups that are not a subgroup)', () => {
         const groupIdsFound: DebugElement[] = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr td:first-child'));
-        allGroups.map((group: Group) => {
+        expect(groupIdsFound.length).toEqual(1);
+        groupNonMembers.map((group: Group) => {
           expect(groupIdsFound.find((foundEl: DebugElement) => {
             return (foundEl.nativeElement.textContent.trim() === group.uuid);
           })).toBeTruthy();
         });
       });
 
-      describe('if group is already a subgroup', () => {
-        it('should have delete button, else it should have add button', () => {
+      it('should display an add button next to non-member groups, not a delete button', () => {
+        groupsFound.map((foundGroupRowElement: DebugElement) => {
+          const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
+          const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
+          expect(addButton).not.toBeNull();
+          expect(deleteButton).toBeNull();
+        });
+      });
+
+      describe('if first add button is pressed', () => {
+        beforeEach(() => {
+          const addButton: DebugElement = fixture.debugElement.query(By.css('#groupsSearch tbody .fa-plus'));
+          addButton.nativeElement.click();
           fixture.detectChanges();
+        });
+        it('then all (two) Groups are subgroups of the active group. No non-members left', () => {
           groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-          const getSubgroups = groupsDataServiceStub.getSubgroups().subgroups;
-          if (getSubgroups !== undefined && getSubgroups.length > 0) {
-            groupsFound.map((foundGroupRowElement: DebugElement) => {
-              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
-              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-              expect(addButton).toBeNull();
-              if (activeGroup.id === groupId.nativeElement.textContent) {
-                expect(deleteButton).toBeNull();
-              } else {
-                expect(deleteButton).not.toBeNull();
-              }
-            });
-          } else {
-            const subgroupIds: string[] = activeGroup.subgroups.map((group: Group) => group.id);
-            groupsFound.map((foundGroupRowElement: DebugElement) => {
-              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
-              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-              if (subgroupIds.includes(groupId.nativeElement.textContent)) {
-                expect(addButton).toBeNull();
-                expect(deleteButton).not.toBeNull();
-              } else {
-                expect(deleteButton).toBeNull();
-                expect(addButton).not.toBeNull();
-              }
-            });
-          }
+          expect(groupsFound.length).toEqual(0);
         });
       });
     });
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 0cff730c62..ae677a5558 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -1,24 +1,38 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, switchMap, take } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { NoContent } from '../../../../core/shared/NoContent.model';
 import {
+  getAllCompletedRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload
 } from '../../../../core/shared/operators';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../../../core/shared/NoContent.model';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 /**
  * Keys to keep track of specific subscriptions
@@ -31,7 +45,7 @@ enum SubKey {
 
 @Component({
   selector: 'ds-subgroups-list',
-  templateUrl: './subgroups-list.component.html'
+  templateUrl: './subgroups-list.component.html',
 })
 /**
  * The list of subgroups in the edit group page
@@ -39,7 +53,7 @@ enum SubKey {
 export class SubgroupsListComponent implements OnInit, OnDestroy {
 
   @Input()
-  messagePrefix: string;
+    messagePrefix: string;
 
   /**
    * Result of search groups, initially all groups
@@ -50,6 +64,8 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
    */
   subGroups$: BehaviorSubject<RemoteData<PaginatedList<Group>>> = new BehaviorSubject(undefined);
 
+  subGroupsPageInfoState$: Observable<PageInfo>;
+
   /**
    * Map of active subscriptions
    */
@@ -61,7 +77,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'ssgl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
   /**
    * Pagination config used to display the list of subgroups of currently active group being edited
@@ -69,7 +85,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'sgl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   // The search form
@@ -103,8 +119,12 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
         this.retrieveSubGroups();
+        this.search({ query: '' });
       }
     }));
+    this.subGroupsPageInfoState$ = this.subGroups$.pipe(
+      map(subGroupsRD => subGroupsRD?.payload?.pageInfo),
+    );
   }
 
   /**
@@ -119,59 +139,18 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       SubKey.Members,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
         switchMap((config) => this.groupDataService.findListByHref(this.groupBeingEdited._links.subgroups.href, {
-            currentPage: config.currentPage,
-            elementsPerPage: config.pageSize
-          },
-          true,
-          true,
-          followLink('object')
-        ))
+          currentPage: config.currentPage,
+          elementsPerPage: config.pageSize,
+        },
+        true,
+        true,
+        followLink('object'),
+        )),
       ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
         this.subGroups$.next(rd);
       }));
   }
 
-  /**
-   * Whether or not the given group is a subgroup of the group currently being edited
-   * @param possibleSubgroup Group that is a possible subgroup (being tested) of the group currently being edited
-   */
-  isSubgroupOfGroup(possibleSubgroup: Group): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((activeGroup: Group) => {
-        if (activeGroup != null) {
-          if (activeGroup.uuid === possibleSubgroup.uuid) {
-            return observableOf(false);
-          } else {
-            return this.groupDataService.findListByHref(activeGroup._links.subgroups.href, {
-              currentPage: 1,
-              elementsPerPage: 9999
-            })
-              .pipe(
-                getFirstSucceededRemoteData(),
-                getRemoteDataPayload(),
-                map((listTotalGroups: PaginatedList<Group>) => listTotalGroups.page.filter((groupInList: Group) => groupInList.id === possibleSubgroup.id)),
-                map((groups: Group[]) => groups.length > 0));
-          }
-        } else {
-          return observableOf(false);
-        }
-      }));
-  }
-
-  /**
-   * Whether or not the given group is the current group being edited
-   * @param group Group that is possibly the current group being edited
-   */
-  isActiveGroup(group: Group): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((activeGroup: Group) => {
-        if (activeGroup != null && activeGroup.uuid === group.uuid) {
-          return observableOf(true);
-        }
-        return observableOf(false);
-      }));
-  }
-
   /**
    * Deletes given subgroup from the group currently being edited
    * @param subgroup  Group we want to delete from the subgroups of the group currently being edited
@@ -181,6 +160,11 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         const response = this.groupDataService.deleteSubGroupFromGroup(activeGroup, subgroup);
         this.showNotifications('deleteSubgroup', response, this.dsoNameService.getName(subgroup), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({ query: this.currentSearchQuery });
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -197,6 +181,11 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
         if (activeGroup.uuid !== subgroup.uuid) {
           const response = this.groupDataService.addSubGroupToGroup(activeGroup, subgroup);
           this.showNotifications('addSubgroup', response, this.dsoNameService.getName(subgroup), activeGroup);
+          // Reload search results (if there is an active query).
+          // This will potentially remove this added subgroup from search results.
+          if (this.currentSearchQuery != null) {
+            this.search({ query: this.currentSearchQuery });
+          }
         } else {
           this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.subgroupToAddIsActiveGroup'));
         }
@@ -207,28 +196,38 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Search in the groups (searches by group name and by uuid exact match)
+   * Search all non-member groups (searches by group name and by uuid exact match).  Used to search for
+   * groups that could be added to current group as a subgroup.
    * @param data  Contains query param
    */
   search(data: any) {
-    const query: string = data.query;
-    if (query != null && this.currentSearchQuery !== query) {
-      this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(this.groupBeingEdited));
-      this.currentSearchQuery = query;
-      this.configSearch.currentPage = 1;
-    }
-    this.searchDone = true;
-
     this.unsubFrom(SubKey.SearchResults);
-    this.subs.set(SubKey.SearchResults, this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
-      switchMap((config) => this.groupDataService.searchGroups(this.currentSearchQuery, {
-        currentPage: config.currentPage,
-        elementsPerPage: config.pageSize
-      }, true, true, followLink('object')
-      ))
-    ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
-      this.searchResults$.next(rd);
-    }));
+    this.subs.set(SubKey.SearchResults,
+      this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
+        switchMap((paginationOptions) => {
+          const query: string = data.query;
+          if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) {
+            this.currentSearchQuery = query;
+            this.paginationService.resetPage(this.configSearch.id);
+          }
+          this.searchDone = true;
+
+          return this.groupDataService.searchNonMemberGroups(this.currentSearchQuery, this.groupBeingEdited.id, {
+            currentPage: paginationOptions.currentPage,
+            elementsPerPage: paginationOptions.pageSize,
+          }, false, true, followLink('object'));
+        }),
+        getAllCompletedRemoteData(),
+        map((rd: RemoteData<any>) => {
+          if (rd.hasFailed) {
+            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage }));
+          } else {
+            return rd;
+          }
+        }))
+        .subscribe((rd: RemoteData<PaginatedList<Group>>) => {
+          this.searchResults$.next(rd);
+        }));
   }
 
   /**
diff --git a/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
index 88f22413e9..056c54bf6a 100644
--- a/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
+++ b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
@@ -1,10 +1,13 @@
-import { AbstractControl, ValidationErrors } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { Observable } from 'rxjs';
-import { map} from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 
 export class ValidateGroupExists {
 
@@ -16,9 +19,9 @@ export class ValidateGroupExists {
   static createValidator(groupDataService: GroupDataService) {
     return (control: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
       return groupDataService.searchGroups(control.value, {
-            currentPage: 1,
-            elementsPerPage: 100
-          })
+        currentPage: 1,
+        elementsPerPage: 100,
+      })
         .pipe(
           getFirstSucceededRemoteListPayload(),
           map( (groups: Group[]) => {
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
index 48fa124c07..b1648f59ec 100644
--- a/src/app/access-control/group-registry/group-page.guard.spec.ts
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -1,10 +1,14 @@
-import { GroupPageGuard } from './group-page.guard';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { GroupPageGuard } from './group-page.guard';
 
 describe('GroupPageGuard', () => {
   const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
@@ -13,7 +17,7 @@ describe('GroupPageGuard', () => {
   const routeSnapshotWithGroupId = {
     params: {
       groupId: groupUuid,
-    }
+    },
   } as unknown as ActivatedRouteSnapshot;
 
   let guard: GroupPageGuard;
@@ -50,10 +54,10 @@ describe('GroupPageGuard', () => {
 
       it('should return true', (done) => {
         guard.canActivate(
-          routeSnapshotWithGroupId, { url: 'current-url'} as any
+          routeSnapshotWithGroupId, { url: 'current-url' } as any,
         ).subscribe((result) => {
           expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
-            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined,
           );
           expect(result).toBeTrue();
           done();
@@ -68,10 +72,10 @@ describe('GroupPageGuard', () => {
 
       it('should not return true', (done) => {
         guard.canActivate(
-          routeSnapshotWithGroupId, { url: 'current-url'} as any
+          routeSnapshotWithGroupId, { url: 'current-url' } as any,
         ).subscribe((result) => {
           expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
-            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined,
           );
           expect(result).not.toBeTrue();
           done();
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
index 057f67ddeb..928271887c 100644
--- a/src/app/access-control/group-registry/group-page.guard.ts
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
 
@@ -28,7 +36,7 @@ export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
 
   getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
     return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
-      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`),
     );
   }
 
diff --git a/src/app/access-control/group-registry/group-registry.actions.ts b/src/app/access-control/group-registry/group-registry.actions.ts
index 8144bd0599..d1bc62a95c 100644
--- a/src/app/access-control/group-registry/group-registry.actions.ts
+++ b/src/app/access-control/group-registry/group-registry.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { Group } from '../../core/eperson/models/group.model';
 import { type } from '../../shared/ngrx/type';
 
diff --git a/src/app/access-control/group-registry/group-registry.reducers.spec.ts b/src/app/access-control/group-registry/group-registry.reducers.spec.ts
index de5b65f5ba..83a6df580d 100644
--- a/src/app/access-control/group-registry/group-registry.reducers.spec.ts
+++ b/src/app/access-control/group-registry/group-registry.reducers.spec.ts
@@ -1,6 +1,12 @@
 import { GroupMock } from '../../shared/testing/group-mock';
-import { GroupRegistryCancelGroupAction, GroupRegistryEditGroupAction } from './group-registry.actions';
-import { groupRegistryReducer, GroupRegistryState } from './group-registry.reducers';
+import {
+  GroupRegistryCancelGroupAction,
+  GroupRegistryEditGroupAction,
+} from './group-registry.actions';
+import {
+  groupRegistryReducer,
+  GroupRegistryState,
+} from './group-registry.reducers';
 
 const initialState: GroupRegistryState = {
   editGroup: null,
diff --git a/src/app/access-control/group-registry/group-registry.reducers.ts b/src/app/access-control/group-registry/group-registry.reducers.ts
index 8e288b7f3a..0bb3ad4b5c 100644
--- a/src/app/access-control/group-registry/group-registry.reducers.ts
+++ b/src/app/access-control/group-registry/group-registry.reducers.ts
@@ -1,5 +1,9 @@
 import { Group } from '../../core/eperson/models/group.model';
-import { GroupRegistryAction, GroupRegistryActionTypes, GroupRegistryEditGroupAction } from './group-registry.actions';
+import {
+  GroupRegistryAction,
+  GroupRegistryActionTypes,
+  GroupRegistryEditGroupAction,
+} from './group-registry.actions';
 
 /**
  * The metadata registry state.
@@ -27,13 +31,13 @@ export function groupRegistryReducer(state = initialState, action: GroupRegistry
 
     case GroupRegistryActionTypes.EDIT_GROUP: {
       return Object.assign({}, state, {
-        editGroup: (action as GroupRegistryEditGroupAction).group
+        editGroup: (action as GroupRegistryEditGroupAction).group,
       });
     }
 
     case GroupRegistryActionTypes.CANCEL_EDIT_GROUP: {
       return Object.assign({}, state, {
-        editGroup: null
+        editGroup: null,
       });
     }
 
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 828aadc95a..2ef67ddf54 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -2,17 +2,17 @@
   <div class="groups-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
           <button class="mr-auto btn btn-success"
-                  [routerLink]="['newGroup']">
+                  [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
-      <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h3>
+      <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div class="flex-grow-1 mr-3">
           <div class="form-group input-group">
@@ -35,7 +35,7 @@
 
       <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
       <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true"
         [paginationOptions]="config"
         [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
@@ -91,7 +91,7 @@
         </div>
       </ds-pagination>
 
-      <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
         {{messagePrefix + 'no-items' | translate}}
       </div>
 
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 635ba727c2..73bb2fe80a 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -1,39 +1,71 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { Group } from '../../core/eperson/models/group.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
-import { GroupsRegistryComponent } from './groups-registry.component';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { NoContent } from '../../core/shared/NoContent.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  DSONameServiceMock,
+  UNDEFINED_NAME,
+} from '../../shared/mocks/dso-name.service.mock';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
+import { GroupsRegistryComponent } from './groups-registry.component';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -78,24 +110,24 @@ describe('GroupsRegistryComponent', () => {
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/epersons':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 1,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), [EPersonMock]));
           default:
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
         }
-      }
+      },
     };
     groupsDataServiceStub = {
       allGroups: mockGroups,
@@ -106,21 +138,21 @@ describe('GroupsRegistryComponent', () => {
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/groups':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 1,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), [GroupMock2]));
           default:
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
         }
       },
@@ -136,7 +168,7 @@ describe('GroupsRegistryComponent', () => {
             elementsPerPage: this.allGroups.length,
             totalElements: this.allGroups.length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), this.allGroups));
         }
         const result = this.allGroups.find((group: Group) => {
@@ -146,7 +178,7 @@ describe('GroupsRegistryComponent', () => {
           elementsPerPage: [result].length,
           totalElements: [result].length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), [result]));
       },
       delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
@@ -156,7 +188,7 @@ describe('GroupsRegistryComponent', () => {
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
         return createSuccessfulRemoteDataObject$(undefined);
-      }
+      },
     };
 
     authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
@@ -167,8 +199,8 @@ describe('GroupsRegistryComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [GroupsRegistryComponent],
@@ -182,9 +214,9 @@ describe('GroupsRegistryComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) }
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -237,16 +269,16 @@ describe('GroupsRegistryComponent', () => {
 
       it('should not check the canManageGroup permissions', () => {
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[0].self
+          FeatureID.CanManageGroup, mockGroups[0].self,
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[0].self, undefined // treated differently
+          FeatureID.CanManageGroup, mockGroups[0].self, undefined, // treated differently
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[1].self
+          FeatureID.CanManageGroup, mockGroups[1].self,
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[1].self, undefined // treated differently
+          FeatureID.CanManageGroup, mockGroups[1].self, undefined, // treated differently
         );
       });
     });
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index ccfd155e39..24d6f9e4a9 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -1,4 +1,8 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
@@ -8,36 +12,46 @@ import {
   EMPTY,
   Observable,
   of as observableOf,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { catchError, defaultIfEmpty, map, switchMap, tap } from 'rxjs/operators';
+import {
+  catchError,
+  defaultIfEmpty,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { GroupDtoModel } from '../../core/eperson/models/group-dto.model';
 import { Group } from '../../core/eperson/models/group.model';
+import { GroupDtoModel } from '../../core/eperson/models/group-dto.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-groups-registry',
@@ -57,7 +71,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'gl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -133,7 +147,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         const query: string = data.query;
         if (query != null && this.currentSearchQuery !== query) {
           this.currentSearchQuery = query;
-          this.paginationService.updateRouteWithUrl(this.config.id, [], {page: 1});
+          this.paginationService.updateRouteWithUrl(this.config.id, [], { page: 1 });
         }
         return this.groupService.searchGroups(this.currentSearchQuery.trim(), {
           currentPage: paginationOptions.currentPage,
@@ -155,19 +169,19 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
                   this.canManageGroup$(isSiteAdmin, group),
                   this.hasLinkedDSO(group),
                   this.getSubgroups(group),
-                  this.getMembers(group)
+                  this.getMembers(group),
                 ]).pipe(
                   map(([canDelete, canManageGroup, hasLinkedDSO, subgroups, members]:
                          [boolean, boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
-                      const groupDtoModel: GroupDtoModel = new GroupDtoModel();
-                      groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
-                      groupDtoModel.ableToEdit = canManageGroup;
-                      groupDtoModel.group = group;
-                      groupDtoModel.subgroups = subgroups.payload;
-                      groupDtoModel.epersons = members.payload;
-                      return groupDtoModel;
-                    }
-                  )
+                    const groupDtoModel: GroupDtoModel = new GroupDtoModel();
+                    groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
+                    groupDtoModel.ableToEdit = canManageGroup;
+                    groupDtoModel.group = group;
+                    groupDtoModel.subgroups = subgroups.payload;
+                    groupDtoModel.epersons = members.payload;
+                    return groupDtoModel;
+                  },
+                  ),
                 );
               } else {
                 return EMPTY;
@@ -175,9 +189,9 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
             })]).pipe(defaultIfEmpty([]), map((dtos: GroupDtoModel[]) => {
               return buildPaginatedList(groups.pageInfo, dtos);
             }));
-          })
+          }),
         );
-      })
+      }),
     ).subscribe((value: PaginatedList<GroupDtoModel>) => {
       this.groupsDto$.next(value);
       this.pageInfoState$.next(value.pageInfo);
@@ -185,7 +199,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     });
 
     this.subs.push(this.searchSub);
-      }
+  }
 
   canManageGroup$(isSiteAdmin: boolean, group: Group): Observable<boolean> {
     if (isSiteAdmin) {
@@ -210,24 +224,34 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
               this.translateService.get(this.messagePrefix + 'notification.deleted.failure.title', { name: this.dsoNameService.getName(group.group) }),
               this.translateService.get(this.messagePrefix + 'notification.deleted.failure.content', { cause: rd.errorMessage }));
           }
-      });
+        });
     }
   }
 
   /**
    * Get the members (epersons embedded value of a group)
+   * NOTE: At this time we only grab the *first* member in order to receive the `totalElements` value
+   * needed for our HTML template.
    * @param group
    */
   getMembers(group: Group): Observable<RemoteData<PaginatedList<EPerson>>> {
-    return this.ePersonDataService.findListByHref(group._links.epersons.href).pipe(getFirstSucceededRemoteData());
+    return this.ePersonDataService.findListByHref(group._links.epersons.href, {
+      currentPage: 1,
+      elementsPerPage: 1,
+    }).pipe(getFirstSucceededRemoteData());
   }
 
   /**
    * Get the subgroups (groups embedded value of a group)
+   * NOTE: At this time we only grab the *first* subgroup in order to receive the `totalElements` value
+   * needed for our HTML template.
    * @param group
    */
   getSubgroups(group: Group): Observable<RemoteData<PaginatedList<Group>>> {
-    return this.groupService.findListByHref(group._links.subgroups.href).pipe(getFirstSucceededRemoteData());
+    return this.groupService.findListByHref(group._links.subgroups.href, {
+      currentPage: 1,
+      elementsPerPage: 1,
+    }).pipe(getFirstSucceededRemoteData());
   }
 
   /**
diff --git a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
index a702a7e6b0..ba3a6f45d7 100644
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
@@ -1,4 +1,4 @@
 <div class="container">
-    <h2>{{'admin.curation-tasks.header' |translate }}</h2>
+    <h1>{{'admin.curation-tasks.header' |translate }}</h1>
     <ds-curation-form></ds-curation-form>
 </div>
diff --git a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
index 358bd0d01e..5aabe0fda0 100644
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
 
 describe('AdminCurationTasksComponent', () => {
   let comp: AdminCurationTasksComponent;
@@ -11,7 +16,7 @@ describe('AdminCurationTasksComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [AdminCurationTasksComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index 1092443436..c51ee7597c 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.batch-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   <p>{{'admin.batch-import.page.help' | translate}}</p>
   <p *ngIf="dso">
     selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
@@ -28,7 +28,7 @@
   <small class="form-text text-muted">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
-  
+
 
   <ds-file-dropzone-no-uploader
     *ngIf="isUpload"
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
index 341aefb704..752bd52e4d 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
@@ -1,22 +1,31 @@
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { BatchImportPageComponent } from './batch-import-page.component';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
-import { FileValidator } from '../../shared/utils/require-file.validator';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import {
-  BATCH_IMPORT_SCRIPT_NAME,
-  ScriptDataService
-} from '../../core/data/processes/script-data.service';
-import { Router } from '@angular/router';
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  BATCH_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../shared/utils/require-file.validator';
+import { BatchImportPageComponent } from './batch-import-page.component';
 
 describe('BatchImportPageComponent', () => {
   let component: BatchImportPageComponent;
@@ -31,14 +40,14 @@ describe('BatchImportPageComponent', () => {
     notificationService = new NotificationsServiceStub();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '46' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '46' }),
+      },
     );
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     locationStub = jasmine.createSpyObj('location', {
-      back: jasmine.createSpy('back')
+      back: jasmine.createSpy('back'),
     });
   }
 
@@ -48,7 +57,7 @@ describe('BatchImportPageComponent', () => {
       imports: [
         FormsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [BatchImportPageComponent, FileValueAccessorDirective, FileValidator],
       providers: [
@@ -57,7 +66,7 @@ describe('BatchImportPageComponent', () => {
         { provide: Router, useValue: router },
         { provide: Location, useValue: locationStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -108,7 +117,7 @@ describe('BatchImportPageComponent', () => {
       it('metadata-import script is invoked with --zip fileName and the mockFile', () => {
         const parameterValues: ProcessParameter[] = [
           Object.assign(new ProcessParameter(), { name: '--add' }),
-          Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' })
+          Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }),
         ];
         expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
       });
@@ -181,7 +190,7 @@ describe('BatchImportPageComponent', () => {
       it('metadata-import script is invoked with --url and the file url', () => {
         const parameterValues: ProcessParameter[] = [
           Object.assign(new ProcessParameter(), { name: '--add' }),
-          Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' })
+          Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' }),
         ];
         expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [null]);
       });
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index 673e1f23f5..2712610fd1 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -1,26 +1,31 @@
-import { Component } from '@angular/core';
 import { Location } from '@angular/common';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { BATCH_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { Process } from '../../process-page/processes/process.model';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
-import {
-  ImportBatchSelectorComponent
-} from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  BATCH_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { ImportBatchSelectorComponent } from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-batch-import-page',
-  templateUrl: './batch-import-page.component.html'
+  templateUrl: './batch-import-page.component.html',
 })
 export class BatchImportPageComponent {
   /**
@@ -91,7 +96,7 @@ export class BatchImportPageComponent {
       }
     } else {
       const parameterValues: ProcessParameter[] = [
-        Object.assign(new ProcessParameter(), { name: '--add' })
+        Object.assign(new ProcessParameter(), { name: '--add' }),
       ];
       if (this.isUpload) {
         parameterValues.push(Object.assign(new ProcessParameter(), { name: '--zip', value: this.fileObject.name }));
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 24901cc11d..73e69737ca 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
   <div class="form-group">
     <div class="form-check">
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
index 814757ec71..131b4561c1 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -1,19 +1,31 @@
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../shared/utils/require-file.validator';
 import { MetadataImportPageComponent } from './metadata-import-page.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('MetadataImportPageComponent', () => {
   let comp: MetadataImportPageComponent;
@@ -28,14 +40,14 @@ describe('MetadataImportPageComponent', () => {
     notificationService = new NotificationsServiceStub();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     locationStub = jasmine.createSpyObj('location', {
-      back: jasmine.createSpy('back')
+      back: jasmine.createSpy('back'),
     });
   }
 
@@ -45,7 +57,7 @@ describe('MetadataImportPageComponent', () => {
       imports: [
         FormsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [MetadataImportPageComponent, FileValueAccessorDirective, FileValidator],
       providers: [
@@ -54,7 +66,7 @@ describe('MetadataImportPageComponent', () => {
         { provide: Router, useValue: router },
         { provide: Location, useValue: locationStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
index 4236d152dc..e554459286 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -2,18 +2,22 @@ import { Location } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { Process } from '../../process-page/processes/process.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
 
 @Component({
   selector: 'ds-metadata-import-page',
-  templateUrl: './metadata-import-page.component.html'
+  templateUrl: './metadata-import-page.component.html',
 })
 
 /**
diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts b/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
new file mode 100644
index 0000000000..c1bdff9818
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
@@ -0,0 +1,50 @@
+import { NgModule } from '@angular/core';
+import {
+  RouterModule,
+  Routes,
+} from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
+import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
+import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
+
+const moduleRoutes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    component: LdnServicesOverviewComponent,
+    resolve: { breadcrumb: I18nBreadcrumbResolver },
+    data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
+  },
+  {
+    path: 'new',
+    resolve: { breadcrumb: NavigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' },
+  },
+  {
+    path: 'edit/:serviceId',
+    resolve: { breadcrumb: NavigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' },
+  },
+];
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(moduleRoutes.map(route => {
+      return { ...route, data: {
+        ...route.data,
+        relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
+          .map((relatedRoute) => {
+            return { path: relatedRoute.path, data: relatedRoute.data };
+          }),
+      } };
+    })),
+  ],
+})
+export class AdminLdnServicesRoutingModule {
+
+}
diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts b/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
new file mode 100644
index 0000000000..59875158ef
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
@@ -0,0 +1,25 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+
+import { SharedModule } from '../../shared/shared.module';
+import { AdminLdnServicesRoutingModule } from './admin-ldn-services-routing.module';
+import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
+import { LdnItemfiltersService } from './ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    AdminLdnServicesRoutingModule,
+    FormsModule,
+  ],
+  declarations: [
+    LdnServicesOverviewComponent,
+    LdnServiceFormComponent,
+  ],
+  providers: [LdnItemfiltersService],
+})
+export class AdminLdnServicesModule {
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
new file mode 100644
index 0000000000..0a7bc39fa3
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -0,0 +1,315 @@
+<div class="container">
+  <form (ngSubmit)="onSubmit()" [formGroup]="formModel">
+    <div class="d-flex">
+      <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
+    </div>
+    <!-- In the toggle section -->
+    <div class="toggle-switch-container" *ngIf="!isNewService">
+      <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+      <div>
+        <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
+        <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
+          <div class="slider"></div>
+        </div>
+      </div>
+    </div>
+    <!-- In the Name section -->
+    <div class="mb-5">
+      <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
+      <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
+             [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
+             formControlName="name"
+             id="name"
+             name="name"
+             type="text">
+      <div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
+        {{ 'ldn-new-service.form.error.name' | translate }}
+      </div>
+    </div>
+
+    <!-- In the description section -->
+    <div class="mb-5 mt-5 d-flex flex-column">
+      <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
+      <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
+                class="form-control" formControlName="description" id="description" name="description"></textarea>
+    </div>
+
+    <div class="mb-5 mt-5">
+      <!-- In the url section -->
+      <div class="d-flex align-items-center">
+        <div class="d-flex flex-column w-50 mr-2">
+          <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
+                 formControlName="url"
+                 id="url"
+                 name="url"
+                 type="text">
+          <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.url' | translate }}
+          </div>
+        </div>
+
+        <div class="d-flex flex-column w-50">
+          <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
+                 id="score"
+                 name="score"
+                 min="0"
+                 max="1"
+                 step=".01"
+                 class="form-control"
+                 type="number">
+          <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.score' | translate }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- In the IP range section -->
+    <div class="mb-5 mt-5">
+      <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
+      <div class="d-flex">
+        <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
+               formControlName="lowerIp"
+               id="lowerIp"
+               name="lowerIp"
+               type="text">
+        <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
+               formControlName="upperIp"
+               id="upperIp"
+               name="upperIp"
+               type="text">
+      </div>
+      <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
+        {{ 'ldn-new-service.form.error.ipRange' | translate }}
+      </div>
+      <div class="text-muted">
+        {{ 'ldn-new-service.form.hint.ipRange' | translate }}
+      </div>
+    </div>
+
+    <!-- In the ldnUrl section -->
+    <div class="mb-5 mt-5">
+      <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
+      <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
+             [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
+             formControlName="ldnUrl"
+             id="ldnUrl"
+             name="ldnUrl"
+             type="text">
+      <div *ngIf="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched" >
+        <div *ngIf="formModel.get('ldnUrl').errors['required']" class="error-text">
+          {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+        </div>
+        <div *ngIf="formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']" class="error-text">
+          {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
+        </div>
+      </div>
+    </div>
+
+
+    <!-- In the Inbound Patterns Labels section -->
+    <div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
+      <div class="col">
+        <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
+      </div>
+      <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
+        <div class="col">
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+        </div>
+        <div class="col-sm-1">
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+        </div>
+      </ng-container>
+      <div class="col-sm-2">
+      </div>
+    </div>
+
+    <!-- In the Inbound Patterns section -->
+    <div *ngIf="areControlsInitialized">
+      <div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
+           [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
+           formGroupName="notifyServiceInboundPatterns">
+
+        <ng-container [formGroupName]="i">
+
+
+          <div class="row mb-1 align-items-center">
+            <div class="col">
+              <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
+                   id="additionalInboundPattern{{i}}"
+                   ngbDropdown placement="top-start">
+                <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
+                  <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                     ngbDropdownToggle></i>
+                  <input
+                    (click)="inboundPatternDropdown.open();"
+                    [readonly]="true"
+                    [value]="selectedInboundPatterns"
+                    class="form-control w-80 scrollable-dropdown-input"
+                    formControlName="patternLabel"
+                    id="inboundPatternDropdownButton"
+                    ngbDropdownAnchor
+                    type="text"
+                    [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
+                  />
+                  <div aria-labelledby="inboundPatternDropdownButton"
+                       class="dropdown-menu dropdown-menu-top w-100 "
+                       ngbDropdownMenu>
+                    <div class="scrollable-menu" role="listbox">
+                      <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
+                              *ngFor="let pattern of inboundPatterns; let internalIndex = index"
+                              [title]="'ldn-service.form.pattern.' + pattern + '.description' | translate"
+                              class="dropdown-item collection-item text-truncate w-100"
+                              ngbDropdownItem
+                              type="button">
+                        <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="col">
+              <ng-container
+                *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
+                <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
+                     placement="top-start">
+                  <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
+                    <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                       ngbDropdownToggle></i>
+                    <input
+                      [readonly]="true"
+                      class="form-control d-none w-100 scrollable-dropdown-input"
+                      formControlName="constraint"
+                      id="inboundItemfilterDropdown"
+                      ngbDropdownAnchor
+                      type="text"
+                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                    />
+                    <input
+                      (click)="inboundItemfilterDropdown.open();"
+                      [readonly]="true"
+                      class="form-control w-100 scrollable-dropdown-input"
+                      formControlName="constraintFormatted"
+                      id="inboundItemfilterDropdownPrettified"
+                      ngbDropdownAnchor
+                      type="text"
+                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                    />
+                    <div aria-labelledby="inboundItemfilterDropdownButton"
+                         class="dropdown-menu scrollable-dropdown-menu w-100 "
+                         ngbDropdownMenu>
+                      <div class="scrollable-menu" role="listbox">
+                        <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
+                                class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
+                          <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
+                        </button>
+                        <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
+                                *ngFor="let constraint of (itemfiltersRD$ | async)?.payload?.page; let internalIndex = index"
+                                class="dropdown-item collection-item text-truncate w-100"
+                                ngbDropdownItem
+                                type="button">
+                          <div>{{ constraint.id + '.label' | translate }}</div>
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </ng-container>
+            </div>
+
+            <div
+              [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
+              class="col-sm-1">
+              <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
+                     type="checkbox">
+              <div (click)="toggleAutomatic(i)"
+                   [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
+                   class="toggle-switch">
+                <div class="slider"></div>
+              </div>
+            </div>
+
+
+            <div class="col-sm-2">
+              <div class="btn-group">
+                <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
+                        [title]="'ldn-service-button-mark-inbound-deletion' | translate"
+                        type="button">
+                  <i class="fas fa-trash"></i>
+                </button>
+
+
+                <button (click)="unmarkForInboundPatternDeletion(i)"
+                        *ngIf="markedForDeletionInboundPattern.includes(i)"
+                        [title]="'ldn-service-button-unmark-inbound-deletion' | translate"
+                        class="btn btn-warning "
+                        type="button">
+                  <i class="fas fa-undo"></i>
+                </button>
+              </div>
+            </div>
+          </div>
+        </ng-container>
+      </div>
+    </div>
+
+    <span (click)="addInboundPattern()"
+          class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
+
+    <div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
+      <button (click)="resetFormAndLeave()" class="btn btn-primary" type="button">
+        <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
+      </button>
+      <button class="btn btn-primary" type="submit">
+        <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
+      </button>
+    </div>
+  </form>
+</div>
+<ng-template #confirmModal>
+    <div class="modal-header">
+      <h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
+      <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
+      <button (click)="closeModal()" aria-label="Close"
+              class="close" type="button">
+        <span aria-hidden="true">×</span>
+      </button>
+    </div>
+
+    <div class="modal-body">
+      <div *ngIf="!isNewService">
+        {{ 'service.overview.edit.body' | translate }}
+      </div>
+      <span *ngIf="isNewService">
+        {{ 'service.overview.create.body' | translate }}
+      </span>
+    </div>
+      <div class="modal-footer">
+        <div *ngIf="!isNewService">
+          <button (click)="closeModal()" class="btn btn-danger mr-2"
+                  id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
+          </button>
+          <button *ngIf="!isNewService" (click)="patchService()"
+                  class="btn btn-primary">{{ 'service.detail.update' | translate }}
+          </button>
+        </div>
+        <div *ngIf="isNewService">
+          <button (click)="closeModal()" class="btn btn-danger mr-2 "
+                  id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
+          </button>
+          <button (click)="createService()"
+                  class="btn btn-primary">{{ 'service.confirm.create' | translate }}
+          </button>
+        </div>
+      </div>
+</ng-template>
+
+
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
new file mode 100644
index 0000000000..afd5c80d1c
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
@@ -0,0 +1,143 @@
+@import '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss';
+@import '../../../shared/form/form.component.scss';
+
+form {
+  font-size: 14px;
+  position: relative;
+}
+
+input,
+select {
+  max-width: 100%;
+  width: 100%;
+  padding: 8px;
+  font-size: 14px;
+}
+
+option:not(:first-child) {
+  font-weight: bold;
+}
+
+.trash-button {
+  width: 40px;
+  height: 40px;
+}
+
+textarea {
+  height: 200px;
+  resize: none;
+}
+
+.add-pattern-link {
+  color: #0048ff;
+  cursor: pointer;
+}
+
+.remove-pattern-link {
+  color: #e34949;
+  cursor: pointer;
+  margin-left: 10px;
+}
+
+.status-checkbox {
+  margin-top: 5px;
+}
+
+
+.invalid-field {
+  border: 1px solid red;
+  color: #000000;
+}
+
+.error-text {
+  color: red;
+  font-size: 0.8em;
+  margin-top: 5px;
+}
+
+.toggle-switch {
+  display: flex;
+  align-items: center;
+  opacity: 0.8;
+  position: relative;
+  width: 60px;
+  height: 30px;
+  background-color: #ccc;
+  border-radius: 15px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.toggle-switch.checked {
+  background-color: #24cc9a;
+}
+
+.slider {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  background-color: #fff;
+  transition: transform 0.3s;
+}
+
+
+.toggle-switch .slider {
+  width: 22px;
+  height: 22px;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+
+.toggle-switch.checked .slider {
+  transform: translateX(30px);
+}
+
+.toggle-switch-container {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-end;
+  margin-top: 10px;
+}
+
+.small-text {
+  font-size: 0.7em;
+  color: #888;
+}
+
+.toggle-switch {
+  cursor: pointer;
+  margin-top: 3px;
+  margin-right: 3px
+}
+
+.label-box {
+  margin-left: 11px;
+}
+
+.label-box-2 {
+  margin-left: 14px;
+}
+
+.label-box-3 {
+  margin-left: 5px;
+}
+
+.submission-form-footer {
+  border-radius: var(--bs-card-border-radius);
+  bottom: 0;
+  background-color: var(--bs-gray-400);
+  padding: calc(var(--bs-spacer) / 2);
+  z-index: calc(var(--ds-submission-footer-z-index) + 1);
+}
+
+.marked-for-deletion {
+  background-color: lighten($red, 30%);
+}
+
+.dropdown-menu-top, .scrollable-dropdown-menu  {
+  z-index: var(--ds-submission-footer-z-index);
+}
+
+
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
new file mode 100644
index 0000000000..b5d774b6c5
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
@@ -0,0 +1,267 @@
+import {
+  ChangeDetectorRef,
+  EventEmitter,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbDropdownModule,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { PaginationService } from 'ngx-pagination';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RouteService } from '../../../core/services/route.service';
+import { MockActivatedRoute } from '../../../shared/mocks/active-router.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LdnServiceFormComponent } from './ldn-service-form.component';
+
+describe('LdnServiceFormEditComponent', () => {
+  let component: LdnServiceFormComponent;
+  let fixture: ComponentFixture<LdnServiceFormComponent>;
+
+  let ldnServicesService: LdnServicesService;
+  let ldnItemfiltersService: any;
+  let cdRefStub: any;
+  let modalService: any;
+  let activatedRoute: MockActivatedRoute;
+
+  const testId = '1234';
+  const routeParams = {
+    serviceId: testId,
+  };
+  const routeUrlSegments = [{ path: 'path' }];
+  const formMockValue = {
+    'id': '',
+    'name': 'name',
+    'description': 'description',
+    'url': 'www.test.com',
+    'ldnUrl': 'https://test.com',
+    'lowerIp': '127.0.0.1',
+    'upperIp': '100.100.100.100',
+    'score': 1,
+    'inboundPattern': '',
+    'constraintPattern': '',
+    'enabled': '',
+    'type': 'ldnservice',
+    'notifyServiceInboundPatterns': [
+      {
+        'pattern': '',
+        'patternLabel': 'Select a pattern',
+        'constraint': '',
+        'automatic': false,
+      },
+    ],
+  };
+
+
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  beforeEach(async () => {
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      create: observableOf(null),
+      update: observableOf(null),
+      findById: createSuccessfulRemoteDataObject$({}),
+    });
+
+    ldnItemfiltersService = {
+      findAll: () => of(['item1', 'item2']),
+    };
+    cdRefStub = Object.assign({
+      detectChanges: () => fixture.detectChanges(),
+    });
+    modalService = {
+      open: () => {/*comment*/
+      },
+    };
+
+
+    activatedRoute = new MockActivatedRoute(routeParams, routeUrlSegments);
+
+    await TestBed.configureTestingModule({
+      imports: [ReactiveFormsModule, TranslateModule.forRoot(), NgbDropdownModule],
+      declarations: [LdnServiceFormComponent],
+      providers: [
+        { provide: LdnServicesService, useValue: ldnServicesService },
+        { provide: LdnItemfiltersService, useValue: ldnItemfiltersService },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ChangeDetectorRef, useValue: cdRefStub },
+        { provide: NgbModal, useValue: modalService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: PaginationService, useValue: {} },
+        FormBuilder,
+        RouteService,
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(LdnServiceFormComponent);
+    component = fixture.componentInstance;
+    spyOn(component, 'filterPatternObjectsAndAssignLabel').and.callFake((a) => a);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+    expect(component.formModel instanceof FormGroup).toBeTruthy();
+  });
+
+  it('should init properties correctly', fakeAsync(() => {
+    spyOn(component, 'fetchServiceData');
+    spyOn(component, 'setItemfilters');
+    component.ngOnInit();
+    tick(100);
+    expect((component as any).serviceId).toEqual(testId);
+    expect(component.isNewService).toBeFalsy();
+    expect(component.areControlsInitialized).toBeTruthy();
+    expect(component.formModel.controls.notifyServiceInboundPatterns).toBeDefined();
+    expect(component.fetchServiceData).toHaveBeenCalledWith(testId);
+    expect(component.setItemfilters).toHaveBeenCalled();
+  }));
+
+  it('should unsubscribe on destroy', () => {
+    spyOn((component as any).routeSubscription, 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).routeSubscription.unsubscribe).toHaveBeenCalled();
+  });
+
+  it('should handle create service with valid form', () => {
+    spyOn(component, 'fetchServiceData').and.callFake((a) => a);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{ pattern: 'patternValue' }]));
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+    const descriptionInput = fixture.debugElement.query(By.css('#description'));
+    const urlInput = fixture.debugElement.query(By.css('#url'));
+    const scoreInput = fixture.debugElement.query(By.css('#score'));
+    const lowerIpInput = fixture.debugElement.query(By.css('#lowerIp'));
+    const upperIpInput = fixture.debugElement.query(By.css('#upperIp'));
+    const ldnUrlInput = fixture.debugElement.query(By.css('#ldnUrl'));
+    component.formModel.patchValue(formMockValue);
+
+    nameInput.nativeElement.value = 'testName';
+    descriptionInput.nativeElement.value = 'testDescription';
+    urlInput.nativeElement.value = 'tetsUrl.com';
+    ldnUrlInput.nativeElement.value = 'tetsLdnUrl.com';
+    scoreInput.nativeElement.value = 1;
+    lowerIpInput.nativeElement.value = '127.0.0.1';
+    upperIpInput.nativeElement.value = '127.0.0.1';
+
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeTruthy();
+  });
+
+  it('should handle create service with invalid form', () => {
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+
+    nameInput.nativeElement.value = 'testName';
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeFalsy();
+  });
+
+  it('should not create service with invalid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).toHaveBeenCalled();
+  });
+
+  it('should create service with valid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    spyOn(component, 'checkPatterns').and.callFake(() => true);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{ pattern: 'patternValue' }]));
+    component.formModel.patchValue(formMockValue);
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).not.toHaveBeenCalled();
+    expect(ldnServicesService.create).toHaveBeenCalled();
+  });
+
+  it('should check patterns', () => {
+    const arrValid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl('pattern'),
+      }),
+    ]);
+
+    const arrInvalid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl(''),
+      }),
+    ]);
+
+    expect(component.checkPatterns(arrValid)).toBeTruthy();
+    expect(component.checkPatterns(arrInvalid)).toBeFalsy();
+  });
+
+  it('should fetch service data', () => {
+    component.fetchServiceData(testId);
+    expect(ldnServicesService.findById).toHaveBeenCalledWith(testId);
+    expect(component.filterPatternObjectsAndAssignLabel).toHaveBeenCalled();
+    expect((component as any).ldnService).toEqual({});
+  });
+
+  it('should generate patch operations', () => {
+    spyOn(component as any, 'createReplaceOperation');
+    spyOn(component as any, 'handlePatterns');
+    component.generatePatchOperations();
+    expect((component as any).createReplaceOperation).toHaveBeenCalledTimes(7);
+    expect((component as any).handlePatterns).toHaveBeenCalled();
+  });
+
+  it('should open modal on submit', () => {
+    spyOn(component, 'openConfirmModal');
+    component.onSubmit();
+    expect(component.openConfirmModal).toHaveBeenCalled();
+  });
+
+
+  it('should reset form and leave', () => {
+    spyOn(component as any, 'sendBack');
+
+    component.resetFormAndLeave();
+    expect((component as any).sendBack).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
new file mode 100644
index 0000000000..cae913ecfd
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -0,0 +1,590 @@
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatestWith,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { IpV4Validator } from '../../../shared/utils/ipV4.validator';
+import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';
+import { NotifyServicePattern } from '../ldn-services-model/ldn-service-patterns.model';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patterns';
+
+/**
+ * Component for editing LDN service through a form that allows to create or edit the properties of a service
+ */
+@Component({
+  selector: 'ds-ldn-service-form',
+  templateUrl: './ldn-service-form.component.html',
+  styleUrls: ['./ldn-service-form.component.scss'],
+  animations: [
+    trigger('toggleAnimation', [
+      state('true', style({})),
+      state('false', style({})),
+      transition('true <=> false', animate('300ms ease-in')),
+    ]),
+  ],
+})
+export class LdnServiceFormComponent implements OnInit, OnDestroy {
+  formModel: FormGroup;
+
+  @ViewChild('confirmModal', { static: true }) confirmModal: TemplateRef<any>;
+  @ViewChild('resetFormModal', { static: true }) resetFormModal: TemplateRef<any>;
+
+  public inboundPatterns: string[] = notifyPatterns;
+  public isNewService: boolean;
+  public areControlsInitialized: boolean;
+  public itemfiltersRD$: Observable<RemoteData<PaginatedList<Itemfilter>>>;
+  public config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 20,
+  });
+  public markedForDeletionInboundPattern: number[] = [];
+  public selectedInboundPatterns: string[];
+
+  protected serviceId: string;
+
+  private deletedInboundPatterns: number[] = [];
+  private modalRef: any;
+  private ldnService: LdnService;
+  private selectPatternDefaultLabeli18Key = 'ldn-service.form.label.placeholder.default-select';
+  private routeSubscription: Subscription;
+
+  constructor(
+    protected ldnServicesService: LdnServicesService,
+    private ldnItemfiltersService: LdnItemfiltersService,
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private route: ActivatedRoute,
+    private cdRef: ChangeDetectorRef,
+    protected modalService: NgbModal,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+    protected paginationService: PaginationService,
+  ) {
+
+    this.formModel = this.formBuilder.group({
+      id: [''],
+      name: ['', Validators.required],
+      description: [''],
+      url: ['', Validators.required],
+      ldnUrl: ['', Validators.required],
+      lowerIp: ['', [Validators.required, new IpV4Validator()]],
+      upperIp: ['', [Validators.required, new IpV4Validator()]],
+      score: ['', [Validators.required, Validators.pattern('^0*(\.[0-9]+)?$|^1(\.0+)?$')]], inboundPattern: [''],
+      constraintPattern: [''],
+      enabled: [''],
+      type: LDN_SERVICE.value,
+    });
+  }
+
+  ngOnInit(): void {
+    this.routeSubscription =  this.route.params.pipe(
+      combineLatestWith(this.route.url),
+    ).subscribe(([params, segment]) => {
+      this.serviceId = params.serviceId;
+      this.isNewService = segment[0].path === 'new';
+      this.formModel.addControl('notifyServiceInboundPatterns', this.formBuilder.array([this.createInboundPatternFormGroup()]));
+      this.areControlsInitialized = true;
+      if (this.serviceId && !this.isNewService) {
+        this.fetchServiceData(this.serviceId);
+      }
+    });
+    this.setItemfilters();
+  }
+
+  ngOnDestroy(): void {
+    this.routeSubscription.unsubscribe();
+  }
+
+  /**
+   * Sets item filters using LDN item filters service
+   */
+  setItemfilters() {
+    this.itemfiltersRD$ = this.ldnItemfiltersService.findAll().pipe(
+      getFirstCompletedRemoteData());
+  }
+
+  /**
+   * Handles the creation of an LDN service by retrieving and validating form fields,
+   * and submitting the form data to the LDN services endpoint.
+   */
+  createService() {
+    this.formModel.markAllAsTouched();
+    const notifyServiceInboundPatterns = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    const hasInboundPattern = notifyServiceInboundPatterns?.length > 0 ? this.checkPatterns(notifyServiceInboundPatterns) : false;
+
+    if (this.formModel.invalid) {
+      this.closeModal();
+      return;
+    }
+
+    if (!hasInboundPattern) {
+      this.notificationService.warning(this.translateService.get('ldn-service-notification.created.warning.title'));
+      this.closeModal();
+      return;
+    }
+
+
+    this.formModel.value.notifyServiceInboundPatterns = this.formModel.value.notifyServiceInboundPatterns.map((pattern: {
+      pattern: string;
+      patternLabel: string,
+      constraintFormatted: string;
+    }) => {
+      const { patternLabel, ...rest } = pattern;
+      delete rest.constraintFormatted;
+      return rest;
+    });
+
+    const values = { ...this.formModel.value, enabled: true };
+
+    const ldnServiceData = this.ldnServicesService.create(values);
+
+    ldnServiceData.pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<LdnService>) => {
+      if (rd.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('ldn-service-notification.created.success.title'),
+          this.translateService.get('ldn-service-notification.created.success.body'));
+        this.closeModal();
+        this.sendBack();
+      } else {
+        if (!this.formModel.errors) {
+          this.setLdnUrlError();
+        }
+        this.notificationService.error(this.translateService.get('ldn-service-notification.created.failure.title'),
+          this.translateService.get('ldn-service-notification.created.failure.body'));
+        this.closeModal();
+      }
+    });
+  }
+
+  /**
+   * Checks if at least one pattern in the specified form array has a value.
+   *
+   * @param {FormArray} formArray - The form array containing patterns to check.
+   * @returns {boolean} - True if at least one pattern has a value, otherwise false.
+   */
+  checkPatterns(formArray: FormArray): boolean {
+    for (let i = 0; i < formArray.length; i++) {
+      const pattern = formArray.at(i).get('pattern').value;
+      if (pattern) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Fetches LDN service data by ID and updates the form
+   * @param serviceId - The ID of the LDN service
+   */
+  fetchServiceData(serviceId: string): void {
+    this.ldnServicesService.findById(serviceId).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      (data: RemoteData<LdnService>) => {
+        if (data.hasSucceeded) {
+          this.ldnService = data.payload;
+          this.formModel.patchValue({
+            id: this.ldnService.id,
+            name: this.ldnService.name,
+            description: this.ldnService.description,
+            url: this.ldnService.url,
+            score: this.ldnService.score,
+            ldnUrl: this.ldnService.ldnUrl,
+            type: this.ldnService.type,
+            enabled: this.ldnService.enabled,
+            lowerIp: this.ldnService.lowerIp,
+            upperIp: this.ldnService.upperIp,
+          });
+          this.filterPatternObjectsAndAssignLabel('notifyServiceInboundPatterns');
+          const notifyServiceInboundPatternsFormArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+          notifyServiceInboundPatternsFormArray.controls.forEach(
+            control => {
+              const controlFormGroup = control as FormGroup;
+              const controlConstraint = controlFormGroup.get('constraint').value;
+              controlFormGroup.patchValue({
+                constraintFormatted: controlConstraint ? this.translateService.instant((controlConstraint as string) + '.label') : '',
+              });
+            },
+          );
+        }
+      },
+    );
+  }
+
+  /**
+   * Filters pattern objects, initializes form groups, assigns labels, and adds them to the specified form array so the correct string is shown in the dropdown..
+   * @param formArrayName - The name of the form array to be populated
+   */
+  filterPatternObjectsAndAssignLabel(formArrayName: string) {
+    const PatternsArray = this.formModel.get(formArrayName) as FormArray;
+    PatternsArray.clear();
+
+    const servicesToUse = this.ldnService.notifyServiceInboundPatterns;
+
+    servicesToUse.forEach((patternObj: NotifyServicePattern) => {
+      const patternFormGroup = this.initializeInboundPatternFormGroup();
+      const newPatternObjWithLabel = Object.assign(new NotifyServicePattern(), {
+        ...patternObj,
+        patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternObj?.pattern + '.label'),
+      });
+      patternFormGroup.patchValue(newPatternObjWithLabel);
+
+      PatternsArray.push(patternFormGroup);
+      this.cdRef.detectChanges();
+    });
+  }
+
+  /**
+   * Generates an array of patch operations based on form changes
+   * @returns Array of patch operations
+   */
+  generatePatchOperations(): any[] {
+    const patchOperations: any[] = [];
+
+    this.createReplaceOperation(patchOperations, 'name', '/name');
+    this.createReplaceOperation(patchOperations, 'description', '/description');
+    this.createReplaceOperation(patchOperations, 'ldnUrl', '/ldnurl');
+    this.createReplaceOperation(patchOperations, 'url', '/url');
+    this.createReplaceOperation(patchOperations, 'score', '/score');
+    this.createReplaceOperation(patchOperations, 'lowerIp', '/lowerIp');
+    this.createReplaceOperation(patchOperations, 'upperIp', '/upperIp');
+
+    this.handlePatterns(patchOperations, 'notifyServiceInboundPatterns');
+    this.deletedInboundPatterns.forEach(index => {
+      const removeOperation: Operation = {
+        op: 'remove',
+        path: `notifyServiceInboundPatterns[${index}]`,
+      };
+      patchOperations.push(removeOperation);
+    });
+
+    return patchOperations;
+  }
+
+  /**
+   * Submits the form by opening the confirmation modal
+   */
+  onSubmit() {
+    this.openConfirmModal(this.confirmModal);
+  }
+
+  /**
+   * Adds a new inbound pattern form group to the array of inbound patterns in the form
+   */
+  addInboundPattern() {
+    const notifyServiceInboundPatternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    notifyServiceInboundPatternsArray.push(this.createInboundPatternFormGroup());
+  }
+
+  /**
+   * Selects an inbound pattern by updating its values based on the provided pattern value and index
+   * @param patternValue - The selected pattern value
+   * @param index - The index of the inbound pattern in the array
+   */
+  selectInboundPattern(patternValue: string, index: number): void {
+    const patternArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray);
+    patternArray.controls[index].patchValue({ pattern: patternValue });
+    patternArray.controls[index].patchValue({ patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternValue + '.label') });
+  }
+
+  /**
+   * Selects an inbound item filter by updating its value based on the provided filter value and index
+   * @param filterValue - The selected filter value
+   * @param index - The index of the inbound pattern in the array
+   */
+  selectInboundItemFilter(filterValue: string, index: number): void {
+    const filterArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray);
+    filterArray.controls[index].patchValue({
+      constraint: filterValue,
+      constraintFormatted: this.translateService.instant((filterValue !== '' ? filterValue : 'ldn.no-filter') + '.label'),
+    });
+    filterArray.markAllAsTouched();
+  }
+
+  /**
+   * Toggles the automatic property of an inbound pattern at the specified index
+   * @param i - The index of the inbound pattern in the array
+   */
+  toggleAutomatic(i: number) {
+    const automaticControl = this.formModel.get(`notifyServiceInboundPatterns.${i}.automatic`);
+    if (automaticControl) {
+      automaticControl.markAsTouched();
+      automaticControl.setValue(!automaticControl.value);
+    }
+  }
+
+  /**
+   * Toggles the enabled status of the LDN service by sending a patch request
+   */
+  toggleEnabled() {
+    const newStatus = !this.formModel.get('enabled').value;
+
+    const patchOperation: Operation = {
+      op: 'replace',
+      path: '/enabled',
+      value: newStatus,
+    };
+
+    this.ldnServicesService.patch(this.ldnService, [patchOperation]).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      () => {
+        this.formModel.get('enabled').setValue(newStatus);
+        this.cdRef.detectChanges();
+      },
+    );
+  }
+
+  /**
+   * Closes the modal
+   */
+  closeModal() {
+    this.modalRef.close();
+    this.cdRef.detectChanges();
+  }
+
+  /**
+   * Opens a confirmation modal with the specified content
+   * @param content - The content to be displayed in the modal
+   */
+  openConfirmModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Patches the LDN service by retrieving and sending patch operations geenrated in generatePatchOperations()
+   */
+  patchService() {
+    this.deleteMarkedInboundPatterns();
+
+    const patchOperations = this.generatePatchOperations();
+    this.formModel.markAllAsTouched();
+    // If the form is invalid, close the modal and return
+    if (this.formModel.invalid) {
+      this.closeModal();
+      return;
+    }
+
+    const notifyServiceInboundPatterns = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    const deletedInboundPatternsLength = this.deletedInboundPatterns.length;
+    // If no inbound patterns are specified, close the modal and return
+    // notify the user that no patterns are specified
+    if (notifyServiceInboundPatterns.length === deletedInboundPatternsLength) {
+      this.notificationService.warning(this.translateService.get('ldn-service-notification.created.warning.title'));
+      this.deletedInboundPatterns = [];
+      this.closeModal();
+      return;
+    }
+
+    this.ldnServicesService.patch(this.ldnService, patchOperations).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      (rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          this.closeModal();
+          this.sendBack();
+          this.notificationService.success(this.translateService.get('admin.registries.services-formats.modify.success.head'),
+            this.translateService.get('admin.registries.services-formats.modify.success.content'));
+        } else {
+          if (!this.formModel.errors) {
+            this.setLdnUrlError();
+          }
+          this.notificationService.error(this.translateService.get('admin.registries.services-formats.modify.failure.head'),
+            this.translateService.get('admin.registries.services-formats.modify.failure.content'));
+          this.closeModal();
+        }
+      });
+  }
+
+  /**
+   * Resets the form and navigates back to the LDN services page
+   */
+  resetFormAndLeave() {
+    this.sendBack();
+  }
+
+  /**
+   * Marks the specified inbound pattern for deletion
+   * @param index - The index of the inbound pattern in the array
+   */
+  markForInboundPatternDeletion(index: number) {
+    if (!this.markedForDeletionInboundPattern.includes(index)) {
+      this.markedForDeletionInboundPattern.push(index);
+    }
+  }
+
+  /**
+   * Unmarks the specified inbound pattern for deletion
+   * @param index - The index of the inbound pattern in the array
+   */
+  unmarkForInboundPatternDeletion(index: number) {
+    const i = this.markedForDeletionInboundPattern.indexOf(index);
+    if (i !== -1) {
+      this.markedForDeletionInboundPattern.splice(i, 1);
+    }
+  }
+
+  /**
+   * Deletes marked inbound patterns from the form model
+   */
+  deleteMarkedInboundPatterns() {
+    this.markedForDeletionInboundPattern.sort((a, b) => b - a);
+    const patternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+
+    for (const index of this.markedForDeletionInboundPattern) {
+      if (index >= 0 && index < patternsArray.length) {
+        const patternGroup = patternsArray.at(index) as FormGroup;
+        const patternValue = patternGroup.value;
+        if (patternValue.isNew) {
+          patternsArray.removeAt(index);
+        } else {
+          this.deletedInboundPatterns.push(index);
+        }
+      }
+    }
+
+    this.markedForDeletionInboundPattern = [];
+  }
+
+  /**
+   * Creates a replace operation and adds it to the patch operations if the form control is dirty
+   * @param patchOperations - The array to store patch operations
+   * @param formControlName - The name of the form control
+   * @param path - The JSON Patch path for the operation
+   */
+  private createReplaceOperation(patchOperations: any[], formControlName: string, path: string): void {
+    if (this.formModel.get(formControlName).dirty) {
+      patchOperations.push({
+        op: 'replace',
+        path,
+        value: this.formModel.get(formControlName).value.toString(),
+      });
+    }
+  }
+
+  /**
+   * Handles patterns in the form array, checking if an add or replace operations is required
+   * @param patchOperations - The array to store patch operations
+   * @param formArrayName - The name of the form array
+   */
+  private handlePatterns(patchOperations: any[], formArrayName: string): void {
+    const patternsArray = this.formModel.get(formArrayName) as FormArray;
+
+    for (let i = 0; i < patternsArray.length; i++) {
+      const patternGroup = patternsArray.at(i) as FormGroup;
+
+      const patternValue = patternGroup.value;
+      delete patternValue.constraintFormatted;
+      if (patternGroup.touched && patternGroup.valid) {
+        delete patternValue?.patternLabel;
+        if (patternValue.isNew) {
+          delete patternValue.isNew;
+          const addOperation = {
+            op: 'add',
+            path: `${formArrayName}/-`,
+            value: patternValue,
+          };
+          patchOperations.push(addOperation);
+        } else {
+          const replaceOperation = {
+            op: 'replace',
+            path: `${formArrayName}[${i}]`,
+            value: patternValue,
+          };
+          patchOperations.push(replaceOperation);
+        }
+      }
+    }
+  }
+
+  /**
+   * Navigates back to the LDN services page
+   */
+  private sendBack() {
+    this.router.navigateByUrl('admin/ldn/services');
+  }
+
+  /**
+   * Creates a form group for inbound patterns
+   * @returns The form group for inbound patterns
+   */
+  private createInboundPatternFormGroup(): FormGroup {
+    const inBoundFormGroup = {
+      pattern: '',
+      patternLabel: this.translateService.instant(this.selectPatternDefaultLabeli18Key),
+      constraint: '',
+      constraintFormatted: '',
+      automatic: false,
+      isNew: true,
+    };
+
+    if (this.isNewService) {
+      delete inBoundFormGroup.isNew;
+    }
+
+    return this.formBuilder.group(inBoundFormGroup);
+  }
+
+  /**
+   * Initializes an existing form group for inbound patterns
+   * @returns The initialized form group for inbound patterns
+   */
+  private initializeInboundPatternFormGroup(): FormGroup {
+    return this.formBuilder.group({
+      pattern: '',
+      patternLabel: '',
+      constraint: '',
+      constraintFormatted: '',
+      automatic: '',
+    });
+  }
+
+
+  /**
+   * set ldnUrl error in case of unprocessable entity and provided value
+   */
+  private setLdnUrlError(): void {
+    const control = this.formModel.controls.ldnUrl;
+    const controlErrors = control.errors || {};
+    control.setErrors({ ...controlErrors, ldnUrlAlreadyAssociated: true });
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts b/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
new file mode 100644
index 0000000000..8494b67dab
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
@@ -0,0 +1,115 @@
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+
+export const mockLdnService: LdnService = {
+  uuid: '1',
+  enabled: false,
+  score: 0,
+  id: 1,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+};
+
+export const mockLdnServiceRD$ = createSuccessfulRemoteDataObject$(mockLdnService);
+
+
+export const mockLdnServices: LdnService[] = [{
+  uuid: '1',
+  enabled: false,
+  score: 0,
+  id: 1,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+}, {
+  uuid: '2',
+  enabled: false,
+  score: 0,
+  id: 2,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+},
+];
+export const mockLdnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>> = of((mockLdnServices as unknown) as RemoteData<PaginatedList<LdnService>>);
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts
new file mode 100644
index 0000000000..110a0779fb
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts
@@ -0,0 +1,93 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LdnItemfiltersService } from './ldn-itemfilters-data.service';
+
+describe('LdnItemfiltersService test', () => {
+  let scheduler: TestScheduler;
+  let service: LdnItemfiltersService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/ldn/itemfilters`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new LdnItemfiltersService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new LdnItemfiltersService(null, null, null, null, null) as unknown as FindAllData<any>;
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('get endpoint', () => {
+    it('should retrieve correct endpoint', (done) => {
+      service.getEndpoint().subscribe(() => {
+        expect(halService.getEndpoint).toHaveBeenCalledWith('itemfilters');
+        done();
+      });
+    });
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
new file mode 100644
index 0000000000..8222c69d79
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { LDN_SERVICE_CONSTRAINT_FILTERS } from '../ldn-services-model/ldn-service.resource-type';
+import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint
+ */
+@Injectable()
+@dataService(LDN_SERVICE_CONSTRAINT_FILTERS)
+export class LdnItemfiltersService extends IdentifiableDataService<Itemfilter> implements FindAllData<Itemfilter> {
+  private findAllData: FindAllDataImpl<Itemfilter>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('itemfilters', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Gets the endpoint URL for the itemfilters.
+   *
+   * @returns {string} - The endpoint URL.
+   */
+  getEndpoint() {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Finds all itemfilters based on the provided options and link configurations.
+   *
+   * @param {FindListOptions} options - The options for finding a list of itemfilters.
+   * @param {boolean} useCachedVersionIfAvailable - Whether to use the cached version if available.
+   * @param {boolean} reRequestOnStale - Whether to re-request the data if it's stale.
+   * @param {...FollowLinkConfig<Itemfilter>[]} linksToFollow - Configurations for following specific links.
+   * @returns {Observable<RemoteData<PaginatedList<Itemfilter>>>} - An observable of remote data containing a paginated list of itemfilters.
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Itemfilter>[]): Observable<RemoteData<PaginatedList<Itemfilter>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts
new file mode 100644
index 0000000000..4ff781f629
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts
@@ -0,0 +1,134 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { CreateData } from '../../../core/data/base/create-data';
+import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec';
+import { DeleteData } from '../../../core/data/base/delete-data';
+import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { PatchData } from '../../../core/data/base/patch-data';
+import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec';
+import { SearchData } from '../../../core/data/base/search-data';
+import { testSearchDataImplementation } from '../../../core/data/base/search-data.spec';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { mockLdnService } from '../ldn-service-serviceMock/ldnServicesRD$-mock';
+import { LdnServicesService } from './ldn-services-data.service';
+
+describe('LdnServicesService test', () => {
+  let scheduler: TestScheduler;
+  let service: LdnServicesService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/ldn/ldnservices`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new LdnServicesService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new LdnServicesService(null, null, null, null, null) as unknown as FindAllData<any>;
+    const initDeleteService = () => new LdnServicesService(null, null, null, null, null) as unknown as DeleteData<any>;
+    const initSearchService = () => new LdnServicesService(null, null, null, null, null) as unknown as SearchData<any>;
+    const initPatchService = () => new LdnServicesService(null, null, null, null, null) as unknown as PatchData<any>;
+    const initCreateService = () => new LdnServicesService(null, null, null, null, null) as unknown as CreateData<any>;
+
+    testFindAllDataImplementation(initFindAllService);
+    testDeleteDataImplementation(initDeleteService);
+    testSearchDataImplementation(initSearchService);
+    testPatchDataImplementation(initPatchService);
+    testCreateDataImplementation(initCreateService);
+  });
+
+  describe('custom methods', () => {
+    it('should find service by inbound pattern', (done) => {
+      const params = [new RequestParam('pattern', 'testPattern')];
+      const findListOptions = Object.assign(new FindListOptions(), {}, { searchParams: params });
+      spyOn(service, 'searchBy').and.returnValue(observableOf(null));
+      spyOn((service as any).searchData, 'searchBy').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([mockLdnService])));
+
+      service.findByInboundPattern('testPattern').subscribe(() => {
+        expect(service.searchBy).toHaveBeenCalledWith('byInboundPattern', findListOptions, undefined, undefined );
+        done();
+      });
+    });
+
+    it('should invoke service', (done) => {
+      const constraints = [{ void: true }];
+      const files = [new File([],'fileName')];
+      spyOn(service as any, 'getInvocationFormData');
+      spyOn(service, 'getBrowseEndpoint').and.returnValue(observableOf('testEndpoint'));
+      service.invoke('serviceName', 'serviceId', constraints, files).subscribe(result => {
+        expect((service as any).getInvocationFormData).toHaveBeenCalledWith(constraints, files);
+        expect(service.getBrowseEndpoint).toHaveBeenCalled();
+        expect(result).toBeInstanceOf(RemoteData);
+        done();
+      });
+
+    });
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
new file mode 100644
index 0000000000..a41bf0c759
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
@@ -0,0 +1,230 @@
+import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../core/data/base/create-data';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../core/data/base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../core/data/base/patch-data';
+import { SearchDataImpl } from '../../../core/data/base/search-data';
+import { ChangeAnalyzer } from '../../../core/data/change-analyzer';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { MultipartPostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { LdnServiceConstrain } from '../ldn-services-model/ldn-service.constrain.model';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+
+/**
+ * Injectable service responsible for fetching/sending data from/to the REST API on the ldnservices endpoint.
+ *
+ * @export
+ * @class LdnServicesService
+ * @extends {IdentifiableDataService<LdnService>}
+ * @implements {FindAllData<LdnService>}
+ * @implements {DeleteData<LdnService>}
+ * @implements {PatchData<LdnService>}
+ * @implements {CreateData<LdnService>}
+ */
+@Injectable()
+@dataService(LDN_SERVICE)
+export class LdnServicesService extends IdentifiableDataService<LdnService> implements FindAllData<LdnService>, DeleteData<LdnService>, PatchData<LdnService>, CreateData<LdnService> {
+  createData: CreateDataImpl<LdnService>;
+  private findAllData: FindAllDataImpl<LdnService>;
+  private deleteData: DeleteDataImpl<LdnService>;
+  private patchData: PatchDataImpl<LdnService>;
+  private comparator: ChangeAnalyzer<LdnService>;
+  private searchData: SearchDataImpl<LdnService>;
+
+  private findByPatternEndpoint = 'byInboundPattern';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('ldnservices', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+  }
+
+  /**
+   * Creates an LDN service by sending a POST request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be created.
+   * @param params Array with additional params to combine with query string
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the creation operation.
+   */
+  create(object: LdnService, ...params: RequestParam[]): Observable<RemoteData<LdnService>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * Updates an LDN service by applying a set of operations through a PATCH request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be updated.
+   * @param {Operation[]} operations - The patch operations to be applied.
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the update operation.
+   */
+  patch(object: LdnService, operations: Operation[]): Observable<RemoteData<LdnService>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * Updates an LDN service by sending a PUT request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be updated.
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the update operation.
+   */
+  update(object: LdnService): Observable<RemoteData<LdnService>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Commits pending updates by sending a PATCH request to the REST API.
+   *
+   * @param {RestRequestMethod} [method] - The HTTP method to be used for the request.
+   */
+  commitUpdates(method?: RestRequestMethod): void {
+    return this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * Creates a patch representing the changes made to the LDN service in the cache.
+   *
+   * @param {LdnService} object - The LDN service object for which to create the patch.
+   * @returns {Observable<Operation[]>} - Observable containing the patch operations.
+   */
+  createPatchFromCache(object: LdnService): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  /**
+   * Retrieves all LDN services from the REST API based on the provided options.
+   *
+   * @param {FindListOptions} [options] - The options to be applied to the request.
+   * @param {boolean} [useCachedVersionIfAvailable] - Flag indicating whether to use cached data if available.
+   * @param {boolean} [reRequestOnStale] - Flag indicating whether to re-request data if it's stale.
+   * @param {...FollowLinkConfig<LdnService>[]} linksToFollow - Optional links to follow during the request.
+   * @returns {Observable<RemoteData<PaginatedList<LdnService>>>} - Observable containing the result of the request.
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Retrieves LDN services based on the inbound pattern from the REST API.
+   *
+   * @param {string} pattern - The inbound pattern to be used in the search.
+   * @param {FindListOptions} [options] - The options to be applied to the request.
+   * @param {boolean} [useCachedVersionIfAvailable] - Flag indicating whether to use cached data if available.
+   * @param {boolean} [reRequestOnStale] - Flag indicating whether to re-request data if it's stale.
+   * @param {...FollowLinkConfig<LdnService>[]} linksToFollow - Optional links to follow during the request.
+   * @returns {Observable<RemoteData<PaginatedList<LdnService>>>} - Observable containing the result of the request.
+   */
+  findByInboundPattern(pattern: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    const params = [new RequestParam('pattern', pattern)];
+    const findListOptions = Object.assign(new FindListOptions(), options, { searchParams: params });
+    return this.searchBy(this.findByPatternEndpoint, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Deletes an LDN service by sending a DELETE request to the REST API.
+   *
+   * @param {string} objectId - The ID of the LDN service to be deleted.
+   * @param {string[]} [copyVirtualMetadata] - Optional virtual metadata to be copied during the deletion.
+   * @returns {Observable<RemoteData<NoContent>>} - Observable containing the result of the deletion operation.
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Deletes an LDN service by its HATEOAS link.
+   *
+   * @param {string} href - The HATEOAS link of the LDN service to be deleted.
+   * @param {string[]} [copyVirtualMetadata] - Optional virtual metadata to be copied during the deletion.
+   * @returns {Observable<RemoteData<NoContent>>} - Observable containing the result of the deletion operation.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  public invoke(serviceName: string, serviceId: string, parameters: LdnServiceConstrain[], files: File[]): Observable<RemoteData<LdnService>> {
+    const requestId = this.requestService.generateRequestId();
+    this.getBrowseEndpoint().pipe(
+      take(1),
+      map((endpoint: string) => new URLCombiner(endpoint, serviceName, 'processes', serviceId).toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(parameters, files);
+        return new MultipartPostRequest(requestId, endpoint, body);
+      }),
+    ).subscribe((request: RestRequest) => this.requestService.send(request));
+
+    return this.rdbService.buildFromRequestUUID<LdnService>(requestId);
+  }
+
+  private getInvocationFormData(constrain: LdnServiceConstrain[], files: File[]): FormData {
+    const form: FormData = new FormData();
+    form.set('properties', JSON.stringify(constrain));
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
new file mode 100644
index 0000000000..0aaa39bda2
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -0,0 +1,99 @@
+<div class="container">
+  <div class="d-flex">
+    <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
+  </div>
+  <div class="d-flex justify-content-end">
+    <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
+      class="fas fa-plus pr-2"></i>{{ 'process.overview.new' | translate }}</button>
+  </div>
+  <ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
+                 [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 [pageInfoState]="(ldnServicesRD$ | async)?.payload"
+                 [paginationOptions]="pageConfig">
+    <div class="table-responsive">
+      <table class="table table-striped table-hover">
+        <thead>
+        <tr>
+          <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let ldnService of (ldnServicesRD$ | async)?.payload?.page">
+          <td class="col-3">{{ ldnService.name }}</td>
+          <td>
+            <ds-truncatable [id]="ldnService.id">
+              <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
+                <div>
+                  {{ ldnService.description }}
+                </div>
+              </ds-truncatable-part>
+            </ds-truncatable>
+          </td>
+          <td>
+                        <span (click)="toggleStatus(ldnService, ldnServicesService)"
+                              [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
+                              [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
+                              class="status-indicator">
+                            {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
+                        </span>
+          </td>
+          <td>
+            <div class="btn-group">
+              <button
+                (click)="selectServiceToDelete(ldnService.id)"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                class="btn btn-outline-danger">
+                <i class="fas fa-trash"></i>
+              </button>
+              <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+                      [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
+                      class="btn btn-outline-dark">
+                <i class="fas fa-edit"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+</div>
+
+<ng-template #deleteModal>
+
+  <div>
+
+    <div class="modal-header">
+      <div>
+        <h4>{{'service.overview.delete.header' | translate }}</h4>
+      </div>
+      <button (click)="closeModal()" aria-label="Close"
+              [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+              class="close" type="button">
+        <span aria-hidden="true">×</span>
+      </button>
+    </div>
+
+    <div class="modal-body">
+      <div>
+        {{ 'service.overview.delete.body' | translate }}
+      </div>
+      <div class="mt-4">
+        <button (click)="closeModal()"
+                [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+                class="btn btn-primary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
+        <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
+                class="btn btn-danger"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                id="delete-confirm">{{ 'service.overview.delete' | translate }}
+        </button>
+      </div>
+    </div>
+  </div>
+</ng-template>
+
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss
new file mode 100644
index 0000000000..07377d63d5
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss
@@ -0,0 +1,29 @@
+.status-indicator {
+  padding: 2.5px 25px 2.5px 25px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.5s;
+}
+
+.status-enabled {
+  background-color: #daf7a6;
+  color: #4f5359;
+  font-size: 85%;
+  font-weight: bold;
+
+}
+
+.status-enabled:hover {
+  background-color: #faa0a0;
+}
+
+.status-disabled {
+  background-color: #faa0a0;
+  color: #4f5359;
+  font-size: 85%;
+  font-weight: bold;
+}
+
+.status-disabled:hover {
+  background-color: #daf7a6;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
new file mode 100644
index 0000000000..babab8a5ab
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
@@ -0,0 +1,176 @@
+import {
+  ChangeDetectorRef,
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+import { LdnServicesOverviewComponent } from './ldn-services-directory.component';
+
+describe('LdnServicesOverviewComponent', () => {
+  let component: LdnServicesOverviewComponent;
+  let fixture: ComponentFixture<LdnServicesOverviewComponent>;
+  let ldnServicesService;
+  let paginationService;
+  let modalService: NgbModal;
+
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  beforeEach(async () => {
+    paginationService = new PaginationServiceStub();
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      'findAll': createSuccessfulRemoteDataObject$({}),
+      'delete': createSuccessfulRemoteDataObject$({}),
+      'patch': createSuccessfulRemoteDataObject$({}),
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [LdnServicesOverviewComponent],
+      providers: [
+        {
+          provide: LdnServicesService,
+          useValue: ldnServicesService,
+        },
+        { provide: PaginationService, useValue: paginationService },
+        {
+          provide: NgbModal, useValue: {
+            open: () => { /*comment*/
+            },
+          },
+        },
+        { provide: ChangeDetectorRef, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LdnServicesOverviewComponent);
+    component = fixture.componentInstance;
+    ldnServicesService = TestBed.inject(LdnServicesService);
+    paginationService = TestBed.inject(PaginationService);
+    modalService = TestBed.inject(NgbModal);
+    component.modalRef = jasmine.createSpyObj({ close: null });
+    component.isProcessingSub = jasmine.createSpyObj({ unsubscribe: null });
+    component.ldnServicesRD$ = of({} as RemoteData<PaginatedList<LdnService>>);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('ngOnInit', () => {
+    it('should call setLdnServices', fakeAsync(() => {
+      spyOn(component, 'setLdnServices').and.callThrough();
+      component.ngOnInit();
+      tick();
+      expect(component.setLdnServices).toHaveBeenCalled();
+    }));
+
+    it('should set ldnServicesRD$ with mock data', fakeAsync(() => {
+      spyOn(component, 'setLdnServices').and.callThrough();
+      const testData: LdnService[] = Object.assign([new LdnService()], [
+        { id: 1, name: 'Service 1', description: 'Description 1', enabled: true },
+        { id: 2, name: 'Service 2', description: 'Description 2', enabled: false },
+        { id: 3, name: 'Service 3', description: 'Description 3', enabled: true }]);
+
+      const mockLdnServicesRD = createPaginatedList(testData);
+      component.ldnServicesRD$ = createSuccessfulRemoteDataObject$(mockLdnServicesRD);
+      fixture.detectChanges();
+
+      const tableRows = fixture.debugElement.nativeElement.querySelectorAll('tbody tr');
+      expect(tableRows.length).toBe(testData.length);
+      const firstRowContent = tableRows[0].textContent;
+      expect(firstRowContent).toContain('Service 1');
+      expect(firstRowContent).toContain('Description 1');
+    }));
+  });
+
+  describe('ngOnDestroy', () => {
+    it('should call paginationService.clearPagination and unsubscribe', () => {
+      // spyOn(paginationService, 'clearPagination');
+      // spyOn(component.isProcessingSub, 'unsubscribe');
+      component.ngOnDestroy();
+      expect(paginationService.clearPagination).toHaveBeenCalledWith(component.pageConfig.id);
+      expect(component.isProcessingSub.unsubscribe).toHaveBeenCalled();
+    });
+  });
+
+  describe('openDeleteModal', () => {
+    it('should open delete modal', () => {
+      spyOn(modalService, 'open');
+      component.openDeleteModal(component.deleteModal);
+      expect(modalService.open).toHaveBeenCalledWith(component.deleteModal);
+    });
+  });
+
+  describe('closeModal', () => {
+    it('should close modal and detect changes', () => {
+      // spyOn(component.modalRef, 'close');
+      spyOn(component.cdRef, 'detectChanges');
+      component.closeModal();
+      expect(component.modalRef.close).toHaveBeenCalled();
+      expect(component.cdRef.detectChanges).toHaveBeenCalled();
+    });
+  });
+
+  describe('deleteSelected', () => {
+    it('should delete selected service and update data', fakeAsync(() => {
+      const serviceId = '123';
+      const mockRemoteData = { /* just an empty object to retrieve as as RemoteData<PaginatedList<LdnService>>  */};
+      spyOn(component, 'setLdnServices').and.callThrough();
+      const deleteSpy = ldnServicesService.delete.and.returnValue(of(mockRemoteData as RemoteData<PaginatedList<LdnService>>));
+      component.selectedServiceId = serviceId;
+      component.deleteSelected(serviceId, ldnServicesService);
+      tick();
+      expect(deleteSpy).toHaveBeenCalledWith(serviceId);
+    }));
+  });
+
+  describe('selectServiceToDelete', () => {
+    it('should set service to delete', fakeAsync(() => {
+      spyOn(component, 'openDeleteModal');
+      const serviceId = 123;
+      component.selectServiceToDelete(serviceId);
+      expect(component.selectedServiceId).toEqual(serviceId);
+      expect(component.openDeleteModal).toHaveBeenCalled();
+    }));
+  });
+
+  describe('toggleStatus', () => {
+    it('should toggle status', (() => {
+      component.toggleStatus({ enabled: false }, ldnServicesService);
+      expect(ldnServicesService.patch).toHaveBeenCalled();
+    }));
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
new file mode 100644
index 0000000000..aa85ff1cbe
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -0,0 +1,182 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import { LdnServicesService } from 'src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { PaginationService } from 'src/app/core/pagination/pagination.service';
+
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+
+/**
+ * The `LdnServicesOverviewComponent` is a component that provides an overview of LDN (Linked Data Notifications) services.
+ * It displays a paginated list of LDN services, allows users to edit and delete services,
+ * toggle the status of each service directly form the page and allows for creation of new services redirecting the user on the creation/edit form
+ */
+@Component({
+  selector: 'ds-ldn-services-directory',
+  templateUrl: './ldn-services-directory.component.html',
+  styleUrls: ['./ldn-services-directory.component.scss'],
+  changeDetection: ChangeDetectionStrategy.Default,
+})
+export class LdnServicesOverviewComponent implements OnInit, OnDestroy {
+
+  selectedServiceId: string | number | null = null;
+  servicesData: any[] = [];
+  @ViewChild('deleteModal', { static: true }) deleteModal: TemplateRef<any>;
+  ldnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>>;
+  config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 10,
+  });
+  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'po',
+    pageSize: 10,
+  });
+  isProcessingSub: Subscription;
+  modalRef: any;
+
+
+  constructor(
+    protected ldnServicesService: LdnServicesService,
+    protected paginationService: PaginationService,
+    protected modalService: NgbModal,
+    public cdRef: ChangeDetectorRef,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.setLdnServices();
+  }
+
+  /**
+   * Sets up the LDN services by fetching and observing the paginated list of services.
+   */
+  setLdnServices() {
+    this.ldnServicesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
+      switchMap((config) => this.ldnServicesService.findAll(config, false, false).pipe(
+        getFirstCompletedRemoteData(),
+      )),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.pageConfig.id);
+    if (hasValue(this.isProcessingSub)) {
+      this.isProcessingSub.unsubscribe();
+    }
+  }
+
+  /**
+   * Opens the delete confirmation modal.
+   *
+   * @param {any} content - The content of the modal.
+   */
+  openDeleteModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Closes the currently open modal and triggers change detection.
+   */
+  closeModal() {
+    this.modalRef.close();
+    this.cdRef.detectChanges();
+  }
+
+  /**
+   * Sets the selected LDN service ID for deletion and opens the delete confirmation modal.
+   *
+   * @param {number} serviceId - The ID of the service to be deleted.
+   */
+  selectServiceToDelete(serviceId: number) {
+    this.selectedServiceId = serviceId;
+    this.openDeleteModal(this.deleteModal);
+  }
+
+  /**
+   * Deletes the selected LDN service.
+   *
+   * @param {string} serviceId - The ID of the service to be deleted.
+   * @param {LdnServicesService} ldnServicesService - The service for managing LDN services.
+   */
+  deleteSelected(serviceId: string, ldnServicesService: LdnServicesService): void {
+    if (this.selectedServiceId !== null) {
+      ldnServicesService.delete(serviceId).pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          this.servicesData = this.servicesData.filter(service => service.id !== serviceId);
+          this.ldnServicesRD$ = this.ldnServicesRD$.pipe(
+            map((remoteData: RemoteData<PaginatedList<LdnService>>) => {
+              if (remoteData.hasSucceeded) {
+                remoteData.payload.page = remoteData.payload.page.filter(service => service.id.toString() !== serviceId);
+              }
+              return remoteData;
+            }),
+          );
+          this.cdRef.detectChanges();
+          this.closeModal();
+          this.notificationService.success(this.translateService.get('ldn-service-delete.notification.success.title'),
+            this.translateService.get('ldn-service-delete.notification.success.content'));
+        } else {
+          this.notificationService.error(this.translateService.get('ldn-service-delete.notification.error.title'),
+            this.translateService.get('ldn-service-delete.notification.error.content'));
+          this.cdRef.detectChanges();
+        }
+      });
+    }
+  }
+
+  /**
+   * Toggles the status (enabled/disabled) of an LDN service.
+   *
+   * @param {any} ldnService - The LDN service object.
+   * @param {LdnServicesService} ldnServicesService - The service for managing LDN services.
+   */
+  toggleStatus(ldnService: any, ldnServicesService: LdnServicesService): void {
+    const newStatus = !ldnService.enabled;
+    const originalStatus = ldnService.enabled;
+
+    const patchOperation: Operation = {
+      op: 'replace',
+      path: '/enabled',
+      value: newStatus,
+    };
+
+    ldnServicesService.patch(ldnService, [patchOperation]).pipe(getFirstCompletedRemoteData()).subscribe(
+      (rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          ldnService.enabled = newStatus;
+          this.notificationService.success(this.translateService.get('ldn-enable-service.notification.success.title'),
+            this.translateService.get('ldn-enable-service.notification.success.content'));
+        } else {
+          ldnService.enabled = originalStatus;
+          this.notificationService.error(this.translateService.get('ldn-enable-service.notification.error.title'),
+            this.translateService.get('ldn-enable-service.notification.error.content'));
+        }
+      },
+    );
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts
new file mode 100644
index 0000000000..73af060413
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts
@@ -0,0 +1,36 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { LDN_SERVICE_CONSTRAINT_FILTER } from './ldn-service.resource-type';
+
+/** A single filter value and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class Itemfilter extends CacheableObject {
+  static type = LDN_SERVICE_CONSTRAINT_FILTER;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: string;
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts
new file mode 100644
index 0000000000..650511005c
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts
@@ -0,0 +1,13 @@
+import { autoserialize } from 'cerialize';
+
+/**
+ * A single notify service pattern and his properties
+ */
+export class NotifyServicePattern {
+  @autoserialize
+    pattern: string;
+  @autoserialize
+    constraint: string;
+  @autoserialize
+    automatic: string;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
new file mode 100644
index 0000000000..040e4d37b8
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
@@ -0,0 +1,8 @@
+/**
+ * List of services statuses
+ */
+export enum LdnServiceStatus {
+  UNKOWN,
+  DISABLED,
+  ENABLED,
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts
new file mode 100644
index 0000000000..5121e47f69
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts
@@ -0,0 +1,3 @@
+export class LdnServiceConstrain {
+  void: any;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts
new file mode 100644
index 0000000000..05a881e7e7
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts
@@ -0,0 +1,12 @@
+/**
+ * The resource type for Ldn-Services
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../../core/shared/resource-type';
+
+export const LDN_SERVICE = new ResourceType('ldnservice');
+export const LDN_SERVICE_CONSTRAINT_FILTERS = new ResourceType('itemfilters');
+
+export const LDN_SERVICE_CONSTRAINT_FILTER = new ResourceType('itemfilter');
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
new file mode 100644
index 0000000000..69b84427d1
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
@@ -0,0 +1,77 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { LDN_SERVICE } from './ldn-service.resource-type';
+import { NotifyServicePattern } from './ldn-service-patterns.model';
+
+/**
+ * LDN Services bounded to each selected pattern, relation set in service creation
+ */
+
+export interface LdnServiceByPattern {
+  allowsMultipleRequests: boolean;
+  services: LdnService[];
+}
+
+/** An LdnService  and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class LdnService extends CacheableObject {
+  static type = LDN_SERVICE;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: number;
+
+  @deserializeAs('id')
+    uuid: string;
+
+  @autoserialize
+    name: string;
+
+  @autoserialize
+    description: string;
+
+  @autoserialize
+    url: string;
+
+  @autoserialize
+    score: number;
+
+  @autoserialize
+    enabled: boolean;
+
+  @autoserialize
+    ldnUrl: string;
+
+  @autoserialize
+    lowerIp: string;
+
+  @autoserialize
+    upperIp: string;
+
+  @autoserialize
+    notifyServiceInboundPatterns?: NotifyServicePattern[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts
new file mode 100644
index 0000000000..c734503d95
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts
@@ -0,0 +1,10 @@
+/**
+ * List of parameter types used for scripts
+ */
+export enum LdnServiceConstrainType {
+  STRING = 'String',
+  DATE = 'date',
+  BOOLEAN = 'boolean',
+  FILE = 'InputStream',
+  OUTPUT = 'OutputStream'
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
new file mode 100644
index 0000000000..faa7dc82d7
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
@@ -0,0 +1,16 @@
+/**
+ * All available patterns for LDN service creation.
+ * They are used to populate a dropdown in the LDN service form creation
+ */
+
+export const notifyPatterns = [
+
+  'request-endorsement',
+
+  'request-ingest',
+
+  'request-review',
+
+];
+
+
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
new file mode 100644
index 0000000000..4d988e6908
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface NotificationsSuggestionTargetsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class NotificationsSuggestionTargetsPageResolver implements Resolve<NotificationsSuggestionTargetsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminNotificationsSuggestionTargetsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): NotificationsSuggestionTargetsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html
new file mode 100644
index 0000000000..b04e7132f1
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html
@@ -0,0 +1 @@
+<ds-publication-claim [source]="'openaire'"></ds-publication-claim>
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.scss
similarity index 100%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss
rename to src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.scss
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
new file mode 100644
index 0000000000..0dcee41450
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { NotificationsSuggestionTargetsPageComponent } from '../../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+
+describe('NotificationsSuggestionTargetsPageComponent', () => {
+  let component: NotificationsSuggestionTargetsPageComponent;
+  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      providers: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
new file mode 100644
index 0000000000..c25fc43d45
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-admin-notifications-publication-claim-page',
+  templateUrl: './admin-notifications-publication-claim-page.component.html',
+  styleUrls: ['./admin-notifications-publication-claim-page.component.scss'],
+})
+export class AdminNotificationsPublicationClaimPageComponent {
+
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
new file mode 100644
index 0000000000..9fcabedd64
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
@@ -0,0 +1,7 @@
+
+export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance';
+export const PUBLICATION_CLAIMS_PATH = 'publication-claim';
+
+export function getQualityAssuranceEditRoute() {
+  return `/${QUALITY_ASSURANCE_EDIT_PATH}`;
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
new file mode 100644
index 0000000000..abcc6587dd
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
@@ -0,0 +1,123 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service';
+import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
+import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
+import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
+import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
+import { QualityAssuranceTopicsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import {
+  PUBLICATION_CLAIMS_PATH,
+  QUALITY_ASSURANCE_EDIT_PATH,
+} from './admin-notifications-routing-paths';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${PUBLICATION_CLAIMS_PATH}`,
+        component: AdminNotificationsPublicationClaimPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.publicationclaim.page.title',
+          breadcrumbKey: 'admin.notifications.publicationclaim',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ SiteAdministratorGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
+        component: QualityAssuranceSourcePageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
+          sourceData: SourceDataResolver,
+        },
+        data: {
+          title: 'admin.notifications.source.breadcrumbs',
+          breadcrumbKey: 'admin.notifications.source',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
+        component: QualityAssuranceEventsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.event.page.title',
+          breadcrumbKey: 'admin.notifications.event',
+          showBreadcrumbsFluid: false,
+        },
+      },
+    ]),
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    AdminNotificationsPublicationClaimPageResolver,
+    SourceDataResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceTopicsPageResolver,
+    QualityAssuranceEventsPageResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceBreadcrumbResolver,
+    QualityAssuranceBreadcrumbService,
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class AdminNotificationsRoutingModule {
+
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications.module.ts b/src/app/admin/admin-notifications/admin-notifications.module.ts
new file mode 100644
index 0000000000..e2149cda7a
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications.module.ts
@@ -0,0 +1,28 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { CoreModule } from '../../core/core.module';
+import { NotificationsModule } from '../../notifications/notifications.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    AdminNotificationsRoutingModule,
+    NotificationsModule,
+  ],
+  declarations: [
+    AdminNotificationsPublicationClaimPageComponent,
+  ],
+  entryComponents: [],
+})
+/**
+ * This module handles all components related to the notifications pages
+ */
+export class AdminNotificationsModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
new file mode 100644
index 0000000000..dc9312ec28
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
@@ -0,0 +1,59 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NotifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
+import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
+import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        path: '',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyDashboardComponent,
+        pathMatch: 'full',
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+      {
+        path: 'inbound',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyIncomingComponent,
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+      {
+        path: 'outbound',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyOutgoingComponent,
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+    ]),
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class AdminNotifyDashboardRoutingModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
new file mode 100644
index 0000000000..3adb7e857b
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -0,0 +1,23 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div class="my-4">{{'admin-notify-dashboard.description' | translate}}</div>
+      <div>
+        <ul class="nav nav-tabs">
+          <li class="nav-item">
+            <a class="nav-link active">{{'admin-notify-dashboard.metrics' | translate}}</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+        </ul>
+        <div class="mt-2">
+          <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
new file mode 100644
index 0000000000..2629313363
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -0,0 +1,60 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyMessage } from './models/admin-notify-message.model';
+import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
+
+describe('AdminNotifyDashboardComponent', () => {
+  let component: AdminNotifyDashboardComponent;
+  let fixture: ComponentFixture<AdminNotifyDashboardComponent>;
+
+  let item1;
+  let item2;
+  let item3;
+  let searchResult1;
+  let searchResult2;
+  let searchResult3;
+  let results;
+
+  const mockBoxes = [
+    { title: 'admin-notify-dashboard.received-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] },
+    { title: 'admin-notify-dashboard.generated-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] },
+  ];
+
+  beforeEach(async () => {
+    item1 = Object.assign(new AdminNotifyMessage(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new AdminNotifyMessage(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    item3 = Object.assign(new AdminNotifyMessage(), { uuid: 'c3bcbff5-ec0c-4831-8e4c-94b9c933ccac' });
+    searchResult1 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item2 });
+    searchResult3 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item3 });
+    results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NgbNavModule],
+      declarations: [ AdminNotifyDashboardComponent ],
+      providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', (done) => {
+    component.notifyMetricsRows$.subscribe(boxes => {
+      expect(boxes).toEqual(mockBoxes);
+      done();
+    });
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
new file mode 100644
index 0000000000..40100d8684
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -0,0 +1,104 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  forkJoin,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import {
+  AdminNotifyMetricsBox,
+  AdminNotifyMetricsRow,
+} from './admin-notify-metrics/admin-notify-metrics.model';
+
+@Component({
+  selector: 'ds-admin-notify-dashboard',
+  templateUrl: './admin-notify-dashboard.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+
+/**
+ * Component used for visual representation and search of LDN messages for Admins
+ */
+export class AdminNotifyDashboardComponent implements OnInit{
+
+  public notifyMetricsRows$: Observable<AdminNotifyMetricsRow[]>;
+
+  private metricsConfig = environment.notifyMetrics;
+  private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'single-result-options',
+    pageSize: 1,
+  });
+
+  constructor(private searchService: SearchService) {
+  }
+
+  ngOnInit() {
+    const mertricsRowsConfigurations = this.metricsConfig
+      .map(row => row.boxes)
+      .map(boxes => boxes.map(box => box.config).filter(config => !!config));
+    const flatConfigurations = [].concat(...mertricsRowsConfigurations.map((config) => config));
+    const searchConfigurations = flatConfigurations
+      .map(config => Object.assign(new PaginatedSearchOptions({}),
+        { configuration: config, pagination: this.singleResultOptions },
+      ));
+
+    this.notifyMetricsRows$ = forkJoin(searchConfigurations.map(config => this.searchService.search(config)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        map(response => this.mapSearchObjectsToMetricsBox(response.payload)),
+      ),
+    ),
+    ).pipe(
+      map(metricBoxes => this.mapUpdatedBoxesToMetricsRows(metricBoxes)),
+    );
+  }
+
+  /**
+   * Function to map received SearchObjects to notify boxes config
+   *
+   * @param searchObject The object to map
+   * @private
+   */
+  private mapSearchObjectsToMetricsBox(searchObject: SearchObjects<DSpaceObject>): AdminNotifyMetricsBox {
+    const count = searchObject.pageInfo.totalElements;
+    const objectConfig = searchObject.configuration;
+    const metricsBoxes = [].concat(...this.metricsConfig.map((config) => config.boxes));
+
+    return {
+      ...metricsBoxes.find(box => box.config === objectConfig),
+      count,
+    };
+  }
+
+  /**
+   * Function to map updated boxes with count to each row of the configuration
+   *
+   * @param boxesWithCount The object to map
+   * @private
+   */
+  private mapUpdatedBoxesToMetricsRows(boxesWithCount: AdminNotifyMetricsBox[]): AdminNotifyMetricsRow[] {
+    return this.metricsConfig.map(row => {
+      return {
+        ...row,
+        boxes: row.boxes.map(rowBox => boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config)),
+      };
+    });
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
new file mode 100644
index 0000000000..d840197ea7
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -0,0 +1,55 @@
+import {
+  CommonModule,
+  DatePipe,
+} from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { SearchPageModule } from '../../search-page/search-page.module';
+import { SearchModule } from '../../shared/search/search.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
+import { AdminNotifyLogsResultComponent } from './admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component';
+import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result/admin-notify-search-result.component';
+import { AdminNotifyMessagesService } from './services/admin-notify-messages.service';
+
+const ENTRY_COMPONENTS = [
+  AdminNotifySearchResultComponent,
+];
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule,
+    SharedModule,
+    AdminNotifyDashboardRoutingModule,
+    SearchModule,
+    SearchPageModule,
+  ],
+  providers: [
+    AdminNotifyMessagesService,
+    DatePipe,
+  ],
+  declarations: [
+    ...ENTRY_COMPONENTS,
+    AdminNotifyDashboardComponent,
+    AdminNotifyMetricsComponent,
+    AdminNotifyIncomingComponent,
+    AdminNotifyOutgoingComponent,
+    AdminNotifyDetailModalComponent,
+    AdminNotifySearchResultComponent,
+    AdminNotifyLogsResultComponent,
+  ],
+})
+export class AdminNotifyDashboardModule {
+  static withEntryComponents() {
+    return {
+      ngModule: AdminNotifyDashboardModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
+    };
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
new file mode 100644
index 0000000000..52d93cbb62
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -0,0 +1,22 @@
+<div class="modal-header">
+  <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body p-4">
+    <div *ngFor="let key of notifyMessageKeys">
+      <div class="row mb-4">
+        <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
+      </div>
+    </div>
+
+  <div class="d-flex justify-content-end">
+    <button class="btn-primary" (click)="toggleCoarMessage()">
+      {{'notify-message-modal.show-message' | translate}}
+    </button>
+  </div>
+
+  <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2" *ngIf="isCoarMessageVisible"></pre>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
new file mode 100644
index 0000000000..7fddf170ff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal.component';
+
+describe('AdminNotifyDetailModalComponent', () => {
+  let component: AdminNotifyDetailModalComponent;
+  let fixture: ComponentFixture<AdminNotifyDetailModalComponent>;
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyDetailModalComponent ],
+      providers: [{ provide: NgbActiveModal, useValue: modalStub }],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDetailModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should close', () => {
+    spyOn(component.response, 'emit');
+    component.closeModal();
+    expect(modalStub.close).toHaveBeenCalled();
+    expect(component.response.emit).toHaveBeenCalledWith(true);
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
new file mode 100644
index 0000000000..3962d9cb50
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -0,0 +1,55 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { fadeIn } from '../../../shared/animations/fade';
+import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+
+@Component({
+  selector: 'ds-admin-notify-detail-modal',
+  templateUrl: './admin-notify-detail-modal.component.html',
+  animations: [
+    fadeIn,
+  ],
+})
+/**
+ * Component for detailed view of LDN messages displayed in search result in AdminNotifyDashboardComponent
+ */
+
+export class AdminNotifyDetailModalComponent {
+  @Input() notifyMessage: AdminNotifyMessage;
+  @Input() notifyMessageKeys: string[];
+
+  /**
+   * An event fired when the modal is closed
+   */
+  @Output()
+    response = new EventEmitter<boolean>();
+
+  public isCoarMessageVisible = false;
+
+
+  constructor(protected activeModal: NgbActiveModal,
+              public translationsService: TranslateService) {
+    this.translationsService.missingTranslationHandler = new MissingTranslationHelper();
+  }
+
+
+  /**
+   * Close the modal and set the response to true so RootComponent knows the modal was closed
+   */
+  closeModal() {
+    this.activeModal.close();
+    this.response.emit(true);
+  }
+
+  toggleCoarMessage() {
+    this.isCoarMessageVisible = !this.isCoarMessageVisible;
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
new file mode 100644
index 0000000000..4c957ca630
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -0,0 +1,23 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../outbound'" [queryParams]="{view: 'table', configuration: 'NOTIFY.outgoing'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+          </ul>
+
+          <ds-admin-notify-logs-result [defaultConfiguration]="'NOTIFY.incoming'" ></ds-admin-notify-logs-result>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
new file mode 100644
index 0000000000..70771bac54
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -0,0 +1,61 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
+
+describe('AdminNotifyIncomingComponent', () => {
+  let component: AdminNotifyIncomingComponent;
+  let fixture: ComponentFixture<AdminNotifyIncomingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
+
+
+  beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api',
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyIncomingComponent ],
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyIncomingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
new file mode 100644
index 0000000000..fc0f410ad5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-incoming',
+  templateUrl: './admin-notify-incoming.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class AdminNotifyIncomingComponent {
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
new file mode 100644
index 0000000000..f7c4f77a70
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -0,0 +1,25 @@
+<div class="container my-4">
+  <div class="row">
+    <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
+    <div class="col-md-9">
+      <div class="h4">
+        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary mr-1 mb-1">
+          {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
+          <span> ×</span>
+        </button>
+      </div>
+      <ds-search-labels [inPlaceSearch]="true"></ds-search-labels>
+    </div>
+  </div>
+</div>
+
+
+<div>
+  <ds-themed-search
+    [configuration]="selectedSearchConfig$ | async"
+    [showViewModes]="false"
+    [searchEnabled]="false"
+    [context]="context"
+  ></ds-themed-search>
+</div>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
new file mode 100644
index 0000000000..16adbd17f3
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
@@ -0,0 +1,55 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component';
+
+describe('AdminNotifyLogsResultComponent', () => {
+  let component: AdminNotifyLogsResultComponent;
+  let fixture: ComponentFixture<AdminNotifyLogsResultComponent>;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyLogsResultComponent ],
+      providers: [
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyLogsResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
new file mode 100644
index 0000000000..626cd2da1f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -0,0 +1,84 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Context } from '../../../../core/shared/context.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-logs-result',
+  templateUrl: './admin-notify-logs-result.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+
+/**
+ * Component for visualization of search page and related results for the logs of the Notify dashboard
+ */
+
+export class AdminNotifyLogsResultComponent implements OnInit {
+
+  @Input()
+    defaultConfiguration: string;
+
+
+  public selectedSearchConfig$: Observable<string>;
+  public isInbound$: Observable<boolean>;
+
+  protected readonly context = Context.CoarNotify;
+
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+              private router: Router,
+              private route: ActivatedRoute,
+              protected cdRef: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.selectedSearchConfig$ = this.searchConfigService.getCurrentConfiguration(this.defaultConfiguration);
+    this.isInbound$ = this.selectedSearchConfig$.pipe(
+      map(config => config.startsWith('NOTIFY.incoming')),
+    );
+  }
+
+  /**
+   * Reset route state to default configuration
+   */
+  public resetDefaultConfiguration() {
+    //Idle navigation to trigger rendering of result on same page
+    this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
+      this.router.navigate([this.getResolvedUrl(this.route.snapshot)], {
+        queryParams: {
+          configuration: this.defaultConfiguration,
+          view: ViewMode.Table,
+        },
+      });
+    });
+  }
+
+  /**
+   * Get resolved url from route
+   *
+   * @param route url path
+   * @returns url path
+   */
+  private getResolvedUrl(route: ActivatedRouteSnapshot): string {
+    return route.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
new file mode 100644
index 0000000000..e9bc1d10b2
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -0,0 +1,24 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../inbound'" [queryParams]="{view: 'table', configuration: 'NOTIFY.incoming'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+          </ul>
+
+          <ds-admin-notify-logs-result [defaultConfiguration]="'NOTIFY.outgoing'" ></ds-admin-notify-logs-result>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
new file mode 100644
index 0000000000..73773736ff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -0,0 +1,60 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
+
+describe('AdminNotifyOutgoingComponent', () => {
+  let component: AdminNotifyOutgoingComponent;
+  let fixture: ComponentFixture<AdminNotifyOutgoingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
+
+  beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api',
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyOutgoingComponent ],
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyOutgoingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
new file mode 100644
index 0000000000..26d6d345be
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-outgoing',
+  templateUrl: './admin-notify-outgoing.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class AdminNotifyOutgoingComponent {
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
new file mode 100644
index 0000000000..3257bdd5ba
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -0,0 +1,9 @@
+<div class="mb-5" *ngFor="let row of boxesConfig">
+  <div class="mb-2">{{ row.title | translate }}</div>
+  <div class="row justify-content-between">
+    <div class="col-sm" *ngFor="let box of row.boxes">
+      <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+    </div>
+  </div>
+</div>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
new file mode 100644
index 0000000000..3411a6134f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
@@ -0,0 +1,74 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics.component';
+
+describe('AdminNotifyMetricsComponent', () => {
+  let component: AdminNotifyMetricsComponent;
+  let fixture: ComponentFixture<AdminNotifyMetricsComponent>;
+  let router: RouterStub;
+
+  beforeEach(async () => {
+    router = Object.assign(new RouterStub(),
+      { url : '/notify-dashboard' },
+    );
+
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyMetricsComponent ],
+      providers: [{ provide: Router, useValue: router }],
+    })
+      .compileComponents();
+
+
+
+    fixture = TestBed.createComponent(AdminNotifyMetricsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+  it('should navigate to correct url based on config', () => {
+    const searchConfig = 'test.involvedItems';
+    const incomingConfig = 'NOTIFY.incoming.test';
+    const outgoingConfig = 'NOTIFY.outgoing.test';
+    const adminPath =  '/admin/search';
+    const routeExtras = {
+      queryParams: {
+        configuration: searchConfig,
+        view: ViewMode.ListElement,
+      },
+    };
+
+    const routeExtrasTable = {
+      queryParams: {
+        configuration: incomingConfig,
+        view: ViewMode.Table,
+      },
+    };
+
+    const routeExtrasTableOutgoing = {
+      queryParams: {
+        configuration: outgoingConfig,
+        view: ViewMode.Table,
+      },
+    };
+    component.navigateToSelectedSearchConfig(searchConfig);
+    expect(router.navigate).toHaveBeenCalledWith([adminPath], routeExtras);
+
+    component.navigateToSelectedSearchConfig(incomingConfig);
+    expect(router.navigate).toHaveBeenCalledWith(['/notify-dashboard/inbound'], routeExtrasTable);
+
+    component.navigateToSelectedSearchConfig(outgoingConfig);
+    expect(router.navigate).toHaveBeenCalledWith(['/notify-dashboard/outbound'], routeExtrasTableOutgoing);
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
new file mode 100644
index 0000000000..6d08f21415
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -0,0 +1,57 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
+
+@Component({
+  selector: 'ds-admin-notify-metrics',
+  templateUrl: './admin-notify-metrics.component.html',
+})
+/**
+ * Component used to display the number of notification for each configured box in the notifyMetrics section
+ */
+
+export class AdminNotifyMetricsComponent {
+
+  @Input()
+    boxesConfig: AdminNotifyMetricsRow[];
+
+  private incomingConfiguration = 'NOTIFY.incoming';
+  private involvedItemsSuffix = 'involvedItems';
+  private inboundPath = '/inbound';
+  private outboundPath = '/outbound';
+  private adminSearchPath = '/admin/search';
+
+  constructor(private router: Router) {
+  }
+
+
+  public navigateToSelectedSearchConfig(searchConfig: string) {
+    const isRelatedItemsConfig = searchConfig.endsWith(this.involvedItemsSuffix);
+
+    if (isRelatedItemsConfig) {
+      this.router.navigate([this.adminSearchPath], {
+        queryParams: {
+          configuration: searchConfig,
+          view: ViewMode.ListElement,
+        },
+      });
+
+      return;
+    }
+
+    const isIncomingConfig = searchConfig.startsWith(this.incomingConfiguration);
+    const selectedPath = isIncomingConfig ? this.inboundPath : this.outboundPath;
+
+    this.router.navigate([`${this.router.url}${selectedPath}`], {
+      queryParams: {
+        configuration: searchConfig,
+        view: ViewMode.Table,
+      },
+    });
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
new file mode 100644
index 0000000000..83b931c866
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -0,0 +1,19 @@
+/**
+ * The properties for each Box to be displayed in rows in the AdminNotifyMetricsComponent
+ */
+
+export interface AdminNotifyMetricsBox {
+  color: string;
+  textColor?: string;
+  title: string;
+  description: string;
+  config: string;
+  count?: number;
+}
+/**
+ * The properties for each Row containing a list of AdminNotifyMetricsBox to be displayed in the AdminNotifyMetricsComponent
+ */
+export interface AdminNotifyMetricsRow {
+  title: string;
+  boxes: AdminNotifyMetricsBox[]
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
new file mode 100644
index 0000000000..af540b094e
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -0,0 +1,51 @@
+<div class="table-responsive mt-2">
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr class="text-nowrap">
+        <th scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
+        <th scope="col">{{'notify-message-result.repositoryItem' | translate}}</th>
+        <th scope="col">{{ 'notify-message-result.ldnService' | translate}}</th>
+        <th scope="col">{{ 'notify-message-result.type' | translate }}</th>
+        <th scope="col">{{ 'notify-message-result.status' | translate  }}</th>
+        <th scope="col">{{ 'notify-message-result.action' | translate }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let message of (messagesSubject$ | async)">
+        <td class="text-nowrap">
+          <div *ngIf="message.queueLastStartTime">{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
+          <div *ngIf="!message.queueLastStartTime">n/a</div>
+        </td>
+        <td>
+          <ds-truncatable [id]="message.id">
+            <ds-truncatable-part [id]="message.id" [minLines]="2">
+              <a *ngIf="message.relatedItem" [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
+            </ds-truncatable-part>
+          </ds-truncatable>
+          <div *ngIf="!message.relatedItem">n/a</div>
+        </td>
+        <td>
+          <div *ngIf="message.ldnService">{{ message.ldnService }}</div>
+          <div *ngIf="!message.ldnService">n/a</div>
+        </td>
+        <td>
+          <div>{{ message.activityStreamType }}</div>
+        </td>
+        <td>
+          <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
+        </td>
+        <td>
+          <div class="d-flex flex-column">
+            <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+            <button *ngIf="message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)"
+                    (click)="reprocessMessage(message)"
+                    class="btn btn-warning"
+            >
+              {{ 'notify-message-result.reprocess' | translate }}
+            </button>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
new file mode 100644
index 0000000000..1a6411cb60
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -0,0 +1,188 @@
+import { DatePipe } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { RouteService } from '../../../core/services/route.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
+
+export const mockAdminNotifyMessages = [
+  {
+    'type': 'message',
+    'id': 'urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
+    'coarNotifyType': 'coar-notify:ReviewAction',
+    'activityStreamType': 'TentativeReject',
+    'inReplyTo': 'urn:uuid:f7289ad5-0955-4c86-834c-fb54a736778b',
+    'object': null,
+    'context': '24d50450-9ff0-485f-82d4-fba1be42f3f9',
+    'queueAttempts': 1,
+    'queueLastStartTime': '2023-11-24T14:44:00.064+00:00',
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.processed',
+    'queueTimeout': '2023-11-24T15:44:00.064+00:00',
+    'queueStatus': 3,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
+      },
+    },
+    'thumbnail': 'test',
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar 2 demo',
+    'message': '{"@context":["https://www.w3.org/ns/activitystreams","https://purl.org/coar/notify"],"id":"urn:uuid:668f26e0-2e8d-4118-b0d2-ee713523bc45","type":["Reject","coar-notify:IngestAction"],"actor":{"id":"https://generic-service.com","type":["Service"],"name":"Generic Service"},"context":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Document"],"ietf:cite-as":"https://doi.org/10.4598/12123488"},"object":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Offer"]},"origin":{"id":"https://generic-service.com/system","type":["Service"],"inbox":"https://notify-inbox.info/inbox7"},"target":{"id":"https://some-organisation.org","type":["Organization"],"inbox":"https://dspace-coar.4science.cloud/server/ldn/inbox"},"inReplyTo":"urn:uuid:d9b4010a-f128-4815-abb2-83707a2ee9cf"}',
+  },
+  {
+    'type': 'message',
+    'id': 'urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
+    'coarNotifyType': 'coar-notify:IngestAction',
+    'activityStreamType': 'Announce',
+    'inReplyTo': 'urn:uuid:b2ad72d6-6ea9-464f-b385-29a78417f6b8',
+    'object': null,
+    'context': 'e657437a-0ee2-437d-916a-bba8c57bf40b',
+    'queueAttempts': 1,
+    'queueLastStartTime': null,
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.unmapped_action',
+    'queueTimeout': '2023-11-24T14:15:34.945+00:00',
+    'queueStatus': 6,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
+      },
+    },
+    'thumbnail': {},
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar demo',
+    'message': '{"@context":["https://www.w3.org/ns/activitystreams","https://purl.org/coar/notify"],"id":"urn:uuid:668f26e0-2e8d-4118-b0d2-ee713523bc45","type":["Reject","coar-notify:IngestAction"],"actor":{"id":"https://generic-service.com","type":["Service"],"name":"Generic Service"},"context":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Document"],"ietf:cite-as":"https://doi.org/10.4598/12123488"},"object":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Offer"]},"origin":{"id":"https://generic-service.com/system","type":["Service"],"inbox":"https://notify-inbox.info/inbox7"},"target":{"id":"https://some-organisation.org","type":["Organization"],"inbox":"https://dspace-coar.4science.cloud/server/ldn/inbox"},"inReplyTo":"urn:uuid:d9b4010a-f128-4815-abb2-83707a2ee9cf"}',
+  },
+] as unknown as AdminNotifyMessage[];
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifySearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+  let adminNotifyMessageService: AdminNotifyMessagesService;
+  let searchConfigService: SearchConfigurationService;
+  let modalService: NgbModal;
+  const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
+  const testObject = {
+    uuid: 'test-property',
+    name: 'test-property',
+    values: ['value-1', 'value-2'],
+  } as ConfigurationProperty;
+
+  beforeEach(async () => {
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: '' }),
+    });
+    adminNotifyMessageService = jasmine.createSpyObj('adminNotifyMessageService', {
+      getDetailedMessages: of(mockAdminNotifyMessages),
+      reprocessMessage: of(mockAdminNotifyMessages),
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('a', {
+        a: {
+          payload: testObject,
+        },
+      }),
+    });
+
+    searchConfigService = jasmine.createSpyObj('searchConfigService', {
+      getCurrentConfiguration: of('NOTIFY.outgoing'),
+    });
+    objectCache = {} as ObjectCacheService;
+
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent ],
+      providers: [
+        { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new RouterStub() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
+        DatePipe,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
+    component = fixture.componentInstance;
+    component.searchConfigService = searchConfigService;
+    modalService = (component as any).modalService;
+    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+    expect(component.isInbound).toBeFalsy();
+  });
+
+  it('should open modal', () => {
+    component.openDetailModal(mockAdminNotifyMessages[0]);
+    expect(modalService.open).toHaveBeenCalledWith(AdminNotifyDetailModalComponent);
+  });
+
+  it('should map messages', (done) => {
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should reprocess message', (done) => {
+    component.reprocessMessage(mockAdminNotifyMessages[0]);
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should unsubscribe on destroy', () => {
+    (component as any).subs = [of(null).subscribe()];
+
+    spyOn((component as any).subs[0], 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).subs[0].unsubscribe).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
new file mode 100644
index 0000000000..a9a329d0b5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -0,0 +1,162 @@
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { Context } from '../../../core/shared/context.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { tabulatableObjectsComponent } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import { TabulatableResultListElementsComponent } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-search-result.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+/**
+ * Component for visualization in table format of the search results related to the AdminNotifyDashboardComponent
+ */
+
+
+export class AdminNotifySearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit, OnDestroy{
+  public messagesSubject$: BehaviorSubject<AdminNotifyMessage[]> = new BehaviorSubject([]);
+  public reprocessStatus = 'QUEUE_STATUS_QUEUED_FOR_RETRY';
+  //we check on one type of config to render specific table headers
+  public isInbound: boolean;
+
+  /**
+   * Statuses for which we display the reprocess button
+   */
+  public validStatusesForReprocess = [
+    'QUEUE_STATUS_UNTRUSTED',
+    'QUEUE_STATUS_UNTRUSTED_IP',
+    'QUEUE_STATUS_FAILED',
+    'QUEUE_STATUS_UNMAPPED_ACTION',
+  ];
+
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Keys to be formatted as date
+   * @private
+   */
+
+  private dateTypeKeys: string[] = ['queueLastStartTime', 'queueTimeout'];
+
+  /**
+   * Keys to be not shown in detail
+   * @private
+   */
+  private messageKeys: string[] = [
+    'type',
+    'id',
+    'coarNotifyType',
+    'activityStreamType',
+    'inReplyTo',
+    'queueAttempts',
+    'queueLastStartTime',
+    'queueStatusLabel',
+    'queueTimeout',
+  ];
+
+  /**
+   * The format for the date values
+   * @private
+   */
+  private dateFormat = 'YYYY/MM/d hh:mm:ss';
+
+  constructor(private modalService: NgbModal,
+                private adminNotifyMessagesService: AdminNotifyMessagesService,
+                private datePipe: DatePipe,
+                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+    super();
+  }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.mapDetailsToMessages();
+    this.subs.push(this.searchConfigService.getCurrentConfiguration('')
+      .subscribe(configuration => {
+        this.isInbound = configuration.startsWith('NOTIFY.incoming');
+      }),
+    );
+  }
+
+  ngOnDestroy() {
+    this.subs.forEach(sub => sub.unsubscribe());
+  }
+
+  /**
+   * Open modal for details visualization
+   * @param notifyMessage the message to be displayed
+   */
+  openDetailModal(notifyMessage: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageToOpen = { ...notifyMessage };
+
+    this.messageKeys.forEach(key => {
+      if (this.dateTypeKeys.includes(key)) {
+        messageToOpen[key] = this.datePipe.transform(messageToOpen[key], this.dateFormat);
+      }
+    });
+    // format COAR message for technical visualization
+    messageToOpen.message = JSON.stringify(JSON.parse(notifyMessage.message), null, 2);
+
+    modalRef.componentInstance.notifyMessage = messageToOpen;
+    modalRef.componentInstance.notifyMessageKeys = this.messageKeys;
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to be reprocessed
+   */
+  reprocessMessage(message: AdminNotifyMessage) {
+    this.subs.push(
+      this.adminNotifyMessagesService.reprocessMessage(message, this.messagesSubject$)
+        .subscribe(response => {
+          this.messagesSubject$.next(response);
+        },
+        ),
+    );
+  }
+
+
+  /**
+   * Map readable results to messages
+   * @private
+   */
+  private mapDetailsToMessages() {
+    this.subs.push(this.adminNotifyMessagesService.getDetailedMessages(this.objects?.page.map(pageResult => pageResult.indexableObject))
+      .subscribe(response => {
+        this.messagesSubject$.next(response);
+      }));
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
new file mode 100644
index 0000000000..5115118993
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
@@ -0,0 +1,7 @@
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+import { searchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { AdminNotifyMessage } from './admin-notify-message.model';
+
+@searchResultFor(AdminNotifyMessage)
+export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
new file mode 100644
index 0000000000..f32451eaff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -0,0 +1,171 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
+
+/**
+ * A message that includes admin notify info
+ */
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class AdminNotifyMessage extends DSpaceObject {
+  static type = ADMIN_NOTIFY_MESSAGE;
+
+  /**
+   * The type of the resource
+   */
+  @excludeFromEquals
+    type = ADMIN_NOTIFY_MESSAGE;
+
+  /**
+   * The id of the message
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The id of the notification
+   */
+  @autoserialize
+    notificationId: string;
+
+  /**
+   * The type of the notification
+   */
+  @autoserialize
+    notificationType: string;
+
+  /**
+   * The type of the notification
+   */
+  @autoserialize
+    coarNotifyType: string;
+
+  /**
+   * The type of the activity
+   */
+  @autoserialize
+    activityStreamType: string;
+
+  /**
+   * The object the message reply to
+   */
+  @autoserialize
+    inReplyTo: string;
+
+  /**
+   * The object the message relates to
+   */
+  @autoserialize
+    object: string;
+
+  /**
+   * The name of the related item
+   */
+  @autoserialize
+    relatedItem: string;
+
+  /**
+   * The name of the related ldn service
+   */
+  @autoserialize
+    ldnService: string;
+
+  /**
+   * The context of the message
+   */
+  @autoserialize
+    context: string;
+
+  /**
+   * The related COAR message
+   */
+  @autoserialize
+    message: string;
+
+  /**
+   * The attempts of the queue
+   */
+  @autoserialize
+    queueAttempts: number;
+
+  /**
+   * Timestamp of the last queue attempt
+   */
+  @autoserialize
+    queueLastStartTime: string;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+    origin: number | string;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+    target: number | string;
+
+  /**
+   * The label for the status of the queue
+   */
+  @autoserialize
+    queueStatusLabel: string;
+
+  /**
+   * The timeout of the queue
+   */
+  @autoserialize
+    queueTimeout: string;
+
+  /**
+   * The status of the queue
+   */
+  @autoserialize
+    queueStatus: number;
+
+  /**
+   * Thumbnail link used when browsing items with showThumbs config enabled.
+   */
+  @autoserialize
+    thumbnail: string;
+
+  /**
+   * The observable pointing to the item itself
+   */
+  @autoserialize
+    item: Observable<AdminNotifyMessage>;
+
+  /**
+   * The observable pointing to the access status of the item
+   */
+  @autoserialize
+    accessStatus: Observable<AdminNotifyMessage>;
+
+
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
new file mode 100644
index 0000000000..994146adb3
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for AdminNotifyMessage
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ADMIN_NOTIFY_MESSAGE = new ResourceType('message');
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
new file mode 100644
index 0000000000..6178b20133
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -0,0 +1,117 @@
+import { deepClone } from 'fast-json-patch';
+import { cold } from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { mockAdminNotifyMessages } from '../admin-notify-search-result/admin-notify-search-result.component.spec';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifyMessagesService } from './admin-notify-messages.service';
+
+describe('AdminNotifyMessagesService test', () => {
+  let service: AdminNotifyMessagesService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let ldnServicesService: LdnServicesService;
+  let itemDataService: ItemDataService;
+  let responseCacheEntry: RequestEntry;
+  let mockMessages: AdminNotifyMessage[];
+
+  const endpointURL = `https://rest.api/rest/api/ldn/messages`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+  const testLdnServiceName = 'testLdnService';
+  const testRelatedItemName = 'testRelatedItem';
+
+  function initTestService() {
+    return new AdminNotifyMessagesService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      ldnServicesService,
+      itemDataService,
+    );
+  }
+
+  beforeEach(() => {
+    mockMessages = deepClone(mockAdminNotifyMessages);
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: endpointURL } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$(mockMessages),
+    });
+
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      findById: createSuccessfulRemoteDataObject$({ name: testLdnServiceName }),
+    });
+
+    itemDataService = jasmine.createSpyObj('itemDataService', {
+      findById: createSuccessfulRemoteDataObject$({ name: testRelatedItemName }),
+    });
+
+    service = initTestService();
+  });
+
+  describe('Admin Notify service', () => {
+    it('should be defined', () => {
+      expect(service).toBeDefined();
+    });
+
+    it('should get details for messages', (done) => {
+      service.getDetailedMessages(mockMessages).pipe(take(1)).subscribe((detailedMessages) => {
+        expect(detailedMessages[0].ldnService).toEqual(testLdnServiceName);
+        expect(detailedMessages[0].relatedItem).toEqual(testRelatedItemName);
+        done();
+      });
+    });
+
+    it('should reprocess message', (done) => {
+      const behaviorSubject = new BehaviorSubject(mockMessages);
+      service.reprocessMessage(mockMessages[0], behaviorSubject).pipe(take(1)).subscribe((reprocessedMessages) => {
+        expect(reprocessedMessages.length).toEqual(2);
+        expect(reprocessedMessages).toEqual(mockMessages);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
new file mode 100644
index 0000000000..04f26c29af
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
@@ -0,0 +1,115 @@
+import { Injectable } from '@angular/core';
+import {
+  BehaviorSubject,
+  from,
+  Observable,
+  of,
+  scan,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
+
+/**
+ * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
+ *
+ * @export
+ * @class AdminNotifyMessagesService
+ * @extends {IdentifiableDataService<AdminNotifyMessage>}
+ */
+@Injectable()
+@dataService(ADMIN_NOTIFY_MESSAGE)
+export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {
+
+  protected reprocessEndpoint = 'enqueueretry';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    private ldnServicesService: LdnServicesService,
+    private itemDataService: ItemDataService,
+  ) {
+    super('messages', requestService, rdbService, objectCache, halService);
+  }
+
+
+  /**
+   * Add detailed information to each message
+   * @param messages the messages to which add detailded info
+   */
+  public getDetailedMessages(messages: AdminNotifyMessage[]): Observable<AdminNotifyMessage[]> {
+    return from(messages).pipe(
+      mergeMap(message =>
+        message.target || message.origin ? this.ldnServicesService.findById((message.target || message.origin).toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({ ...message, ldnService: detail.name })),
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.object || message.context  ? this.itemDataService.findById(message.object || message.context).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({ ...message, relatedItem: detail.name })),
+        ) : of(message),
+      ),
+      scan((acc: any, value: any) => [...acc, value], []),
+    );
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to reprocess
+   * @param messageSubject the current visualised messages source
+   */
+  public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>): Observable<AdminNotifyMessage[]> {
+    const requestId = this.requestService.generateRequestId();
+
+    return this.halService.getEndpoint(this.reprocessEndpoint).pipe(
+      map(endpoint => endpoint.replace('{id}', message.id)),
+      map((endpointURL: string) => new PostRequest(requestId, endpointURL)),
+      tap(request => this.requestService.send(request)),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<AdminNotifyMessage>(request.uuid)),
+      getFirstCompletedRemoteData(),
+      getAllSucceededRemoteDataPayload(),
+      mergeMap(reprocessedMessage => this.getDetailedMessages([reprocessedMessage])),
+    ).pipe(
+      mergeMap((newMessages) =>  messageSubject.pipe(
+        map(messages => {
+          const detailedReprocessedMessage = newMessages[0];
+          const messageToUpdate = messages.find(currentMessage => currentMessage.id === message.id);
+          const indexOfMessageToUpdate = messages.indexOf(messageToUpdate);
+          detailedReprocessedMessage.target = message.target;
+          detailedReprocessedMessage.object = message.object;
+          detailedReprocessedMessage.origin = message.origin;
+          detailedReprocessedMessage.context = message.context;
+          messages[indexOfMessageToUpdate] = detailedReprocessedMessage;
+
+          return messages;
+        }),
+      )),
+    );
+  }
+}
diff --git a/src/app/admin/admin-registries/admin-registries-routing.module.ts b/src/app/admin/admin-registries/admin-registries-routing.module.ts
index 49a76708cc..3134d3285e 100644
--- a/src/app/admin/admin-registries/admin-registries-routing.module.ts
+++ b/src/app/admin/admin-registries/admin-registries-routing.module.ts
@@ -1,9 +1,10 @@
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
+import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
+import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
+import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 
 @NgModule({
   imports: [
@@ -11,29 +12,29 @@ import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
       {
         path: 'metadata',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
-        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' },
         children: [
           {
             path: '',
-            component: MetadataRegistryComponent
+            component: MetadataRegistryComponent,
           },
           {
             path: ':schemaName',
             resolve: { breadcrumb: I18nBreadcrumbResolver },
             component: MetadataSchemaComponent,
-            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
-          }
-        ]
+            data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' },
+          },
+        ],
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: () => import('./bitstream-formats/bitstream-formats.module')
           .then((m) => m.BitstreamFormatsModule),
-        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
+        data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' },
       },
-    ])
-  ]
+    ]),
+  ],
 })
 export class AdminRegistriesRoutingModule {
 
diff --git a/src/app/admin/admin-registries/admin-registries.module.ts b/src/app/admin/admin-registries/admin-registries.module.ts
index 65f7b61419..42432a90ed 100644
--- a/src/app/admin/admin-registries/admin-registries.module.ts
+++ b/src/app/admin/admin-registries/admin-registries.module.ts
@@ -1,14 +1,15 @@
-import { NgModule } from '@angular/core';
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { AdminRegistriesRoutingModule } from './admin-registries-routing.module';
 import { CommonModule } from '@angular/common';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { FormModule } from '../../shared/form/form.module';
 import { SharedModule } from '../../shared/shared.module';
+import { AdminRegistriesRoutingModule } from './admin-registries-routing.module';
+import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
+import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
 import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
 import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
-import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
-import { FormModule } from '../../shared/form/form.module';
+import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 
 @NgModule({
   imports: [
@@ -17,14 +18,14 @@ import { FormModule } from '../../shared/form/form.module';
     RouterModule,
     BitstreamFormatsModule,
     AdminRegistriesRoutingModule,
-    FormModule
+    FormModule,
   ],
   declarations: [
     MetadataRegistryComponent,
     MetadataSchemaComponent,
     MetadataSchemaFormComponent,
-    MetadataFieldFormComponent
-  ]
+    MetadataFieldFormComponent,
+  ],
 })
 export class AdminRegistriesModule {
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
index 2b65b369b2..d1be68633f 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
@@ -1,11 +1,11 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom mb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h1>
 
             <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
index 6787350d86..72d2795170 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
@@ -1,19 +1,27 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { AddBitstreamFormatComponent } from './add-bitstream-format.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 describe('AddBitstreamFormatComponent', () => {
   let comp: AddBitstreamFormatComponent;
@@ -38,7 +46,7 @@ describe('AddBitstreamFormatComponent', () => {
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
       createBitstreamFormat: createSuccessfulRemoteDataObject$({}),
-      clearBitStreamFormatRequests: observableOf(null)
+      clearBitStreamFormatRequests: observableOf(null),
     });
 
     TestBed.configureTestingModule({
@@ -49,7 +57,7 @@ describe('AddBitstreamFormatComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
@@ -78,7 +86,7 @@ describe('AddBitstreamFormatComponent', () => {
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
         createBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
-        clearBitStreamFormatRequests: observableOf(null)
+        clearBitStreamFormatRequests: observableOf(null),
       });
 
       TestBed.configureTestingModule({
@@ -89,7 +97,7 @@ describe('AddBitstreamFormatComponent', () => {
           { provide: NotificationsService, useValue: notificationService },
           { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
       }).compileComponents();
     }));
     beforeEach(initBeforeEach);
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
index 132343dcf0..4dc43480c0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
@@ -1,12 +1,13 @@
-import { Router } from '@angular/router';
 import { Component } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the page to create a new bitstream format.
@@ -35,16 +36,16 @@ export class AddBitstreamFormatComponent {
     this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((response: RemoteData<BitstreamFormat>) => {
-        if (response.hasSucceeded) {
-          this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
-            this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
-          this.router.navigate([getBitstreamFormatsModuleRoute()]);
-          this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
-        } else {
-          this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),
-            this.translateService.get('admin.registries.bitstream-formats.create.failure.content'));
-        }
+      if (response.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
+          this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
+        this.router.navigate([getBitstreamFormatsModuleRoute()]);
+        this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
+      } else {
+        this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),
+          this.translateService.get('admin.registries.bitstream-formats.create.failure.content'));
       }
+    },
     );
   }
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
index c5bebb292b..874274af8b 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
-import { type } from '../../../shared/ngrx/type';
+
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { type } from '../../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
@@ -15,7 +16,7 @@ export const BitstreamFormatsRegistryActionTypes = {
 
   SELECT_FORMAT: type('dspace/bitstream-formats-registry/SELECT_FORMAT'),
   DESELECT_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_FORMAT'),
-  DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT')
+  DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT'),
 };
 
 /**
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
index 76576afc7a..09c867bc72 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
@@ -1,11 +1,15 @@
 import { Action } from '@ngrx/store';
+
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
-import { bitstreamFormatReducer, BitstreamFormatRegistryState } from './bitstream-format.reducers';
 import {
   BitstreamFormatsRegistryDeselectAction,
   BitstreamFormatsRegistryDeselectAllAction,
-  BitstreamFormatsRegistrySelectAction
+  BitstreamFormatsRegistrySelectAction,
 } from './bitstream-format.actions';
+import {
+  bitstreamFormatReducer,
+  BitstreamFormatRegistryState,
+} from './bitstream-format.reducers';
 
 const bitstreamFormat1: BitstreamFormat = new BitstreamFormat();
 bitstreamFormat1.id = 'test-uuid-1';
@@ -16,15 +20,15 @@ bitstreamFormat2.id = 'test-uuid-2';
 bitstreamFormat2.shortDescription = 'test-short-2';
 
 const initialState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: []
+  selectedBitstreamFormats: [],
 };
 
 const bitstream1SelectedState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: [bitstreamFormat1]
+  selectedBitstreamFormats: [bitstreamFormat1],
 };
 
 const bitstream1and2SelectedState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: [bitstreamFormat1, bitstreamFormat2]
+  selectedBitstreamFormats: [bitstreamFormat1, bitstreamFormat2],
 };
 
 describe('BitstreamFormatReducer', () => {
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
index 41880bf16c..40642a5fdb 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
@@ -3,7 +3,7 @@ import {
   BitstreamFormatsRegistryAction,
   BitstreamFormatsRegistryActionTypes,
   BitstreamFormatsRegistryDeselectAction,
-  BitstreamFormatsRegistrySelectAction
+  BitstreamFormatsRegistrySelectAction,
 } from './bitstream-format.actions';
 
 /**
@@ -32,21 +32,21 @@ export function bitstreamFormatReducer(state = initialState, action: BitstreamFo
 
     case BitstreamFormatsRegistryActionTypes.SELECT_FORMAT: {
       return Object.assign({}, state, {
-        selectedBitstreamFormats: [...state.selectedBitstreamFormats, (action as BitstreamFormatsRegistrySelectAction).bitstreamFormat]
+        selectedBitstreamFormats: [...state.selectedBitstreamFormats, (action as BitstreamFormatsRegistrySelectAction).bitstreamFormat],
       });
     }
 
     case BitstreamFormatsRegistryActionTypes.DESELECT_FORMAT: {
       return Object.assign({}, state, {
         selectedBitstreamFormats: state.selectedBitstreamFormats.filter(
-          (selectedBitstreamFormats) => selectedBitstreamFormats !== (action as BitstreamFormatsRegistryDeselectAction).bitstreamFormat
-        )
+          (selectedBitstreamFormats) => selectedBitstreamFormats !== (action as BitstreamFormatsRegistryDeselectAction).bitstreamFormat,
+        ),
       });
     }
 
     case BitstreamFormatsRegistryActionTypes.DESELECT_ALL_FORMAT: {
       return Object.assign({}, state, {
-        selectedBitstreamFormats: []
+        selectedBitstreamFormats: [],
       });
     }
     default:
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
index 2f08f8257c..e4a2a36f26 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -1,10 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
-import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -14,28 +15,28 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
     RouterModule.forChild([
       {
         path: '',
-        component: BitstreamFormatsComponent
+        component: BitstreamFormatsComponent,
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
-        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
+        data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' },
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
           bitstreamFormat: BitstreamFormatsResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
+        data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' },
       },
-    ])
+    ]),
   ],
   providers: [
     BitstreamFormatsResolver,
-  ]
+  ],
 })
 export class BitstreamFormatsRoutingModule {
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 0a2e9f0f92..b61d7ea525 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -2,7 +2,7 @@
   <div class="bitstream-formats row">
     <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h1>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
@@ -19,7 +19,7 @@
           <table id="formats" class="table table-striped table-hover">
             <thead>
             <tr>
-              <th scope="col"></th>
+              <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
@@ -31,9 +31,11 @@
               <td>
                 <label class="mb-0">
                   <input type="checkbox"
+                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
                          [checked]="isSelected(bitstreamFormat) | async"
                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                   >
+                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}}</span>
                 </label>
               </td>
               <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
@@ -45,7 +47,7 @@
           </table>
         </div>
       </ds-pagination>
-      <div *ngIf="(bitstreamFormats | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
+      <div *ngIf="(bitstreamFormats | async)?.payload?.totalElements === 0" class="alert alert-info" role="alert">
         {{'admin.registries.bitstream-formats.no-items' | translate}}
       </div>
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 8a44240b7e..b63a6213eb 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -1,31 +1,40 @@
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import {
+  createFailedRemoteDataObject$,
   createNoContentRemoteDataObject$,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$,
-  createFailedRemoteDataObject$
 } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
 
 describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
@@ -79,7 +88,7 @@ describe('BitstreamFormatsComponent', () => {
     bitstreamFormat1,
     bitstreamFormat2,
     bitstreamFormat3,
-    bitstreamFormat4
+    bitstreamFormat4,
   ];
   const mockFormatsRD = createSuccessfulRemoteDataObject(createPaginatedList(mockFormatsList));
 
@@ -96,7 +105,7 @@ describe('BitstreamFormatsComponent', () => {
       deselectBitstreamFormat: {},
       deselectAllBitstreamFormats: {},
       delete: createSuccessfulRemoteDataObject$({}),
-      clearBitStreamFormatRequests: observableOf('cleared')
+      clearBitStreamFormatRequests: observableOf('cleared'),
     });
 
     paginationService = new PaginationServiceStub();
@@ -108,8 +117,8 @@ describe('BitstreamFormatsComponent', () => {
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: NotificationsService, useValue: notificationsServiceStub },
-        { provide: PaginationService, useValue: paginationService }
-      ]
+        { provide: PaginationService, useValue: paginationService },
+      ],
     }).compileComponents();
   };
 
@@ -212,34 +221,34 @@ describe('BitstreamFormatsComponent', () => {
 
   describe('deleteFormats success', () => {
     beforeEach(waitForAsync(() => {
-        notificationsServiceStub = new NotificationsServiceStub();
+      notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
+      scheduler = getTestScheduler();
 
-        bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-          findAll: observableOf(mockFormatsRD),
-          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
-          getSelectedBitstreamFormats: observableOf(mockFormatsList),
-          selectBitstreamFormat: {},
-          deselectBitstreamFormat: {},
-          deselectAllBitstreamFormats: {},
-          delete: createNoContentRemoteDataObject$(),
-          clearBitStreamFormatRequests: observableOf('cleared')
-        });
+      bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        findAll: observableOf(mockFormatsRD),
+        find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
+        getSelectedBitstreamFormats: observableOf(mockFormatsList),
+        selectBitstreamFormat: {},
+        deselectBitstreamFormat: {},
+        deselectAllBitstreamFormats: {},
+        delete: createNoContentRemoteDataObject$(),
+        clearBitStreamFormatRequests: observableOf('cleared'),
+      });
 
       paginationService = new PaginationServiceStub();
 
       TestBed.configureTestingModule({
-          imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-          declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
-          providers: [
-            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-            { provide: NotificationsService, useValue: notificationsServiceStub },
-            { provide: PaginationService, useValue: paginationService }
-          ]
-        }).compileComponents();
-      }
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        providers: [
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+          { provide: NotificationsService, useValue: notificationsServiceStub },
+          { provide: PaginationService, useValue: paginationService },
+        ],
+      }).compileComponents();
+    },
     ));
 
     beforeEach(initBeforeEach);
@@ -261,34 +270,34 @@ describe('BitstreamFormatsComponent', () => {
 
   describe('deleteFormats error', () => {
     beforeEach(waitForAsync(() => {
-        notificationsServiceStub = new NotificationsServiceStub();
+      notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
+      scheduler = getTestScheduler();
 
-        bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-          findAll: observableOf(mockFormatsRD),
-          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
-          getSelectedBitstreamFormats: observableOf(mockFormatsList),
-          selectBitstreamFormat: {},
-          deselectBitstreamFormat: {},
-          deselectAllBitstreamFormats: {},
-          delete: createFailedRemoteDataObject$(),
-          clearBitStreamFormatRequests: observableOf('cleared')
-        });
+      bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        findAll: observableOf(mockFormatsRD),
+        find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
+        getSelectedBitstreamFormats: observableOf(mockFormatsList),
+        selectBitstreamFormat: {},
+        deselectBitstreamFormat: {},
+        deselectAllBitstreamFormats: {},
+        delete: createFailedRemoteDataObject$(),
+        clearBitStreamFormatRequests: observableOf('cleared'),
+      });
 
       paginationService = new PaginationServiceStub();
 
       TestBed.configureTestingModule({
-          imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-          declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
-          providers: [
-            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-            { provide: NotificationsService, useValue: notificationsServiceStub },
-            { provide: PaginationService, useValue: paginationService }
-          ]
-        }).compileComponents();
-      }
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        providers: [
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+          { provide: NotificationsService, useValue: notificationsServiceStub },
+          { provide: PaginationService, useValue: paginationService },
+        ],
+      }).compileComponents();
+    },
     ));
 
     beforeEach(initBeforeEach);
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 162bf2bdb2..522f466735 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,25 +1,39 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable} from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
-import { map, mergeMap, switchMap, take, toArray } from 'rxjs/operators';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 /**
  * This component renders a list of bitstream formats
  */
 @Component({
   selector: 'ds-bitstream-formats',
-  templateUrl: './bitstream-formats.component.html'
+  templateUrl: './bitstream-formats.component.html',
 })
 export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
@@ -35,7 +49,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rbp',
     pageSize: 20,
-    pageSizeOptions: [20, 40, 60, 80, 100]
+    pageSizeOptions: [20, 40, 60, 80, 100],
   });
 
   constructor(private notificationsService: NotificationsService,
@@ -64,7 +78,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
         map((response: RemoteData<NoContent>) => response.hasSucceeded),
       )),
       // wait for all responses to come in and return them as a single array
-      toArray()
+      toArray(),
     ).subscribe((results: boolean[]) => {
       // Count the number of succeeded and failed deletions
       const successResponses = results.filter((result: boolean) => result);
@@ -101,7 +115,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
     return this.bitstreamFormatService.getSelectedBitstreamFormats().pipe(
       map((bitstreamFormats: BitstreamFormat[]) => {
         return bitstreamFormats.find((selectedFormat) => selectedFormat.id === bitstreamFormat.id) != null;
-      })
+      }),
     );
   }
 
@@ -127,7 +141,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
     const messages = observableCombineLatest(
       this.translateService.get(`${prefix}.${suffix}.head`),
-      this.translateService.get(`${prefix}.${suffix}.amount`, {amount: amount})
+      this.translateService.get(`${prefix}.${suffix}.amount`, { amount: amount }),
     );
     messages.subscribe(([head, content]) => {
 
@@ -144,7 +158,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
     this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
       switchMap((findListOptions: FindListOptions) => {
         return this.bitstreamFormatService.findAll(findListOptions);
-      })
+      }),
     );
   }
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
index afbe35a1f6..4c8b3284b0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { SharedModule } from '../../../shared/shared.module';
-import { FormatFormComponent } from './format-form/format-form.component';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+
 import { FormModule } from '../../../shared/form/form.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
+import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
+import { FormatFormComponent } from './format-form/format-form.component';
 
 @NgModule({
   imports: [
@@ -15,14 +16,14 @@ import { FormModule } from '../../../shared/form/form.module';
     SharedModule,
     RouterModule,
     BitstreamFormatsRoutingModule,
-    FormModule
+    FormModule,
   ],
   declarations: [
     BitstreamFormatsComponent,
     EditBitstreamFormatComponent,
     AddBitstreamFormatComponent,
-    FormatFormComponent
-  ]
+    FormatFormComponent,
+  ],
 })
 export class BitstreamFormatsModule {
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
index a00f660baf..4ab186cdc6 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
@@ -1,9 +1,14 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 /**
@@ -24,7 +29,7 @@ export class BitstreamFormatsResolver implements Resolve<RemoteData<BitstreamFor
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<BitstreamFormat>> {
     return this.bitstreamFormatDataService.findById(route.params.id)
       .pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       );
   }
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
index f57ec9cd38..efcced2a87 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
@@ -1,11 +1,11 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom mb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h1>
 
              <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
index b09c50c70a..5df6f74c13 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -1,24 +1,32 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../../../shared/testing/router.stub';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
 
 describe('EditBitstreamFormatComponent', () => {
   let comp: EditBitstreamFormatComponent;
@@ -36,8 +44,8 @@ describe('EditBitstreamFormatComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat)
-    })
+      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat),
+    }),
   };
 
   let router;
@@ -48,7 +56,7 @@ describe('EditBitstreamFormatComponent', () => {
     router = new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      updateBitstreamFormat: createSuccessfulRemoteDataObject$({})
+      updateBitstreamFormat: createSuccessfulRemoteDataObject$({}),
     });
 
     TestBed.configureTestingModule({
@@ -60,7 +68,7 @@ describe('EditBitstreamFormatComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
@@ -99,7 +107,7 @@ describe('EditBitstreamFormatComponent', () => {
       router = new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500)
+        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
       });
 
       TestBed.configureTestingModule({
@@ -111,7 +119,7 @@ describe('EditBitstreamFormatComponent', () => {
           { provide: NotificationsService, useValue: notificationService },
           { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
       }).compileComponents();
     }));
     beforeEach(initBeforeEach);
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
index 14b109fe26..e7d1d501af 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
@@ -1,14 +1,21 @@
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component, OnInit } from '@angular/core';
+import { map } from 'rxjs/operators';
+
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the edit page of a bitstream format.
@@ -36,7 +43,7 @@ export class EditBitstreamFormatComponent implements OnInit {
 
   ngOnInit(): void {
     this.bitstreamFormatRD$ = this.route.data.pipe(
-      map((data) => data.bitstreamFormat as RemoteData<BitstreamFormat>)
+      map((data) => data.bitstreamFormat as RemoteData<BitstreamFormat>),
     );
   }
 
@@ -49,15 +56,15 @@ export class EditBitstreamFormatComponent implements OnInit {
     this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((response: RemoteData<BitstreamFormat>) => {
-        if (response.hasSucceeded) {
-          this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
-            this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
-          this.router.navigate([getBitstreamFormatsModuleRoute()]);
-        } else {
-          this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
-            'admin.registries.bitstream-formats.create.edit.content');
-        }
+      if (response.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
+          this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
+        this.router.navigate([getBitstreamFormatsModuleRoute()]);
+      } else {
+        this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
+          'admin.registries.bitstream-formats.create.edit.content');
       }
+    },
     );
   }
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
index ca3fbcbc99..ceeb313a9d 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
@@ -1,17 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { RouterStub } from '../../../../shared/testing/router.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { FormatFormComponent } from './format-form.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicCheckboxModel,
+  DynamicFormArrayModel,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
-import { DynamicCheckboxModel, DynamicFormArrayModel, DynamicInputModel } from '@ng-dynamic-forms/core';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { isEmpty } from '../../../../shared/empty.util';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { FormatFormComponent } from './format-form.component';
 
 describe('FormatFormComponent', () => {
   let comp: FormatFormComponent;
@@ -45,7 +57,7 @@ describe('FormatFormComponent', () => {
       providers: [
         { provide: Router, useValue: router },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 142f6fb83d..42a1e4baff 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -1,6 +1,11 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import {
   DynamicCheckboxModel,
   DynamicFormArrayModel,
@@ -9,20 +14,25 @@ import {
   DynamicFormService,
   DynamicInputModel,
   DynamicSelectModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
-import { Router } from '@angular/router';
-import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+
 import { environment } from '../../../../../environments/environment';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../shared/empty.util';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * The component responsible for rendering the form to create/edit a bitstream format
  */
 @Component({
   selector: 'ds-bitstream-format-form',
-  templateUrl: './format-form.component.html'
+  templateUrl: './format-form.component.html',
 })
 export class FormatFormComponent implements OnInit {
 
@@ -40,9 +50,9 @@ export class FormatFormComponent implements OnInit {
   /**
    * The different supported support level of the bitstream format
    */
-  supportLevelOptions = [{label: BitstreamFormatSupportLevel.Known, value: BitstreamFormatSupportLevel.Known},
-    {label: BitstreamFormatSupportLevel.Unknown, value: BitstreamFormatSupportLevel.Unknown},
-    {label: BitstreamFormatSupportLevel.Supported, value: BitstreamFormatSupportLevel.Supported}];
+  supportLevelOptions = [{ label: BitstreamFormatSupportLevel.Known, value: BitstreamFormatSupportLevel.Known },
+    { label: BitstreamFormatSupportLevel.Unknown, value: BitstreamFormatSupportLevel.Unknown },
+    { label: BitstreamFormatSupportLevel.Supported, value: BitstreamFormatSupportLevel.Supported }];
 
   /**
    * Styling element for repeatable field
@@ -58,8 +68,8 @@ export class FormatFormComponent implements OnInit {
    */
   arrayInputElementLayout: DynamicFormControlLayout = {
     grid: {
-      host: 'col'
-    }
+      host: 'col',
+    },
   };
 
   /**
@@ -73,10 +83,10 @@ export class FormatFormComponent implements OnInit {
       hint: 'admin.registries.bitstream-formats.edit.shortDescription.hint',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Please enter a name for this bitstream format'
+        required: 'Please enter a name for this bitstream format',
       },
     }),
     new DynamicInputModel({
@@ -100,7 +110,7 @@ export class FormatFormComponent implements OnInit {
       options: this.supportLevelOptions,
       label: 'admin.registries.bitstream-formats.edit.supportLevel.label',
       hint: 'admin.registries.bitstream-formats.edit.supportLevel.hint',
-      value: this.supportLevelOptions[0].value
+      value: this.supportLevelOptions[0].value,
 
     }),
     new DynamicCheckboxModel({
@@ -117,8 +127,8 @@ export class FormatFormComponent implements OnInit {
         new DynamicInputModel({
           id: 'extension',
           placeholder: 'admin.registries.bitstream-formats.edit.extensions.placeholder',
-        }, this.arrayInputElementLayout)
-      ]
+        }, this.arrayInputElementLayout),
+      ],
     }, this.arrayElementLayout),
   ];
 
@@ -146,7 +156,7 @@ export class FormatFormComponent implements OnInit {
             for (let i = 0; i < extenstions.length; i++) {
               formArray.insertGroup(i).group[0] = new DynamicInputModel({
                 id: `extension-${i}`,
-                value: extenstions[i]
+                value: extenstions[i],
               }, this.arrayInputElementLayout);
             }
           }
@@ -165,7 +175,7 @@ export class FormatFormComponent implements OnInit {
   onSubmit() {
     const updatedBitstreamFormat = Object.assign(new BitstreamFormat(),
       {
-        id: this.bitstreamFormat.id
+        id: this.bitstreamFormat.id,
       });
 
     this.formModel.forEach(
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
index 3fc872ca43..2e06d168ce 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -1,8 +1,9 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
-import { type } from '../../../shared/ngrx/type';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { type } from '../../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
@@ -24,7 +25,7 @@ export const MetadataRegistryActionTypes = {
   CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'),
   SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'),
   DESELECT_FIELD: type('dspace/metadata-registry/DESELECT_FIELD'),
-  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD')
+  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD'),
 };
 
 /**
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 35bffad185..63242b4795 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -2,7 +2,7 @@
     <div class="metadata-registry row">
         <div class="col-12">
 
-            <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h2>
+            <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
 
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
@@ -19,7 +19,7 @@
                     <table id="metadata-schemas" class="table table-striped table-hover">
                         <thead>
                         <tr>
-                            <th scope="col"></th>
+                            <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
@@ -34,6 +34,7 @@
                                            [checked]="isSelected(schema) | async"
                                            (change)="selectMetadataSchema(schema, $event)"
                                     >
+                                    <span class="sr-only">{{((isSelected(schema) | async) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
                                 </label>
                             </td>
                             <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
@@ -46,7 +47,7 @@
 
             </ds-pagination>
 
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
               {{'admin.registries.metadata.schemas.no-items' | translate}}
             </div>
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 944288a7a5..63acf0f258 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -1,25 +1,34 @@
-import { MetadataRegistryComponent } from './metadata-registry.component';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
-import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { MetadataRegistryComponent } from './metadata-registry.component';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
@@ -31,22 +40,22 @@ describe('MetadataRegistryComponent', () => {
       id: 1,
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1',
         },
       },
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/'
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
     },
     {
       id: 2,
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2',
         },
       },
       prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema'
-    }
+      namespace: 'http://dspace.org/mockschema',
+    },
   ];
   const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -61,7 +70,7 @@ describe('MetadataRegistryComponent', () => {
     deleteMetadataSchema: () => observableOf(new RestResponse(true, 200, 'OK')),
     deselectAllMetadataSchema: () => {
     },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
+    clearMetadataSchemaRequests: () => observableOf(undefined),
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
@@ -75,11 +84,11 @@ describe('MetadataRegistryComponent', () => {
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: PaginationService, useValue: paginationService },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataRegistryComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 857034604e..976ab572cc 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,24 +1,35 @@
 import { Component } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  zip,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-metadata-registry',
   templateUrl: './metadata-registry.component.html',
-  styleUrls: ['./metadata-registry.component.scss']
+  styleUrls: ['./metadata-registry.component.scss'],
 })
 /**
  * A component used for managing all existing metadata schemas within the repository.
@@ -36,7 +47,7 @@ export class MetadataRegistryComponent {
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rm',
-    pageSize: 25
+    pageSize: 25,
   });
 
   /**
@@ -60,7 +71,7 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.needsUpdate$.pipe(
       filter((update) => update === true),
       switchMap(() => this.paginationService.getCurrentPagination(this.config.id, this.config)),
-      switchMap((currentPagination) => this.registryService.getMetadataSchemas(toFindListOptions(currentPagination)))
+      switchMap((currentPagination) => this.registryService.getMetadataSchemas(toFindListOptions(currentPagination))),
     );
   }
 
@@ -92,7 +103,7 @@ export class MetadataRegistryComponent {
    */
   isActive(schema: MetadataSchema): Observable<boolean> {
     return this.getActiveSchema().pipe(
-      map((activeSchema) => schema === activeSchema)
+      map((activeSchema) => schema === activeSchema),
     );
   }
 
@@ -120,7 +131,7 @@ export class MetadataRegistryComponent {
    */
   isSelected(schema: MetadataSchema): Observable<boolean> {
     return this.registryService.getSelectedMetadataSchemas().pipe(
-      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
+      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null),
     );
   }
 
@@ -148,7 +159,7 @@ export class MetadataRegistryComponent {
           this.registryService.deselectAllMetadataSchema();
           this.registryService.cancelEditMetadataSchema();
         });
-      }
+      },
     );
   }
 
@@ -162,7 +173,7 @@ export class MetadataRegistryComponent {
     const suffix = success ? 'success' : 'failure';
     const messages = observableCombineLatest(
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.deleted.${suffix}`, {amount: amount})
+      this.translateService.get(`${prefix}.deleted.${suffix}`, { amount: amount }),
     );
     messages.subscribe(([head, content]) => {
       if (success) {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
index 3e26a8fdc1..07d01b8dc3 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
@@ -1,3 +1,5 @@
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -8,11 +10,12 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from './metadata-registry.actions';
-import { metadataRegistryReducer, MetadataRegistryState } from './metadata-registry.reducers';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import {
+  metadataRegistryReducer,
+  MetadataRegistryState,
+} from './metadata-registry.reducers';
 
 class NullAction extends MetadataRegistryEditSchemaAction {
   type = null;
@@ -27,11 +30,11 @@ const schema: MetadataSchema = Object.assign(new MetadataSchema(),
     id: 'schema-id',
     _links: {
       self: {
-        href: 'http://rest.self/schema/dc'
+        href: 'http://rest.self/schema/dc',
       },
     },
     prefix: 'dc',
-    namespace: 'http://dublincore.org/documents/dcmi-terms/'
+    namespace: 'http://dublincore.org/documents/dcmi-terms/',
   });
 
 const schema2: MetadataSchema = Object.assign(new MetadataSchema(),
@@ -43,7 +46,7 @@ const schema2: MetadataSchema = Object.assign(new MetadataSchema(),
       },
     },
     prefix: 'dcterms',
-    namespace: 'http://purl.org/dc/terms/'
+    namespace: 'http://purl.org/dc/terms/',
   });
 
 const field: MetadataField = Object.assign(new MetadataField(),
@@ -57,7 +60,7 @@ const field: MetadataField = Object.assign(new MetadataField(),
     element: 'contributor',
     qualifier: 'author',
     scopeNote: 'Author of an item',
-    schema: schema
+    schema: schema,
   });
 
 const field2: MetadataField = Object.assign(new MetadataField(),
@@ -71,35 +74,35 @@ const field2: MetadataField = Object.assign(new MetadataField(),
     element: 'title',
     qualifier: null,
     scopeNote: 'Title of an item',
-    schema: schema
+    schema: schema,
   });
 
 const initialState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [],
   editField: null,
-  selectedFields: []
+  selectedFields: [],
 };
 
 const editState: MetadataRegistryState = {
   editSchema: schema,
   selectedSchemas: [],
   editField: field,
-  selectedFields: []
+  selectedFields: [],
 };
 
 const selectState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [schema2],
   editField: null,
-  selectedFields: [field2]
+  selectedFields: [field2],
 };
 
 const moreSelectState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [schema, schema2],
   editField: null,
-  selectedFields: [field, field2]
+  selectedFields: [field, field2],
 };
 
 describe('metadataRegistryReducer', () => {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
index e805c8b8fc..6cb72a0a8b 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -1,3 +1,5 @@
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import {
   MetadataRegistryAction,
   MetadataRegistryActionTypes,
@@ -6,10 +8,8 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from './metadata-registry.actions';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 
 /**
  * The metadata registry state.
@@ -29,7 +29,7 @@ const initialState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [],
   editField: null,
-  selectedFields: []
+  selectedFields: [],
 };
 
 /**
@@ -43,65 +43,65 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
 
     case MetadataRegistryActionTypes.EDIT_SCHEMA: {
       return Object.assign({}, state, {
-        editSchema: (action as MetadataRegistryEditSchemaAction).schema
+        editSchema: (action as MetadataRegistryEditSchemaAction).schema,
       });
     }
 
     case MetadataRegistryActionTypes.CANCEL_EDIT_SCHEMA: {
       return Object.assign({}, state, {
-        editSchema: null
+        editSchema: null,
       });
     }
 
     case MetadataRegistryActionTypes.SELECT_SCHEMA: {
       return Object.assign({}, state, {
-        selectedSchemas: [...state.selectedSchemas, (action as MetadataRegistrySelectSchemaAction).schema]
+        selectedSchemas: [...state.selectedSchemas, (action as MetadataRegistrySelectSchemaAction).schema],
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_SCHEMA: {
       return Object.assign({}, state, {
         selectedSchemas: state.selectedSchemas.filter(
-          (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema
-        )
+          (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema,
+        ),
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_ALL_SCHEMA: {
       return Object.assign({}, state, {
-        selectedSchemas: []
+        selectedSchemas: [],
       });
     }
 
     case MetadataRegistryActionTypes.EDIT_FIELD: {
       return Object.assign({}, state, {
-        editField: (action as MetadataRegistryEditFieldAction).field
+        editField: (action as MetadataRegistryEditFieldAction).field,
       });
     }
 
     case MetadataRegistryActionTypes.CANCEL_EDIT_FIELD: {
       return Object.assign({}, state, {
-        editField: null
+        editField: null,
       });
     }
 
     case MetadataRegistryActionTypes.SELECT_FIELD: {
       return Object.assign({}, state, {
-        selectedFields: [...state.selectedFields, (action as MetadataRegistrySelectFieldAction).field]
+        selectedFields: [...state.selectedFields, (action as MetadataRegistrySelectFieldAction).field],
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_FIELD: {
       return Object.assign({}, state, {
         selectedFields: state.selectedFields.filter(
-          (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field
-        )
+          (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field,
+        ),
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_ALL_FIELD: {
       return Object.assign({}, state, {
-        selectedFields: []
+        selectedFields: [],
       });
     }
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index a4a4613565..85d1e90692 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index b758767ddb..17fdb6cd3d 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -1,15 +1,21 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { of as observableOf } from 'rxjs';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
 
 describe('MetadataSchemaFormComponent', () => {
   let component: MetadataSchemaFormComponent;
@@ -22,7 +28,7 @@ describe('MetadataSchemaFormComponent', () => {
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
     cancelEditMetadataSchema: () => {
     },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
+    clearMetadataSchemaRequests: () => observableOf(undefined),
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
@@ -32,7 +38,7 @@ describe('MetadataSchemaFormComponent', () => {
         reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
         },
       };
-    }
+    },
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
@@ -42,9 +48,9 @@ describe('MetadataSchemaFormComponent', () => {
       declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: FormBuilderService, useValue: formBuilderServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -64,7 +70,7 @@ describe('MetadataSchemaFormComponent', () => {
 
     const expected = Object.assign(new MetadataSchema(), {
       namespace: namespace,
-      prefix: prefix
+      prefix: prefix,
     } as MetadataSchema);
 
     beforeEach(() => {
@@ -90,7 +96,7 @@ describe('MetadataSchemaFormComponent', () => {
       const expectedWithId = Object.assign(new MetadataSchema(), {
         id: 1,
         namespace: namespace,
-        prefix: prefix
+        prefix: prefix,
       } as MetadataSchema);
 
       beforeEach(() => {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 1992289ff7..640a9bff29 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,21 +1,35 @@
-import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { UntypedFormGroup } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { take } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 
 @Component({
   selector: 'ds-metadata-schema-form',
-  templateUrl: './metadata-schema-form.component.html'
+  templateUrl: './metadata-schema-form.component.html',
 })
 /**
  * A form used for creating and editing metadata schemas
@@ -53,14 +67,14 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     name: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     namespace: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
-    }
+        host: 'col col-sm-6 d-inline-block',
+      },
+    },
   };
 
   /**
@@ -79,42 +93,42 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
   ngOnInit() {
     combineLatest([
       this.translateService.get(`${this.messagePrefix}.name`),
-      this.translateService.get(`${this.messagePrefix}.namespace`)
+      this.translateService.get(`${this.messagePrefix}.namespace`),
     ]).subscribe(([name, namespace]) => {
       this.name = new DynamicInputModel({
-          id: 'name',
-          label: name,
-          name: 'name',
-          validators: {
-            required: null,
-            pattern: '^[^. ,]*$',
-            maxLength: 32,
-          },
-          required: true,
-          errorMessages: {
-            pattern: 'error.validation.metadata.name.invalid-pattern',
-            maxLength: 'error.validation.metadata.name.max-length',
-          },
-        });
+        id: 'name',
+        label: name,
+        name: 'name',
+        validators: {
+          required: null,
+          pattern: '^[^. ,]*$',
+          maxLength: 32,
+        },
+        required: true,
+        errorMessages: {
+          pattern: 'error.validation.metadata.name.invalid-pattern',
+          maxLength: 'error.validation.metadata.name.max-length',
+        },
+      });
       this.namespace = new DynamicInputModel({
-          id: 'namespace',
-          label: namespace,
-          name: 'namespace',
-          validators: {
-            required: null,
-            maxLength: 256,
-          },
-          required: true,
-          errorMessages: {
-            maxLength: 'error.validation.metadata.namespace.max-length',
-          },
-        });
+        id: 'namespace',
+        label: namespace,
+        name: 'namespace',
+        validators: {
+          required: null,
+          maxLength: 256,
+        },
+        required: true,
+        errorMessages: {
+          maxLength: 'error.validation.metadata.namespace.max-length',
+        },
+      });
       this.formModel = [
         new DynamicFormGroupModel(
           {
             id: 'metadatadataschemagroup',
-            group:[this.namespace, this.name]
-          })
+            group:[this.namespace, this.name],
+          }),
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataSchema().subscribe((schema: MetadataSchema) => {
@@ -147,30 +161,48 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit(): void {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
-      (schema: MetadataSchema) => {
-        const values = {
-          prefix: this.name.value,
-          namespace: this.namespace.value
-        };
-        if (schema == null) {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            this.submitForm.emit(newSchema);
-          });
-        } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
-            id: schema.id,
-            prefix: schema.prefix,
-            namespace: values.namespace,
-          })).subscribe((updatedSchema: MetadataSchema) => {
-            this.submitForm.emit(updatedSchema);
-          });
-        }
+    this.registryService
+      .getActiveMetadataSchema()
+      .pipe(
+        take(1),
+        switchMap((schema: MetadataSchema) => {
+          const metadataValues = {
+            prefix: this.name.value,
+            namespace: this.namespace.value,
+          };
+
+          let createOrUpdate$: Observable<MetadataSchema>;
+
+          if (schema == null) {
+            createOrUpdate$ =
+                  this.registryService.createOrUpdateMetadataSchema(
+                    Object.assign(new MetadataSchema(), metadataValues),
+                  );
+          } else {
+            const updatedSchema = Object.assign(
+              new MetadataSchema(),
+              schema,
+              {
+                namespace: metadataValues.namespace,
+              },
+            );
+            createOrUpdate$ =
+                  this.registryService.createOrUpdateMetadataSchema(
+                    updatedSchema,
+                  );
+          }
+
+          return createOrUpdate$;
+        }),
+        tap(() => {
+          this.registryService.clearMetadataSchemaRequests().subscribe();
+        }),
+      )
+      .subscribe((updatedOrCreatedSchema: MetadataSchema) => {
+        this.submitForm.emit(updatedOrCreatedSchema);
         this.clearFields();
         this.registryService.cancelEditMetadataSchema();
-      }
-    );
+      });
   }
 
   /**
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 4e29fbb6e8..44b6bfb697 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index ad7b54945d..fb9037b582 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MetadataFieldFormComponent } from './metadata-field-form.component';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { MetadataFieldFormComponent } from './metadata-field-form.component';
 
 describe('MetadataFieldFormComponent', () => {
   let component: MetadataFieldFormComponent;
@@ -21,7 +26,7 @@ describe('MetadataFieldFormComponent', () => {
   const metadataSchema = Object.assign(new MetadataSchema(), {
     id: 1,
     namespace: 'fake schema',
-    prefix: 'fake'
+    prefix: 'fake',
   });
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -33,7 +38,7 @@ describe('MetadataFieldFormComponent', () => {
     },
     cancelEditMetadataSchema: () => {
     },
-    clearMetadataFieldRequests: () => observableOf(undefined)
+    clearMetadataFieldRequests: () => observableOf(undefined),
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
@@ -43,7 +48,7 @@ describe('MetadataFieldFormComponent', () => {
         reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
         },
       };
-    }
+    },
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
@@ -53,9 +58,9 @@ describe('MetadataFieldFormComponent', () => {
       declarations: [MetadataFieldFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: FormBuilderService, useValue: formBuilderServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -83,7 +88,7 @@ describe('MetadataFieldFormComponent', () => {
     const expected = Object.assign(new MetadataField(), {
       element: element,
       qualifier: qualifier,
-      scopeNote: scopeNote
+      scopeNote: scopeNote,
     });
 
     beforeEach(() => {
@@ -112,7 +117,7 @@ describe('MetadataFieldFormComponent', () => {
         schema: metadataSchema,
         element: element,
         qualifier: qualifier,
-        scopeNote: scopeNote
+        scopeNote: scopeNote,
       });
 
       beforeEach(() => {
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 773e0600fb..48451357a0 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,22 +1,31 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
-import { UntypedFormGroup } from '@angular/forms';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { combineLatest } from 'rxjs';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { take } from 'rxjs/operators';
+
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 
 @Component({
   selector: 'ds-metadata-field-form',
-  templateUrl: './metadata-field-form.component.html'
+  templateUrl: './metadata-field-form.component.html',
 })
 /**
  * A form used for creating and editing metadata fields
@@ -51,7 +60,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
   /**
    * A dynamic input model for the scopeNote field
    */
-  scopeNote: DynamicInputModel;
+  scopeNote: DynamicTextAreaModel;
 
   /**
    * A list of all dynamic input models
@@ -64,19 +73,19 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     element: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     qualifier: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     scopeNote: {
       grid: {
-        host: 'col col-sm-12 d-inline-block'
-      }
-    }
+        host: 'col col-sm-12 d-inline-block',
+      },
+    },
   };
 
   /**
@@ -101,7 +110,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
     combineLatest([
       this.translateService.get(`${this.messagePrefix}.element`),
       this.translateService.get(`${this.messagePrefix}.qualifier`),
-      this.translateService.get(`${this.messagePrefix}.scopenote`)
+      this.translateService.get(`${this.messagePrefix}.scopenote`),
     ]).subscribe(([element, qualifier, scopenote]) => {
       this.element = new DynamicInputModel({
         id: 'element',
@@ -132,18 +141,19 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           maxLength: 'error.validation.metadata.qualifier.max-length',
         },
       });
-      this.scopeNote = new DynamicInputModel({
+      this.scopeNote = new DynamicTextAreaModel({
         id: 'scopeNote',
         label: scopenote,
         name: 'scopeNote',
         required: false,
+        rows: 5,
       });
       this.formModel = [
         new DynamicFormGroupModel(
-        {
-          id: 'metadatadatafieldgroup',
-          group:[this.element, this.qualifier, this.scopeNote]
-        })
+          {
+            id: 'metadatadatafieldgroup',
+            group:[this.element, this.qualifier, this.scopeNote],
+          }),
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => {
@@ -200,7 +210,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
         }
         this.clearFields();
         this.registryService.cancelEditMetadataField();
-      }
+      },
     );
   }
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 557741df80..97123d29a5 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -2,7 +2,7 @@
   <div class="metadata-schema row">
     <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h1>
 
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
@@ -10,7 +10,7 @@
         [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
-      <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
+      <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
 
       <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
         <ds-pagination
@@ -24,7 +24,7 @@
             <table id="metadata-fields" class="table table-striped table-hover">
               <thead>
               <tr>
-                <th></th>
+                <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
@@ -33,15 +33,14 @@
               <tbody>
               <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
-                <td>
-                  <label class="mb-0">
-                    <input type="checkbox"
-                           [checked]="isSelected(field) | async"
-                           (change)="selectMetadataField(field, $event)">
-                  </label>
+                <td *ngVar="(isSelected(field) | async) as selected">
+                  <input type="checkbox"
+                         [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
+                         [checked]="selected"
+                         (change)="selectMetadataField(field, $event)">
                 </td>
                 <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier" class="mb-0">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
               </tbody>
@@ -49,7 +48,7 @@
           </div>
         </ds-pagination>
 
-        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+        <div *ngIf="fields?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
           {{'admin.registries.schema.fields.no-items' | translate}}
         </div>
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index 2b660a6363..6c4e62e45f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -1,30 +1,39 @@
-import { MetadataSchemaComponent } from './metadata-schema.component';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { By } from '@angular/platform-browser';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
-import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataSchemaComponent } from './metadata-schema.component';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -39,7 +48,7 @@ describe('MetadataSchemaComponent', () => {
         },
       },
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/'
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
     },
     {
       id: 2,
@@ -49,8 +58,8 @@ describe('MetadataSchemaComponent', () => {
         },
       },
       prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema'
-    }
+      namespace: 'http://dspace.org/mockschema',
+    },
   ];
   const mockFieldsList = [
     {
@@ -63,7 +72,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'advisor',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
     },
     {
       id: 2,
@@ -75,7 +84,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'author',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
     },
     {
       id: 3,
@@ -87,7 +96,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'editor',
       scopeNote: 'test scope note',
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
     },
     {
       id: 4,
@@ -99,8 +108,8 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'illustrator',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
-    }
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
+    },
   ];
   const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -117,14 +126,14 @@ describe('MetadataSchemaComponent', () => {
     deleteMetadataField: () => observableOf(new RestResponse(true, 200, 'OK')),
     deselectAllMetadataField: () => {
     },
-    clearMetadataFieldRequests: () => observableOf(undefined)
+    clearMetadataFieldRequests: () => observableOf(undefined),
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   const schemaNameParam = 'mock';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({
-      schemaName: schemaNameParam
-    })
+      schemaName: schemaNameParam,
+    }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -139,9 +148,9 @@ describe('MetadataSchemaComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: Router, useValue: new RouterStub() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index d0827e6e4d..483aa9644e 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,38 +1,50 @@
-import { Component, OnInit } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
   combineLatest,
+  combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  zip
+  zip,
 } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import { RemoteData } from '../../../core/data/remote-data';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
-import { NoContent } from '../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-metadata-schema',
   templateUrl: './metadata-schema.component.html',
-  styleUrls: ['./metadata-schema.component.scss']
+  styleUrls: ['./metadata-schema.component.scss'],
 })
 /**
  * A component used for managing all existing metadata fields within the current metadata schema.
  * The admin can create, edit or delete metadata fields here.
  */
-export class MetadataSchemaComponent implements OnInit {
+export class MetadataSchemaComponent implements OnInit, OnDestroy {
   /**
    * The metadata schema
    */
@@ -49,7 +61,7 @@ export class MetadataSchemaComponent implements OnInit {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rm',
     pageSize: 25,
-    pageSizeOptions: [25, 50, 100, 200]
+    pageSizeOptions: [25, 50, 100, 200],
   });
 
   /**
@@ -60,7 +72,6 @@ export class MetadataSchemaComponent implements OnInit {
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
-              private router: Router,
               private paginationService: PaginationService,
               private translateService: TranslateService) {
 
@@ -86,13 +97,13 @@ export class MetadataSchemaComponent implements OnInit {
    */
   private updateFields() {
     this.metadataFields$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
-      switchMap((currentPagination) => combineLatest(this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination))),
+      switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination)])),
       switchMap(([schema, update, currentPagination]: [MetadataSchema, boolean, PaginationComponentOptions]) => {
         if (update) {
           this.needsUpdate$.next(false);
         }
         return this.registryService.getMetadataFieldsBySchema(schema, toFindListOptions(currentPagination), !update, true);
-      })
+      }),
     );
   }
 
@@ -125,7 +136,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   isActive(field: MetadataField): Observable<boolean> {
     return this.getActiveField().pipe(
-      map((activeField) => field === activeField)
+      map((activeField) => field === activeField),
     );
   }
 
@@ -153,7 +164,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   isSelected(field: MetadataField): Observable<boolean> {
     return this.registryService.getSelectedMetadataFields().pipe(
-      map((fields) => fields.find((selectedField) => selectedField === field) != null)
+      map((fields) => fields.find((selectedField) => selectedField === field) != null),
     );
   }
 
@@ -181,7 +192,7 @@ export class MetadataSchemaComponent implements OnInit {
           this.registryService.deselectAllMetadataField();
           this.registryService.cancelEditMetadataField();
         });
-      }
+      },
     );
   }
 
@@ -193,10 +204,10 @@ export class MetadataSchemaComponent implements OnInit {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
+    const messages = observableCombineLatest([
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
-    );
+      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount }),
+    ]);
     messages.subscribe(([head, content]) => {
       if (success) {
         this.notificationsService.success(head, content);
@@ -207,6 +218,7 @@ export class MetadataSchemaComponent implements OnInit {
   }
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.registryService.deselectAllMetadataField();
   }
 
 }
diff --git a/src/app/admin/admin-reports/admin-reports-routing.module.ts b/src/app/admin/admin-reports/admin-reports-routing.module.ts
new file mode 100644
index 0000000000..e891fa9ad4
--- /dev/null
+++ b/src/app/admin/admin-reports/admin-reports-routing.module.ts
@@ -0,0 +1,38 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component';
+import { FilteredItemsComponent } from './filtered-items/filtered-items.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: 'collections',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'admin.reports.collections.title', breadcrumbKey: 'admin.reports.collections' },
+        children: [
+          {
+            path: '',
+            component: FilteredCollectionsComponent,
+          },
+        ],
+      },
+      {
+        path: 'queries',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'admin.reports.items.title', breadcrumbKey: 'admin.reports.items' },
+        children: [
+          {
+            path: '',
+            component: FilteredItemsComponent,
+          },
+        ],
+      },
+    ]),
+  ],
+})
+export class AdminReportsRoutingModule {
+
+}
diff --git a/src/app/admin/admin-reports/admin-reports.module.ts b/src/app/admin/admin-reports/admin-reports.module.ts
new file mode 100644
index 0000000000..6eb713f0a4
--- /dev/null
+++ b/src/app/admin/admin-reports/admin-reports.module.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminReportsRoutingModule } from './admin-reports-routing.module';
+import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component';
+import { FilteredItemsComponent } from './filtered-items/filtered-items.component';
+import { FiltersComponent } from './filters-section/filters-section.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    RouterModule,
+    FormModule,
+    AdminReportsRoutingModule,
+    NgbAccordionModule,
+  ],
+  declarations: [
+    FilteredCollectionsComponent,
+    FilteredItemsComponent,
+    FiltersComponent,
+  ],
+})
+export class AdminReportsModule {
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts
new file mode 100644
index 0000000000..39b51424ed
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts
@@ -0,0 +1,36 @@
+export class FilteredCollection {
+
+  public label: string;
+  public handle: string;
+  public communityLabel: string;
+  public communityHandle: string;
+  public nbTotalItems: number;
+  public values = {};
+  public allFiltersValue: number;
+
+  public clear() {
+    this.label = '';
+    this.handle = '';
+    this.communityLabel = '';
+    this.communityHandle = '';
+    this.nbTotalItems = 0;
+    this.values = {};
+    this.allFiltersValue = 0;
+  }
+
+  public deserialize(object: any) {
+    this.clear();
+    this.label = object.label;
+    this.handle = object.handle;
+    this.communityLabel = object.community_label;
+    this.communityHandle = object.community_handle;
+    this.nbTotalItems = object.nb_total_items;
+    const valuesPerFilter = object.values;
+    for (const filter in valuesPerFilter) {
+      if (valuesPerFilter.hasOwnProperty(filter)) {
+        this.values[filter] = valuesPerFilter[filter];
+      }
+    }
+    this.allFiltersValue = object.all_filters_value;
+  }
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
new file mode 100644
index 0000000000..5199a115a6
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -0,0 +1,64 @@
+<div class="container">
+    <div class="metadata-registry row">
+        <div class="col-12">
+
+            <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
+
+            <div id="metadatadiv">
+                <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
+                    <ngb-panel id="filters">
+                        <ng-template ngbPanelTitle>
+                          {{ "admin.reports.commons.filters" | translate }}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="container">
+                                <div class="row">
+                                    <span class="col-3"></span>
+                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                                </div>
+                                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                                <div class="row">
+                                    <span class="col-3"></span>
+                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                                </div>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="collections">
+                        <ng-template ngbPanelTitle>
+                          {{ "admin.reports.collections.collections-report" | translate }}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <table id="table" class="table table-striped">
+                                <thead>
+                                    <tr class="header">
+                                        <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
+                                        <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
+                                        <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
+                                        <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
+                                        <th *ngFor="let filter of results.summary.values | keyvalue">{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
+                                    </tr>
+                                    <tr class="header">
+                                        <th class="num">{{ results.summary.nbTotalItems }}</th>
+                                        <th class="num">{{ results.summary.allFiltersValue }}</th>
+                                        <th class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ filter.value }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr *ngFor="let coll of results.collections">
+                                        <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
+                                        <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
+                                        <td class="num">{{ coll.nbTotalItems }}</td>
+                                        <td class="num">{{ coll.allFiltersValue }}</td>
+                                        <td class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ coll.values[filter.key] || 0 }}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </ng-template>
+                    </ngb-panel>
+                </ngb-accordion>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss
new file mode 100644
index 0000000000..73ce5275e5
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss
@@ -0,0 +1,3 @@
+.num {
+    text-align: center;
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
new file mode 100644
index 0000000000..1fa350645b
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -0,0 +1,94 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormBuilder } from '@angular/forms';
+import {
+  NgbAccordion,
+  NgbAccordionModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+
+import { FilteredCollectionsComponent } from './filtered-collections.component';
+
+describe('FiltersComponent', () => {
+  let component: FilteredCollectionsComponent;
+  let fixture: ComponentFixture<FilteredCollectionsComponent>;
+  let formBuilder: FormBuilder;
+
+  const expected = {
+    payload: {
+      collections: [],
+      summary: {
+        label: 'Test',
+      },
+    },
+    statusCode: 200,
+    statusText: 'OK',
+  } as RawRestResponse;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [FilteredCollectionsComponent],
+      imports: [
+        NgbAccordionModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        HttpClientTestingModule,
+      ],
+      providers: [
+        FormBuilder,
+        DspaceRestService,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(waitForAsync(() => {
+    formBuilder = TestBed.inject(FormBuilder);
+
+    fixture = TestBed.createComponent(FilteredCollectionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should be displaying the filters panel initially', () => {
+    let accordion: NgbAccordion = component.accordionComponent;
+    expect(accordion.isExpanded('filters')).toBeTrue();
+  });
+
+  describe('toggle', () => {
+    beforeEach(() => {
+      spyOn(component, 'getFilteredCollections').and.returnValue(observableOf(expected));
+      spyOn(component.results, 'deserialize');
+      spyOn(component.accordionComponent, 'expand').and.callThrough();
+      component.submit();
+      fixture.detectChanges();
+    });
+
+    it('should be displaying the collections panel after submitting', waitForAsync(() => {
+      fixture.whenStable().then(() => {
+        expect(component.accordionComponent.expand).toHaveBeenCalledWith('collections');
+        expect(component.accordionComponent.isExpanded('collections')).toBeTrue();
+      });
+    }));
+  });
+});
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
new file mode 100644
index 0000000000..84e334e971
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -0,0 +1,77 @@
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormGroup,
+} from '@angular/forms';
+import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
+import { RestRequestMethod } from 'src/app/core/data/rest-request-method';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { environment } from 'src/environments/environment';
+
+import { FiltersComponent } from '../filters-section/filters-section.component';
+import { FilteredCollections } from './filtered-collections.model';
+
+/**
+ * Component representing the Filtered Collections content report
+ */
+@Component({
+  selector: 'ds-report-filtered-collections',
+  templateUrl: './filtered-collections.component.html',
+  styleUrls: ['./filtered-collections.component.scss'],
+})
+export class FilteredCollectionsComponent {
+
+  queryForm: FormGroup;
+  results: FilteredCollections = new FilteredCollections();
+  @ViewChild('acc') accordionComponent: NgbAccordion;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private restService: DspaceRestService) {}
+
+  ngOnInit() {
+    this.queryForm = this.formBuilder.group({
+      filters: FiltersComponent.formGroup(this.formBuilder),
+    });
+  }
+
+  filtersFormGroup(): FormGroup {
+    return this.queryForm.get('filters') as FormGroup;
+  }
+
+  getGroup(filterId: string): string {
+    return FiltersComponent.getGroup(filterId).id;
+  }
+
+  submit() {
+    this
+      .getFilteredCollections()
+      .subscribe(
+        response => {
+          this.results.deserialize(response.payload);
+          this.accordionComponent.expand('collections');
+        },
+      );
+  }
+
+  getFilteredCollections(): Observable<RawRestResponse> {
+    let params = this.toQueryString();
+    if (params.length > 0) {
+      params = `?${params}`;
+    }
+    const scheme = environment.rest.ssl ? 'https' : 'http';
+    const urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
+    return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filteredcollections${params}`);
+  }
+
+  private toQueryString(): string {
+    const params = FiltersComponent.toQueryString(this.queryForm.value.filters);
+    return params;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts
new file mode 100644
index 0000000000..248924c761
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts
@@ -0,0 +1,26 @@
+import { FilteredCollection } from './filtered-collection.model';
+
+export class FilteredCollections {
+
+  public collections: Array<FilteredCollection> = [];
+  public summary: FilteredCollection = new FilteredCollection();
+
+  public clear() {
+    this.collections.splice(0, this.collections.length);
+    this.summary.clear();
+  }
+
+  public deserialize(object: any) {
+    this.clear();
+    const summary = object.summary;
+    this.summary.deserialize(summary);
+    const collections = object.collections;
+    for (let i = 0; i < collections.length; i++) {
+      const collection = collections[i];
+      const coll = new FilteredCollection();
+      coll.deserialize(collection);
+      this.collections.push(coll);
+    }
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
new file mode 100644
index 0000000000..b5bc55f6ff
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -0,0 +1,23 @@
+import { Item } from 'src/app/core/shared/item.model';
+
+export class FilteredItems {
+
+  public items: Item[] = [];
+  public itemCount: number;
+
+  public clear() {
+    this.items.splice(0, this.items.length);
+  }
+
+  public deserialize(object: any, offset: number = 0) {
+    this.clear();
+    this.itemCount = object.itemCount;
+    const items = object.items;
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+      item.index = this.items.length + offset + 1;
+      this.items.push(item);
+    }
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
new file mode 100644
index 0000000000..4b6679bdbc
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -0,0 +1,175 @@
+<div class="container">
+    <div class="metadata-registry row">
+        <div class="col-12">
+
+            <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
+
+            <div id="querydiv" [formGroup]="queryForm">
+                <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
+                    <ngb-panel id="collectionSelector">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.collectionSelector' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                            </select>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="metadataFieldQueries">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.metadataFieldQueries' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <fieldset id="predefqueries" class="form-group">
+                                <label>
+                                    {{'admin.reports.items.predefinedQueries' | translate}}
+                                </label>
+                                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                                    <option *ngFor="let item of presetQueries" [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
+                                </select>
+                            </fieldset>
+                            <div class="row">&nbsp;</div>
+                            <div id="queries">
+                                <div class="metadata" *ngFor="let pred of queryPredicatesArray().controls; let i = index">
+                                    <div [formGroup]="pred" class="form-group">
+                                        <div class="form-row">
+                                            <div class="col-4">
+                                                <select class="query-tool" formControlName="field" class="form-control">
+                                                    <option *ngFor="let item of metadataFieldsWithAny" [value]="item.id">{{item.name$ | async}}</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-auto">
+                                                <select class="query-tool" formControlName="operator" class="form-control">
+                                                    <option *ngFor="let item of predicates" [value]="item.id">{{item.name$ | async | translate}}</option>
+                                                </select>
+                                            </div>
+                                            <div class="col">
+                                                <input class="form-control" formControlName="value"/>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
+                                                &nbsp;
+                                                <button class="btn btn-light" [disabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="limitPaginateQueries">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.limitPaginateQueries' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="row align-items-center">
+                                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
+                                <div class="col-6">
+                                    <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                                        <option *ngFor="let item of pageLimits" value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
+                                <div class="col-6">
+                                    <input id="offset" name="offset" value="0" class="form-control col-6">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="filters">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.commons.filters' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                            <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="additionalData">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.commons.additional-data' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div id="show-fields">
+                                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                                    <option *ngFor="let item of metadataFields" [value]="item.id">{{item.name$ | async}}</option>
+                                </select>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="itemResults">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.collections.item-results' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <table id="table" class="table table-striped">
+                                <thead>
+                                    <tr class="header">
+                                        <th>{{ "admin.reports.items.number" | translate }}</th>
+                                        <th>{{ "admin.reports.items.id" | translate }}</th>
+                                        <th>{{ "admin.reports.items.collection" | translate }}</th>
+                                        <th>{{ "admin.reports.items.handle" | translate }}</th>
+                                        <th>{{ "admin.reports.items.title" | translate }}</th>
+                                        <th *ngFor="let field of queryForm.value['additionalFields']">{{ field }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr *ngFor="let item of results$ | async">
+                                        <td class="num">{{ item.index }}</td>
+                                        <td>{{ item.uuid }}</td>
+                                        <td><a *ngIf="item.owningCollection" href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a></td>
+                                        <td><a *ngIf="item.handle" href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a></td>
+                                        <td>{{ item.name }}</td>
+                                        <td class="num" *ngFor="let field of queryForm.value['additionalFields']">
+                                            <span *ngFor="let mdvalue of item.metadata[field]">
+                                                {{ mdvalue.value || "" }}
+                                            </span>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <div>
+                                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
+                            </div>
+                            <div>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [disabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [disabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+<!--
+                                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
+-->
+                            </div>
+                            <table id="itemtable" class="sortable"></table>
+                        </ng-template>
+                    </ngb-panel>
+                </ngb-accordion>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss b/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss
new file mode 100644
index 0000000000..73ce5275e5
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss
@@ -0,0 +1,3 @@
+.num {
+    text-align: center;
+}
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.scss b/src/app/admin/admin-reports/filtered-items/filtered-items.component.spec.ts
similarity index 100%
rename from src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.scss
rename to src/app/admin/admin-reports/filtered-items/filtered-items.component.spec.ts
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
new file mode 100644
index 0000000000..c63880ae48
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -0,0 +1,348 @@
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { CommunityDataService } from 'src/app/core/data/community-data.service';
+import { MetadataFieldDataService } from 'src/app/core/data/metadata-field-data.service';
+import { MetadataSchemaDataService } from 'src/app/core/data/metadata-schema-data.service';
+import { RestRequestMethod } from 'src/app/core/data/rest-request-method';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
+import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
+import { Collection } from 'src/app/core/shared/collection.model';
+import { Community } from 'src/app/core/shared/community.model';
+import { Item } from 'src/app/core/shared/item.model';
+import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators';
+import { isEmpty } from 'src/app/shared/empty.util';
+import { environment } from 'src/environments/environment';
+
+import { FiltersComponent } from '../filters-section/filters-section.component';
+import { FilteredItems } from './filtered-items-model';
+import { OptionVO } from './option-vo.model';
+import { PresetQuery } from './preset-query.model';
+import { QueryPredicate } from './query-predicate.model';
+
+/**
+ * Component representing the Filtered Items content report.
+ */
+@Component({
+  selector: 'ds-report-filtered-items',
+  templateUrl: './filtered-items.component.html',
+  styleUrls: ['./filtered-items.component.scss'],
+})
+export class FilteredItemsComponent {
+
+  collections: OptionVO[];
+  presetQueries: PresetQuery[];
+  metadataFields: OptionVO[];
+  metadataFieldsWithAny: OptionVO[];
+  predicates: OptionVO[];
+  pageLimits: OptionVO[];
+
+  queryForm: FormGroup;
+  currentPage = 0;
+  results: FilteredItems = new FilteredItems();
+  results$: Observable<Item[]>;
+  @ViewChild('acc') accordionComponent: NgbAccordion;
+
+  constructor(
+    private communityService: CommunityDataService,
+    private collectionService: CollectionDataService,
+    private metadataSchemaService: MetadataSchemaDataService,
+    private metadataFieldService: MetadataFieldDataService,
+    private translateService: TranslateService,
+    private formBuilder: FormBuilder,
+    private restService: DspaceRestService) {}
+
+  ngOnInit() {
+    this.loadCollections();
+    this.loadPresetQueries();
+    this.loadMetadataFields();
+    this.loadPredicates();
+    this.loadPageLimits();
+
+    const formQueryPredicates: FormGroup[] = [
+      new QueryPredicate().toFormGroup(this.formBuilder),
+    ];
+
+    this.queryForm = this.formBuilder.group({
+      collections: this.formBuilder.control([''], []),
+      presetQuery: this.formBuilder.control('new', []),
+      queryPredicates: this.formBuilder.array(formQueryPredicates),
+      pageLimit: this.formBuilder.control('10', []),
+      filters: FiltersComponent.formGroup(this.formBuilder),
+      additionalFields: this.formBuilder.control([], []),
+    });
+  }
+
+  loadCollections(): void {
+    this.collections = [];
+    const wholeRepo$ = this.translateService.stream('admin.reports.items.wholeRepo');
+    this.collections.push(OptionVO.collectionLoc('', wholeRepo$));
+
+    this.communityService.findAll({ elementsPerPage: 10000, currentPage: 1 }).pipe(
+      getFirstSucceededRemoteListPayload(),
+    ).subscribe(
+      (communitiesRest: Community[]) => {
+        communitiesRest.forEach(community => {
+          const commVO = OptionVO.collection(community.uuid, community.name, true);
+          this.collections.push(commVO);
+
+          this.collectionService.findByParent(community.uuid, { elementsPerPage: 10000, currentPage: 1 }).pipe(
+            getFirstSucceededRemoteListPayload(),
+          ).subscribe(
+            (collectionsRest: Collection[]) => {
+              collectionsRest.filter(collection => collection.firstMetadataValue('dspace.entity.type') === 'Publication')
+                .forEach(collection => {
+                  const collVO = OptionVO.collection(collection.uuid, '–' + collection.name);
+                  this.collections.push(collVO);
+                });
+            },
+          );
+        });
+      },
+    );
+  }
+
+  loadPresetQueries(): void {
+    this.presetQueries = [
+      PresetQuery.of('new', 'admin.reports.items.preset.new', []),
+      PresetQuery.of('q1', 'admin.reports.items.preset.hasNoTitle', [
+        QueryPredicate.of('dc.title', QueryPredicate.DOES_NOT_EXIST),
+      ]),
+      PresetQuery.of('q2', 'admin.reports.items.preset.hasNoIdentifierUri', [
+        QueryPredicate.of('dc.identifier.uri', QueryPredicate.DOES_NOT_EXIST),
+      ]),
+      PresetQuery.of('q3', 'admin.reports.items.preset.hasCompoundSubject', [
+        QueryPredicate.of('dc.subject.*', QueryPredicate.LIKE, '%;%'),
+      ]),
+      PresetQuery.of('q4', 'admin.reports.items.preset.hasCompoundAuthor', [
+        QueryPredicate.of('dc.contributor.author', QueryPredicate.LIKE, '% and %'),
+      ]),
+      PresetQuery.of('q5', 'admin.reports.items.preset.hasCompoundCreator', [
+        QueryPredicate.of('dc.creator', QueryPredicate.LIKE, '% and %'),
+      ]),
+      PresetQuery.of('q6', 'admin.reports.items.preset.hasUrlInDescription', [
+        QueryPredicate.of('dc.description', QueryPredicate.MATCHES, '^.*(http://|https://|mailto:).*$'),
+      ]),
+      PresetQuery.of('q7', 'admin.reports.items.preset.hasFullTextInProvenance', [
+        QueryPredicate.of('dc.description.provenance', QueryPredicate.MATCHES, '^.*No\. of bitstreams(.|\r|\n|\r\n)*\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$'),
+      ]),
+      PresetQuery.of('q8', 'admin.reports.items.preset.hasNonFullTextInProvenance', [
+        QueryPredicate.of('dc.description.provenance', QueryPredicate.DOES_NOT_MATCH, '^.*No\. of bitstreams(.|\r|\n|\r\n)*\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$'),
+      ]),
+      PresetQuery.of('q9', 'admin.reports.items.preset.hasEmptyMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^\s*$'),
+      ]),
+      PresetQuery.of('q10', 'admin.reports.items.preset.hasUnbreakingDataInDescription', [
+        QueryPredicate.of('dc.description.*', QueryPredicate.MATCHES, '^.*[^\s]{50,}.*$'),
+      ]),
+      PresetQuery.of('q12', 'admin.reports.items.preset.hasXmlEntityInMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^.*&#.*$'),
+      ]),
+      PresetQuery.of('q13', 'admin.reports.items.preset.hasNonAsciiCharInMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^.*[^[:ascii:]].*$'),
+      ]),
+    ];
+  }
+
+  loadMetadataFields(): void {
+    this.metadataFields = [];
+    this.metadataFieldsWithAny = [];
+    const anyField$ = this.translateService.stream('admin.reports.items.anyField');
+    this.metadataFieldsWithAny.push(OptionVO.itemLoc('*', anyField$));
+    this.metadataSchemaService.findAll({ elementsPerPage: 10000, currentPage: 1 }).pipe(
+      getFirstSucceededRemoteListPayload(),
+    ).subscribe(
+      (schemasRest: MetadataSchema[]) => {
+        schemasRest.forEach(schema => {
+          this.metadataFieldService.findBySchema(schema, { elementsPerPage: 10000, currentPage: 1 }).pipe(
+            getFirstSucceededRemoteListPayload(),
+          ).subscribe(
+            (fieldsRest: MetadataField[]) => {
+              fieldsRest.forEach(field => {
+                let fieldName = schema.prefix + '.' + field.toString();
+                let fieldVO = OptionVO.item(fieldName, fieldName);
+                this.metadataFields.push(fieldVO);
+                this.metadataFieldsWithAny.push(fieldVO);
+                if (isEmpty(field.qualifier)) {
+                  fieldName = schema.prefix + '.' + field.element + '.*';
+                  fieldVO = OptionVO.item(fieldName, fieldName);
+                  this.metadataFieldsWithAny.push(fieldVO);
+                }
+              });
+            },
+          );
+        });
+      },
+    );
+  }
+
+  loadPredicates(): void {
+    this.predicates = [
+      OptionVO.item(QueryPredicate.EXISTS, 'admin.reports.items.predicate.exists'),
+      OptionVO.item(QueryPredicate.DOES_NOT_EXIST, 'admin.reports.items.predicate.doesNotExist'),
+      OptionVO.item(QueryPredicate.EQUALS, 'admin.reports.items.predicate.equals'),
+      OptionVO.item(QueryPredicate.DOES_NOT_EQUAL, 'admin.reports.items.predicate.doesNotEqual'),
+      OptionVO.item(QueryPredicate.LIKE, 'admin.reports.items.predicate.like'),
+      OptionVO.item(QueryPredicate.NOT_LIKE, 'admin.reports.items.predicate.notLike'),
+      OptionVO.item(QueryPredicate.CONTAINS, 'admin.reports.items.predicate.contains'),
+      OptionVO.item(QueryPredicate.DOES_NOT_CONTAIN, 'admin.reports.items.predicate.doesNotContain'),
+      OptionVO.item(QueryPredicate.MATCHES, 'admin.reports.items.predicate.matches'),
+      OptionVO.item(QueryPredicate.DOES_NOT_MATCH, 'admin.reports.items.predicate.doesNotMatch'),
+    ];
+  }
+
+  loadPageLimits(): void {
+    this.pageLimits = [
+      OptionVO.item('10', '10'),
+      OptionVO.item('25', '25'),
+      OptionVO.item('50', '50'),
+      OptionVO.item('100', '100'),
+    ];
+  }
+
+  queryPredicatesArray(): FormArray {
+    return (this.queryForm.get('queryPredicates') as FormArray);
+  }
+
+  addQueryPredicate(newItem: FormGroup = new QueryPredicate().toFormGroup(this.formBuilder)) {
+    this.queryPredicatesArray().push(newItem);
+  }
+
+  deleteQueryPredicateDisabled(): boolean {
+    return this.queryPredicatesArray().length < 2;
+  }
+
+  deleteQueryPredicate(index: number, nbToDelete: number = 1) {
+    if (index > -1) {
+      this.queryPredicatesArray().removeAt(index);
+    }
+  }
+
+  setPresetQuery() {
+    const queryField = this.queryForm.controls.presetQuery as FormControl;
+    const value = queryField.value;
+    const query = this.presetQueries.find(q => q.id === value);
+    if (query !== undefined) {
+      this.queryPredicatesArray().clear();
+      query.predicates
+        .map(qp => qp.toFormGroup(this.formBuilder))
+        .forEach(qp => this.addQueryPredicate(qp));
+      if (query.predicates.length === 0) {
+        this.addQueryPredicate(new QueryPredicate().toFormGroup(this.formBuilder));
+      }
+    }
+  }
+
+  filtersFormGroup(): FormGroup {
+    return this.queryForm.get('filters') as FormGroup;
+  }
+
+  private pageSize() {
+    const form = this.queryForm.value;
+    return form.pageLimit;
+  }
+
+  canNavigatePrevious(): boolean {
+    return this.currentPage > 0;
+  }
+
+  prevPage() {
+    if (this.canNavigatePrevious()) {
+      this.currentPage--;
+      this.resubmit();
+    }
+  }
+
+  pageCount(): number {
+    const total = this.results.itemCount || 0;
+    return Math.ceil(total / this.pageSize());
+  }
+
+  canNavigateNext(): boolean {
+    return this.currentPage + 1 < this.pageCount();
+  }
+
+  nextPage() {
+    if (this.canNavigateNext()) {
+      this.currentPage++;
+      this.resubmit();
+    }
+  }
+
+  submit() {
+    this.accordionComponent.expand('itemResults');
+    this.currentPage = 0;
+    this.resubmit();
+  }
+
+  resubmit() {
+    this.results$ = this
+      .getFilteredItems()
+      .pipe(
+        map(response => {
+          const offset = this.currentPage * this.pageSize();
+          this.results.deserialize(response.payload, offset);
+          return this.results.items;
+        }),
+      );
+  }
+
+  getFilteredItems(): Observable<RawRestResponse> {
+    let params = this.toQueryString();
+    if (params.length > 0) {
+      params = `?${params}`;
+    }
+    const scheme = environment.rest.ssl ? 'https' : 'http';
+    const urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
+    return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filtereditems${params}`);
+  }
+
+  private toQueryString(): string {
+    let params = `pageNumber=${this.currentPage}&pageLimit=${this.pageSize()}`;
+
+    const colls = this.queryForm.value.collections;
+    for (let i = 0; i < colls.length; i++) {
+      params += `&collections=${colls[i]}`;
+    }
+
+    const preds = this.queryForm.value.queryPredicates;
+    for (let i = 0; i < preds.length; i++) {
+      const field = preds[i].field;
+      const op = preds[i].operator;
+      const value = preds[i].value;
+      params += `&queryPredicates=${field}:${op}`;
+      if (value) {
+        params += `:${value}`;
+      }
+    }
+
+    const filters = FiltersComponent.toQueryString(this.queryForm.value.filters);
+    if (filters.length > 0) {
+      params += `&${filters}`;
+    }
+
+    const addFlds = this.queryForm.value.additionalFields;
+    for (let i = 0; i < addFlds.length; i++) {
+      params += `&additionalFields=${addFlds[i]}`;
+    }
+
+    return params;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
new file mode 100644
index 0000000000..56334b041f
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
@@ -0,0 +1,50 @@
+import { Observable } from 'rxjs';
+
+/**
+ * Component representing an option in each selectable list of values
+ * used in the Filtered Items report query interface
+ */
+export class OptionVO {
+
+  id: string;
+  name$: Observable<string>;
+  disabled = false;
+
+  static collection(id: string, name: string, disabled: boolean = false): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = OptionVO.toObservable(name);
+    opt.disabled = disabled;
+    return opt;
+  }
+
+  static collectionLoc(id: string, name$: Observable<string>, disabled: boolean = false): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = name$;
+    opt.disabled = disabled;
+    return opt;
+  }
+
+  static item(id: string, name: string): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = OptionVO.toObservable(name);
+    return opt;
+  }
+
+  static itemLoc(id: string, name$: Observable<string>): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = name$;
+    return opt;
+  }
+
+  private static toObservable<T>(value: T): Observable<T> {
+    return new Observable<T>(subscriber => {
+      subscriber.next(value);
+      subscriber.complete();
+    });
+
+  }
+}
diff --git a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
new file mode 100644
index 0000000000..213819b70e
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
@@ -0,0 +1,17 @@
+import { QueryPredicate } from './query-predicate.model';
+
+export class PresetQuery {
+
+  id: string;
+  label: string;
+  predicates: QueryPredicate[];
+
+  static of(id: string, label: string, predicates: QueryPredicate[]) {
+    const query = new PresetQuery();
+    query.id = id;
+    query.label = label;
+    query.predicates = predicates;
+    return query;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts b/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts
new file mode 100644
index 0000000000..1c12d72e27
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts
@@ -0,0 +1,40 @@
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+
+export class QueryPredicate {
+
+  static EXISTS = 'exists';
+  static DOES_NOT_EXIST = 'doesnt_exist';
+  static EQUALS = 'equals';
+  static DOES_NOT_EQUAL = 'not_equals';
+  static LIKE = 'like';
+  static NOT_LIKE = 'not_like';
+  static CONTAINS = 'contains';
+  static DOES_NOT_CONTAIN = 'doesnt_contain';
+  static MATCHES = 'matches';
+  static DOES_NOT_MATCH = 'doesnt_match';
+
+  field = '*';
+  operator: string;
+  value: string;
+
+  static of(field: string, operator: string, value: string = '') {
+    const pred = new QueryPredicate();
+    pred.field = field;
+    pred.operator = operator;
+    pred.value = value;
+    return pred;
+  }
+
+  toFormGroup(formBuilder: FormBuilder): FormGroup {
+    return formBuilder.group({
+      field: new FormControl(this.field),
+      operator: new FormControl(this.operator),
+      value: new FormControl(this.value),
+    });
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filter-group.model.ts b/src/app/admin/admin-reports/filters-section/filter-group.model.ts
new file mode 100644
index 0000000000..975b43a986
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filter-group.model.ts
@@ -0,0 +1,19 @@
+import { Filter } from './filter.model';
+
+export class FilterGroup {
+
+  id: string;
+  key: string;
+
+  constructor(id: string, public filters: Filter[]) {
+    this.id = id;
+    this.key = 'admin.reports.commons.filters.' + id;
+    filters.forEach(filter => {
+      filter.key = this.key + '.' + filter.id;
+      if (filter.hasTooltip) {
+        filter.tooltipKey = filter.key + '.tooltip';
+      }
+    });
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filter.model.ts b/src/app/admin/admin-reports/filters-section/filter.model.ts
new file mode 100644
index 0000000000..63eeb114cd
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filter.model.ts
@@ -0,0 +1,8 @@
+export class Filter {
+
+  key: string;
+  tooltipKey: string;
+
+  constructor(public id: string, public hasTooltip: boolean = false) {}
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
new file mode 100644
index 0000000000..1e7856f09c
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -0,0 +1,19 @@
+<fieldset class="row row-cols-2">
+    <ng-container>
+        <span class="col-12">&nbsp;</span>
+        <span class="col-1">&nbsp;</span>
+        <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
+        <span class="col-2">&nbsp;</span>
+        <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
+        <span class="col-1">&nbsp;</span>
+        <span class="col-12">&nbsp;</span>
+    </ng-container>
+</fieldset>
+<fieldset class="row row-cols-2" *ngFor="let group of allFilters()">
+    <legend>{{group.key | translate}}</legend>
+    <ng-container [formGroup]="filtersForm">
+        <div *ngFor="let filter of group.filters" class="col-6">
+            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1 align-baseline" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
+        </div>
+    </ng-container>
+</fieldset>
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
similarity index 100%
rename from src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
rename to src/app/admin/admin-reports/filters-section/filters-section.component.scss
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts
new file mode 100644
index 0000000000..6b8b069f93
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts
@@ -0,0 +1,109 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormBuilder } from '@angular/forms';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+
+import { FiltersComponent } from './filters-section.component';
+
+describe('FiltersComponent', () => {
+  let component: FiltersComponent;
+  let fixture: ComponentFixture<FiltersComponent>;
+  let formBuilder: FormBuilder;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [FiltersComponent],
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      providers: [
+        FormBuilder,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(waitForAsync(() => {
+    formBuilder = TestBed.inject(FormBuilder);
+
+    fixture = TestBed.createComponent(FiltersComponent);
+    component = fixture.componentInstance;
+    component.filtersForm = FiltersComponent.formGroup(formBuilder);
+    fixture.detectChanges();
+  }));
+
+  const isOneSelected = (values: any): boolean => {
+    let oneSelected = false;
+    let allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; !oneSelected && i < allFilters.length; i++) {
+      let group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        let filter = group.filters[j];
+        oneSelected = oneSelected || values[filter.id];
+      }
+    }
+    return oneSelected;
+  };
+
+  const isAllSelected = (values: any): boolean => {
+    let allSelected = true;
+    let allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; allSelected && i < allFilters.length; i++) {
+      let group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        let filter = group.filters[j];
+        allSelected = allSelected && values[filter.id];
+      }
+    }
+    return allSelected;
+  };
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should select all checkboxes', () => {
+    // By default, nothing is selected, so at least one item is not selected.
+    let values = component.filtersForm.value;
+    let allSelected: boolean = isAllSelected(values);
+    expect(allSelected).toBeFalse();
+
+    // Now we select everything...
+    component.selectAll();
+
+    // We must retrieve the form values again since selectAll() injects a new dictionary.
+    values = component.filtersForm.value;
+    allSelected = isAllSelected(values);
+    expect(allSelected).toBeTrue();
+  });
+
+  it('should deselect all checkboxes', () => {
+    // Since nothing is selected by default, we select at least an item
+    // so that deselectAll() actually deselects something.
+    let values = component.filtersForm.value;
+    values.is_item = true;
+    let oneSelected: boolean = isOneSelected(values);
+    expect(oneSelected).toBeTrue();
+
+    // Now we deselect everything...
+    component.deselectAll();
+
+    // We must retrieve the form values again since deselectAll() injects a new dictionary.
+    values = component.filtersForm.value;
+    oneSelected = isOneSelected(values);
+    expect(oneSelected).toBeFalse();
+  });
+});
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
new file mode 100644
index 0000000000..a739d849f8
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -0,0 +1,157 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+
+import { Filter } from './filter.model';
+import { FilterGroup } from './filter-group.model';
+
+/**
+ * Component representing the Query Filters section used in both
+ * Filtered Collections and Filtered Items content reports
+ */
+@Component({
+  selector: 'ds-filters',
+  templateUrl: './filters-section.component.html',
+  styleUrls: ['./filters-section.component.scss'],
+})
+export class FiltersComponent {
+
+  static FILTERS = [
+    new FilterGroup('property', [
+      new Filter('is_item'),
+      new Filter('is_withdrawn'),
+      new Filter('is_not_withdrawn'),
+      new Filter('is_discoverable'),
+      new Filter('is_not_discoverable'),
+    ]),
+    new FilterGroup('bitstream', [
+      new Filter('has_multiple_originals'),
+      new Filter('has_no_originals'),
+      new Filter('has_one_original'),
+    ]),
+    new FilterGroup('bitstream_mime', [
+      new Filter('has_doc_original'),
+      new Filter('has_image_original'),
+      new Filter('has_unsupp_type'),
+      new Filter('has_mixed_original'),
+      new Filter('has_pdf_original'),
+      new Filter('has_jpg_original'),
+      new Filter('has_small_pdf'),
+      new Filter('has_large_pdf'),
+      new Filter('has_doc_without_text'),
+    ]),
+    new FilterGroup('mime', [
+      new Filter('has_only_supp_image_type'),
+      new Filter('has_unsupp_image_type'),
+      new Filter('has_only_supp_doc_type'),
+      new Filter('has_unsupp_doc_type'),
+    ]),
+    new FilterGroup('bundle', [
+      new Filter('has_unsupported_bundle'),
+      new Filter('has_small_thumbnail'),
+      new Filter('has_original_without_thumbnail'),
+      new Filter('has_invalid_thumbnail_name'),
+      new Filter('has_non_generated_thumb'),
+      new Filter('no_license'),
+      new Filter('has_license_documentation'),
+    ]),
+    new FilterGroup('permission', [
+      new Filter('has_restricted_original', true),
+      new Filter('has_restricted_thumbnail', true),
+      new Filter('has_restricted_metadata', true),
+    ]),
+  ];
+
+  @Input() filtersForm: FormGroup;
+
+  static formGroup(formBuilder: FormBuilder): FormGroup {
+    const fields = {};
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        fields[filter.id] = new FormControl(false);
+      }
+    }
+    return formBuilder.group(fields);
+  }
+
+  static getFilter(filterId: string): Filter {
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        if (filter.id === filterId) {
+          return filter;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  static getGroup(filterId: string): FilterGroup {
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        if (filter.id === filterId) {
+          return group;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  static toQueryString(filters: { [key: string]: any }): string {
+    let params = '';
+    let first = true;
+    for (const key in filters) {
+      if (filters[key]) {
+        if (first) {
+          first = false;
+        } else {
+          params += '&';
+        }
+        params += `filters=${key}`;
+      }
+    }
+    return params;
+  }
+
+  allFilters(): FilterGroup[] {
+    return FiltersComponent.FILTERS;
+  }
+
+  private setAllFilters(value: boolean) {
+    // I don't know why, but patchValue() with individual controls doesn't work.
+    // I therefore use setValue() with the whole set, which mercifully works...
+    const fields = {};
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        fields[filter.id] = value;
+      }
+    }
+    this.filtersForm.setValue(fields);
+  }
+
+  selectAll(): void {
+    this.setAllFilters(true);
+  }
+
+  deselectAll(): void {
+    this.setAllFilters(false);
+  }
+
+}
diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
index 3168ea93c9..bfcd16d18d 100644
--- a/src/app/admin/admin-routing-paths.ts
+++ b/src/app/admin/admin-routing-paths.ts
@@ -1,8 +1,30 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAdminModuleRoute } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifications-routing-paths';
 
 export const REGISTRIES_MODULE_PATH = 'registries';
+export const NOTIFICATIONS_MODULE_PATH = 'notifications';
+export const LDN_PATH = 'ldn';
+export const REPORTS_MODULE_PATH = 'reports';
+export const NOTIFY_DASHBOARD_MODULE_PATH = 'notify-dashboard';
+
 
 export function getRegistriesModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
 }
+
+export function getLdnServicesModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
+}
+
+export function getNotificationsModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
+}
+
+export function getNotificatioQualityAssuranceRoute() {
+  return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
+}
+
+export function getReportsModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), REPORTS_MODULE_PATH).toString();
+}
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 8e4f13b164..d9255e6482 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -1,64 +1,105 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
-import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
+import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
+import {
+  LDN_PATH,
+  NOTIFICATIONS_MODULE_PATH,
+  NOTIFY_DASHBOARD_MODULE_PATH,
+  REGISTRIES_MODULE_PATH,
+  REPORTS_MODULE_PATH,
+} from './admin-routing-paths';
+import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
+      {
+        path: NOTIFICATIONS_MODULE_PATH,
+        loadChildren: () => import('./admin-notifications/admin-notifications.module')
+          .then((m) => m.AdminNotificationsModule),
+      },
       {
         path: REGISTRIES_MODULE_PATH,
         loadChildren: () => import('./admin-registries/admin-registries.module')
           .then((m) => m.AdminRegistriesModule),
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'search',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminSearchPageComponent,
-        data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }
+        data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'workflow',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminWorkflowPageComponent,
-        data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }
+        data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'curation-tasks',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminCurationTasksComponent,
-        data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' }
+        data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'metadata-import',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: MetadataImportPageComponent,
-        data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' }
+        data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'batch-import',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: BatchImportPageComponent,
-        data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }
+        data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'system-wide-alert',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule),
-        data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}
+        data: { title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert' },
+        canActivate: [SiteAdministratorGuard],
       },
-    ])
+      {
+        path: LDN_PATH,
+        children: [
+          { path: '', pathMatch: 'full', redirectTo: 'services' },
+          {
+            path: 'services',
+            loadChildren: () => import('./admin-ldn-services/admin-ldn-services.module')
+              .then((m) => m.AdminLdnServicesModule),
+          },
+        ],
+      },
+      {
+        path: REPORTS_MODULE_PATH,
+        loadChildren: () => import('./admin-reports/admin-reports.module')
+          .then((m) => m.AdminReportsModule),
+      },
+      {
+        path: NOTIFY_DASHBOARD_MODULE_PATH,
+        loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard.module')
+          .then((m) => m.AdminNotifyDashboardModule),
+      },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class AdminRoutingModule {
 
diff --git a/src/app/admin/admin-search-page/admin-search-page.component.spec.ts b/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
index 7be486d7da..43c7d86a08 100644
--- a/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
@@ -1,7 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { AdminSearchPageComponent } from './admin-search-page.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminSearchPageComponent;
@@ -10,7 +14,7 @@ describe('AdminSearchPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [AdminSearchPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-page.component.ts b/src/app/admin/admin-search-page/admin-search-page.component.ts
index c9c6b84245..6508b20efa 100644
--- a/src/app/admin/admin-search-page/admin-search-page.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-page.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 
 @Component({
   selector: 'ds-admin-search-page',
   templateUrl: './admin-search-page.component.html',
-  styleUrls: ['./admin-search-page.component.scss']
+  styleUrls: ['./admin-search-page.component.scss'],
 })
 
 /**
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index 1ea27b36b6..249c6b15bb 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -1,27 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
-import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
-import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { FileService } from '../../../../../core/shared/file.service';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -37,7 +42,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
   }
 
   const linkService = jasmine.createSpyObj('linkService', {
-    resolveLink: {}
+    resolveLink: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -47,7 +52,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
         NoopAnimationsModule,
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([]),
-        SharedModule
+        SharedModule,
       ],
       declarations: [CollectionAdminSearchResultGridElementComponent],
       providers: [
@@ -58,7 +63,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
         { provide: FileService, useClass: FileServiceStub },
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: ThemeService, useValue: getMockThemeService() },
-      ]
+      ],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 1412090e0f..5d39b79da5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-collection-admin-search-result-list-element',
   styleUrls: ['./collection-admin-search-result-grid-element.component.scss'],
-  templateUrl: './collection-admin-search-result-grid-element.component.html'
+  templateUrl: './collection-admin-search-result-grid-element.component.html',
 })
 /**
  * The component for displaying a list element for a collection search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index 996366e20a..137f5be5f2 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -1,29 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
-import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
-import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { Community } from '../../../../../core/shared/community.model';
+import { FileService } from '../../../../../core/shared/file.service';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
@@ -39,7 +43,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
   }
 
   const linkService = jasmine.createSpyObj('linkService', {
-    resolveLink: {}
+    resolveLink: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -49,7 +53,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
         NoopAnimationsModule,
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([]),
-        SharedModule
+        SharedModule,
       ],
       declarations: [CommunityAdminSearchResultGridElementComponent],
       providers: [
@@ -61,7 +65,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: ThemeService, useValue: getMockThemeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index b0d603338b..9dd672e54c 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { Community } from '../../../../../core/shared/community.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-community-admin-search-result-grid-element',
   styleUrls: ['./community-admin-search-result-grid-element.component.scss'],
-  templateUrl: './community-admin-search-result-grid-element.component.html'
+  templateUrl: './community-admin-search-result-grid-element.component.html',
 })
 /**
  * The component for displaying a list element for a community search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
index c4b737849b..639c47f7f8 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
@@ -1,4 +1,4 @@
-<ng-template dsListableObject>
+<ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges>
   <ng-content></ng-content>
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
index ee3de42131..80bd4469f6 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -1,31 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
-import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
-import { AccessStatusObject } from '../../../../../shared/object-collection/shared/badges/access-status-badge/access-status.model';
-import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
 import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
-import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { AccessStatusObject } from '../../../../../shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
 import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
 
 describe('ItemAdminSearchResultGridElementComponent', () => {
   let component: ItemAdminSearchResultGridElementComponent;
@@ -36,13 +41,13 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
 
   const mockAccessStatusDataService = {
     findAccessStatusFor(item: Item): Observable<RemoteData<AccessStatusObject>> {
       return createSuccessfulRemoteDataObject$(new AccessStatusObject());
-    }
+    },
   };
 
   const mockThemeService = getMockThemeService();
@@ -63,7 +68,7 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
           NoopAnimationsModule,
           TranslateModule.forRoot(),
           RouterTestingModule.withRoutes([]),
-          SharedModule
+          SharedModule,
         ],
         providers: [
           { provide: TruncatableService, useValue: mockTruncatableService },
@@ -74,7 +79,7 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
           { provide: FileService, useClass: FileServiceStub },
           { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
index dab6694f36..b337df8ed2 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
@@ -1,40 +1,50 @@
-import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild } from '@angular/core';
+import {
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import {
   getListableObjectComponent,
-  listableObjectComponent
+  listableObjectComponent,
 } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-item-admin-search-result-grid-element',
   styleUrls: ['./item-admin-search-result-grid-element.component.scss'],
-  templateUrl: './item-admin-search-result-grid-element.component.html'
+  templateUrl: './item-admin-search-result-grid-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result on the admin search page
  */
-export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnDestroy, OnInit {
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
   @ViewChild('badges', { static: true }) badges: ElementRef;
   @ViewChild('buttons', { static: true }) buttons: ElementRef;
 
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
     protected truncatableService: TruncatableService,
     protected bitstreamDataService: BitstreamDataService,
     private themeService: ThemeService,
-    private componentFactoryResolver: ComponentFactoryResolver,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
   }
@@ -44,23 +54,32 @@ export class ItemAdminSearchResultGridElementComponent extends SearchResultGridE
    */
   ngOnInit(): void {
     super.ngOnInit();
-    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
+    const component: GenericConstructor<Component> = this.getComponent();
 
-    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
+    const viewContainerRef = this.dynamicComponentLoaderDirective.viewContainerRef;
     viewContainerRef.clear();
 
-    const componentRef = viewContainerRef.createComponent(
-      componentFactory,
-      0,
-      undefined,
-      [
-        [this.badges.nativeElement],
-        [this.buttons.nativeElement]
-      ]);
-    (componentRef.instance as any).object = this.object;
-    (componentRef.instance as any).index = this.index;
-    (componentRef.instance as any).linkType = this.linkType;
-    (componentRef.instance as any).listID = this.listID;
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+        projectableNodes: [
+          [this.badges.nativeElement],
+          [this.buttons.nativeElement],
+        ],
+      },
+    );
+    this.compRef.setInput('object',this.object);
+    this.compRef.setInput('index', this.index);
+    this.compRef.setInput('linkType', this.linkType);
+    this.compRef.setInput('listID', this.listID);
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
   }
 
   /**
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
index 8937847ff5..cd7e7a237b 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -1,20 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
 
 describe('CollectionAdminSearchResultListElementComponent', () => {
   let component: CollectionAdminSearchResultListElementComponent;
@@ -34,13 +38,13 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [CollectionAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 8bcf20b230..4ca4c3af4d 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-collection-admin-search-result-list-element',
   styleUrls: ['./collection-admin-search-result-list-element.component.scss'],
-  templateUrl: './collection-admin-search-result-list-element.component.html'
+  templateUrl: './collection-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a collection search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
index 110d77b1e5..3c1315cc64 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -1,20 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../../../core/shared/community.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
 
 describe('CommunityAdminSearchResultListElementComponent', () => {
   let component: CommunityAdminSearchResultListElementComponent;
@@ -34,13 +38,13 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [CommunityAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 9419ae3f3f..a3f8b42a13 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { Community } from '../../../../../core/shared/community.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-community-admin-search-result-list-element',
   styleUrls: ['./community-admin-search-result-list-element.component.scss'],
-  templateUrl: './community-admin-search-result-list-element.component.html'
+  templateUrl: './community-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a community search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
index 667e8edea9..f34c2709d8 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
 
 describe('ItemAdminSearchResultListElementComponent', () => {
   let component: ItemAdminSearchResultListElementComponent;
@@ -31,13 +36,13 @@ describe('ItemAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [ItemAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
index b1dea11341..c181640c2c 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-item-admin-search-result-list-element',
   styleUrls: ['./item-admin-search-result-list-element.component.scss'],
-  templateUrl: './item-admin-search-result-list-element.component.html'
+  templateUrl: './item-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
index f354ac5f89..33a2cacb80 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
@@ -1,21 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Item } from '../../../core/shared/item.model';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
 } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
+import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
 
 describe('ItemAdminSearchResultActionsComponent', () => {
   let component: ItemAdminSearchResultActionsComponent;
@@ -34,10 +38,10 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [ItemAdminSearchResultActionsComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index fcc3cf0f17..54f6c82f3b 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,20 +1,24 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Item } from '../../../core/shared/item.model';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
-  ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_DELETE_PATH,
-  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
 } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-admin-search-result-actions-element',
   styleUrls: ['./item-admin-search-result-actions.component.scss'],
-  templateUrl: './item-admin-search-result-actions.component.html'
+  templateUrl: './item-admin-search-result-actions.component.html',
 })
 /**
  * The component for displaying the actions for a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts
index 353d6dd498..f8eec908ff 100644
--- a/src/app/admin/admin-search-page/admin-search.module.ts
+++ b/src/app/admin/admin-search-page/admin-search.module.ts
@@ -1,16 +1,17 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminSearchPageComponent } from './admin-search-page.component';
-import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
-import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
-import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
-import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
-import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
-import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
-import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component';
+
 import { JournalEntitiesModule } from '../../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../../entity-groups/research-entities/research-entities.module';
 import { SearchModule } from '../../shared/search/search.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminSearchPageComponent } from './admin-search-page.component';
+import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
+import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
+import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
+import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
+import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
+import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
+import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -20,7 +21,7 @@ const ENTRY_COMPONENTS = [
   ItemAdminSearchResultGridElementComponent,
   CommunityAdminSearchResultGridElementComponent,
   CollectionAdminSearchResultGridElementComponent,
-  ItemAdminSearchResultActionsComponent
+  ItemAdminSearchResultActionsComponent,
 ];
 
 @NgModule({
@@ -28,12 +29,12 @@ const ENTRY_COMPONENTS = [
     SearchModule,
     SharedModule.withEntryComponents(),
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: [
     AdminSearchPageComponent,
-    ...ENTRY_COMPONENTS
-  ]
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class AdminSearchModule {
   /**
@@ -43,7 +44,7 @@ export class AdminSearchModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 7f1e8716ba..24ba17fff4 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,23 +1,21 @@
-<div class="sidebar-section">
-    <a class="nav-item nav-link d-flex flex-row flex-nowrap"
-       [ngClass]="{ disabled: isDisabled }"
-       [attr.aria-disabled]="isDisabled"
-       [attr.aria-labelledby]="'sidebarName-' + section.id"
-       [title]="('menu.section.icon.' + section.id) | translate"
-       [routerLink]="itemModel.link"
-       (keyup.space)="navigate($event)"
-       (keyup.enter)="navigate($event)"
-       href="javascript:void(0);"
-    >
-      <div class="shortcut-icon">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+<div>
+  <a class="sidebar-section-wrapper"
+     [ngClass]="{ disabled: isDisabled }"
+     role="menuitem"
+     [attr.aria-disabled]="isDisabled"
+     [attr.aria-labelledby]="adminMenuSectionTitleId(section.id)"
+     [routerLink]="itemModel.link"
+     (keyup.space)="navigate($event)"
+     (keyup.enter)="navigate($event)"
+     href="javascript:void(0);"
+  >
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
+      <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+        <span [id]="adminMenuSectionTitleId(section.id)">{{itemModel.text | translate}}</span>
       </div>
-      <div class="sidebar-collapsible">
-        <div class="toggle">
-          <span id="sidebarName-{{section.id}}" class="section-header-text">
-            {{itemModel.text | translate}}
-          </span>
-        </div>
-      </div>
-    </a>
+    </div>
+  </a>
 </div>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
index 260a364d7a..3131899c49 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
@@ -1,15 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
-import { Component } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { AdminSidebarSectionComponent } from './admin-sidebar-section.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminSidebarSectionComponent', () => {
   let component: AdminSidebarSectionComponent;
@@ -24,14 +28,14 @@ describe('AdminSidebarSectionComponent', () => {
         imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
         declarations: [AdminSidebarSectionComponent, TestComponent],
         providers: [
-          {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com'}, icon: iconString}},
-          {provide: MenuService, useValue: menuService},
-          {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-        ]
+          { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } },
+          { provide: MenuService, useValue: menuService },
+          { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        ],
       }).overrideComponent(AdminSidebarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -48,7 +52,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should not contain the disabled class', () => {
@@ -64,14 +68,14 @@ describe('AdminSidebarSectionComponent', () => {
         imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
         declarations: [AdminSidebarSectionComponent, TestComponent],
         providers: [
-          {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com', disabled: true}, icon: iconString}},
-          {provide: MenuService, useValue: menuService},
-          {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-        ]
+          { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com', disabled: true }, icon: iconString } },
+          { provide: MenuService, useValue: menuService },
+          { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        ],
       }).overrideComponent(AdminSidebarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -88,7 +92,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should contain the disabled class', () => {
@@ -102,7 +106,7 @@ describe('AdminSidebarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index d6cd803622..d677c7f8ba 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -1,19 +1,24 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
-import { MenuService } from '../../../shared/menu/menu.service';
-import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
-import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
-import { MenuSection } from '../../../shared/menu/menu-section.model';
-import { MenuID } from '../../../shared/menu/menu-id.model';
-import { isEmpty } from '../../../shared/empty.util';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
+import { isEmpty } from '../../../shared/empty.util';
+import { MenuService } from '../../../shared/menu/menu.service';
+import { MenuID } from '../../../shared/menu/menu-id.model';
+import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
+import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
+import { MenuSection } from '../../../shared/menu/menu-section.model';
+import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
+
 /**
  * Represents a non-expandable section in the admin sidebar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-admin-sidebar-section]',
+  selector: 'ds-admin-sidebar-section',
   templateUrl: './admin-sidebar-section.component.html',
   styleUrls: ['./admin-sidebar-section.component.scss'],
 
@@ -53,4 +58,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
       this.router.navigate(this.itemModel.link);
     }
   }
+
+  adminMenuSectionId(sectionId: string) {
+    return `admin-menu-section-${sectionId}`;
+  }
+
+  adminMenuSectionTitleId(sectionId: string) {
+    return `admin-menu-section-${sectionId}-title`;
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index ef220b834b..f3d5409a64 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,55 +1,63 @@
-<nav class="navbar navbar-dark p-0"
-     [ngClass]="{'active': sidebarOpen, 'inactive': sidebarClosed}"
+<nav class="navbar navbar-dark p-0 vh-100"
+     id="admin-sidebar"
+     [attr.aria-label]="'menu.header.nav.description' | translate"
+     [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
      [@slideSidebar]="{
-      value: (!(sidebarExpanded | async) ? 'collapsed' : 'expanded'),
-      params: {sidebarWidth: (sidebarWidth | async)}
+      value: ((sidebarExpanded | async) !== true ? 'collapsed' : 'expanded'),
+      params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
      }" (@slideSidebar.done)="finishSlide($event)" (@slideSidebar.start)="startSlide($event)"
      *ngIf="menuVisible | async"
      (mouseenter)="handleMouseEnter($event)"
-     (mouseleave)="handleMouseLeave($event)"
-     role="navigation" [attr.aria-label]="'menu.header.admin.description' |translate">
-    <div class="sidebar-top-level-items">
-        <ul class="navbar-nav">
-            <li class="admin-menu-header">
-              <div class="sidebar-section">
-                <div href="javascript:void(0);" class="nav-item d-flex flex-row flex-nowrap py-0">
-                  <div class="shortcut-icon navbar-brand logo-wrapper">
-                    <img class="admin-logo" src="assets/images/dspace-logo-mini.svg"
-                         [alt]="('menu.header.image.logo') | translate">
-                  </div>
-                  <div class="sidebar-collapsible navbar-brand">
-                    <div class="mr-0">
-                      <h4 class="section-header-text mb-0">{{ 'menu.header.admin' | translate }}</h4>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </li>
+     (mouseleave)="handleMouseLeave($event)">
 
-            <ng-container *ngFor="let section of (sections | async)">
-                <ng-container
-                        *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-            </ng-container>
-        </ul>
-    </div>
-    <div class="navbar-nav">
-        <div class="sidebar-section" id="sidebar-collapse-toggle">
-            <a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
-               href="javascript:void(0);"
-               (click)="toggle($event)"
-               (keyup.space)="toggle($event)"
-            >
-              <div class="shortcut-icon">
-                <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
-                   [title]="'menu.section.icon.pin' | translate"></i>
-                <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
-                   [title]="'menu.section.icon.unpin' | translate"></i>
-              </div>
-              <div class="sidebar-collapsible">
-                <span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
-                <span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
-              </div>
-            </a>
+  <!-- HEADER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
+    <div class="sidebar-section-wrapper">
+      <div class="sidebar-fixed-element-wrapper">
+        <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
         </div>
+      </div>
     </div>
+  </div>
+
+  <!-- ITEMS -->
+
+  <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
+    <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+        [attr.aria-label]="'menu.header.admin.description' |translate">
+      <ng-container *ngFor="let section of (sections | async)">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+      </ng-container>
+    </div>
+  </div>
+
+  <!-- TOGGLER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
+    <a class="sidebar-section-wrapper sidebar-full-width-container"
+       id="sidebar-collapse-toggle"
+       href="javascript:void(0);"
+       (click)="toggle($event)"
+       (keyup.space)="toggle($event)"
+    >
+      <div class="sidebar-fixed-element-wrapper">
+        <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
+           [title]="'menu.section.icon.pin' | translate"></i>
+                <i *ngIf="(menuCollapsed | async) !== true" class="fas fa-fw fa-angle-double-left"
+           [title]="'menu.section.icon.unpin' | translate"></i>
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+        </div>
+      </div>
+    </a>
+  </div>
+
 </nav>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
index 5ed0142c7f..d3607ca625 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.scss
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
@@ -1,123 +1,140 @@
 :host {
-  --ds-icon-z-index: 10;
 
-    left: 0;
-    top: 0;
-    height: 100vh;
-    flex: 1 1 auto;
-    nav {
-        background-color: var(--ds-admin-sidebar-bg);
-        height: 100%;
-        flex-direction: column;
-        > div {
-            width: 100%;
-            &.sidebar-top-level-items {
-                flex: 1;
-                overflow: auto;
-                @include dark-scrollbar;
-            }
+  /* SIDEBAR SIZE AND POSITION */
+
+  /* Sidebar hierarchy:
+   § nav
+     § .sidebar-full-width-container (any OPTIONAL full width element with no horizontal margin or padding - it can be nested)
+       § .sidebar-section-wrapper
+         § .sidebar-fixed-element-wrapper
+         § .sidebar-collapsible-element-outer-wrapper
+           § .sidebar-collapsible-element-inner-wrapper
+             § .sidebar-item
+   */
+
+  // Sidebar position
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: var(--ds-sidebar-z-index);
+
+  // Sidebar size and content position
+  nav#admin-sidebar {
+
+    max-width: var(--ds-admin-sidebar-fixed-element-width); // Sidebar collapsed width
+
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+
+    div#sidebar-top-level-items-container {
+      flex: 1 1 auto; // Fill available vertical space
+      overflow-x: hidden;
+      overflow-y: auto;
+      @include dark-scrollbar;
+    }
+
+    img#admin-sidebar-logo {
+      height: var(--ds-admin-sidebar-logo-height);
+    }
+
+    ::ng-deep {
+
+      // This class must be applied to any nested wrapper containing a sidebar section
+      .sidebar-full-width-container {
+        width: 100%;
+        padding-left: 0;
+        padding-right: 0;
+        margin-left: 0;
+        margin-right: 0;
+      }
+
+      // This class must be applied to the innermost block element containing a section or subsection link
+      // (it can be applied together with `sidebar-collapsible-element-inner-wrapper`)
+      .sidebar-item {
+        padding-top: var(--ds-admin-sidebar-item-padding);
+        padding-bottom: var(--ds-admin-sidebar-item-padding);
+      }
+
+      // These classes handle the collapsing behavior
+      .sidebar-section-wrapper {
+
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: stretch;
+
+        // These elements have fixed width and determine the width of the collapsed sidebar
+        & > .sidebar-fixed-element-wrapper {
+          min-width: var(--ds-admin-sidebar-fixed-element-width);
+          flex: 1 1 auto; // Fill available space
+
+          // Align the icons
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          align-items: center;
         }
 
-        &.inactive ::ng-deep .sidebar-collapsible {
-            margin-left: calc(-1 * var(--ds-sidebar-items-width));
-        }
-
-        .navbar-nav {
-            .admin-menu-header {
-                background-color: var(--ds-admin-sidebar-header-bg);
-
-                .sidebar-section {
-                  background-color: inherit;
-                }
-
-                .logo-wrapper {
-                    img {
-                        height: 20px;
-                    }
-                }
-                .section-header-text {
-                    line-height: 1.5;
-                }
-
-                .navbar-brand {
-                  margin-right: 0;
-                }
-
-            }
-        }
-
-
-        ::ng-deep {
-            .navbar-nav {
-                .sidebar-section {
-                    display: flex;
-                    align-content: stretch;
-                    background-color: var(--ds-admin-sidebar-bg);
-                    overflow-x: visible;
-
-                    .nav-item {
-                        padding-top: var(--bs-spacer);
-                        padding-bottom: var(--bs-spacer);
-                        background-color: inherit;
-
-                      &:focus-visible {
-                        // since links fill the whole sidebar, we _inset_ the outline
-                        outline-offset: -4px;
-
-                        // replace padding with margins so it doesn't extend over the :focus-visible outline
-                        //  → can't remove the padding altogether; the icon needs to fill out
-                        //    the collapsed width of the sidebar for the slide animation to look decent.
-                        .shortcut-icon {
-                          padding-left: 0;
-                          padding-right: 0;
-                          margin-left: var(--ds-icon-padding);
-                          margin-right: var(--ds-icon-padding);
-                        }
-                        .logo-wrapper {
-                          margin-right: var(--bs-navbar-padding-x) !important;
-                        }
-                        .navbar-brand {
-                          padding-top: 0;
-                          padding-bottom: 0;
-                          margin-top: var(--bs-navbar-brand-padding-y);
-                          margin-bottom: var(--bs-navbar-brand-padding-y);
-                        }
-                      }
-                    }
-
-                    .shortcut-icon {
-                        background-color: inherit;
-                        padding-left: var(--ds-icon-padding);
-                        padding-right: var(--ds-icon-padding);
-                        z-index: var(--ds-icon-z-index);
-                        align-self: baseline;
-                    }
-
-                    .sidebar-collapsible {
-                        padding-left: 0;
-                        padding-right: var(--bs-spacer);
-                        width: var(--ds-sidebar-items-width);
-                        position: relative;
-                        .toggle {
-                          width: 100%;
-                        }
-
-                        ul {
-                          padding-top: var(--bs-spacer);
-
-                          li a {
-                            padding-left: var(--bs-spacer);
-                          }
-                        }
-                    }
-
-                    &.active > .sidebar-collapsible > .nav-link {
-                        color: var(--bs-navbar-dark-active-color);
-                    }
-                }
-            }
+        & > .sidebar-collapsible-element-outer-wrapper {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-end; // make inner wrapper slide on the left when collapsing
+          max-width: calc(100% - var(--ds-admin-sidebar-fixed-element-width)); // fill available space
+          padding-left: var(--ds-dark-scrollbar-width); // leave room for scrollbar
+          overflow-x: hidden; // hide inner wrapper when sidebar is collapsed
+
+          // These elements have fixed width and slide on the left when the sidebar is collapsed
+          // Their content should fill all available space
+          & > .sidebar-collapsible-element-inner-wrapper {
+            min-width: calc(var(--ds-admin-sidebar-collapsible-element-width) - var(--ds-dark-scrollbar-width));
+            height: 100%;
+            padding-right: var(--ds-admin-sidebar-item-padding);
+          }
         }
+      }
 
     }
 
+    // Set here any style that depends on the sidebar status
+    &.collapsed, &.transitioning, &.expanded { }
+
+  }
+
+  /* SIDEBAR STYLE */
+
+  nav#admin-sidebar {
+
+    background-color: var(--ds-admin-sidebar-bg);
+
+    ::ng-deep {
+
+      color: white;
+
+      // Set here the style of the *-menu-item nested components
+      .ds-menu-item {
+      }
+
+      a {
+        color: var(--ds-admin-sidebar-link-color);
+        text-decoration: none;
+
+        &:hover, &:focus {
+          color: var(--ds-admin-sidebar-link-hover-color);
+        }
+      }
+    }
+
+    div#sidebar-header-container {
+      background-color: var(--ds-admin-sidebar-header-bg);
+      .sidebar-fixed-element-wrapper {
+        background-color: var(--ds-admin-sidebar-header-bg);
+      }
+    }
+
+    div#sidebar-collapse-toggle-container {
+      .sidebar-collapsible-element-inner-wrapper {
+      }
+    }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
index 88efd2a711..b8de30031b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -1,26 +1,36 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { AdminSidebarComponent } from './admin-sidebar.component';
-import { MenuService } from '../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
-import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RouterTestingModule } from '@angular/router/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import createSpy = jasmine.createSpy;
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
 import { Item } from '../../core/shared/item.model';
-import { ThemeService } from '../../shared/theme-support/theme.service';
+import { MenuService } from '../../shared/menu/menu.service';
 import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
+import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { AdminSidebarComponent } from './admin-sidebar.component';
 
 describe('AdminSidebarComponent', () => {
   let comp: AdminSidebarComponent;
@@ -37,23 +47,23 @@ describe('AdminSidebarComponent', () => {
     lastModified: '2018',
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(mockItem)
+      dso: createSuccessfulRemoteDataObject(mockItem),
     }),
-    children: []
+    children: [],
   };
 
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     scriptService = jasmine.createSpyObj('scriptService', { scriptWithNameExistsAndCanExecute: observableOf(true) });
     TestBed.configureTestingModule({
@@ -72,15 +82,15 @@ describe('AdminSidebarComponent', () => {
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
-          }
-        }
+            },
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(AdminSidebarComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-      }
+      },
     }).compileComponents();
   }));
 
@@ -143,10 +153,10 @@ describe('AdminSidebarComponent', () => {
   describe('when the collapse link is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle > a'));
+      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle-container > a'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
     });
 
@@ -161,7 +171,7 @@ describe('AdminSidebarComponent', () => {
       const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
       sidebarToggler.triggerEventHandler('mouseenter', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick(99);
       expect(menuService.expandMenuPreview).not.toHaveBeenCalled();
@@ -176,7 +186,7 @@ describe('AdminSidebarComponent', () => {
       const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
       sidebarToggler.triggerEventHandler('mouseleave', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick(399);
       expect(menuService.collapseMenuPreview).not.toHaveBeenCalled();
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 26ded965d4..37bc8bbf98 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,14 +1,31 @@
-import { Component, HostListener, Injector, OnInit } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { debounceTime, distinctUntilChanged, first, map, withLatestFrom } from 'rxjs/operators';
+import {
+  Component,
+  HostListener,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  first,
+  map,
+  withLatestFrom,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { slideSidebar } from '../../shared/animations/slide';
 import { MenuComponent } from '../../shared/menu/menu.component';
 import { MenuService } from '../../shared/menu/menu.service';
-import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
-import { ActivatedRoute } from '@angular/router';
+import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 
 /**
@@ -18,7 +35,7 @@ import { ThemeService } from '../../shared/theme-support/theme.service';
   selector: 'ds-admin-sidebar',
   templateUrl: './admin-sidebar.component.html',
   styleUrls: ['./admin-sidebar.component.scss'],
-  animations: [slideSidebar]
+  animations: [slideSidebar],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
@@ -28,9 +45,14 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   menuID = MenuID.ADMIN;
 
   /**
-   * Observable that emits the width of the collapsible menu sections
+   * Observable that emits the width of the sidebar when expanded
    */
-  sidebarWidth: Observable<string>;
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
 
   /**
    * Is true when the sidebar is open, is false when the sidebar is animating or closed
@@ -44,6 +66,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
 
+  /**
+   * Is true when the sidebar is opening or closing
+   * @type {boolean}
+   */
+  sidebarTransitioning = !this.sidebarOpen; // Animation in progress
+
   /**
    * Emits true when either the menu OR the menu's preview is expanded, else emits false
    */
@@ -58,7 +86,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
     private authService: AuthService,
     public authorizationService: AuthorizationDataService,
     public route: ActivatedRoute,
-    protected themeService: ThemeService
+    protected themeService: ThemeService,
   ) {
     super(menuService, injector, authorizationService, route, themeService);
     this.inFocus$ = new BehaviorSubject(false);
@@ -69,7 +97,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width');
     this.authService.isAuthenticated()
       .subscribe((loggedIn: boolean) => {
         if (loggedIn) {
@@ -83,13 +110,13 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
       });
     this.sidebarExpanded = combineLatest([this.menuCollapsed, this.menuPreviewCollapsed])
       .pipe(
-        map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed))
+        map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed)),
       );
     this.inFocus$.pipe(
       debounceTime(50),
       distinctUntilChanged(),  // disregard focusout in situations like --(focusout)-(focusin)--
       withLatestFrom(
-        combineLatest([this.menuCollapsed, this.menuPreviewCollapsed])
+        combineLatest([this.menuCollapsed, this.menuPreviewCollapsed]),
       ),
     ).subscribe(([inFocus, [collapsed, previewCollapsed]]) => {
       if (collapsed) {
@@ -134,6 +161,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   startSlide(event: any): void {
+    this.sidebarTransitioning = true;
     if (event.toState === 'expanded') {
       this.sidebarClosed = false;
     } else if (event.toState === 'collapsed') {
@@ -146,6 +174,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   finishSlide(event: any): void {
+    this.sidebarTransitioning = false;
     if (event.fromState === 'expanded') {
       this.sidebarClosed = true;
     } else if (event.fromState === 'collapsed') {
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 1f4666bbd0..636938b7b6 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -1,37 +1,46 @@
-<div class="sidebar-section" [ngClass]="{'expanded': (expanded | async)}"
+<div [ngClass]="{'expanded': (isExpanded$ | async)}"
     [@bgColor]="{
-     value: ((expanded | async) ? 'endBackground' : 'startBackground'),
-     params: {endColor: (sidebarActiveBg | async)}}">
-  <div class="nav-item nav-link d-flex flex-row flex-nowrap"
-     role="button" tabindex="0"
-     [attr.aria-labelledby]="'sidebarName-' + section.id"
-     [attr.aria-expanded]="expanded | async"
-     [title]="('menu.section.icon.' + section.id) | translate"
-       [class.disabled]="section.model?.disabled"
+     value: ((isExpanded$ | async) ? 'endBackground' : 'startBackground'),
+     params: {endColor: (sidebarActiveBg$ | async)}
+     }">
+  <a class="sidebar-section-wrapper"
+     role="menuitem" tabindex="0"
+     aria-haspopup="menu"
+     [attr.aria-controls]="adminMenuSectionId(section.id)"
+     [attr.aria-expanded]="isExpanded$ | async"
+     [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+     [class.disabled]="section.model?.disabled"
      (click)="toggleSection($event)"
      (keyup.space)="toggleSection($event)"
-     (keyup.enter)="toggleSection($event)"
+     href="javascript:void(0);"
   >
-    <div class="shortcut-icon h-100">
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
     </div>
-    <div class="sidebar-collapsible">
-      <div class="toggle">
-        <span id="sidebarName-{{section.id}}" class="section-header-text">
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
+        <span [id]="adminMenuSectionTitleId(section.id)">
           <ng-container
             *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
-        <i class="fas fa-chevron-right fa-pull-right"
-           [@rotate]="(expanded | async) ? 'expanded' : 'collapsed'"
-           [title]="('menu.section.toggle.' + section.id) | translate"
+        <i class="fas fa-chevron-right fa-xs" aria-hidden="true"
+           [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
         ></i>
       </div>
-      <ul class="sidebar-sub-level-items list-unstyled" @slide *ngIf="(expanded | async)">
-        <li *ngFor="let subSection of (subSections$ | async)">
-          <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </li>
-      </ul>
+    </div>
+  </a>
+  <div class="sidebar-section-wrapper subsection" @slide *ngIf="(isExpanded$ | async)">
+    <div class="sidebar-fixed-element-wrapper"></div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper">
+        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+          <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
+            {{ (sectionMap$ | async).get(subSection.id).component | json}}
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 802fade8c1..845ba734df 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,23 +1,24 @@
-:host ::ng-deep {
-    .fa-chevron-right {
-        padding-left: calc(var(--bs-spacer) / 2);
-        font-size: 0.5rem;
-        line-height: 3;
+:host {
+  .sidebar-sub-level-item-list  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    ::ng-deep .ds-menu-item {
+      margin-left: var(--ds-admin-sidebar-section-indent);
     }
+  }
 
-    .sidebar-sub-level-items {
-        list-style: disc;
-        color: var(--bs-navbar-dark-color);
-        overflow: hidden;
-        margin-bottom: calc(-1 * var(--bs-spacer)); // the bottom-most nav-item is padded, no need for double spacing
-    }
+  .toggler-wrapper {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-between;
+  }
 
-    .sidebar-collapsible {
-        display: flex;
-        flex-direction: column;
-    }
-
-    li.sidebar-section.expanded {
-      background-color: var(--ds-admin-sidebar-active-bg) !important;
+  .subsection {
+    .sidebar-collapsible-element-inner-wrapper {
+      overflow-y: hidden;
     }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
index dd31f757c2..d01f4693ef 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
@@ -1,17 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component';
 import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
-import { of as observableOf } from 'rxjs';
-import { Component } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { Router } from '@angular/router';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
+import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component';
 
 describe('ExpandableAdminSidebarSectionComponent', () => {
   let component: ExpandableAdminSidebarSectionComponent;
@@ -27,11 +31,11 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: Router, useValue: new RouterStub() },
-      ]
+      ],
     }).overrideComponent(ExpandableAdminSidebarSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -49,17 +53,17 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
   });
 
   it('should set the right icon', () => {
-    const icon = fixture.debugElement.query(By.css('.shortcut-icon > i.fas'));
+    const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"] > i.fas'));
     expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
   });
 
   describe('when the header text is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleActiveSection');
-      const sidebarToggler = fixture.debugElement.query(By.css('.sidebar-section > div.nav-item'));
+      const sidebarToggler = fixture.debugElement.query(By.css('a.sidebar-section-wrapper'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
     });
 
@@ -72,7 +76,7 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 4555c0fa93..a43be47879 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -1,25 +1,33 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { rotate } from '../../../shared/animations/rotate';
-import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component';
-import { slide } from '../../../shared/animations/slide';
-import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
-import { bgColor } from '../../../shared/animations/bgColor';
-import { MenuService } from '../../../shared/menu/menu.service';
-import { combineLatest as combineLatestObservable, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
-import { MenuID } from '../../../shared/menu/menu-id.model';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { bgColor } from '../../../shared/animations/bgColor';
+import { rotate } from '../../../shared/animations/rotate';
+import { slide } from '../../../shared/animations/slide';
+import { MenuService } from '../../../shared/menu/menu.service';
+import { MenuID } from '../../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
+import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
+import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component';
 
 /**
  * Represents a expandable section in the sidebar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-expandable-admin-sidebar-section]',
+  selector: 'ds-expandable-admin-sidebar-section',
   templateUrl: './expandable-admin-sidebar-section.component.html',
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
-  animations: [rotate, slide, bgColor]
+  animations: [rotate, slide, bgColor],
 })
 
 @rendersSectionForMenu(MenuID.ADMIN, true)
@@ -32,23 +40,23 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
   /**
    * The background color of the section when it's active
    */
-  sidebarActiveBg;
+  sidebarActiveBg$: Observable<string>;
 
   /**
    * Emits true when the sidebar is currently collapsed, true when it's expanded
    */
-  sidebarCollapsed: Observable<boolean>;
+  isSidebarCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the sidebar's preview is currently collapsed, true when it's expanded
    */
-  sidebarPreviewCollapsed: Observable<boolean>;
+  isSidebarPreviewCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the menu section is expanded, else emits false
    * This is true when the section is active AND either the sidebar or it's preview is open
    */
-  expanded: Observable<boolean>;
+  isExpanded$: Observable<boolean>;
 
   constructor(
     @Inject('sectionDataProvider') menuSection,
@@ -65,12 +73,20 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarActiveBg = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
-    this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.expanded = combineLatestObservable(this.active, this.sidebarCollapsed, this.sidebarPreviewCollapsed)
-      .pipe(
-        map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed)))
-      );
+    this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
+    this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+    this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
+    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+      map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
+    );
+  }
+
+  toggleSection($event: Event) {
+    this.menuService.expandMenuPreview(this.menuID); // fixes accessibility issue
+    super.toggleSection($event);
+  }
+
+  adminMenuSubsectionId(sectionId: string, subsectionId: string) {
+    return `admin-menu-section-${sectionId}-${subsectionId}`;
   }
 }
diff --git a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
index f2f35725e8..30f1a60ee2 100644
--- a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { AdminSidebarComponent } from './admin-sidebar.component';
 
@@ -11,6 +16,19 @@ import { AdminSidebarComponent } from './admin-sidebar.component';
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
 export class ThemedAdminSidebarComponent extends ThemedComponent<AdminSidebarComponent> {
+
+  /**
+   * Observable that emits the width of the sidebar when expanded
+   */
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
+
+  protected inAndOutputNames: (keyof AdminSidebarComponent & keyof this)[] = ['collapsedSidebarWidth$', 'expandedSidebarWidth$'];
+
   protected getComponentName(): string {
     return 'AdminSidebarComponent';
   }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
index c80bc677f2..b422cfd7c7 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
@@ -1,7 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminWorkflowPageComponent;
@@ -10,7 +14,7 @@ describe('AdminSearchPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [AdminWorkflowPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
index c3ccc9555a..0b66fe711c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 
 @Component({
   selector: 'ds-admin-workflow-page',
   templateUrl: './admin-workflow-page.component.html',
-  styleUrls: ['./admin-workflow-page.component.scss']
+  styleUrls: ['./admin-workflow-page.component.scss'],
 })
 
 /**
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
index 04377fcc81..8aaec2bbf8 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
@@ -1,20 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
-import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import {
-  getWorkflowItemDeleteRoute,
-  getWorkflowItemSendBackRoute
-} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
-import { Item } from '../../../../../core/shared/item.model';
+
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
+import {
+  getWorkflowItemDeleteRoute,
+  getWorkflowItemSendBackRoute,
+} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
 
 describe('WorkflowItemAdminWorkflowActionsComponent', () => {
   let component: WorkflowItemAdminWorkflowActionsComponent;
@@ -37,10 +41,10 @@ describe('WorkflowItemAdminWorkflowActionsComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [WorkflowItemAdminWorkflowActionsComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
index 480c48f25e..1f724c351e 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
@@ -1,15 +1,18 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
 import {
   getWorkflowItemDeleteRoute,
-  getWorkflowItemSendBackRoute
+  getWorkflowItemSendBackRoute,
 } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 @Component({
   selector: 'ds-workflow-item-admin-workflow-actions-element',
   styleUrls: ['./workflow-item-admin-workflow-actions.component.scss'],
-  templateUrl: './workflow-item-admin-workflow-actions.component.html'
+  templateUrl: './workflow-item-admin-workflow-actions.component.html',
 })
 /**
  * The component for displaying the actions for a list element for a workflow-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts
index 6e917ed088..9415c4f9fb 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts
@@ -1,13 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector.component';
-import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service';
-import { NotificationsService } from '../../../../../../shared/notifications/notifications.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
 import { Group } from '../../../../../../core/eperson/models/group.model';
 import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
-import { of } from 'rxjs';
+import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service';
+import { NotificationsService } from '../../../../../../shared/notifications/notifications.service';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector.component';
 
 describe('SupervisionOrderGroupSelectorComponent', () => {
   let component: SupervisionOrderGroupSelectorComponent;
@@ -17,7 +25,7 @@ describe('SupervisionOrderGroupSelectorComponent', () => {
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
 
   const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', {
-    create: of(new SupervisionOrder())
+    create: of(new SupervisionOrder()),
   });
 
   const selectedOrderType = 'NONE';
@@ -38,7 +46,7 @@ describe('SupervisionOrderGroupSelectorComponent', () => {
         { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
         { provide: NotificationsService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
index 2eec0cfd0c..0ddc588c1a 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
@@ -1,13 +1,18 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+
 import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { Group } from '../../../../../../core/eperson/models/group.model';
 import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
 import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service';
-import { RemoteData } from '../../../../../../core/data/remote-data';
 
 /**
  * Component to wrap a dropdown - for type of order -
@@ -76,7 +81,7 @@ export class SupervisionOrderGroupSelectorComponent {
   save() {
     this.isSubmitted = true;
     if (this.selectedOrderType && this.selectedGroup) {
-      let supervisionDataObject = new SupervisionOrder();
+      const supervisionDataObject = new SupervisionOrder();
       supervisionDataObject.ordertype = this.selectedOrderType;
       this.supervisionOrderDataService.create(supervisionDataObject, this.itemUUID, this.selectedGroup.uuid, this.selectedOrderType).pipe(
         getFirstCompletedRemoteData(),
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
index 2f4ed631cc..1a30bff969 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
@@ -1,14 +1,22 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
+import {
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { SupervisionOrderStatusComponent } from './supervision-order-status.component';
-import { VarDirective } from '../../../../../../shared/utils/var.directive';
 import { TranslateLoaderMock } from '../../../../../../shared/mocks/translate-loader.mock';
 import { supervisionOrderListMock } from '../../../../../../shared/testing/supervision-order.mock';
+import { VarDirective } from '../../../../../../shared/utils/var.directive';
+import { SupervisionOrderStatusComponent } from './supervision-order-status.component';
 
 describe('SupervisionOrderStatusComponent', () => {
   let component: SupervisionOrderStatusComponent;
@@ -21,16 +29,16 @@ describe('SupervisionOrderStatusComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ SupervisionOrderStatusComponent, VarDirective ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
@@ -38,7 +46,7 @@ describe('SupervisionOrderStatusComponent', () => {
     component = fixture.componentInstance;
     component.supervisionOrderList = supervisionOrderListMock;
     component.ngOnChanges(    {
-      supervisionOrderList: new SimpleChange(null, supervisionOrderListMock, true)
+      supervisionOrderList: new SimpleChange(null, supervisionOrderListMock, true),
     });
     fixture.detectChanges();
   });
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
index 93c6441e92..37b5903f0c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
@@ -1,14 +1,28 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  from,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  reduce,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, from, Observable } from 'rxjs';
-import { map, mergeMap, reduce } from 'rxjs/operators';
-
-import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
+import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { Group } from '../../../../../../core/eperson/models/group.model';
 import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
+import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
 import { isNotEmpty } from '../../../../../../shared/empty.util';
-import { RemoteData } from '../../../../../../core/data/remote-data';
-import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
 
 export interface SupervisionOrderListEntry {
   supervisionOrder: SupervisionOrder;
@@ -18,7 +32,7 @@ export interface SupervisionOrderListEntry {
 @Component({
   selector: 'ds-supervision-order-status',
   templateUrl: './supervision-order-status.component.html',
-  styleUrls: ['./supervision-order-status.component.scss']
+  styleUrls: ['./supervision-order-status.component.scss'],
 })
 export class SupervisionOrderStatusComponent implements OnChanges {
 
@@ -61,13 +75,13 @@ export class SupervisionOrderStatusComponent implements OnChanges {
           if (sogRD.hasSucceeded) {
             const entry: SupervisionOrderListEntry = {
               supervisionOrder: so,
-              group: sogRD.payload
+              group: sogRD.payload,
             };
             return entry;
           } else {
             return null;
           }
-        })
+        }),
       )),
       reduce((acc: SupervisionOrderListEntry[], value: any) => {
         if (isNotEmpty(value)) {
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts
index a8f0581ec0..ee5aaa40af 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts
@@ -1,31 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { of } from 'rxjs';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
-import { WorkspaceItemAdminWorkflowActionsComponent } from './workspace-item-admin-workflow-actions.component';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
-import {
- getWorkspaceItemDeleteRoute,
-} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { Item } from '../../../../../core/shared/item.model';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
-import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
 import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
 import { supervisionOrderEntryMock } from '../../../../../shared/testing/supervision-order.mock';
-import {
-  SupervisionOrderGroupSelectorComponent
-} from './supervision-order-group-selector/supervision-order-group-selector.component';
+import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
+import { WorkspaceItemAdminWorkflowActionsComponent } from './workspace-item-admin-workflow-actions.component';
 
 describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
   let component: WorkspaceItemAdminWorkflowActionsComponent;
@@ -56,15 +55,15 @@ describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
       imports: [
         NgbModalModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [WorkspaceItemAdminWorkflowActionsComponent],
       providers: [
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: NotificationsService, useValue: notificationService },
-        { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }
+        { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -97,7 +96,7 @@ describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
     beforeEach(() => {
       spyOn(component.delete, 'emit');
       spyOn((component as any).modalService, 'open').and.returnValue({
-        componentInstance: { response: of(true) }
+        componentInstance: { response: of(true) },
       });
     });
 
@@ -138,7 +137,7 @@ describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
     beforeEach(() => {
       spyOn(component.create, 'emit');
       spyOn((component as any).modalService, 'open').and.returnValue({
-        componentInstance: { create: of(true) }
+        componentInstance: { create: of(true) },
       });
     });
 
@@ -146,7 +145,7 @@ describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
       component.openSupervisionModal();
       expect((component as any).modalService.open).toHaveBeenCalledWith(SupervisionOrderGroupSelectorComponent, {
         size: 'lg',
-        backdrop: 'static'
+        backdrop: 'static',
       });
       expect(component.create.emit).toHaveBeenCalled();
     });
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
index 36678460da..7ef5896b3c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
@@ -1,34 +1,45 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-
-import { map, Observable } from 'rxjs';
-import { switchMap, take, tap } from 'rxjs/operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+import {
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
-import {
-  SupervisionOrderGroupSelectorComponent
-} from './supervision-order-group-selector/supervision-order-group-selector.component';
-import {
- getWorkspaceItemDeleteRoute
-} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../../../item-page/edit-item-page/edit-item-page.routing-paths';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
-import { SupervisionOrderListEntry } from './supervision-order-status/supervision-order-status.component';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../../../item-page/edit-item-page/edit-item-page.routing-paths';
 import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../../../shared/empty.util';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { getSearchResultFor } from '../../../../../shared/search/search-result-element-decorator';
+import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
+import { SupervisionOrderListEntry } from './supervision-order-status/supervision-order-status.component';
 
 @Component({
   selector: 'ds-workspace-item-admin-workflow-actions-element',
   styleUrls: ['./workspace-item-admin-workflow-actions.component.scss'],
-  templateUrl: './workspace-item-admin-workflow-actions.component.html'
+  templateUrl: './workspace-item-admin-workflow-actions.component.html',
 })
 /**
  * The component for displaying the actions for a list element for a workspace-item on the admin workflow search page
@@ -94,7 +105,7 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
     );
 
     item$.pipe(
-      map((item: Item) => this.getPoliciesRoute(item))
+      map((item: Item) => this.getPoliciesRoute(item)),
     ).subscribe((route: string[]) => {
       this.resourcePoliciesPageRoute = route;
     });
@@ -124,7 +135,7 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
    */
   deleteSupervisionOrder(supervisionOrderEntry: SupervisionOrderListEntry) {
     const modalRef = this.modalService.open(ConfirmationModalComponent);
-    modalRef.componentInstance.dso = supervisionOrderEntry.group;
+    modalRef.componentInstance.name = this.dsoNameService.getName(supervisionOrderEntry.group);
     modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-supervision.modal.header';
     modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-supervision.modal.info';
     modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-supervision.modal.cancel';
@@ -143,22 +154,22 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
                   null,
                   this.translateService.get(
                     this.messagePrefix + '.notification.deleted.success',
-                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) }
-                  )
+                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) },
+                  ),
                 );
               } else {
                 this.notificationsService.error(
                   null,
                   this.translateService.get(
                     this.messagePrefix + '.notification.deleted.failure',
-                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) }
-                  )
+                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) },
+                  ),
                 );
               }
-            })
+            }),
           );
         }
-      })
+      }),
     ).subscribe((result: boolean) => {
       if (result) {
         this.delete.emit(this.convertReloadedObject());
@@ -172,7 +183,7 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
   openSupervisionModal() {
     const supervisionModal: NgbModalRef = this.modalService.open(SupervisionOrderGroupSelectorComponent, {
       size: 'lg',
-      backdrop: 'static'
+      backdrop: 'static',
     });
     supervisionModal.componentInstance.itemUUID = this.item.uuid;
     supervisionModal.componentInstance.create.subscribe(() => {
@@ -186,7 +197,7 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
   private convertReloadedObject(): DSpaceObject {
     const constructor = getSearchResultFor((this.wsi as any).constructor);
     return Object.assign(new constructor(), this.wsi, {
-      indexableObject: this.wsi
+      indexableObject: this.wsi,
     });
   }
 }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
index 87bae0c261..c5c2a5331a 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
@@ -1,4 +1,4 @@
-<ng-template dsListableObject>
+<ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges class="position-absolute ml-1">
     <div class="workflow-badge">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
index 8035c53547..732a691102 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
@@ -1,34 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
-import {
-  WorkflowItemSearchResultAdminWorkflowGridElementComponent
-} from './workflow-item-search-result-admin-workflow-grid-element.component';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import {
-  ItemGridElementComponent
-} from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import {
-  ListableObjectDirective
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import {
-  WorkflowItemSearchResult
-} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './workflow-item-search-result-admin-workflow-grid-element.component';
 
 describe('WorkflowItemSearchResultAdminWorkflowGridElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowGridElementComponent;
@@ -38,7 +34,7 @@ describe('WorkflowItemSearchResultAdminWorkflowGridElementComponent', () => {
   let itemRD$;
   let linkService;
   let object;
-  let themeService;
+  let themeService: ThemeService;
 
   function init() {
     itemRD$ = createSuccessfulRemoteDataObject$(new Item());
@@ -55,7 +51,11 @@ describe('WorkflowItemSearchResultAdminWorkflowGridElementComponent', () => {
     init();
     TestBed.configureTestingModule(
       {
-        declarations: [WorkflowItemSearchResultAdminWorkflowGridElementComponent, ItemGridElementComponent, ListableObjectDirective],
+        declarations: [
+          WorkflowItemSearchResultAdminWorkflowGridElementComponent,
+          ItemGridElementComponent,
+          DynamicComponentLoaderDirective,
+        ],
         imports: [
           NoopAnimationsModule,
           TranslateModule.forRoot(),
@@ -67,16 +67,16 @@ describe('WorkflowItemSearchResultAdminWorkflowGridElementComponent', () => {
           {
             provide: TruncatableService, useValue: {
               isCollapsed: () => observableOf(true),
-            }
+            },
           },
           { provide: BitstreamDataService, useValue: {} },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .overrideComponent(WorkflowItemSearchResultAdminWorkflowGridElementComponent, {
         set: {
-          entryComponents: [ItemGridElementComponent]
-        }
+          entryComponents: [ItemGridElementComponent],
+        },
       })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
index fd9d21e227..a94a96e9d5 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,44 +1,53 @@
-import { Component, ComponentFactoryResolver, ElementRef, ViewChild } from '@angular/core';
-import { Item } from '../../../../../core/shared/item.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
-  getListableObjectComponent,
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { Item } from '../../../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../../core/shared/operators';
-import { take } from 'rxjs/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import {
+  getListableObjectComponent,
+  listableObjectComponent,
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-grid-element',
   styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'],
-  templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html'
+  templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html',
 })
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
  */
-export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnDestroy, OnInit {
   /**
    * Directive used to render the dynamic component in
    */
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
 
   /**
    * The html child that contains the badges html
@@ -55,13 +64,14 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
    */
   public item$: Observable<Item>;
 
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
-    private componentFactoryResolver: ComponentFactoryResolver,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
     private themeService: ThemeService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
   }
@@ -75,26 +85,34 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
     this.dso = this.linkService.resolveLink(this.dso, followLink('item'));
     this.item$ = (this.dso.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload());
     this.item$.pipe(take(1)).subscribe((item: Item) => {
-        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent(item));
+      const component: GenericConstructor<Component> = this.getComponent(item);
 
-        const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-        viewContainerRef.clear();
+      const viewContainerRef = this.dynamicComponentLoaderDirective.viewContainerRef;
+      viewContainerRef.clear();
 
-        const componentRef = viewContainerRef.createComponent(
-          componentFactory,
-          0,
-          undefined,
-          [
+      this.compRef = viewContainerRef.createComponent(
+        component, {
+          index: 0,
+          injector: undefined,
+          projectableNodes: [
             [this.badges.nativeElement],
-            [this.buttons.nativeElement]
-          ]);
-        (componentRef.instance as any).object = item;
-        (componentRef.instance as any).index = this.index;
-        (componentRef.instance as any).linkType = this.linkType;
-        (componentRef.instance as any).listID = this.listID;
-        componentRef.changeDetectorRef.detectChanges();
-      }
-    );
+            [this.buttons.nativeElement],
+          ],
+        },
+      );
+      this.compRef.setInput('object', item);
+      this.compRef.setInput('index', this.index);
+      this.compRef.setInput('linkType', this.linkType);
+      this.compRef.setInput('listID', this.listID);
+      this.compRef.changeDetectorRef.detectChanges();
+    });
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
   }
 
   /**
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
index 767ad79786..f78a0a3ca4 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
@@ -1,4 +1,4 @@
-<ng-template dsListableObject>
+<ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges class="position-absolute ml-1">
     <div class="workflow-badge">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts
index b9e752c104..b9781fb4f9 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts
@@ -1,41 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { of as observableOf } from 'rxjs';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import {
-  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
-} from './workspace-item-search-result-admin-workflow-grid-element.component';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import {
-  ItemGridElementComponent
-} from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import {
-  ListableObjectDirective
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import {
-  WorkflowItemSearchResult
-} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
 import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import {
   supervisionOrderPaginatedListRD,
-  supervisionOrderPaginatedListRD$
+  supervisionOrderPaginatedListRD$,
 } from '../../../../../shared/testing/supervision-order.mock';
-import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkspaceItemSearchResultAdminWorkflowGridElementComponent } from './workspace-item-search-result-admin-workflow-grid-element.component';
 
 describe('WorkspaceItemSearchResultAdminWorkflowGridElementComponent', () => {
   let component: WorkspaceItemSearchResultAdminWorkflowGridElementComponent;
@@ -45,7 +40,7 @@ describe('WorkspaceItemSearchResultAdminWorkflowGridElementComponent', () => {
   let itemRD$;
   let linkService;
   let object;
-  let themeService;
+  let themeService: ThemeService;
   let supervisionOrderDataService;
 
   function init() {
@@ -67,7 +62,11 @@ describe('WorkspaceItemSearchResultAdminWorkflowGridElementComponent', () => {
     init();
     TestBed.configureTestingModule(
       {
-        declarations: [WorkspaceItemSearchResultAdminWorkflowGridElementComponent, ItemGridElementComponent, ListableObjectDirective],
+        declarations: [
+          WorkspaceItemSearchResultAdminWorkflowGridElementComponent,
+          ItemGridElementComponent,
+          DynamicComponentLoaderDirective,
+        ],
         imports: [
           NoopAnimationsModule,
           TranslateModule.forRoot(),
@@ -79,17 +78,17 @@ describe('WorkspaceItemSearchResultAdminWorkflowGridElementComponent', () => {
           {
             provide: TruncatableService, useValue: {
               isCollapsed: () => observableOf(true),
-            }
+            },
           },
           { provide: BitstreamDataService, useValue: {} },
-          { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }
+          { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .overrideComponent(WorkspaceItemSearchResultAdminWorkflowGridElementComponent, {
         set: {
-          entryComponents: [ItemGridElementComponent]
-        }
+          entryComponents: [ItemGridElementComponent],
+        },
       })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
index d6f39e79fe..a25b8c6f00 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,53 +1,62 @@
-import { Component, ComponentFactoryResolver, ElementRef, ViewChild, OnInit } from '@angular/core';
+import {
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, mergeMap, take, tap } from 'rxjs/operators';
-
-import { Item } from '../../../../../core/shared/item.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import {
-  getListableObjectComponent,
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import {
-  SearchResultGridElementComponent
-} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
-import {
-  ListableObjectDirective
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { Item } from '../../../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../../core/shared/operators';
-import {
-  WorkspaceItemSearchResult
-} from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
-import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import {
+  getListableObjectComponent,
+  listableObjectComponent,
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-grid-element',
   styleUrls: ['./workspace-item-search-result-admin-workflow-grid-element.component.scss'],
-  templateUrl: './workspace-item-search-result-admin-workflow-grid-element.component.html'
+  templateUrl: './workspace-item-search-result-admin-workflow-grid-element.component.html',
 })
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
  */
-export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
+export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnDestroy, OnInit {
 
   /**
    * The item linked to the workspace item
@@ -67,7 +76,7 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
   /**
    * Directive used to render the dynamic component in
    */
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
 
   /**
    * The html child that contains the badges html
@@ -79,9 +88,13 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
    */
   @ViewChild('buttons', { static: true }) buttons: ElementRef;
 
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
-    private componentFactoryResolver: ComponentFactoryResolver,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
     private themeService: ThemeService,
@@ -100,36 +113,43 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
     this.dso = this.linkService.resolveLink(this.dso, followLink('item'));
     this.item$ = (this.dso.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload());
     this.item$.pipe(take(1)).subscribe((item: Item) => {
-        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent(item));
+      const component: GenericConstructor<Component> = this.getComponent(item);
 
-        const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-        viewContainerRef.clear();
+      const viewContainerRef = this.dynamicComponentLoaderDirective.viewContainerRef;
+      viewContainerRef.clear();
 
-        const componentRef = viewContainerRef.createComponent(
-          componentFactory,
-          0,
-          undefined,
-          [
+      this.compRef = viewContainerRef.createComponent(
+        component, {
+          index: 0,
+          projectableNodes: [
             [this.badges.nativeElement],
-            [this.buttons.nativeElement]
-          ]);
-        (componentRef.instance as any).object = item;
-        (componentRef.instance as any).index = this.index;
-        (componentRef.instance as any).linkType = this.linkType;
-        (componentRef.instance as any).listID = this.listID;
-        componentRef.changeDetectorRef.detectChanges();
-      }
+            [this.buttons.nativeElement],
+          ],
+        });
+      this.compRef.setInput('object', item);
+      this.compRef.setInput('index', this.index);
+      this.compRef.setInput('linkType', this.linkType);
+      this.compRef.setInput('listID', this.listID);
+      this.compRef.changeDetectorRef.detectChanges();
+    },
     );
 
     this.item$.pipe(
       take(1),
       tap((item: Item) => this.itemId = item.id),
-      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id))
+      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id)),
     ).subscribe((supervisionOrderList: SupervisionOrder[]) => {
       this.supervisionOrder$.next(supervisionOrderList);
     });
   }
 
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
+  }
+
   /**
    * Fetch the component depending on the item's entity type, view mode and context
    * @returns {GenericConstructor<Component>}
@@ -147,10 +167,10 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
    */
   private retrieveSupervisorOrders(itemId): Observable<SupervisionOrder[]> {
     return this.supervisionOrderDataService.searchByItem(
-      itemId, false, true, followLink('group')
+      itemId, false, true, followLink('group'),
     ).pipe(
       getFirstCompletedRemoteData(),
-      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : [])
+      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : []),
     );
   }
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
index ab5d8b79a8..5b79a2ff8c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -1,29 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import {
-  WorkflowItemSearchResultAdminWorkflowListElementComponent
-} from './workflow-item-search-result-admin-workflow-list-element.component';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import {
-  WorkflowItemSearchResult
-} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './workflow-item-search-result-admin-workflow-list-element.component';
 
 describe('WorkflowItemSearchResultAdminWorkflowListElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowListElementComponent;
@@ -58,9 +58,9 @@ describe('WorkflowItemSearchResultAdminWorkflowListElementComponent', () => {
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: LinkService, useValue: linkService },
           { provide: DSONameService, useClass: DSONameServiceMock },
-          { provide: APP_CONFIG, useValue: environment }
+          { provide: APP_CONFIG, useValue: environment },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
index d0e773d696..247ba9f354 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
@@ -1,31 +1,36 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
 import {
-  SearchResultListElementComponent
-} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import {
-  WorkflowItemSearchResult
-} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-list-element',
   styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'],
-  templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html'
+  templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
@@ -40,7 +45,7 @@ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends S
   constructor(private linkService: LinkService,
               protected truncatableService: TruncatableService,
               public dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts
index 19eefc9c48..e196ab30d3 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -1,36 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import {
-  WorkspaceItemSearchResultAdminWorkflowListElementComponent
-} from './workspace-item-search-result-admin-workflow-list-element.component';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import {
-  WorkflowItemSearchResult
-} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
 import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import {
   supervisionOrderPaginatedListRD,
-  supervisionOrderPaginatedListRD$
+  supervisionOrderPaginatedListRD$,
 } from '../../../../../shared/testing/supervision-order.mock';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkspaceItemSearchResultAdminWorkflowListElementComponent } from './workspace-item-search-result-admin-workflow-list-element.component';
 
 describe('WorkspaceItemSearchResultAdminWorkflowListElementComponent', () => {
   let component: WorkspaceItemSearchResultAdminWorkflowListElementComponent;
@@ -71,9 +70,9 @@ describe('WorkspaceItemSearchResultAdminWorkflowListElementComponent', () => {
           { provide: LinkService, useValue: linkService },
           { provide: DSONameService, useClass: DSONameServiceMock },
           { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
-          { provide: APP_CONFIG, useValue: environment }
+          { provide: APP_CONFIG, useValue: environment },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
index 3d6d1c8e44..aa3c601da6 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
@@ -1,42 +1,50 @@
-import { Component, Inject, OnInit } from '@angular/core';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, mergeMap, take, tap } from 'rxjs/operators';
-
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../../core/shared/operators';
-import { Item } from '../../../../../core/shared/item.model';
-import {
-  SearchResultListElementComponent
-} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
-import {
-  WorkspaceItemSearchResult
-} from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
 import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
-import { PaginatedList } from '../../../../../core/data/paginated-list.model';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-list-element',
   styleUrls: ['./workspace-item-search-result-admin-workflow-list-element.component.scss'],
-  templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html'
+  templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
@@ -62,7 +70,7 @@ export class WorkspaceItemSearchResultAdminWorkflowListElementComponent extends
               public dsoNameService: DSONameService,
               protected supervisionOrderDataService: SupervisionOrderDataService,
               protected truncatableService: TruncatableService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -78,7 +86,7 @@ export class WorkspaceItemSearchResultAdminWorkflowListElementComponent extends
     this.item$.pipe(
       take(1),
       tap((item: Item) => this.itemId = item.id),
-      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id))
+      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id)),
     ).subscribe((supervisionOrderList: SupervisionOrder[]) => {
       this.supervisionOrder$.next(supervisionOrderList);
     });
@@ -92,10 +100,10 @@ export class WorkspaceItemSearchResultAdminWorkflowListElementComponent extends
    */
   private retrieveSupervisorOrders(itemId): Observable<SupervisionOrder[]> {
     return this.supervisionOrderDataService.searchByItem(
-      itemId, false, true, followLink('group')
+      itemId, false, true, followLink('group'),
     ).pipe(
       getFirstCompletedRemoteData(),
-      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : [])
+      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : []),
     );
   }
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
index 21990c1ea9..97041ee64d 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow.module.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
@@ -1,45 +1,29 @@
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '../../shared/shared.module';
-import {
-  WorkflowItemSearchResultAdminWorkflowGridElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
-import {
-  WorkflowItemAdminWorkflowActionsComponent
-} from './admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component';
-import {
-  WorkflowItemSearchResultAdminWorkflowListElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
-import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
 import { SearchModule } from '../../shared/search/search.module';
-import {
-  WorkspaceItemAdminWorkflowActionsComponent
-} from './admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component';
-import {
-  WorkspaceItemSearchResultAdminWorkflowListElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component';
-import {
-  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component';
-import {
-  SupervisionOrderGroupSelectorComponent
-} from './admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component';
-import {
-  SupervisionOrderStatusComponent
-} from './admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
+import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component';
+import { SupervisionOrderGroupSelectorComponent } from './admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component';
+import { SupervisionOrderStatusComponent } from './admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component';
+import { WorkspaceItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component';
+import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
+import { WorkspaceItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component';
+import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
+import { WorkspaceItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   WorkflowItemSearchResultAdminWorkflowListElementComponent,
   WorkflowItemSearchResultAdminWorkflowGridElementComponent,
   WorkspaceItemSearchResultAdminWorkflowListElementComponent,
-  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
+  WorkspaceItemSearchResultAdminWorkflowGridElementComponent,
 ];
 
 @NgModule({
   imports: [
     SearchModule,
-    SharedModule.withEntryComponents()
+    SharedModule.withEntryComponents(),
   ],
   declarations: [
     AdminWorkflowPageComponent,
@@ -47,11 +31,11 @@ const ENTRY_COMPONENTS = [
     SupervisionOrderStatusComponent,
     WorkflowItemAdminWorkflowActionsComponent,
     WorkspaceItemAdminWorkflowActionsComponent,
-    ...ENTRY_COMPONENTS
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
-    AdminWorkflowPageComponent
-  ]
+    AdminWorkflowPageComponent,
+  ],
 })
 export class AdminWorkflowModuleModule {
   /**
@@ -61,7 +45,7 @@ export class AdminWorkflowModuleModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index 3dc0036854..d75d4457f7 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -1,17 +1,19 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
 import { AccessControlModule } from '../access-control/access-control.module';
+import { SharedModule } from '../shared/shared.module';
+import { UploadModule } from '../shared/upload/upload.module';
+import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
+import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
+import { AdminReportsModule } from './admin-reports/admin-reports.module';
 import { AdminRoutingModule } from './admin-routing.module';
-import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { AdminWorkflowModuleModule } from './admin-workflow-page/admin-workflow.module';
 import { AdminSearchModule } from './admin-search-page/admin-search.module';
 import { AdminSidebarSectionComponent } from './admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
 import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
-import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
-import { UiSwitchModule } from 'ngx-ui-switch';
-import { UploadModule } from '../shared/upload/upload.module';
+import { AdminWorkflowModuleModule } from './admin-workflow-page/admin-workflow.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -24,6 +26,7 @@ const ENTRY_COMPONENTS = [
   imports: [
     AdminRoutingModule,
     AdminRegistriesModule,
+    AdminReportsModule,
     AccessControlModule,
     AdminSearchModule.withEntryComponents(),
     AdminWorkflowModuleModule.withEntryComponents(),
@@ -34,8 +37,8 @@ const ENTRY_COMPONENTS = [
   declarations: [
     AdminCurationTasksComponent,
     MetadataImportPageComponent,
-    BatchImportPageComponent
-  ]
+    BatchImportPageComponent,
+  ],
 })
 export class AdminModule {
   /**
@@ -45,7 +48,7 @@ export class AdminModule {
   static withEntryComponents() {
     return {
       ngModule: AdminModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
index fe2837c6e3..9b95ee0d0a 100644
--- a/src/app/app-routing-paths.ts
+++ b/src/app/app-routing-paths.ts
@@ -1,12 +1,15 @@
-import { DSpaceObject } from './core/shared/dspace-object.model';
-import { Community } from './core/shared/community.model';
-import { Collection } from './core/shared/collection.model';
-import { Item } from './core/shared/item.model';
-import { getCommunityPageRoute } from './community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths';
-import { getItemModuleRoute, getItemPageRoute } from './item-page/item-page-routing-paths';
-import { hasValue } from './shared/empty.util';
+import { getCommunityPageRoute } from './community-page/community-page-routing-paths';
+import { Collection } from './core/shared/collection.model';
+import { Community } from './core/shared/community.model';
+import { DSpaceObject } from './core/shared/dspace-object.model';
+import { Item } from './core/shared/item.model';
 import { URLCombiner } from './core/url-combiner/url-combiner';
+import {
+  getItemModuleRoute,
+  getItemPageRoute,
+} from './item-page/item-page-routing-paths';
+import { hasValue } from './shared/empty.util';
 
 export const BITSTREAM_MODULE_PATH = 'bitstreams';
 
@@ -27,10 +30,11 @@ export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: st
   return {
     routerLink: url,
     queryParams: {
-      bitstream: bitstream.uuid
-    }
+      bitstream: bitstream.uuid,
+    },
   };
 }
+export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
 export const HOME_PAGE_PATH = 'admin';
 
@@ -132,3 +136,10 @@ export const SUBSCRIPTIONS_MODULE_PATH = 'subscriptions';
 export function getSubscriptionsModuleRoute() {
   return `/${SUBSCRIPTIONS_MODULE_PATH}`;
 }
+
+export const EDIT_ITEM_PATH = 'edit-items';
+export function getEditItemPageRoute() {
+  return `/${EDIT_ITEM_PATH}`;
+}
+export const CORRECTION_TYPE_PATH = 'corrections';
+
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index deb68f1ea9..84b6fa9275 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,11 +1,10 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, NoPreloading } from '@angular/router';
-import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
-
-import { AuthenticatedGuard } from './core/auth/authenticated.guard';
 import {
-  SiteAdministratorGuard
-} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+  NoPreloading,
+  RouterModule,
+} from '@angular/router';
+
+import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
   ACCESS_CONTROL_MODULE_PATH,
   ADMIN_MODULE_PATH,
@@ -24,22 +23,22 @@ import {
 } from './app-routing-paths';
 import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
-import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
-import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
-import { ReloadGuard } from './core/reload/reload.guard';
-import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
+import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
+import { AuthenticatedGuard } from './core/auth/authenticated.guard';
+import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
 import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
-import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
-import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
-import {
-  GroupAdministratorGuard
-} from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import {
-  ThemedPageInternalServerErrorComponent
-} from './page-internal-server-error/themed-page-internal-server-error.component';
+import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
+import { ReloadGuard } from './core/reload/reload.guard';
+import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 import { ServerCheckGuard } from './core/server-check/server-check.guard';
+import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
+import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
 import { MenuResolver } from './menu.resolver';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
+import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
+import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
 
 @NgModule({
   imports: [
@@ -57,163 +56,180 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
             path: 'reload/:rnd',
             component: ThemedPageNotFoundComponent,
             pathMatch: 'full',
-            canActivate: [ReloadGuard]
+            canActivate: [ReloadGuard],
           },
           {
             path: 'home',
             loadChildren: () => import('./home-page/home-page.module')
               .then((m) => m.HomePageModule),
             data: { showBreadcrumbs: false },
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'community-list',
             loadChildren: () => import('./community-list-page/community-list-page.module')
               .then((m) => m.CommunityListPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'id',
             loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'handle',
             loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: REGISTER_PATH,
             loadChildren: () => import('./register-page/register-page.module')
               .then((m) => m.RegisterPageModule),
-            canActivate: [SiteRegisterGuard]
+            canActivate: [SiteRegisterGuard],
           },
           {
             path: FORGOT_PASSWORD_PATH,
             loadChildren: () => import('./forgot-password/forgot-password.module')
               .then((m) => m.ForgotPasswordModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard, ForgotPasswordCheckGuard],
           },
           {
             path: COMMUNITY_MODULE_PATH,
             loadChildren: () => import('./community-page/community-page.module')
               .then((m) => m.CommunityPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: COLLECTION_MODULE_PATH,
             loadChildren: () => import('./collection-page/collection-page.module')
               .then((m) => m.CollectionPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: ITEM_MODULE_PATH,
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'entities/:entity-type',
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: LEGACY_BITSTREAM_MODULE_PATH,
             loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: BITSTREAM_MODULE_PATH,
             loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'mydspace',
             loadChildren: () => import('./my-dspace-page/my-dspace-page.module')
               .then((m) => m.MyDSpacePageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'search',
             loadChildren: () => import('./search-page/search-page-routing.module')
               .then((m) => m.SearchPageRoutingModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'browse',
             loadChildren: () => import('./browse-by/browse-by-page.module')
               .then((m) => m.BrowseByPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: ADMIN_MODULE_PATH,
             loadChildren: () => import('./admin/admin.module')
               .then((m) => m.AdminModule),
-            canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
+          },
+          {
+            path: NOTIFICATIONS_MODULE_PATH,
+            loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
+              .then((m) => m.AdminNotificationsModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
+          },
+          {
+            path: NOTIFICATIONS_MODULE_PATH,
+            loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
+              .then((m) => m.NotificationsPageModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page.module')
-              .then((m) => m.LoginPageModule)
+              .then((m) => m.LoginPageModule),
           },
           {
             path: 'logout',
             loadChildren: () => import('./logout-page/logout-page.module')
-              .then((m) => m.LogoutPageModule)
+              .then((m) => m.LogoutPageModule),
           },
           {
             path: 'submit',
             loadChildren: () => import('./submit-page/submit-page.module')
               .then((m) => m.SubmitPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'import-external',
             loadChildren: () => import('./import-external-page/import-external-page.module')
               .then((m) => m.ImportExternalPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'workspaceitems',
             loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module')
               .then((m) => m.WorkspaceitemsEditPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: WORKFLOW_ITEM_MODULE_PATH,
             loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page.module')
               .then((m) => m.WorkflowItemsEditPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: PROFILE_MODULE_PATH,
             loadChildren: () => import('./profile-page/profile-page.module')
               .then((m) => m.ProfilePageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: PROCESS_MODULE_PATH,
             loadChildren: () => import('./process-page/process-page.module')
               .then((m) => m.ProcessPageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
+          },
+          { path: SUGGESTION_MODULE_PATH,
+            loadChildren: () => import('./suggestions-page/suggestions-page.module')
+              .then((m) => m.SuggestionsPageModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: INFO_MODULE_PATH,
-            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule)
+            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
             loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: FORBIDDEN_PATH,
-            component: ThemedForbiddenComponent
+            component: ThemedForbiddenComponent,
           },
           {
             path: 'statistics',
@@ -224,7 +240,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
           {
             path: HEALTH_PAGE_PATH,
             loadChildren: () => import('./health-page/health-page.module')
-              .then((m) => m.HealthPageModule)
+              .then((m) => m.HealthPageModule),
           },
           {
             path: ACCESS_CONTROL_MODULE_PATH,
@@ -235,11 +251,11 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
             path: 'subscriptions',
             loadChildren: () => import('./subscriptions-page/subscriptions-page-routing.module')
               .then((m) => m.SubscriptionsPageRoutingModule),
-            canActivate: [AuthenticatedGuard]
+            canActivate: [AuthenticatedGuard],
           },
           { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
-        ]
-      }
+        ],
+      },
     ], {
       // enableTracing: true,
       useHash: false,
@@ -248,7 +264,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
       initialNavigation: 'enabledBlocking',
       preloadingStrategy: NoPreloading,
       onSameUrlNavigation: 'reload',
-})
+    }),
   ],
   exports: [RouterModule],
 })
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index e921c67ace..70694a1fbb 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,52 +1,68 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-// Load the implementations that should be tested
-import { AppComponent } from './app.component';
-import { HostWindowState } from './shared/search/host-window.reducer';
-import { HostWindowResizeAction } from './shared/host-window.actions';
-import { MetadataService } from './core/metadata/metadata.service';
-
-import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
-import { MetadataServiceMock } from './shared/mocks/metadata-service.mock';
-import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
-import { AuthServiceMock } from './shared/mocks/auth.service.mock';
-import { AuthService } from './core/auth/auth.service';
-import { MenuService } from './shared/menu/menu.service';
-import { CSSVariableService } from './shared/sass-helper/css-variable.service';
-import { CSSVariableServiceStub } from './shared/testing/css-variable-service.stub';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
-import { HostWindowService } from './shared/host-window.service';
-import { HostWindowServiceStub } from './shared/testing/host-window-service.stub';
-import { RouteService } from './core/services/route.service';
-import { MockActivatedRoute } from './shared/mocks/active-router.mock';
-import { RouterMock } from './shared/mocks/router.mock';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { storeModuleConfig } from './app.reducer';
-import { LocaleService } from './core/locale/locale.service';
-import { authReducer } from './core/auth/auth.reducer';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { ThemeService } from './shared/theme-support/theme.service';
-import { getMockThemeService } from './shared/mocks/theme-service.mock';
-import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../config/app-config.interface';
 import { environment } from '../environments/environment';
+// Load the implementations that should be tested
+import { AppComponent } from './app.component';
+import { storeModuleConfig } from './app.reducer';
+import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import { authReducer } from './core/auth/auth.reducer';
+import { AuthService } from './core/auth/auth.service';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { RouteService } from './core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from './core/services/window.service';
+import { HostWindowResizeAction } from './shared/host-window.actions';
+import { HostWindowService } from './shared/host-window.service';
+import { MenuService } from './shared/menu/menu.service';
+import { MockActivatedRoute } from './shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from './shared/mocks/auth.service.mock';
+import { MetadataServiceMock } from './shared/mocks/metadata-service.mock';
+import { RouterMock } from './shared/mocks/router.mock';
+import { getMockThemeService } from './shared/mocks/theme-service.mock';
+import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
+import { CSSVariableService } from './shared/sass-helper/css-variable.service';
+import { HostWindowState } from './shared/search/host-window.reducer';
+import { CSSVariableServiceStub } from './shared/testing/css-variable-service.stub';
+import { HostWindowServiceStub } from './shared/testing/host-window-service.stub';
+import { MenuServiceStub } from './shared/testing/menu-service.stub';
+import { ThemeService } from './shared/theme-support/theme.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
 const menuService = new MenuServiceStub();
 const initialState = {
-  core: { auth: { loading: false } }
+  core: { auth: { loading: false } },
 };
 
 export function getMockLocaleService(): LocaleService {
   return jasmine.createSpyObj('LocaleService', {
-    setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode')
+    setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
   });
 }
 
@@ -64,8 +80,8 @@ describe('App component', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [AppComponent], // declare the test component
@@ -85,9 +101,9 @@ describe('App component', () => {
         { provide: APP_CONFIG, useValue: environment },
         provideMockStore({ initialState }),
         AppComponent,
-        RouteService
+        RouteService,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     };
   };
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ba7b738227..edb1c7966b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,7 @@
-import { distinctUntilChanged, take, withLatestFrom } from 'rxjs/operators';
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
+import {
+  DOCUMENT,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -15,22 +17,39 @@ import {
   NavigationStart,
   Router,
 } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
-import { NgbModal, NgbModalConfig } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbModal,
+  NgbModalConfig,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { HostWindowResizeAction } from './shared/host-window.actions';
-import { HostWindowState } from './shared/search/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-import { isAuthenticationBlocking } from './core/auth/selectors';
-import { AuthService } from './core/auth/auth.service';
-import { CSSVariableService } from './shared/sass-helper/css-variable.service';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+  withLatestFrom,
+} from 'rxjs/operators';
+
 import { environment } from '../environments/environment';
+import { AuthService } from './core/auth/auth.service';
+import { isAuthenticationBlocking } from './core/auth/selectors';
 import { models } from './core/core.module';
-import { ThemeService } from './shared/theme-support/theme.service';
-import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from './core/services/window.service';
 import { distinctNext } from './core/shared/distinct-next';
+import { HostWindowResizeAction } from './shared/host-window.actions';
+import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import { CSSVariableService } from './shared/sass-helper/css-variable.service';
+import { HostWindowState } from './shared/search/host-window.reducer';
+import { ThemeService } from './shared/theme-support/theme.service';
 
 @Component({
   selector: 'ds-app',
@@ -102,7 +121,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
     this.isAuthBlocking$ = this.store.pipe(
       select(isAuthenticationBlocking),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
 
     this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight);
@@ -133,7 +152,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   private dispatchWindowSize(width, height): void {
     this.store.dispatch(
-      new HostWindowResizeAction(width, height)
+      new HostWindowResizeAction(width, height),
     );
   }
 
diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts
index 871fae8d6b..92b5d880d0 100644
--- a/src/app/app.effects.ts
+++ b/src/app/app.effects.ts
@@ -1,9 +1,9 @@
-import { StoreEffects } from './store.effects';
-import { NotificationsEffects } from './shared/notifications/notifications.effects';
 import { NavbarEffects } from './navbar/navbar.effects';
-import { SidebarEffects } from './shared/sidebar/sidebar-effects.service';
 import { RelationshipEffects } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects';
+import { NotificationsEffects } from './shared/notifications/notifications.effects';
+import { SidebarEffects } from './shared/sidebar/sidebar-effects.service';
 import { ThemeEffects } from './shared/theme-support/theme.effects';
+import { StoreEffects } from './store.effects';
 
 export const appEffects = [
   StoreEffects,
@@ -11,5 +11,5 @@ export const appEffects = [
   NotificationsEffects,
   SidebarEffects,
   ThemeEffects,
-  RelationshipEffects
+  RelationshipEffects,
 ];
diff --git a/src/app/app.metareducers.ts b/src/app/app.metareducers.ts
index 4cdecdc797..559389ccd3 100644
--- a/src/app/app.metareducers.ts
+++ b/src/app/app.metareducers.ts
@@ -29,9 +29,9 @@ export function universalMetaReducer(reducer) {
 }
 
 export const debugMetaReducers = [
-  debugMetaReducer
+  debugMetaReducer,
 ];
 
 export const appMetaReducers = [
-  universalMetaReducer
+  universalMetaReducer,
 ];
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 89e361821b..a452459a4a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,35 +1,58 @@
-import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common';
-import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import {
+  APP_BASE_HREF,
+  CommonModule,
+  DOCUMENT,
+} from '@angular/common';
+import {
+  HTTP_INTERCEPTORS,
+  HttpClientModule,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
-import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
-import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
+import {
+  RouterStateSerializer,
+  StoreRouterConnectingModule,
+} from '@ngrx/router-store';
+import {
+  MetaReducer,
+  StoreModule,
+  USER_PROVIDED_META_REDUCERS,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
-import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
 
-import { AppRoutingModule } from './app-routing.module';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../config/app-config.interface';
+import { StoreDevModules } from '../config/store/devtools';
+import { environment } from '../environments/environment';
+import { EagerThemesModule } from '../themes/eager-themes.module';
 import { AppComponent } from './app.component';
 import { appEffects } from './app.effects';
-import { appMetaReducers, debugMetaReducers } from './app.metareducers';
-import { appReducers, AppState, storeModuleConfig } from './app.reducer';
+import {
+  appMetaReducers,
+  debugMetaReducers,
+} from './app.metareducers';
+import {
+  appReducers,
+  AppState,
+  storeModuleConfig,
+} from './app.reducer';
+import { AppRoutingModule } from './app-routing.module';
+import { AuthInterceptor } from './core/auth/auth.interceptor';
 import { CoreModule } from './core/core.module';
+import { LocaleInterceptor } from './core/locale/locale.interceptor';
+import { LogInterceptor } from './core/log/log.interceptor';
 import { ClientCookieService } from './core/services/client-cookie.service';
+import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
 import { NavbarModule } from './navbar/navbar.module';
+import { RootModule } from './root.module';
 import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
 import { SharedModule } from './shared/shared.module';
-import { environment } from '../environments/environment';
-import { AuthInterceptor } from './core/auth/auth.interceptor';
-import { LocaleInterceptor } from './core/locale/locale.interceptor';
-import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
-import { LogInterceptor } from './core/log/log.interceptor';
-import { EagerThemesModule } from '../themes/eager-themes.module';
-import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
-import { StoreDevModules } from '../config/store/devtools';
-import { RootModule } from './root.module';
 
 export function getConfig() {
   return environment;
@@ -67,41 +90,41 @@ const PROVIDERS = [
   {
     provide: APP_BASE_HREF,
     useFactory: getBaseHref,
-    deps: [DOCUMENT, APP_CONFIG]
+    deps: [DOCUMENT, APP_CONFIG],
   },
   {
     provide: USER_PROVIDED_META_REDUCERS,
     useFactory: getMetaReducers,
-    deps: [APP_CONFIG]
+    deps: [APP_CONFIG],
   },
   {
     provide: RouterStateSerializer,
-    useClass: DSpaceRouterStateSerializer
+    useClass: DSpaceRouterStateSerializer,
   },
   ClientCookieService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: AuthInterceptor,
-    multi: true
+    multi: true,
   },
   // register LocaleInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: LocaleInterceptor,
-    multi: true
+    multi: true,
   },
   // register XsrfInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: XsrfInterceptor,
-    multi: true
+    multi: true,
   },
   // register LogInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: LogInterceptor,
-    multi: true
+    multi: true,
   },
   // register the dynamic matcher used by form. MUST be provided by the app module
   ...DYNAMIC_MATCHER_PROVIDERS,
@@ -117,10 +140,10 @@ const EXPORTS = [
 @NgModule({
   imports: [
     BrowserModule.withServerTransition({ appId: 'dspace-angular' }),
-    ...IMPORTS
+    ...IMPORTS,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   declarations: [
     ...DECLARATIONS,
@@ -128,7 +151,7 @@ const EXPORTS = [
   exports: [
     ...EXPORTS,
     ...DECLARATIONS,
-  ]
+  ],
 })
 export class AppModule {
 
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 802ad1aff5..d79a3c1aaa 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -1,53 +1,81 @@
-import { routerReducer, RouterReducerState } from '@ngrx/router-store';
-import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store';
+import {
+  routerReducer,
+  RouterReducerState,
+} from '@ngrx/router-store';
+import {
+  ActionReducerMap,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
 import {
   ePeopleRegistryReducer,
-  EPeopleRegistryState
+  EPeopleRegistryState,
 } from './access-control/epeople-registry/epeople-registry.reducers';
 import {
   groupRegistryReducer,
-  GroupRegistryState
+  GroupRegistryState,
 } from './access-control/group-registry/group-registry.reducers';
 import {
   metadataRegistryReducer,
-  MetadataRegistryState
+  MetadataRegistryState,
 } from './admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   CommunityListReducer,
-  CommunityListState
+  CommunityListState,
 } from './community-list-page/community-list.reducer';
+import { correlationIdReducer } from './correlation-id/correlation-id.reducer';
+import {
+  contextHelpReducer,
+  ContextHelpState,
+} from './shared/context-help.reducer';
 import { hasValue } from './shared/empty.util';
 import {
   NameVariantListsState,
-  nameVariantReducer
+  nameVariantReducer,
 } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
-import { formReducer, FormState } from './shared/form/form.reducer';
-import { menusReducer} from './shared/menu/menu.reducer';
+import {
+  formReducer,
+  FormState,
+} from './shared/form/form.reducer';
+import { menusReducer } from './shared/menu/menu.reducer';
+import { MenusState } from './shared/menu/menus-state.model';
 import {
   notificationsReducer,
-  NotificationsState
+  NotificationsState,
 } from './shared/notifications/notifications.reducers';
 import {
   selectableListReducer,
-  SelectableListsState
+  SelectableListsState,
 } from './shared/object-list/selectable-list/selectable-list.reducer';
 import {
   ObjectSelectionListState,
-  objectSelectionReducer
+  objectSelectionReducer,
 } from './shared/object-select/object-select.reducer';
-import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/css-variable.reducer';
-
-import { hostWindowReducer, HostWindowState } from './shared/search/host-window.reducer';
+import {
+  cssVariablesReducer,
+  CSSVariablesState,
+} from './shared/sass-helper/css-variable.reducer';
+import {
+  hostWindowReducer,
+  HostWindowState,
+} from './shared/search/host-window.reducer';
 import {
   filterReducer,
-  SearchFiltersState
+  SearchFiltersState,
 } from './shared/search/search-filters/search-filter/search-filter.reducer';
-import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer';
-import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
-import { ThemeState, themeReducer } from './shared/theme-support/theme.reducer';
-import { MenusState } from './shared/menu/menus-state.model';
-import { correlationIdReducer } from './correlation-id/correlation-id.reducer';
-import { contextHelpReducer, ContextHelpState } from './shared/context-help.reducer';
+import {
+  sidebarReducer,
+  SidebarState,
+} from './shared/sidebar/sidebar.reducer';
+import {
+  themeReducer,
+  ThemeState,
+} from './shared/theme-support/theme.reducer';
+import {
+  truncatableReducer,
+  TruncatablesState,
+} from './shared/truncatable/truncatable.reducer';
 
 export interface AppState {
   router: RouterReducerState;
@@ -108,6 +136,6 @@ export function keySelector<T>(key: string, selector): MemoizedSelector<AppState
 export const storeModuleConfig = {
   runtimeChecks: {
     strictStateImmutability: true,
-    strictActionImmutability: true
-  }
+    strictActionImmutability: true,
+  },
 };
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
index c41351f380..a460a6c892 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
@@ -1,17 +1,26 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
 
 describe('BitstreamAuthorizationsComponent', () => {
   let comp: BitstreamAuthorizationsComponent<DSpaceObject>;
@@ -23,21 +32,21 @@ describe('BitstreamAuthorizationsComponent', () => {
       'dc.title': [
         {
           value: 'file name',
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      content: { href: 'file-selflink' }
-    }
+      content: { href: 'file-selflink' },
+    },
   });
 
   const bitstreamRD = createSuccessfulRemoteDataObject(bitstream);
 
   const routeStub = {
     data: observableOf({
-      bitstream: bitstreamRD
-    })
+      bitstream: bitstreamRD,
+    }),
   };
 
   beforeEach(waitForAsync(() => {
@@ -47,9 +56,9 @@ describe('BitstreamAuthorizationsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [BitstreamAuthorizationsComponent],
       providers: [
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index adc0638780..c65a0ee9c2 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -1,8 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
@@ -27,7 +32,7 @@ export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> impl
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
index af3afe98f8..1467ffb0cc 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h3>{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h3>
+  <h1 class="h2">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
   <div class="pt-3">
     <button (click)="back()" class="btn btn-outline-secondary">
       <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}
diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
index 59261e56d2..a1dcd894bc 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
@@ -1,19 +1,27 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AuthService } from '../../core/auth/auth.service';
-import { FileService } from '../../core/shared/file.service';
-import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { ActivatedRoute, Router } from '@angular/router';
-import { getForbiddenRoute } from '../../app-routing-paths';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { SignpostingDataService } from '../../core/data/signposting-data.service';
-import { ServerResponseService } from '../../core/services/server-response.service';
 import { PLATFORM_ID } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { getForbiddenRoute } from '../../app-routing-paths';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { FileService } from '../../core/shared/file.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
 
 describe('BitstreamDownloadPageComponent', () => {
   let component: BitstreamDownloadPageComponent;
@@ -33,48 +41,48 @@ describe('BitstreamDownloadPageComponent', () => {
   const mocklink = {
     href: 'http://test.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   const mocklink2 = {
     href: 'http://test2.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   function init() {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     authorizationService = jasmine.createSpyObj('authorizationSerivice', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     fileService = jasmine.createSpyObj('fileService', {
-      retrieveFileDownloadLink: observableOf('content-url-with-headers')
+      retrieveFileDownloadLink: observableOf('content-url-with-headers'),
     });
 
     hardRedirectService = jasmine.createSpyObj('fileService', {
-      redirect: {}
+      redirect: {},
     });
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
         content: { href: 'bitstream-content-link' },
         self: { href: 'bitstream-self-link' },
-      }
+      },
     });
 
     activatedRoute = {
       data: observableOf({
         bitstream: createSuccessfulRemoteDataObject(
-          bitstream
-        )
+          bitstream,
+        ),
       }),
       params: observableOf({
-        id: 'testid'
-      })
+        id: 'testid',
+      }),
     };
 
     router = jasmine.createSpyObj('router', ['navigateByUrl']);
@@ -84,7 +92,7 @@ describe('BitstreamDownloadPageComponent', () => {
     });
 
     signpostingDataService = jasmine.createSpyObj('SignpostingDataService', {
-      getLinks: observableOf([mocklink, mocklink2])
+      getLinks: observableOf([mocklink, mocklink2]),
     });
   }
 
@@ -101,8 +109,8 @@ describe('BitstreamDownloadPageComponent', () => {
         { provide: HardRedirectService, useValue: hardRedirectService },
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
-        { provide: PLATFORM_ID, useValue: 'server' }
-      ]
+        { provide: PLATFORM_ID, useValue: 'server' },
+      ],
     })
       .compileComponents();
   }
diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
index 0b8e6a66e5..d8d9074f66 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
@@ -1,27 +1,51 @@
-import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { getRemoteDataPayload } from '../../core/shared/operators';
-import { Bitstream } from '../../core/shared/bitstream.model';
+import {
+  isPlatformServer,
+  Location,
+} from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { getForbiddenRoute } from '../../app-routing-paths';
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { FileService } from '../../core/shared/file.service';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { getForbiddenRoute } from '../../app-routing-paths';
 import { RemoteData } from '../../core/data/remote-data';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
-import { isPlatformServer, Location } from '@angular/common';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
-import { ServerResponseService } from '../../core/services/server-response.service';
 import { SignpostingLink } from '../../core/data/signposting-links.model';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { FileService } from '../../core/shared/file.service';
+import { getRemoteDataPayload } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-bitstream-download-page',
-  templateUrl: './bitstream-download-page.component.html'
+  templateUrl: './bitstream-download-page.component.html',
 })
 /**
  * Page component for downloading a bitstream
@@ -42,7 +66,7 @@ export class BitstreamDownloadPageComponent implements OnInit {
     public dsoNameService: DSONameService,
     private signpostingDataService: SignpostingDataService,
     private responseService: ServerResponseService,
-    @Inject(PLATFORM_ID) protected platformId: string
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
     this.initPageLinks();
   }
@@ -58,7 +82,7 @@ export class BitstreamDownloadPageComponent implements OnInit {
 
     this.bitstream$ = this.bitstreamRD$.pipe(
       redirectOn4xx(this.router, this.auth),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
     this.bitstream$.pipe(
@@ -80,14 +104,14 @@ export class BitstreamDownloadPageComponent implements OnInit {
         } else {
           return [[isAuthorized, isLoggedIn, bitstream, '']];
         }
-      })
+      }),
     ).subscribe(([isAuthorized, isLoggedIn, bitstream, fileLink]: [boolean, boolean, Bitstream, string]) => {
       if (isAuthorized && isLoggedIn && isNotEmpty(fileLink)) {
         this.hardRedirectService.redirect(fileLink);
       } else if (isAuthorized && !isLoggedIn) {
         this.hardRedirectService.redirect(bitstream._links.content.href);
       } else if (!isAuthorized && isLoggedIn) {
-        this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+        this.router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
       } else if (!isAuthorized && !isLoggedIn) {
         this.auth.setRedirectUrl(this.router.url);
         this.router.navigateByUrl('login');
diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 3960ccb743..fd39466f23 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -1,18 +1,19 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { BitstreamPageResolver } from './bitstream-page.resolver';
-import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
-import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
-import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
-import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
-import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
+import { BitstreamPageResolver } from './bitstream-page.resolver';
 import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -28,7 +29,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
         },
       },
       {
@@ -36,7 +37,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
         },
       },
       {
@@ -44,7 +45,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':id/download',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: BitstreamPageResolver
+          bitstream: BitstreamPageResolver,
         },
       },
       {
@@ -54,7 +55,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           bitstream: BitstreamPageResolver,
           breadcrumb: BitstreamBreadcrumbResolver,
         },
-        canActivate: [AuthenticatedGuard]
+        canActivate: [AuthenticatedGuard],
       },
       {
         path: EDIT_BITSTREAM_AUTHORIZATIONS_PATH,
@@ -63,19 +64,19 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'create',
             resolve: {
-              resourcePolicyTarget: ResourcePolicyTargetResolver
+              resourcePolicyTarget: ResourcePolicyTargetResolver,
             },
             component: ResourcePolicyCreateComponent,
-            data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
+            data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true },
           },
           {
             path: 'edit',
             resolve: {
               breadcrumb: I18nBreadcrumbResolver,
-              resourcePolicy: ResourcePolicyResolver
+              resourcePolicy: ResourcePolicyResolver,
             },
             component: ResourcePolicyEditComponent,
-            data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
+            data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true },
           },
           {
             path: '',
@@ -84,17 +85,17 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
               breadcrumb: BitstreamBreadcrumbResolver,
             },
             component: BitstreamAuthorizationsComponent,
-            data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
-          }
-        ]
-      }
-    ])
+            data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true },
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     BitstreamPageResolver,
     BitstreamBreadcrumbResolver,
-    BitstreamBreadcrumbsService
-  ]
+    BitstreamBreadcrumbsService,
+  ],
 })
 export class BitstreamPageRoutingModule {
 }
diff --git a/src/app/bitstream-page/bitstream-page.module.ts b/src/app/bitstream-page/bitstream-page.module.ts
index 9bbe3d200c..b24ab976c2 100644
--- a/src/app/bitstream-page/bitstream-page.module.ts
+++ b/src/app/bitstream-page/bitstream-page.module.ts
@@ -1,12 +1,13 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared/shared.module';
-import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
-import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
-import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { NgModule } from '@angular/core';
+
 import { FormModule } from '../shared/form/form.module';
 import { ResourcePoliciesModule } from '../shared/resource-policies/resource-policies.module';
+import { SharedModule } from '../shared/shared.module';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
+import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
+import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
 import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
 
 /**
@@ -18,14 +19,14 @@ import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-e
     SharedModule,
     BitstreamPageRoutingModule,
     FormModule,
-    ResourcePoliciesModule
+    ResourcePoliciesModule,
   ],
   declarations: [
     BitstreamAuthorizationsComponent,
     EditBitstreamPageComponent,
     ThemedEditBitstreamPageComponent,
     BitstreamDownloadPageComponent,
-  ]
+  ],
 })
 export class BitstreamPageModule {
 }
diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index db2af2d554..7880247934 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -1,19 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Bitstream } from '../core/shared/bitstream.model';
+
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
  * Requesting them as embeds will limit the number of requests
  */
- export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
+export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
   followLink('bundle', {}, followLink('primaryBitstream'), followLink('item')),
-  followLink('format')
+  followLink('format'),
 ];
 
 /**
@@ -37,12 +45,12 @@ export class BitstreamPageResolver implements Resolve<RemoteData<Bitstream>> {
         getFirstCompletedRemoteData(),
       );
   }
-    /**
+  /**
      * Method that returns the follow links to already resolve
      * The self links defined in this list are expected to be requested somewhere in the near future
      * Requesting them as embeds will limit the number of requests
      */
-    get followLinks(): FollowLinkConfig<Bitstream>[] {
-      return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
-    }
+  get followLinks(): FollowLinkConfig<Bitstream>[] {
+    return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
+  }
 }
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index 11aa3bfe75..b306eb2721 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -8,7 +8,7 @@
         <div class="container">
           <div class="row">
             <div class="col-12">
-              <h3>{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h3>
+              <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
             </div>
           </div>
         </div>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
index 80adde4ecc..e69de29bb2 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
@@ -1,12 +0,0 @@
-:host {
-  ::ng-deep {
-    .switch {
-      position: absolute;
-      top: calc(var(--bs-spacer) * 2.5);
-    }
-  }
-}
-:host ::ng-deep ds-dynamic-form-control-container > div > label {
-  margin-top: 1.75rem;
-}
-
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index b83f2b9664..6f26d537bc 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -1,30 +1,53 @@
-import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { NotificationType } from '../../shared/notifications/models/notification-type';
-import { INotification, Notification } from '../../shared/notifications/models/notification.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { hasValue } from '../../shared/empty.util';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { FileSizePipe } from '../../shared/utils/file-size-pipe';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../../core/shared/item.model';
 import { MetadataValueFilter } from '../../core/shared/metadata.models';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
+import { hasValue } from '../../shared/empty.util';
+import {
+  INotification,
+  Notification,
+} from '../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -62,8 +85,8 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Unknown,
         mimetype: 'application/octet-stream',
         _links: {
-          self: { href: 'format-selflink-1' }
-        }
+          self: { href: 'format-selflink-1' },
+        },
       }),
       Object.assign({
         id: '2',
@@ -72,8 +95,8 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Known,
         mimetype: 'image/png',
         _links: {
-          self: { href: 'format-selflink-2' }
-        }
+          self: { href: 'format-selflink-2' },
+        },
       }),
       Object.assign({
         id: '3',
@@ -82,9 +105,9 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Known,
         mimetype: 'image/gif',
         _links: {
-          self: { href: 'format-selflink-3' }
-        }
-      })
+          self: { href: 'format-selflink-3' },
+        },
+      }),
     ] as BitstreamFormat[];
     selectedFormat = allFormats[1];
 
@@ -98,42 +121,42 @@ describe('EditBitstreamPageComponent', () => {
           return new UntypedFormGroup(controls);
         }
         return undefined;
-      }
+      },
     });
 
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
     });
 
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
 
     bundle = {
       _links: {
         primaryBitstream: {
-          href: 'bundle-selflink'
-        }
+          href: 'bundle-selflink',
+        },
       },
       item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
         uuid: 'some-uuid',
         firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
           return undefined;
         },
-      }))
+      })),
     };
 
     const result = createSuccessfulRemoteDataObject$(bundle);
     primaryBitstreamService = jasmine.createSpyObj('PrimaryBitstreamService',
-    {
-      put: result,
-      create: result,
-      delete: result,
-    });
+      {
+        put: result,
+        create: result,
+        delete: result,
+      });
 
   });
 
@@ -143,15 +166,15 @@ describe('EditBitstreamPageComponent', () => {
       bundle = {
         _links: {
           primaryBitstream: {
-            href: 'bundle-selflink'
-          }
+            href: 'bundle-selflink',
+          },
         },
         item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
           uuid: 'some-uuid',
           firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
             return undefined;
           },
-        }))
+        })),
       };
       const bundleName = 'ORIGINAL';
 
@@ -161,20 +184,20 @@ describe('EditBitstreamPageComponent', () => {
         metadata: {
           'dc.description': [
             {
-              value: 'Bitstream description'
-            }
+              value: 'Bitstream description',
+            },
           ],
           'dc.title': [
             {
-              value: 'Bitstream title'
-            }
-          ]
+              value: 'Bitstream title',
+            },
+          ],
         },
         format: createSuccessfulRemoteDataObject$(selectedFormat),
         _links: {
-          self: 'bitstream-selflink'
+          self: 'bitstream-selflink',
         },
-        bundle: createSuccessfulRemoteDataObject$(bundle)
+        bundle: createSuccessfulRemoteDataObject$(bundle),
       });
       bitstreamService = jasmine.createSpyObj('bitstreamService', {
         findById: createSuccessfulRemoteDataObject$(bitstream),
@@ -182,13 +205,13 @@ describe('EditBitstreamPageComponent', () => {
         update: createSuccessfulRemoteDataObject$(bitstream),
         updateFormat: createSuccessfulRemoteDataObject$(bitstream),
         commitUpdates: {},
-        patch: {}
+        patch: {},
       });
       bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-        findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+        findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
       });
       dsoNameService = jasmine.createSpyObj('dsoNameService', {
-        getName: bundleName
+        getName: bundleName,
       });
 
       TestBed.configureTestingModule({
@@ -201,16 +224,16 @@ describe('EditBitstreamPageComponent', () => {
             provide: ActivatedRoute,
             useValue: {
               data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
-              snapshot: { queryParams: {} }
-            }
+              snapshot: { queryParams: {} },
+            },
           },
           { provide: BitstreamDataService, useValue: bitstreamService },
           { provide: DSONameService, useValue: dsoNameService },
           { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
           { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
-          ChangeDetectorRef
+          ChangeDetectorRef,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
     }));
@@ -293,7 +316,7 @@ describe('EditBitstreamPageComponent', () => {
             });
 
             it('should call put with the correct bitstream on the PrimaryBitstreamService', () => {
-              expect(primaryBitstreamService.put).toHaveBeenCalledWith(jasmine.objectContaining({uuid: currentPrimary}), bundle);
+              expect(primaryBitstreamService.put).toHaveBeenCalledWith(jasmine.objectContaining({ uuid: currentPrimary }), bundle);
             });
           });
 
@@ -304,7 +327,7 @@ describe('EditBitstreamPageComponent', () => {
             });
 
             it('should call create with the correct bitstream on the PrimaryBitstreamService', () => {
-              expect(primaryBitstreamService.create).toHaveBeenCalledWith(jasmine.objectContaining({uuid: currentPrimary}), bundle);
+              expect(primaryBitstreamService.create).toHaveBeenCalledWith(jasmine.objectContaining({ uuid: currentPrimary }), bundle);
             });
           });
         });
@@ -374,8 +397,8 @@ describe('EditBitstreamPageComponent', () => {
         beforeEach(() => {
           comp.formGroup.patchValue({
             formatContainer: {
-              selectedFormat: allFormats[2].id
-            }
+              selectedFormat: allFormats[2].id,
+            },
           });
           fixture.detectChanges();
           comp.onSubmit();
@@ -420,51 +443,51 @@ describe('EditBitstreamPageComponent', () => {
         metadata: {
           'dc.description': [
             {
-              value: 'Bitstream description'
-            }
+              value: 'Bitstream description',
+            },
           ],
           'dc.title': [
             {
-              value: 'Bitstream title'
-            }
+              value: 'Bitstream title',
+            },
           ],
           'iiif.label': [
             {
-              value: 'chapter one'
-            }
+              value: 'chapter one',
+            },
           ],
           'iiif.toc': [
             {
-              value: 'chapter one'
-            }
+              value: 'chapter one',
+            },
           ],
           'iiif.image.width': [
             {
-              value: '2400'
-            }
+              value: '2400',
+            },
           ],
           'iiif.image.height': [
             {
-              value: '2800'
-            }
+              value: '2800',
+            },
           ],
         },
         format: createSuccessfulRemoteDataObject$(allFormats[1]),
         _links: {
-          self: 'bitstream-selflink'
+          self: 'bitstream-selflink',
         },
         bundle: createSuccessfulRemoteDataObject$({
           _links: {
             primaryBitstream: {
-              href: 'bundle-selflink'
-            }
+              href: 'bundle-selflink',
+            },
           },
           item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
             uuid: 'some-uuid',
             firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
               return 'True';
-            }
-          }))
+            },
+          })),
         }),
       });
       bitstreamService = jasmine.createSpyObj('bitstreamService', {
@@ -473,33 +496,33 @@ describe('EditBitstreamPageComponent', () => {
         update: createSuccessfulRemoteDataObject$(bitstream),
         updateFormat: createSuccessfulRemoteDataObject$(bitstream),
         commitUpdates: {},
-        patch: {}
+        patch: {},
       });
 
       dsoNameService = jasmine.createSpyObj('dsoNameService', {
-        getName: bundleName
+        getName: bundleName,
       });
 
       TestBed.configureTestingModule({
         imports: [TranslateModule.forRoot(), RouterTestingModule],
         declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
         providers: [
-          {provide: NotificationsService, useValue: notificationsService},
-          {provide: DynamicFormService, useValue: formService},
+          { provide: NotificationsService, useValue: notificationsService },
+          { provide: DynamicFormService, useValue: formService },
           {
             provide: ActivatedRoute,
             useValue: {
-              data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
-              snapshot: {queryParams: {}}
-            }
+              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              snapshot: { queryParams: {} },
+            },
           },
-          {provide: BitstreamDataService, useValue: bitstreamService},
-          {provide: DSONameService, useValue: dsoNameService},
-          {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+          { provide: BitstreamDataService, useValue: bitstreamService },
+          { provide: DSONameService, useValue: dsoNameService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
           { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
-          ChangeDetectorRef
+          ChangeDetectorRef,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
@@ -535,120 +558,120 @@ describe('EditBitstreamPageComponent', () => {
     });
   });
 
-    describe('ignore OTHERCONTENT bundle', () => {
+  describe('ignore OTHERCONTENT bundle', () => {
 
-      const bundleName = 'OTHERCONTENT';
+    const bundleName = 'OTHERCONTENT';
 
-      beforeEach(waitForAsync(() => {
+    beforeEach(waitForAsync(() => {
 
-        bitstream = Object.assign(new Bitstream(), {
-          metadata: {
-            'dc.description': [
-              {
-                value: 'Bitstream description'
-              }
-            ],
-            'dc.title': [
-              {
-                value: 'Bitstream title'
-              }
-            ],
-            'iiif.label': [
-              {
-                value: 'chapter one'
-              }
-            ],
-            'iiif.toc': [
-              {
-                value: 'chapter one'
-              }
-            ],
-            'iiif.image.width': [
-              {
-                value: '2400'
-              }
-            ],
-            'iiif.image.height': [
-              {
-                value: '2800'
-              }
-            ],
-          },
-          format: createSuccessfulRemoteDataObject$(allFormats[2]),
-          _links: {
-            self: 'bitstream-selflink'
-          },
-          bundle: createSuccessfulRemoteDataObject$({
-            _links: {
-              primaryBitstream: {
-                href: 'bundle-selflink'
-              }
+      bitstream = Object.assign(new Bitstream(), {
+        metadata: {
+          'dc.description': [
+            {
+              value: 'Bitstream description',
             },
-            item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
-              uuid: 'some-uuid',
-              firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-                return 'True';
-              }
-            }))
-          }),
-        });
-        bitstreamService = jasmine.createSpyObj('bitstreamService', {
-          findById: createSuccessfulRemoteDataObject$(bitstream),
-          findByHref: createSuccessfulRemoteDataObject$(bitstream),
-          update: createSuccessfulRemoteDataObject$(bitstream),
-          updateFormat: createSuccessfulRemoteDataObject$(bitstream),
-          commitUpdates: {},
-          patch: {}
-        });
-
-        dsoNameService = jasmine.createSpyObj('dsoNameService', {
-          getName: bundleName
-        });
-
-        TestBed.configureTestingModule({
-          imports: [TranslateModule.forRoot(), RouterTestingModule],
-          declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
-          providers: [
-            {provide: NotificationsService, useValue: notificationsService},
-            {provide: DynamicFormService, useValue: formService},
-            {provide: ActivatedRoute,
-              useValue: {
-                data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
-                snapshot: {queryParams: {}}
-              }
-            },
-            {provide: BitstreamDataService, useValue: bitstreamService},
-            {provide: DSONameService, useValue: dsoNameService},
-            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-            { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
-            ChangeDetectorRef
           ],
-          schemas: [NO_ERRORS_SCHEMA]
-        }).compileComponents();
-      }));
+          'dc.title': [
+            {
+              value: 'Bitstream title',
+            },
+          ],
+          'iiif.label': [
+            {
+              value: 'chapter one',
+            },
+          ],
+          'iiif.toc': [
+            {
+              value: 'chapter one',
+            },
+          ],
+          'iiif.image.width': [
+            {
+              value: '2400',
+            },
+          ],
+          'iiif.image.height': [
+            {
+              value: '2800',
+            },
+          ],
+        },
+        format: createSuccessfulRemoteDataObject$(allFormats[2]),
+        _links: {
+          self: 'bitstream-selflink',
+        },
+        bundle: createSuccessfulRemoteDataObject$({
+          _links: {
+            primaryBitstream: {
+              href: 'bundle-selflink',
+            },
+          },
+          item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+            uuid: 'some-uuid',
+            firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+              return 'True';
+            },
+          })),
+        }),
+      });
+      bitstreamService = jasmine.createSpyObj('bitstreamService', {
+        findById: createSuccessfulRemoteDataObject$(bitstream),
+        findByHref: createSuccessfulRemoteDataObject$(bitstream),
+        update: createSuccessfulRemoteDataObject$(bitstream),
+        updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+        commitUpdates: {},
+        patch: {},
+      });
+
+      dsoNameService = jasmine.createSpyObj('dsoNameService', {
+        getName: bundleName,
+      });
+
+      TestBed.configureTestingModule({
+        imports: [TranslateModule.forRoot(), RouterTestingModule],
+        declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+        providers: [
+          { provide: NotificationsService, useValue: notificationsService },
+          { provide: DynamicFormService, useValue: formService },
+          { provide: ActivatedRoute,
+            useValue: {
+              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              snapshot: { queryParams: {} },
+            },
+          },
+          { provide: BitstreamDataService, useValue: bitstreamService },
+          { provide: DSONameService, useValue: dsoNameService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
+          ChangeDetectorRef,
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(EditBitstreamPageComponent);
+      comp = fixture.componentInstance;
+      fixture.detectChanges();
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigate');
+    });
+
+    describe('EditBitstreamPageComponent with IIIF fields', () => {
+      let rawForm;
 
       beforeEach(() => {
-        fixture = TestBed.createComponent(EditBitstreamPageComponent);
-        comp = fixture.componentInstance;
-        fixture.detectChanges();
-        router = TestBed.inject(Router);
-        spyOn(router, 'navigate');
+        rawForm = comp.formGroup.getRawValue();
       });
 
-      describe('EditBitstreamPageComponent with IIIF fields', () => {
-        let rawForm;
-
-        beforeEach(() => {
-          rawForm = comp.formGroup.getRawValue();
-        });
-
-        it('should NOT set is IIIF to true', () => {
-          expect(comp.isIIIF).toBeFalse();
-        });
-        it('should put the \"IIIF Label\" input not to be shown', () => {
-          expect(rawForm.iiifLabelContainer).toBeFalsy();
-        });
+      it('should NOT set is IIIF to true', () => {
+        expect(comp.isIIIF).toBeFalse();
       });
+      it('should put the \"IIIF Label\" input not to be shown', () => {
+        expect(rawForm.iiifLabelContainer).toBeFalsy();
+      });
+    });
   });
 
 });
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b77d2151a9..84d08c192a 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,37 +1,75 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicFormService,
+  DynamicInputModel,
+  DynamicSelectModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import cloneDeep from 'lodash/cloneDeep';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { Metadata } from '../../core/shared/metadata.utils';
-import { Location } from '@angular/common';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import { Bundle } from '../../core/shared/bundle.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../core/shared/item.model';
+import { Metadata } from '../../core/shared/metadata.utils';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
   styleUrls: ['./edit-bitstream-page.component.scss'],
   templateUrl: './edit-bitstream-page.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 /**
  * Page component for editing a bitstream
@@ -124,20 +162,20 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     name: 'fileName',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'You must provide a file name for the bitstream'
-    }
+      required: 'You must provide a file name for the bitstream',
+    },
   });
 
   /**
    * The Dynamic Switch Model for the file's name
    */
   primaryBitstreamModel = new DynamicCustomSwitchModel({
-      id: 'primaryBitstream',
-      name: 'primaryBitstream'
-    }
+    id: 'primaryBitstream',
+    name: 'primaryBitstream',
+  },
   );
 
   /**
@@ -147,7 +185,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'description',
     name: 'description',
-    rows: 10
+    rows: 10,
   });
 
   /**
@@ -155,7 +193,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   selectedFormatModel = new DynamicSelectModel({
     id: 'selectedFormat',
-    name: 'selectedFormat'
+    name: 'selectedFormat',
   });
 
   /**
@@ -163,29 +201,29 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   newFormatModel = new DynamicInputModel({
     id: 'newFormat',
-    name: 'newFormat'
+    name: 'newFormat',
   });
 
   /**
    * The Dynamic Input Model for the iiif label
    */
   iiifLabelModel = new DsDynamicInputModel({
-      hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
-      id: 'iiifLabel',
-      name: 'iiifLabel'
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
+    id: 'iiifLabel',
+    name: 'iiifLabel',
+  },
+  {
+    grid: {
+      host: 'col col-lg-6 d-inline-block',
     },
-    {
-      grid: {
-        host: 'col col-lg-6 d-inline-block'
-      }
-    });
+  });
   iiifLabelContainer = new DynamicFormGroupModel({
     id: 'iiifLabelContainer',
-    group: [this.iiifLabelModel]
+    group: [this.iiifLabelModel],
   }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifTocModel = new DsDynamicInputModel({
@@ -194,16 +232,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     name: 'iiifToc',
   }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifTocContainer = new DynamicFormGroupModel({
     id: 'iiifTocContainer',
-    group: [this.iiifTocModel]
+    group: [this.iiifTocModel],
   }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifWidthModel = new DsDynamicInputModel({
@@ -212,40 +250,40 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     name: 'iiifWidth',
   }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifWidthContainer = new DynamicFormGroupModel({
     id: 'iiifWidthContainer',
-    group: [this.iiifWidthModel]
+    group: [this.iiifWidthModel],
   }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifHeightModel = new DsDynamicInputModel({
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'iiifHeight',
-    name: 'iiifHeight'
+    name: 'iiifHeight',
   }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifHeightContainer = new DynamicFormGroupModel({
     id: 'iiifHeightContainer',
-    group: [this.iiifHeightModel]
+    group: [this.iiifHeightModel],
   }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   /**
    * All input models in a simple array for easier iterations
    */
-  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel,
+  inputModels = [this.primaryBitstreamModel, this.fileNameModel, this.descriptionModel, this.selectedFormatModel,
     this.newFormatModel];
 
   /**
@@ -256,27 +294,27 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     new DynamicFormGroupModel({
       id: 'fileNamePrimaryContainer',
       group: [
+        this.primaryBitstreamModel,
         this.fileNameModel,
-        this.primaryBitstreamModel
-      ]
+      ],
     }, {
       grid: {
-        host: 'form-row'
-      }
+        host: 'form-row',
+      },
     }),
     new DynamicFormGroupModel({
       id: 'descriptionContainer',
       group: [
-        this.descriptionModel
-      ]
+        this.descriptionModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'formatContainer',
       group: [
         this.selectedFormatModel,
-        this.newFormatModel
-      ]
-    })
+        this.newFormatModel,
+      ],
+    }),
   ];
 
   /**
@@ -290,49 +328,52 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     fileName: {
       grid: {
-        host: 'col col-sm-8 d-inline-block'
-      }
+        host: 'col col-sm-8 d-inline-block',
+      },
     },
     primaryBitstream: {
       grid: {
-        host: 'col col-sm-4 d-inline-block switch border-0'
-      }
+        container: 'col-12',
+      },
+      element: {
+        container: 'text-right',
+      },
     },
     description: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     embargo: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     selectedFormat: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     newFormat: {
       grid: {
-        host: this.newFormatBaseLayout + ' invisible'
-      }
+        host: this.newFormatBaseLayout + ' invisible',
+      },
     },
     fileNamePrimaryContainer: {
       grid: {
-        host: 'row position-relative'
-      }
+        host: 'row position-relative',
+      },
     },
     descriptionContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     formatContainer: {
       grid: {
-        host: 'row'
-      }
-    }
+        host: 'row',
+      },
+    },
   };
 
   /**
@@ -374,7 +415,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   constructor(private route: ActivatedRoute,
               private router: Router,
               private changeDetectorRef: ChangeDetectorRef,
-              private location: Location,
               private formService: DynamicFormService,
               private translate: TranslateService,
               private bitstreamService: BitstreamDataService,
@@ -382,7 +422,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
               private notificationsService: NotificationsService,
               private bitstreamFormatService: BitstreamFormatDataService,
               private primaryBitstreamService: PrimaryBitstreamService,
-              ) {
+  ) {
   }
 
   /**
@@ -440,14 +480,14 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
           this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
           this.itemId = item.uuid;
           this.setIiifStatus(this.bitstream);
-        })
+        }),
     );
 
     this.subs.push(
       this.translate.onLangChange
         .subscribe(() => {
           this.updateFieldTranslations();
-        })
+        }),
     );
   }
 
@@ -469,39 +509,39 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.formGroup.patchValue({
       fileNamePrimaryContainer: {
         fileName: bitstream.name,
-        primaryBitstream: this.primaryBitstreamUUID === bitstream.uuid
+        primaryBitstream: this.primaryBitstreamUUID === bitstream.uuid,
       },
       descriptionContainer: {
-        description: bitstream.firstMetadataValue('dc.description')
+        description: bitstream.firstMetadataValue('dc.description'),
       },
       formatContainer: {
-        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
-      }
+        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
+      },
     });
     if (this.isIIIF) {
       this.formGroup.patchValue({
         iiifLabelContainer: {
-          iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA)
+          iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA),
         },
         iiifTocContainer: {
-          iiifToc: bitstream.firstMetadataValue(this.IIIF_TOC_METADATA)
+          iiifToc: bitstream.firstMetadataValue(this.IIIF_TOC_METADATA),
         },
         iiifWidthContainer: {
-          iiifWidth: bitstream.firstMetadataValue(this.IMAGE_WIDTH_METADATA)
+          iiifWidth: bitstream.firstMetadataValue(this.IMAGE_WIDTH_METADATA),
         },
         iiifHeightContainer: {
-          iiifHeight: bitstream.firstMetadataValue(this.IMAGE_HEIGHT_METADATA)
-        }
+          iiifHeight: bitstream.firstMetadataValue(this.IMAGE_HEIGHT_METADATA),
+        },
       });
     }
     this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     ).subscribe((format: BitstreamFormat) => {
       this.originalFormat = format;
       this.formGroup.patchValue({
         formatContainer: {
-          selectedFormat: format.id
-        }
+          selectedFormat: format.id,
+        },
       });
       this.updateNewFormatLayout(format.id);
     });
@@ -514,7 +554,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
       Object.assign({
         value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription
+        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription,
       }));
   }
 
@@ -546,7 +586,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.inputModels.forEach(
       (fieldModel: DynamicFormControlModel) => {
         this.updateFieldTranslation(fieldModel);
-      }
+      },
     );
   }
 
@@ -600,11 +640,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       const completedBundleRd$ = bundleRd$.pipe(getFirstCompletedRemoteData());
 
       this.subs.push(completedBundleRd$.pipe(
-        filter((bundleRd: RemoteData<Bundle>) => bundleRd.hasFailed)
+        filter((bundleRd: RemoteData<Bundle>) => bundleRd.hasFailed),
       ).subscribe((bundleRd: RemoteData<Bundle>) => {
         this.notificationsService.error(
           this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.primaryBitstream.title'),
-          bundleRd.errorMessage
+          bundleRd.errorMessage,
         );
         errorWhileSaving = true;
       }));
@@ -616,13 +656,13 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
           } else {
             return this.bundle;
           }
-        })
+        }),
       );
 
       this.subs.push(bundle$.pipe(
         hasValueOperator(),
         switchMap((bundle: Bundle) => this.bitstreamService.findByHref(bundle._links.primaryBitstream.href, false)),
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       ).subscribe((bitstream: Bitstream) => {
         this.primaryBitstreamUUID = hasValue(bitstream) ? bitstream.uuid : null;
       }));
@@ -637,12 +677,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
             this.notificationsService.error(
               this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.format.title'),
-              formatResponse.errorMessage
+              formatResponse.errorMessage,
             );
           } else {
             return formatResponse.payload;
           }
-        })
+        }),
       );
     } else {
       bitstream$ = observableOf(this.bitstream);
@@ -652,14 +692,14 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       tap(([bundle]) => this.bundle = bundle),
       switchMap(() => {
         return this.bitstreamService.update(updatedBitstream).pipe(
-          getFirstSucceededRemoteDataPayload()
+          getFirstSucceededRemoteDataPayload(),
         );
-      })
+      }),
     ).subscribe(() => {
       this.bitstreamService.commitUpdates();
       this.notificationsService.success(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.content'),
       );
       if (!errorWhileSaving) {
         this.navigateToItemEditBitstreams();
@@ -753,13 +793,13 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         getFirstSucceededRemoteData(),
         map((item: RemoteData<Item>) =>
           (item.payload.firstMetadataValue('dspace.iiif.enabled') &&
-            item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
+            item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null),
         ))));
 
     const iiifSub = combineLatest(
       isImage$,
       isIIIFBundle$,
-      isEnabled$
+      isEnabled$,
     ).subscribe(([isImage, isIIIFBundle, isEnabled]) => {
       if (isImage && isIIIFBundle && isEnabled) {
         this.isIIIF = true;
diff --git a/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts
index dcca28a495..5c6af7e321 100644
--- a/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
 
 @Component({
   selector: 'ds-themed-edit-bitstream-page',
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
index aec8cd22f4..9fd2dc315a 100644
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
@@ -1,9 +1,10 @@
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 import { EMPTY } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { RemoteData } from '../core/data/remote-data';
-import { TestScheduler } from 'rxjs/testing';
 import { RequestEntryState } from '../core/data/request-entry-state.model';
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 
 describe(`LegacyBitstreamUrlResolver`, () => {
   let resolver: LegacyBitstreamUrlResolver;
@@ -20,7 +21,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
 
     route = {
       params: {},
-      queryParams: {}
+      queryParams: {},
     };
     state = {};
     remoteDataMocks = {
@@ -30,7 +31,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
       Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
     };
     bitstreamDataService = {
-      findByItemHandle: () => undefined
+      findByItemHandle: () => undefined,
     } as any;
     resolver = new LegacyBitstreamUrlResolver(bitstreamDataService);
   });
@@ -44,8 +45,8 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             prefix: '123456789',
             suffix: '1234',
             filename: 'some-file.pdf',
-            sequence_id: '5'
-          }
+            sequence_id: '5',
+          },
         });
       });
       it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
@@ -54,7 +55,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             route.params.sequence_id,
-            route.params.filename
+            route.params.filename,
           );
         });
       });
@@ -71,8 +72,8 @@ describe(`LegacyBitstreamUrlResolver`, () => {
               filename: 'some-file.pdf',
             },
             queryParams: {
-              sequenceId: '5'
-            }
+              sequenceId: '5',
+            },
           });
         });
         it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
@@ -81,7 +82,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
               `${route.params.prefix}/${route.params.suffix}`,
               route.queryParams.sequenceId,
-              route.params.filename
+              route.params.filename,
             );
           });
         });
@@ -103,7 +104,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
               `${route.params.prefix}/${route.params.suffix}`,
               undefined,
-              route.params.filename
+              route.params.filename,
             );
           });
         });
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
index 948bec2473..36e0cd5532 100644
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { hasNoValue } from '../shared/empty.util';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
 
 /**
  * This class resolves a bitstream based on the DSpace 6 XMLUI or JSPUI bitstream download URLs
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>> {
   constructor(protected bitstreamDataService: BitstreamDataService) {
@@ -28,21 +33,21 @@ export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
     Observable<RemoteData<Bitstream>> {
-      const prefix = route.params.prefix;
-      const suffix = route.params.suffix;
-      const filename = route.params.filename;
+    const prefix = route.params.prefix;
+    const suffix = route.params.suffix;
+    const filename = route.params.filename;
 
-      let sequenceId = route.params.sequence_id;
-      if (hasNoValue(sequenceId)) {
-        sequenceId = route.queryParams.sequenceId;
-      }
+    let sequenceId = route.params.sequence_id;
+    if (hasNoValue(sequenceId)) {
+      sequenceId = route.queryParams.sequenceId;
+    }
 
-      return this.bitstreamDataService.findByItemHandle(
-        `${prefix}/${suffix}`,
-        sequenceId,
-        filename,
-      ).pipe(
-        getFirstCompletedRemoteData()
-      );
+    return this.bitstreamDataService.findByItemHandle(
+      `${prefix}/${suffix}`,
+      sequenceId,
+      filename,
+    ).pipe(
+      getFirstCompletedRemoteData(),
+    );
   }
 }
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index bff792eeff..3bba89622f 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(breadcrumbs$ | async) as breadcrumbs">
     <nav *ngIf="(showBreadcrumbs$ | async)" aria-label="breadcrumb" class="nav-breadcrumb">
-        <ol class="container breadcrumb">
+        <ol class="container breadcrumb my-0">
             <ng-container
                     *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
             <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index a4d83b82ea..ac9cb42ce5 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -4,9 +4,8 @@
 
 .breadcrumb {
   border-radius: 0;
-  margin-top: calc(-1 * var(--ds-content-spacing));
-  padding-bottom: var(--ds-content-spacing / 3);
-  padding-top: var(--ds-content-spacing / 3);
+  padding-bottom: calc(var(--ds-content-spacing) / 2);
+  padding-top: calc(var(--ds-content-spacing) / 2);
   background-color: var(--ds-breadcrumb-bg);
 }
 
diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
index 69387e7534..ecaafc88bf 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.spec.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
@@ -1,15 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
+import { VarDirective } from '../shared/utils/var.directive';
+import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 import { BreadcrumbsComponent } from './breadcrumbs.component';
 import { BreadcrumbsService } from './breadcrumbs.service';
-import { Breadcrumb } from './breadcrumb/breadcrumb.model';
-import { VarDirective } from '../shared/utils/var.directive';
-import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
-import { RouterTestingModule } from '@angular/router/testing';
-import { of as observableOf } from 'rxjs';
-import { DebugElement } from '@angular/core';
 
 describe('BreadcrumbsComponent', () => {
   let component: BreadcrumbsComponent;
@@ -50,7 +57,7 @@ describe('BreadcrumbsComponent', () => {
           loader: {
             provide: TranslateLoader,
             useClass: TranslateLoaderMock,
-          }
+          },
         }),
       ],
       providers: [
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 248fb446ed..1d0c61981c 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 import { BreadcrumbsService } from './breadcrumbs.service';
-import { Observable } from 'rxjs';
 
 /**
  * Component representing the breadcrumbs of a page
@@ -9,7 +10,7 @@ import { Observable } from 'rxjs';
 @Component({
   selector: 'ds-breadcrumbs',
   templateUrl: './breadcrumbs.component.html',
-  styleUrls: ['./breadcrumbs.component.scss']
+  styleUrls: ['./breadcrumbs.component.scss'],
 })
 export class BreadcrumbsComponent {
 
diff --git a/src/app/breadcrumbs/breadcrumbs.service.spec.ts b/src/app/breadcrumbs/breadcrumbs.service.spec.ts
index 11b8bace39..89dd2c98b5 100644
--- a/src/app/breadcrumbs/breadcrumbs.service.spec.ts
+++ b/src/app/breadcrumbs/breadcrumbs.service.spec.ts
@@ -1,12 +1,20 @@
 import { TestBed } from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  Subject,
+} from 'rxjs';
 
-import { BreadcrumbsService } from './breadcrumbs.service';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-import { Observable, of as observableOf, Subject } from 'rxjs';
-import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model';
 import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
-import { cold } from 'jasmine-marbles';
+import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model';
+import { BreadcrumbsService } from './breadcrumbs.service';
 
 class TestBreadcrumbsService implements BreadcrumbsProviderService<string> {
   getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
@@ -80,8 +88,8 @@ describe('BreadcrumbsService', () => {
       const route1 = {
         snapshot: {
           data: { breadcrumb: breadcrumbConfigA },
-          routeConfig: { resolve: { breadcrumb: {} } }
-        }
+          routeConfig: { resolve: { breadcrumb: {} } },
+        },
       };
 
       const expectation1 = [
@@ -94,7 +102,7 @@ describe('BreadcrumbsService', () => {
       const route2 = {
         snapshot: {
           data: { breadcrumb: breadcrumbConfigA },
-          routeConfig: { resolve: { breadcrumb: {} } }
+          routeConfig: { resolve: { breadcrumb: {} } },
         },
         firstChild: {
           snapshot: {
@@ -104,10 +112,10 @@ describe('BreadcrumbsService', () => {
           firstChild: {
             snapshot: {
               data: { breadcrumb: breadcrumbConfigB },
-              routeConfig: { resolve: { breadcrumb: {} } }
-            }
-          }
-        }
+              routeConfig: { resolve: { breadcrumb: {} } },
+            },
+          },
+        },
       };
 
       const expectation2 = [
@@ -129,8 +137,8 @@ describe('BreadcrumbsService', () => {
               breadcrumb: breadcrumbConfigA,
               showBreadcrumbs: false, // explicitly hide breadcrumbs
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route1);
@@ -142,8 +150,8 @@ describe('BreadcrumbsService', () => {
               breadcrumb: breadcrumbConfigA,
               showBreadcrumbs: true, // explicitly show breadcrumbs
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route2);
@@ -158,8 +166,8 @@ describe('BreadcrumbsService', () => {
             data: {
               // no breadcrumbs set - always hide
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route1);
diff --git a/src/app/breadcrumbs/breadcrumbs.service.ts b/src/app/breadcrumbs/breadcrumbs.service.ts
index a7be030c12..73ec7da39b 100644
--- a/src/app/breadcrumbs/breadcrumbs.service.ts
+++ b/src/app/breadcrumbs/breadcrumbs.service.ts
@@ -1,12 +1,31 @@
 import { Injectable } from '@angular/core';
-import {combineLatest, Observable, of as observableOf, ReplaySubject} from 'rxjs';
-import {Breadcrumb} from './breadcrumb/breadcrumb.model';
-import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
-import {filter, map, switchMap, tap} from 'rxjs/operators';
-import {hasNoValue, hasValue, isUndefined} from '../shared/empty.util';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  ReplaySubject,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isUndefined,
+} from '../shared/empty.util';
+import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BreadcrumbsService {
 
diff --git a/src/app/breadcrumbs/themed-breadcrumbs.component.ts b/src/app/breadcrumbs/themed-breadcrumbs.component.ts
index 1869a440b9..7dca22bdf1 100644
--- a/src/app/breadcrumbs/themed-breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/themed-breadcrumbs.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { BreadcrumbsComponent } from './breadcrumbs.component';
 
diff --git a/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts
deleted file mode 100644
index 8eeae0c5de..0000000000
--- a/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByDatePageComponent
- * */
-@Component({
-  selector: 'ds-themed-browse-by-metadata-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Date)
-export class ThemedBrowseByDatePageComponent
-  extends ThemedComponent<BrowseByDatePageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByDatePageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-date-page/browse-by-date-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-date-page.component`);
-  }
-}
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
similarity index 72%
rename from src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
rename to src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
index e41d3a45b2..b6e87356f2 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
@@ -1,32 +1,44 @@
-import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BrowseService } from '../../core/browse/browse.service';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { Community } from '../../core/shared/community.model';
-import { Item } from '../../core/shared/item.model';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { BrowseService } from '../../core/browse/browse.service';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
+import { BrowseByDateComponent } from './browse-by-date.component';
 
-describe('BrowseByDatePageComponent', () => {
-  let comp: BrowseByDatePageComponent;
-  let fixture: ComponentFixture<BrowseByDatePageComponent>;
+describe('BrowseByDateComponent', () => {
+  let comp: BrowseByDateComponent;
+  let fixture: ComponentFixture<BrowseByDateComponent>;
   let route: ActivatedRoute;
   let paginationService;
 
@@ -35,9 +47,9 @@ describe('BrowseByDatePageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const firstItem = Object.assign(new Item(), {
@@ -45,40 +57,40 @@ describe('BrowseByDatePageComponent', () => {
     metadata: {
       'dc.date.issued': [
         {
-          value: '1950-01-01'
-        }
-      ]
-    }
+          value: '1950-01-01',
+        },
+      ],
+    },
   });
   const lastItem = Object.assign(new Item(), {
     id: 'last-item-id',
     metadata: {
       'dc.date.issued': [
         {
-          value: '1960-01-01'
-        }
-      ]
-    }
+          value: '1960-01-01',
+        },
+      ],
+    },
   });
 
-   const mockBrowseService = {
-     getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData([]),
-     getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData([firstItem]),
-     getFirstItemFor: (definition: string, scope?: string, sortDirection?: SortDirection) => null
-   };
+  const mockBrowseService = {
+    getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData([]),
+    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData([firstItem]),
+    getFirstItemFor: (definition: string, scope?: string, sortDirection?: SortDirection) => null,
+  };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
     queryParams: observableOf({}),
-    data: observableOf({ metadata: 'dateissued', metadataField: 'dc.date.issued' })
+    data: observableOf({ metadata: 'dateissued', metadataField: 'dc.date.issued' }),
   });
 
   const mockCdRef = Object.assign({
-    detectChanges: () => fixture.detectChanges()
+    detectChanges: () => fixture.detectChanges(),
   });
 
   paginationService = new PaginationServiceStub();
@@ -86,7 +98,7 @@ describe('BrowseByDatePageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByDatePageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByDateComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
@@ -94,14 +106,14 @@ describe('BrowseByDatePageComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
         { provide: ChangeDetectorRef, useValue: mockCdRef },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByDatePageComponent);
+    fixture = TestBed.createComponent(BrowseByDateComponent);
     const browseService = fixture.debugElement.injector.get(BrowseService);
     spyOn(browseService, 'getFirstItemFor')
       // ok to expect the default browse as first param since we just need the mock items obtained via sort direction.
@@ -112,9 +124,13 @@ describe('BrowseByDatePageComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should initialize the list of items', () => {
+  it('should initialize the list of items', (done: DoneFn) => {
+    expect(comp.loading$).toBeObservable(cold('(a|)', {
+      a: false,
+    }));
     comp.items$.subscribe((result) => {
       expect(result.payload.page).toEqual([firstItem]);
+      done();
     });
   });
 
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
similarity index 60%
rename from src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
rename to src/app/browse-by/browse-by-date/browse-by-date.component.ts
index 7074190e1e..7e772fb4c1 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,50 +1,76 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions,
-  getBrowseSearchOptions
-} from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { BrowseService } from '../../core/browse/browse.service';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
-import { PaginationService } from '../../core/pagination/pagination.service';
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { isValidDate } from '../../shared/date.util';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BrowseService } from '../../core/browse/browse.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Item } from '../../core/shared/item.model';
+import { isValidDate } from '../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from '../browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 
 @Component({
-  selector: 'ds-browse-by-date-page',
-  styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html'
+  selector: 'ds-browse-by-date',
+  styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'],
+  templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
 })
 /**
  * Component for browsing items by metadata definition of type 'date'
  * A metadata definition (a.k.a. browse id) is a short term used to describe one or multiple metadata fields.
  * An example would be 'dateissued' for 'dc.date.issued'
  */
-export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
+@rendersBrowseBy(BrowseByDataType.Date)
+export class BrowseByDateComponent extends BrowseByMetadataComponent implements OnInit {
 
   /**
    * The default metadata keys to use for determining the lower limit of the StartsWith dropdown options
    */
   defaultMetadataKeys = ['dc.date.issued'];
 
-  public constructor(protected route: ActivatedRoute,
-                     protected browseService: BrowseService,
-                     protected dsoService: DSpaceObjectDataService,
-                     protected router: Router,
-                     protected paginationService: PaginationService,
-                     protected cdRef: ChangeDetectorRef,
-                     @Inject(APP_CONFIG) public appConfig: AppConfig,
-                     public dsoNameService: DSONameService,
+  public constructor(
+    protected route: ActivatedRoute,
+    protected browseService: BrowseService,
+    protected dsoService: DSpaceObjectDataService,
+    protected paginationService: PaginationService,
+    protected router: Router,
+    @Inject(APP_CONFIG) public appConfig: AppConfig,
+    public dsoNameService: DSONameService,
+    protected cdRef: ChangeDetectorRef,
   ) {
     super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
   }
@@ -57,19 +83,17 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.route.data,
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
         this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), currentPage, currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
-        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
+        const searchOptions = browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails);
         this.updatePageWithItems(searchOptions, this.value, undefined);
-        this.updateParent(params.scope);
-        this.updateLogo();
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
       }));
   }
@@ -85,15 +109,24 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
    * @param scope           The scope under which to fetch the earliest item for
    */
   updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
-    const firstItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
-    const lastItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    const firstItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
+    const lastItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    this.loading$ = observableCombineLatest([
+      firstItemRD$,
+      lastItemRD$,
+    ]).pipe(
+      map(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => firstItemRD.isLoading || lastItemRD.isLoading),
+    );
     this.subs.push(
-      observableCombineLatest([firstItemRD, lastItemRD]).subscribe(([firstItem, lastItem]) => {
-        let lowerLimit = this.getLimit(firstItem, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
-        let upperLimit = this.getLimit(lastItem, metadataKeys, new Date().getUTCFullYear());
-        const options = [];
-        const oneYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
-        const fiveYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
+      observableCombineLatest([
+        firstItemRD$,
+        lastItemRD$,
+      ]).subscribe(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+        let lowerLimit: number = this.getLimit(firstItemRD, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
+        const upperLimit: number = this.getLimit(lastItemRD, metadataKeys, new Date().getUTCFullYear());
+        const options: number[] = [];
+        const oneYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
+        const fiveYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
         if (lowerLimit <= fiveYearBreak) {
           lowerLimit -= 10;
         } else if (lowerLimit <= oneYearBreak) {
@@ -101,7 +134,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         } else {
           lowerLimit -= 1;
         }
-        let i = upperLimit;
+        let i: number = upperLimit;
         while (i > lowerLimit) {
           options.push(i);
           if (i <= fiveYearBreak) {
@@ -116,7 +149,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
           this.startsWithOptions = options;
           this.cdRef.detectChanges();
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
index fc8b40267a..f5b57faa28 100644
--- a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
+++ b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
@@ -1,15 +1,22 @@
 import { Injectable } from '@angular/core';
-import { Community } from '../core/shared/community.model';
-import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
-import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { Collection } from '../core/shared/collection.model';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
 import { map } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
+
 import { getDSORoute } from '../app-routing-paths';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import { hasValue } from '../shared/empty.util';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject on a browse by page
@@ -33,7 +40,7 @@ export class BrowseByDSOBreadcrumbResolver {
         getRemoteDataPayload(),
         map((object: Community | Collection) => {
           return { provider: this.breadcrumbService, key: object, url: getDSORoute(object) };
-        })
+        }),
       );
     }
     return undefined;
diff --git a/src/app/browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts
index aac5ba2723..04a0b99651 100644
--- a/src/app/browse-by/browse-by-guard.spec.ts
+++ b/src/app/browse-by/browse-by-guard.spec.ts
@@ -1,17 +1,17 @@
 import { first } from 'rxjs/operators';
-import { BrowseByGuard } from './browse-by-guard';
-import { of as observableOf } from 'rxjs';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { BrowseByDataType } from './browse-by-switcher/browse-by-decorator';
+
 import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
-import { DSONameServiceMock } from '../shared/mocks/dso-name.service.mock';
-import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
 import { RouterStub } from '../shared/testing/router.stub';
+import { BrowseByGuard } from './browse-by-guard';
+import { BrowseByDataType } from './browse-by-switcher/browse-by-data-type';
 
 describe('BrowseByGuard', () => {
   describe('canActivate', () => {
     let guard: BrowseByGuard;
-    let dsoService: any;
     let translateService: any;
     let browseDefinitionService: any;
     let router: any;
@@ -25,21 +25,17 @@ describe('BrowseByGuard', () => {
     const browseDefinition = Object.assign(new ValueListBrowseDefinition(), { type: BrowseByDataType.Metadata, metadataKeys: ['dc.contributor'] });
 
     beforeEach(() => {
-      dsoService = {
-        findById: (dsoId: string) => observableOf({ payload: { name: name }, hasSucceeded: true })
-      };
-
       translateService = {
-        instant: () => field
+        instant: () => field,
       };
 
       browseDefinitionService = {
-        findById: () => createSuccessfulRemoteDataObject$(browseDefinition)
+        findById: () => createSuccessfulRemoteDataObject$(browseDefinition),
       };
 
       router = new RouterStub() as any;
 
-      guard = new BrowseByGuard(dsoService, translateService, browseDefinitionService, new DSONameServiceMock() as DSONameService, router);
+      guard = new BrowseByGuard(translateService, browseDefinitionService, router);
     });
 
     it('should return true, and sets up the data correctly, with a scope and value', () => {
@@ -48,13 +44,14 @@ describe('BrowseByGuard', () => {
           title: field,
           browseDefinition,
         },
+        parent: null,
         params: {
           id,
         },
         queryParams: {
           scope,
-          value
-        }
+          value,
+        },
       };
       guard.canActivate(scopedRoute as any, undefined)
         .pipe(first())
@@ -64,14 +61,14 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: name,
+              scope,
               field,
-              value: '"' + value + '"'
+              value: '"' + value + '"',
             };
             expect(scopedRoute.data).toEqual(result);
             expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
 
@@ -85,8 +82,8 @@ describe('BrowseByGuard', () => {
           id,
         },
         queryParams: {
-          scope
-        }
+          scope,
+        },
       };
 
       guard.canActivate(scopedNoValueRoute as any, undefined)
@@ -97,29 +94,65 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: name,
+              scope,
               field,
-              value: ''
+              value: '',
             };
             expect(scopedNoValueRoute.data).toEqual(result);
             expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
 
+    it('should return true, and sets up the data correctly using the community/collection page id, with a scope and without value', () => {
+      const scopedNoValueRoute = {
+        data: {
+          title: field,
+          browseDefinition,
+        },
+        parent: {
+          params: {
+            id: scope,
+          },
+        },
+        params: {
+          id,
+        },
+        queryParams: {
+        },
+      };
+
+      guard.canActivate(scopedNoValueRoute as any, undefined).pipe(
+        first(),
+      ).subscribe((canActivate) => {
+        const result = {
+          title,
+          id,
+          browseDefinition,
+          scope,
+          field,
+          value: '',
+        };
+        expect(scopedNoValueRoute.data).toEqual(result);
+        expect(router.navigate).not.toHaveBeenCalled();
+        expect(canActivate).toEqual(true);
+      });
+    });
+
     it('should return true, and sets up the data correctly, without a scope and with a value', () => {
       const route = {
         data: {
           title: field,
           browseDefinition,
         },
+        parent: null,
         params: {
           id,
         },
         queryParams: {
-          value
-        }
+          value,
+        },
       };
       guard.canActivate(route as any, undefined)
         .pipe(first())
@@ -129,14 +162,14 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: '',
+              scope: undefined,
               field,
-              value: '"' + value + '"'
+              value: '"' + value + '"',
             };
             expect(route.data).toEqual(result);
             expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
 
@@ -147,13 +180,14 @@ describe('BrowseByGuard', () => {
         data: {
           title: field,
         },
+        parent: null,
         params: {
           id,
         },
         queryParams: {
           scope,
-          value
-        }
+          value,
+        },
       };
       guard.canActivate(scopedRoute as any, undefined)
         .pipe(first())
diff --git a/src/app/browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts
index dd87699a84..744b5d5ea8 100644
--- a/src/app/browse-by/browse-by-guard.ts
+++ b/src/app/browse-by/browse-by-guard.ts
@@ -1,17 +1,30 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
-import { hasNoValue, hasValue } from '../shared/empty.util';
-import { map, switchMap } from 'rxjs/operators';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Data,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service';
-import { BrowseDefinition } from '../core/shared/browse-definition.model';
-import { DSONameService } from '../core/breadcrumbs/dso-name.service';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { BrowseDefinition } from '../core/shared/browse-definition.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../shared/empty.util';
 
 @Injectable()
 /**
@@ -19,11 +32,10 @@ import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
  */
 export class BrowseByGuard implements CanActivate {
 
-  constructor(protected dsoService: DSpaceObjectDataService,
-              protected translate: TranslateService,
-              protected browseDefinitionService: BrowseDefinitionDataService,
-              protected dsoNameService: DSONameService,
-              protected router: Router,
+  constructor(
+    protected translate: TranslateService,
+    protected browseDefinitionService: BrowseDefinitionDataService,
+    protected router: Router,
   ) {
   }
 
@@ -39,41 +51,30 @@ export class BrowseByGuard implements CanActivate {
     } else {
       browseDefinition$ = observableOf(route.data.browseDefinition);
     }
-    const scope = route.queryParams.scope;
+    const scope = route.queryParams.scope ?? route.parent?.params.id;
     const value = route.queryParams.value;
     const metadataTranslated = this.translate.instant(`browse.metadata.${id}`);
     return browseDefinition$.pipe(
       switchMap((browseDefinition: BrowseDefinition | undefined) => {
         if (hasValue(browseDefinition)) {
-          if (hasValue(scope)) {
-            const dso$: Observable<DSpaceObject> = this.dsoService.findById(scope).pipe(getFirstSucceededRemoteDataPayload());
-            return dso$.pipe(
-              map((dso: DSpaceObject) => {
-                const name = this.dsoNameService.getName(dso);
-                route.data = this.createData(title, id, browseDefinition, name, metadataTranslated, value, route);
-                return true;
-              })
-            );
-          } else {
-            route.data = this.createData(title, id, browseDefinition, '', metadataTranslated, value, route);
-            return observableOf(true);
-          }
+          route.data = this.createData(title, id, browseDefinition, metadataTranslated, value, route, scope);
+          return observableOf(true);
         } else {
           void this.router.navigate([PAGE_NOT_FOUND_PATH]);
           return observableOf(false);
         }
-      })
+      }),
     );
   }
 
-  private createData(title, id, browseDefinition, collection, field, value, route) {
+  private createData(title: string, id: string, browseDefinition: BrowseDefinition, field: string, value: string, route: ActivatedRouteSnapshot, scope: string): Data {
     return Object.assign({}, route.data, {
       title: title,
       id: id,
       browseDefinition: browseDefinition,
-      collection: collection,
       field: field,
-      value: hasValue(value) ? `"${value}"` : ''
+      value: hasValue(value) ? `"${value}"` : '',
+      scope: scope,
     });
   }
 }
diff --git a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
index 56dcd6317b..1687d2a2dd 100644
--- a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
+++ b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
@@ -1,8 +1,12 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
+
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 
 /**
  * This class resolves a BreadcrumbConfig object with an i18n key string for a route
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
deleted file mode 100644
index 8d062d739f..0000000000
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<div class="container">
-    <ng-container *ngVar="(parent$ | async) as parent">
-    <ng-container *ngIf="parent?.payload as parentContext">
-        <div class="d-flex flex-row border-bottom mb-4 pb-4">
-
-            <header class="comcol-header mr-auto">
-        <!-- Parent Name -->
-        <ds-comcol-page-header [name]="dsoNameService.getName(parentContext)">
-        </ds-comcol-page-header>
-      <!-- Collection logo -->
-        <ds-comcol-page-logo *ngIf="logo$"
-                             [logo]="(logo$ | async)?.payload"
-                             [alternateText]="'Community or Collection Logo'">
-        </ds-comcol-page-logo>
-        <!-- Handle -->
-        <ds-themed-comcol-page-handle
-            [content]="parentContext.handle"
-            [title]="parentContext.type+'.page.handle'" >
-        </ds-themed-comcol-page-handle>
-        <!-- Introductory text -->
-        <ds-comcol-page-content [content]="parentContext.introductoryText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-        <!-- News -->
-        <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
-        </ds-comcol-page-content>
-      </header>
-        <ds-dso-edit-menu></ds-dso-edit-menu>
-        </div>
-      <!-- Browse-By Links -->
-      <ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>
-      </ng-container></ng-container>
-
-    <section class="comcol-page-browse-section">
-    <div class="browse-by-metadata w-100">
-    <ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:
-      {
-        collection: dsoNameService.getName((parent$ | async)?.payload),
-        field: 'browse.metadata.' + browseId | translate,
-        startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
-        value: (value)? '&quot;' + value + '&quot;': ''
-      } }}"
-      parentname="{{dsoNameService.getName((parent$ | async)?.payload)}}"
-      [objects$]="(items$ !== undefined)? items$ : browseEntries$"
-      [paginationConfig]="(currentPagination$ |async)"
-      [sortConfig]="(currentSort$ |async)"
-      [type]="startsWithType"
-      [startsWithOptions]="startsWithOptions"
-      (prev)="goPrev()"
-      (next)="goNext()">
-    </ds-browse-by>
-    <ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
-  </div>
-  </section>
-  <ng-container *ngVar="(parent$ | async) as parent">
-    <ng-container *ngIf="parent?.payload as parentContext">
-  <footer *ngIf="parentContext.copyrightText" class="border-top my-5 pt-4">
-    <div >
-
-      <!-- Copyright -->
-      <ds-comcol-page-content [content]="parentContext.copyrightText" [hasInnerHtml]="true">
-      </ds-comcol-page-content>
-    </div>
-  </footer>
-</ng-container>
-</ng-container>
-</div>
diff --git a/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts
deleted file mode 100644
index b0679258e9..0000000000
--- a/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByMetadataPageComponent } from './browse-by-metadata-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByMetadataPageComponent
- **/
-@Component({
-  selector: 'ds-themed-browse-by-metadata-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Metadata)
-export class ThemedBrowseByMetadataPageComponent
-  extends ThemedComponent<BrowseByMetadataPageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByMetadataPageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-metadata-page.component`);
-  }
-}
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
new file mode 100644
index 0000000000..69c3c31c46
--- /dev/null
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -0,0 +1,21 @@
+<section class="comcol-page-browse-section">
+  <div class="browse-by-metadata w-100">
+    <ds-themed-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
+                         title="{{'browse.title' | translate:{
+                           field: 'browse.metadata.' + browseId | translate,
+                           startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
+                           value: (value)? '&quot;' + value + '&quot;': ''
+                         } }}"
+                         [displayTitle]="displayTitle"
+                         [objects$]="(items$ !== undefined)? items$ : browseEntries$"
+                         [paginationConfig]="(currentPagination$ |async)"
+                         [sortConfig]="(currentSort$ |async)"
+                         [type]="startsWithType"
+                         [startsWithOptions]="startsWithOptions"
+                         (prev)="goPrev()"
+                         (next)="goNext()">
+    </ds-themed-browse-by>
+    <ds-themed-loading *ngIf="loading$ | async"
+                       message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
+  </div>
+</section>
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
similarity index 100%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
similarity index 81%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
index a5beeb8a45..e15e41b161 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
@@ -1,39 +1,54 @@
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions,
-  getBrowseSearchOptions
-} from './browse-by-metadata-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowseService } from '../../core/browse/browse.service';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { Observable, of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RemoteData } from '../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
-import { Item } from '../../core/shared/item.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { Community } from '../../core/shared/community.model';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { APP_CONFIG } from '../../../config/app-config.interface';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from './browse-by-metadata.component';
 
-describe('BrowseByMetadataPageComponent', () => {
-  let comp: BrowseByMetadataPageComponent;
-  let fixture: ComponentFixture<BrowseByMetadataPageComponent>;
+describe('BrowseByMetadataComponent', () => {
+  let comp: BrowseByMetadataComponent;
+  let fixture: ComponentFixture<BrowseByMetadataComponent>;
   let browseService: BrowseService;
   let route: ActivatedRoute;
   let paginationService;
@@ -43,16 +58,16 @@ describe('BrowseByMetadataPageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const environmentMock = {
     browseBy: {
       showThumbnails: true,
-      pageSize: 10
-    }
+      pageSize: 10,
+    },
   };
 
   const mockEntries = [
@@ -61,41 +76,41 @@ describe('BrowseByMetadataPageComponent', () => {
       authority: null,
       value: 'John Doe',
       language: 'en',
-      count: 1
+      count: 1,
     },
     {
       type: BrowseEntry.type,
       authority: null,
       value: 'James Doe',
       language: 'en',
-      count: 3
+      count: 3,
     },
     {
       type: BrowseEntry.type,
       authority: null,
       value: 'Fake subject',
       language: 'en',
-      count: 2
-    }
+      count: 2,
+    },
   ];
 
   const mockItems = [
     Object.assign(new Item(), {
-      id: 'fakeId'
-    })
+      id: 'fakeId',
+    }),
   ];
 
   const mockBrowseService = {
     getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData(mockEntries),
-    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
+    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems),
   };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({})
+    params: observableOf({}),
   });
 
   paginationService = new PaginationServiceStub();
@@ -103,21 +118,21 @@ describe('BrowseByMetadataPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByMetadataPageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByMetadataComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environmentMock }
+        { provide: APP_CONFIG, useValue: environmentMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
+    fixture = TestBed.createComponent(BrowseByMetadataComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
     browseService = (comp as any).browseService;
@@ -139,25 +154,23 @@ describe('BrowseByMetadataPageComponent', () => {
     beforeEach(() => {
       const paramsWithValue = {
         metadata: 'author',
-        value: 'John Doe'
+        value: 'John Doe',
       };
 
       route.params = observableOf(paramsWithValue);
       comp.ngOnInit();
-      comp.updateParent('fake-scope');
-      comp.updateLogo();
       fixture.detectChanges();
     });
 
-    it('should fetch items', () => {
+    it('should fetch items', (done: DoneFn) => {
+      expect(comp.loading$).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
       comp.items$.subscribe((result) => {
         expect(result.payload.page).toEqual(mockItems);
+        done();
       });
     });
-
-    it('should fetch the logo', () => {
-      expect(comp.logo$).toBeTruthy();
-    });
   });
 
   describe('when calling browseParamsToOptions', () => {
@@ -165,7 +178,7 @@ describe('BrowseByMetadataPageComponent', () => {
 
     beforeEach(() => {
       const paramsScope = {
-        scope: 'fake-scope'
+        scope: 'fake-scope',
       };
       const paginationOptions = Object.assign(new PaginationComponentOptions(), {
         currentPage: 5,
@@ -176,7 +189,7 @@ describe('BrowseByMetadataPageComponent', () => {
         field: 'fake-field',
       };
 
-      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author', comp.fetchThumbnails);
+      result = browseParamsToOptions(paramsScope, 'fake-scope', paginationOptions, sortOptions, 'author', comp.fetchThumbnails);
     });
 
     it('should return BrowseEntrySearchOptions with the correct properties', () => {
@@ -196,7 +209,7 @@ describe('BrowseByMetadataPageComponent', () => {
 
     beforeEach(() => {
       const paramsScope = {
-        scope: 'fake-scope'
+        scope: 'fake-scope',
       };
       const paginationOptions = Object.assign(new PaginationComponentOptions(), {
         currentPage: 5,
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
similarity index 64%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 113bc67c92..8d5382f27b 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,34 +1,59 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { BrowseService } from '../../core/browse/browse.service';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { Item } from '../../core/shared/item.model';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { getFirstSucceededRemoteData } from '../../core/shared/operators';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { filter, map, mergeMap } from 'rxjs/operators';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { Collection } from '../../core/shared/collection.model';
-import { Community } from '../../core/shared/community.model';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+import {
+  Component,
+  Inject,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BrowseService } from '../../core/browse/browse.service';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { Context } from '../../core/shared/context.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
 @Component({
-  selector: 'ds-browse-by-metadata-page',
-  styleUrls: ['./browse-by-metadata-page.component.scss'],
-  templateUrl: './browse-by-metadata-page.component.html'
+  selector: 'ds-browse-by-metadata',
+  styleUrls: ['./browse-by-metadata.component.scss'],
+  templateUrl: './browse-by-metadata.component.html',
 })
 /**
  * Component for browsing (items) by metadata definition.
@@ -36,7 +61,30 @@ export const BBM_PAGINATION_ID = 'bbm';
  * or multiple metadata fields.  An example would be 'author' for
  * 'dc.contributor.*'
  */
-export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
+@rendersBrowseBy(BrowseByDataType.Metadata)
+export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * The optional context
+   */
+  @Input() context: Context;
+
+  /**
+   * The {@link BrowseByDataType} of this Component
+   */
+  @Input() browseByType: BrowseByDataType;
+
+  /**
+   * The ID of the {@link Community} or {@link Collection} of the scope to display
+   */
+  @Input() scope: string;
+
+  /**
+   * Display the h1 title in the section
+   */
+  @Input() displayTitle = true;
+
+  scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
   /**
    * The list of browse-entries to display
@@ -48,16 +96,6 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
 
-  /**
-   * The current Community or Collection we're browsing metadata/items in
-   */
-  parent$: Observable<RemoteData<DSpaceObject>>;
-
-  /**
-   * The logo of the current Community or Collection
-   */
-  logo$: Observable<RemoteData<Bitstream>>;
-
   /**
    * The pagination config used to display the values
    */
@@ -98,7 +136,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    * The list of StartsWith options
    * Should be defined after ngOnInit is called!
    */
-  startsWithOptions;
+  startsWithOptions: (string | number)[];
 
   /**
    * The value we're browsing items for
@@ -110,7 +148,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
   /**
    * The authority key (may be undefined) associated with {@link #value}.
    */
-   authority: string;
+  authority: string;
 
   /**
    * The current startsWith option (fetched and updated from query-params)
@@ -122,6 +160,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   fetchThumbnails: boolean;
 
+  /**
+   * Observable determining if the loading animation needs to be shown
+   */
+  loading$ = observableOf(true);
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
@@ -130,14 +173,13 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
   ) {
-
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
-        id: BBM_PAGINATION_ID,
-        currentPage: 1,
-        pageSize: this.appConfig.browseBy.pageSize,
-        });
-    }
+      id: BBM_PAGINATION_ID,
+      currentPage: 1,
+      pageSize: this.appConfig.browseBy.pageSize,
+    });
+  }
 
 
   ngOnInit(): void {
@@ -147,37 +189,42 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-          this.browseId = params.id || this.defaultBrowseId;
-          this.authority = params.authority;
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+        this.browseId = params.id || this.defaultBrowseId;
+        this.authority = params.authority;
 
-          if (typeof params.value === 'string'){
-            this.value = params.value.trim();
-          } else {
-            this.value = '';
-          }
+        if (typeof params.value === 'string'){
+          this.value = params.value.trim();
+        } else {
+          this.value = '';
+        }
 
-          if (typeof params.startsWith === 'string'){
-            this.startsWith = params.startsWith.trim();
-          }
+        if (params.startsWith === undefined || params.startsWith === '') {
+          this.startsWith = undefined;
+        }
 
-          if (isNotEmpty(this.value)) {
-            this.updatePageWithItems(
-              browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
-          } else {
-            this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
-          }
-          this.updateParent(params.scope);
-          this.updateLogo();
-        }));
+        if (typeof params.startsWith === 'string'){
+          this.startsWith = params.startsWith.trim();
+        }
+
+        if (isNotEmpty(this.value)) {
+          this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
+        } else {
+          this.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
+        }
+      }));
     this.updateStartsWithTextOptions();
 
   }
 
+  ngOnChanges(): void {
+    this.scope$.next(this.scope);
+  }
+
   /**
    * Update the StartsWith options with text values
    * It adds the value "0-9" as well as all letters from A to Z
@@ -196,6 +243,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
+    this.loading$ = this.browseEntries$.pipe(
+      map((browseEntriesRD: RemoteData<PaginatedList<BrowseEntry>>) => browseEntriesRD.isLoading),
+    );
     this.items$ = undefined;
   }
 
@@ -210,37 +260,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string, authority: string) {
     this.items$ = this.browseService.getBrowseItemsFor(value, authority, searchOptions);
-  }
-
-  /**
-   * Update the parent Community or Collection using their scope
-   * @param scope   The UUID of the Community or Collection to fetch
-   */
-  updateParent(scope: string) {
-    if (hasValue(scope)) {
-      const linksToFollow = () => {
-        return [followLink('logo')];
-      };
-      this.parent$ = this.dsoService.findById(scope,
-        true,
-        true,
-        ...linksToFollow() as FollowLinkConfig<DSpaceObject>[]).pipe(
-        getFirstSucceededRemoteData()
-      );
-    }
-  }
-
-  /**
-   * Update the parent Community or Collection logo
-   */
-  updateLogo() {
-    if (hasValue(this.parent$)) {
-      this.logo$ = this.parent$.pipe(
-        map((rd: RemoteData<Collection | Community>) => rd.payload),
-        filter((collectionOrCommunity: Collection | Community) => hasValue(collectionOrCommunity.logo)),
-        mergeMap((collectionOrCommunity: Collection | Community) => collectionOrCommunity.logo)
-      );
-    }
+    this.loading$ = this.items$.pipe(
+      map((itemsRD: RemoteData<PaginatedList<Item>>) => itemsRD.isLoading),
+    );
   }
 
   /**
@@ -274,7 +296,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+    this.subs.filter((sub: Subscription) => hasValue(sub)).forEach((sub: Subscription) => sub.unsubscribe());
     this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
@@ -290,9 +312,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
  * @returns BrowseEntrySearchOptions instance
  */
 export function getBrowseSearchOptions(defaultBrowseId: string,
-                                       paginationConfig: PaginationComponentOptions,
-                                       sortConfig: SortOptions,
-                                       fetchThumbnails?: boolean) {
+  paginationConfig: PaginationComponentOptions,
+  sortConfig: SortOptions,
+  fetchThumbnails?: boolean) {
   if (!hasValue(fetchThumbnails)) {
     fetchThumbnails = false;
   }
@@ -303,22 +325,24 @@ export function getBrowseSearchOptions(defaultBrowseId: string,
 /**
  * Function to transform query and url parameters into searchOptions used to fetch browse entries or items
  * @param params            URL and query parameters
+ * @param scope             The scope to show the results
  * @param paginationConfig  Pagination configuration
  * @param sortConfig        Sorting configuration
  * @param metadata          Optional metadata definition to fetch browse entries/items for
  * @param fetchThumbnail   Optional parameter for requesting thumbnail images
  */
 export function browseParamsToOptions(params: any,
-                                      paginationConfig: PaginationComponentOptions,
-                                      sortConfig: SortOptions,
-                                      metadata?: string,
-                                      fetchThumbnail?: boolean): BrowseEntrySearchOptions {
+  scope: string,
+  paginationConfig: PaginationComponentOptions,
+  sortConfig: SortOptions,
+  metadata?: string,
+  fetchThumbnail?: boolean): BrowseEntrySearchOptions {
   return new BrowseEntrySearchOptions(
     metadata,
     paginationConfig,
     sortConfig,
     params.startsWith,
-    params.scope,
-    fetchThumbnail
+    scope,
+    fetchThumbnail,
   );
 }
diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index 554a6c4f46..7602e9fa76 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -1,16 +1,24 @@
 import { NgModule } from '@angular/core';
-import { BrowseByRoutingModule } from './browse-by-routing.module';
-import { BrowseByModule } from './browse-by.module';
-import { ItemDataService } from '../core/data/item-data.service';
+
 import { BrowseService } from '../core/browse/browse.service';
-import { BrowseByGuard } from './browse-by-guard';
+import { ItemDataService } from '../core/data/item-data.service';
 import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
+import { SharedModule } from '../shared/shared.module';
+import { BrowseByModule } from './browse-by.module';
+import { BrowseByGuard } from './browse-by-guard';
+import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
+import { BrowseByRoutingModule } from './browse-by-routing.module';
+
+const DECLARATIONS = [
+  BrowseByPageComponent,
+];
 
 @NgModule({
   imports: [
     SharedBrowseByModule,
     BrowseByRoutingModule,
-    BrowseByModule.withEntryComponents(),
+    BrowseByModule,
+    SharedModule,
   ],
   providers: [
     ItemDataService,
@@ -18,8 +26,11 @@ import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.modul
     BrowseByGuard,
   ],
   declarations: [
-
-  ]
+    ...DECLARATIONS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
 })
 export class BrowseByPageModule {
 
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.html b/src/app/browse-by/browse-by-page/browse-by-page.component.html
new file mode 100644
index 0000000000..6e9476e1e9
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.html
@@ -0,0 +1,4 @@
+<div class="container">
+  <ds-browse-by-switcher [browseByType]="browseByType$ | async">
+  </ds-browse-by-switcher>
+</div>
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.scss b/src/app/browse-by/browse-by-page/browse-by-page.component.scss
similarity index 100%
rename from src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.scss
rename to src/app/browse-by/browse-by-page/browse-by-page.component.scss
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
new file mode 100644
index 0000000000..688ce48bf8
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
@@ -0,0 +1,73 @@
+// eslint-disable-next-line max-classes-per-file
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component';
+import { BrowseByPageComponent } from './browse-by-page.component';
+
+@rendersBrowseBy('BrowseByPageComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="BrowseByTestComponent"></span>',
+})
+class BrowseByTestComponent {
+}
+
+class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
+  getRenderType(): BrowseByDataType {
+    return 'BrowseByPageComponent' as BrowseByDataType;
+  }
+}
+
+describe('BrowseByPageComponent', () => {
+  let component: BrowseByPageComponent;
+  let fixture: ComponentFixture<BrowseByPageComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    themeService = getMockThemeService();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        BrowseByPageComponent,
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BrowseByPageComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the correct browse section based on the route browseDefinition', () => {
+    activatedRoute.testData = {
+      browseDefinition: new TestBrowseByPageBrowseDefinition(),
+    };
+
+    fixture.detectChanges();
+
+    expect(component).toBeTruthy();
+    expect(fixture.debugElement.query(By.css('#BrowseByTestComponent'))).not.toBeNull();
+  });
+});
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
new file mode 100644
index 0000000000..7007b89174
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -0,0 +1,35 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+
+@Component({
+  selector: 'ds-browse-by-page',
+  templateUrl: './browse-by-page.component.html',
+  styleUrls: ['./browse-by-page.component.scss'],
+})
+export class BrowseByPageComponent implements OnInit {
+
+  browseByType$: Observable<BrowseByDataType>;
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Fetch the correct browse-by component by using the relevant config from the route data
+   */
+  ngOnInit(): void {
+    this.browseByType$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+    );
+  }
+
+}
diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index bb67dc65ae..5f92268b89 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -1,10 +1,11 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { BrowseByGuard } from './browse-by-guard';
-import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
-import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
+import { RouterModule } from '@angular/router';
+
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
+import { BrowseByGuard } from './browse-by-guard';
+import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
+import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
 
 @NgModule({
   imports: [
@@ -13,23 +14,23 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         path: '',
         resolve: {
           breadcrumb: BrowseByDSOBreadcrumbResolver,
-          menu: DSOEditMenuResolver
+          menu: DSOEditMenuResolver,
         },
         children: [
           {
             path: ':id',
-            component: ThemedBrowseBySwitcherComponent,
+            component: BrowseByPageComponent,
             canActivate: [BrowseByGuard],
             resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
-            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
-          }
-        ]
-      }])
+            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' },
+          },
+        ],
+      }]),
   ],
   providers: [
     BrowseByI18nBreadcrumbResolver,
-    BrowseByDSOBreadcrumbResolver
-  ]
+    BrowseByDSOBreadcrumbResolver,
+  ],
 })
 export class BrowseByRoutingModule {
 
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts b/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts
new file mode 100644
index 0000000000..5324018b34
--- /dev/null
+++ b/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts
@@ -0,0 +1,6 @@
+export enum BrowseByDataType {
+  Title = 'title',
+  Metadata = 'text',
+  Date = 'date',
+  Hierarchy = 'hierarchy',
+}
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
index 19a6277151..64604cdc04 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
@@ -1,4 +1,5 @@
-import { BrowseByDataType, rendersBrowseBy } from './browse-by-decorator';
+import { BrowseByDataType } from './browse-by-data-type';
+import { rendersBrowseBy } from './browse-by-decorator';
 
 describe('BrowseByDecorator', () => {
   const titleDecorator = rendersBrowseBy(BrowseByDataType.Title);
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
index b59a46cae1..8011f86713 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
@@ -1,40 +1,40 @@
-import { hasNoValue } from '../../shared/empty.util';
-import { InjectionToken } from '@angular/core';
+import { Component } from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { hasNoValue } from '../../shared/empty.util';
 import {
   DEFAULT_THEME,
-  resolveTheme
+  resolveTheme,
 } from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
-
-export enum BrowseByDataType {
-  Title = 'title',
-  Metadata = 'text',
-  Date = 'date'
-}
+import { BrowseByDataType } from './browse-by-data-type';
 
 export const DEFAULT_BROWSE_BY_TYPE = BrowseByDataType.Metadata;
+export const DEFAULT_BROWSE_BY_CONTEXT = Context.Any;
 
-export const BROWSE_BY_COMPONENT_FACTORY = new InjectionToken<(browseByType, theme) => GenericConstructor<any>>('getComponentByBrowseByType', {
-  providedIn: 'root',
-  factory: () => getComponentByBrowseByType
-});
-
-const map = new Map();
+const map: Map<BrowseByDataType, Map<Context, Map<string, GenericConstructor<Component>>>> = new Map();
 
 /**
  * Decorator used for rendering Browse-By pages by type
  * @param browseByType  The type of page
+ * @param context The optional context for the component
  * @param theme The optional theme for the component
  */
-export function rendersBrowseBy(browseByType: string, theme = DEFAULT_THEME) {
+export function rendersBrowseBy(browseByType: BrowseByDataType, context = DEFAULT_BROWSE_BY_CONTEXT, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
+    if (hasNoValue(browseByType)) {
+      return;
+    }
     if (hasNoValue(map.get(browseByType))) {
       map.set(browseByType, new Map());
     }
-    if (hasNoValue(map.get(browseByType).get(theme))) {
-      map.get(browseByType).set(theme, component);
+    if (hasNoValue(map.get(browseByType).get(context))) {
+      map.get(browseByType).set(context, new Map());
+    }
+    if (hasNoValue(map.get(browseByType).get(context).get(theme))) {
+      map.get(browseByType).get(context).set(theme, component);
     } else {
-      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}" and theme "${theme}"`);
+      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}", context "${context}" and theme "${theme}"`);
     }
   };
 }
@@ -42,12 +42,17 @@ export function rendersBrowseBy(browseByType: string, theme = DEFAULT_THEME) {
 /**
  * Get the component used for rendering a Browse-By page by type
  * @param browseByType  The type of page
+ * @param context The context to match
  * @param theme the theme to match
  */
-export function getComponentByBrowseByType(browseByType, theme) {
-  let themeMap = map.get(browseByType);
+export function getComponentByBrowseByType(browseByType: BrowseByDataType, context: Context, theme: string): GenericConstructor<Component> {
+  let contextMap: Map<Context, Map<string, GenericConstructor<Component>>> = map.get(browseByType);
+  if (hasNoValue(contextMap)) {
+    contextMap = map.get(DEFAULT_BROWSE_BY_TYPE);
+  }
+  let themeMap: Map<string, GenericConstructor<Component>> = contextMap.get(context);
   if (hasNoValue(themeMap)) {
-    themeMap = map.get(DEFAULT_BROWSE_BY_TYPE);
+    themeMap = contextMap.get(DEFAULT_BROWSE_BY_CONTEXT);
   }
   const comp = resolveTheme(themeMap, theme);
   if (hasNoValue(comp)) {
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
deleted file mode 100644
index afe79cf2b1..0000000000
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-container *ngComponentOutlet="browseByComponent | async"></ng-container>
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index c13405dd4d..1c1898d95f 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -1,13 +1,31 @@
-import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { BROWSE_BY_COMPONENT_FACTORY, BrowseByDataType } from './browse-by-decorator';
-import { BehaviorSubject } from 'rxjs';
-import { ThemeService } from '../../shared/theme-support/theme.service';
+import {
+  Component,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
-import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
 import { NonHierarchicalBrowseDefinition } from '../../core/shared/non-hierarchical-browse-definition';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { BrowseByDataType } from './browse-by-data-type';
+import { rendersBrowseBy } from './browse-by-decorator';
+import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
+
+@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="BrowseByTestComponent"></span>',
+})
+class BrowseByTestComponent {
+}
 
 describe('BrowseBySwitcherComponent', () => {
   let comp: BrowseBySwitcherComponent;
@@ -18,69 +36,68 @@ describe('BrowseBySwitcherComponent', () => {
       new FlatBrowseDefinition(), {
         id: 'title',
         dataType: BrowseByDataType.Title,
-      }
+      },
     ),
     Object.assign(
       new FlatBrowseDefinition(), {
         id: 'dateissued',
         dataType: BrowseByDataType.Date,
-        metadataKeys: ['dc.date.issued']
-      }
+        metadataKeys: ['dc.date.issued'],
+      },
     ),
     Object.assign(
       new ValueListBrowseDefinition(), {
         id: 'author',
         dataType: BrowseByDataType.Metadata,
-      }
+      },
     ),
     Object.assign(
       new ValueListBrowseDefinition(), {
         id: 'subject',
         dataType: BrowseByDataType.Metadata,
-      }
+      },
     ),
   ];
 
-  const data = new BehaviorSubject(createDataWithBrowseDefinition(new FlatBrowseDefinition()));
-
-  const activatedRouteStub = {
-    data
-  };
-
   let themeService: ThemeService;
-  let themeName: string;
+  const themeName = 'dspace';
 
   beforeEach(waitForAsync(() => {
-    themeName = 'dspace';
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: themeName,
-    });
+    themeService = getMockThemeService(themeName);
 
-    TestBed.configureTestingModule({
-      declarations: [BrowseBySwitcherComponent],
-      providers: [
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: ThemeService, useValue: themeService },
-        { provide: BROWSE_BY_COMPONENT_FACTORY, useValue: jasmine.createSpy('getComponentByBrowseByType').and.returnValue(null) }
+    void TestBed.configureTestingModule({
+      declarations: [
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(BrowseBySwitcherComponent);
     comp = fixture.componentInstance;
+    spyOn(comp, 'getComponent').and.returnValue(BrowseByTestComponent);
+    spyOn(comp, 'connectInputsAndOutputs').and.callThrough();
   }));
 
   types.forEach((type: NonHierarchicalBrowseDefinition) => {
     describe(`when switching to a browse-by page for "${type.id}"`, () => {
-      beforeEach(() => {
-        data.next(createDataWithBrowseDefinition(type));
+      beforeEach(async () => {
+        comp.browseByType = type.dataType;
+        comp.ngOnChanges({
+          browseByType: new SimpleChange(undefined, type.dataType, true),
+        });
         fixture.detectChanges();
+        await fixture.whenStable();
       });
 
-      it(`should call getComponentByBrowseByType with type "${type.dataType}"`, () => {
-        expect((comp as any).getComponentByBrowseByType).toHaveBeenCalledWith(type.dataType, themeName);
+      it(`should call getComponent with type "${type.dataType}"`, () => {
+        expect(comp.getComponent).toHaveBeenCalled();
+        expect(comp.connectInputsAndOutputs).toHaveBeenCalled();
       });
     });
   });
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index 35e4edf900..c7fcd4e9d3 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -1,38 +1,42 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { BROWSE_BY_COMPONENT_FACTORY } from './browse-by-decorator';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { BrowseDefinition } from '../../core/shared/browse-definition.model';
-import { ThemeService } from '../../shared/theme-support/theme.service';
+import { AbstractComponentLoaderComponent } from '../../shared/abstract-component-loader/abstract-component-loader.component';
+import { BrowseByDataType } from './browse-by-data-type';
+import { getComponentByBrowseByType } from './browse-by-decorator';
 
 @Component({
   selector: 'ds-browse-by-switcher',
-  templateUrl: './browse-by-switcher.component.html'
+  templateUrl: '../../shared/abstract-component-loader/abstract-component-loader.component.html',
 })
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-export class BrowseBySwitcherComponent implements OnInit {
+export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<Component> {
 
-  /**
-   * Resolved browse-by component
-   */
-  browseByComponent: Observable<any>;
+  @Input() context: Context;
 
-  public constructor(protected route: ActivatedRoute,
-                     protected themeService: ThemeService,
-                     @Inject(BROWSE_BY_COMPONENT_FACTORY) private getComponentByBrowseByType: (browseByType, theme) => GenericConstructor<any>) {
-  }
+  @Input() browseByType: BrowseByDataType;
 
-  /**
-   * Fetch the correct browse-by component by using the relevant config from the route data
-   */
-  ngOnInit(): void {
-    this.browseByComponent = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.getRenderType(), this.themeService.getThemeName()))
-    );
+  @Input() displayTitle: boolean;
+
+  @Input() scope: string;
+
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'context',
+    'browseByType',
+  ];
+
+  protected inputNames: (keyof this & string)[] = [
+    'context',
+    'browseByType',
+    'displayTitle',
+    'scope',
+  ];
+
+  public getComponent(): GenericConstructor<Component> {
+    return getComponentByBrowseByType(this.browseByType, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts b/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts
new file mode 100644
index 0000000000..b670b7bea4
--- /dev/null
+++ b/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts
@@ -0,0 +1,19 @@
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
+
+/**
+ * Directive used as a hook to know where to inject the dynamic loaded component
+ */
+@Directive({
+  selector: '[dsDynamicComponentLoader]',
+})
+export class DynamicComponentLoaderDirective {
+
+  constructor(
+    public viewContainerRef: ViewContainerRef,
+  ) {
+  }
+
+}
diff --git a/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts
deleted file mode 100644
index 0187d4e3c5..0000000000
--- a/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
-
-/**
- * Themed wrapper for BrowseBySwitcherComponent
- */
-@Component({
-  selector: 'ds-themed-browse-by-switcher',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html'
-})
-export class ThemedBrowseBySwitcherComponent extends ThemedComponent<BrowseBySwitcherComponent> {
-  protected getComponentName(): string {
-    return 'BrowseBySwitcherComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-switcher/browse-by-switcher.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-switcher.component`);
-  }
-
-
-}
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts
deleted file mode 100644
index cf6345bf39..0000000000
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { ActivatedRoute } from '@angular/router';
-import { Observable, Subscription } from 'rxjs';
-import { BrowseDefinition } from '../../core/shared/browse-definition.model';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { BROWSE_BY_COMPONENT_FACTORY } from '../browse-by-switcher/browse-by-decorator';
-import { map } from 'rxjs/operators';
-import { ThemeService } from 'src/app/shared/theme-support/theme.service';
-import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
-
-@Component({
-  selector: 'ds-browse-by-taxonomy-page',
-  templateUrl: './browse-by-taxonomy-page.component.html',
-  styleUrls: ['./browse-by-taxonomy-page.component.scss']
-})
-/**
- * Component for browsing items by metadata in a hierarchical controlled vocabulary
- */
-export class BrowseByTaxonomyPageComponent implements OnInit, OnDestroy {
-
-  /**
-   * The {@link VocabularyOptions} object
-   */
-  vocabularyOptions: VocabularyOptions;
-
-  /**
-   * The selected vocabulary entries
-   */
-  selectedItems: VocabularyEntryDetail[] = [];
-
-  /**
-   * The query parameters, contain the selected entries
-   */
-  filterValues: string[];
-
-  /**
-   * The facet the use when filtering
-   */
-  facetType: string;
-
-  /**
-   * The used vocabulary
-   */
-  vocabularyName: string;
-
-  /**
-   * The parameters used in the URL
-   */
-  queryParams: any;
-
-  /**
-   * Resolved browse-by component
-   */
-  browseByComponent: Observable<any>;
-
-  /**
-   * Subscriptions to track
-   */
-  browseByComponentSubs: Subscription[] = [];
-
-  public constructor( protected route: ActivatedRoute,
-                      protected themeService: ThemeService,
-                      @Inject(BROWSE_BY_COMPONENT_FACTORY) private getComponentByBrowseByType: (browseByType, theme) => GenericConstructor<any>) {
-  }
-
-  ngOnInit(): void {
-    this.browseByComponent = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => {
-        this.getComponentByBrowseByType(data.browseDefinition.getRenderType(), this.themeService.getThemeName());
-        return data.browseDefinition;
-      })
-    );
-    this.browseByComponentSubs.push(this.browseByComponent.subscribe((browseDefinition: HierarchicalBrowseDefinition) => {
-      this.facetType = browseDefinition.facetType;
-      this.vocabularyName = browseDefinition.vocabulary;
-      this.vocabularyOptions = { name: this.vocabularyName, closed: true };
-    }));
-  }
-
-  /**
-   * Adds detail to selectedItems, transforms it to be used as query parameter
-   * and adds that to filterValues.
-   *
-   * @param detail VocabularyEntryDetail to be added
-   */
-  onSelect(detail: VocabularyEntryDetail): void {
-      this.selectedItems.push(detail);
-      this.filterValues = this.selectedItems
-        .map((item: VocabularyEntryDetail) => `${item.value},equals`);
-    this.updateQueryParams();
-  }
-
-  /**
-   * Removes detail from selectedItems and filterValues.
-   *
-   * @param detail VocabularyEntryDetail to be removed
-   */
-  onDeselect(detail: VocabularyEntryDetail): void {
-    this.selectedItems = this.selectedItems.filter((entry: VocabularyEntryDetail) => { return entry.id !== detail.id; });
-    this.filterValues = this.filterValues.filter((value: string) => { return value !== `${detail.value},equals`; });
-    this.updateQueryParams();
-  }
-
-  /**
-   * Updates queryParams based on the current facetType and filterValues.
-   */
-  private updateQueryParams(): void {
-    this.queryParams = {
-      ['f.' + this.facetType]: this.filterValues
-    };
-  }
-
-  ngOnDestroy(): void {
-    this.browseByComponentSubs.forEach((sub: Subscription) => sub.unsubscribe());
-  }
-}
diff --git a/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts b/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts
deleted file mode 100644
index 212044b853..0000000000
--- a/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Component } from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
-import { BrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page.component';
-
-@Component({
-  selector: 'ds-themed-browse-by-taxonomy-page',
-  templateUrl: '../../shared/theme-support/themed.component.html',
-  styleUrls: []
-})
-/**
- * Themed wrapper for BrowseByTaxonomyPageComponent
- */
-@rendersBrowseBy('hierarchy')
-export class ThemedBrowseByTaxonomyPageComponent extends ThemedComponent<BrowseByTaxonomyPageComponent>{
-
-  protected getComponentName(): string {
-    return 'BrowseByTaxonomyPageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-taxonomy-page.component`);
-  }
-}
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
similarity index 70%
rename from src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
rename to src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
index 0ae3da6847..3dd9b6b25a 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
@@ -1,4 +1,11 @@
-<div class="container">
+<section>
+  <h1 *ngIf="displayTitle">
+    {{ ('browse.title') | translate:{
+    field: 'browse.metadata.' + vocabularyName | translate,
+    startsWith: '',
+    value: '',
+  } }}
+  </h1>
   <div class="mb-3">
     <ds-vocabulary-treeview [vocabularyOptions]=vocabularyOptions
                             [multiSelect]="true"
@@ -11,4 +18,4 @@
      [queryParams]="queryParams"
      [queryParamsHandling]="'merge'">
     {{ 'browse.taxonomy.button' | translate }}</a>
-</div>
+</section>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.scss b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
similarity index 100%
rename from src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.scss
rename to src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.spec.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts
similarity index 65%
rename from src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.spec.ts
rename to src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts
index c724017b1f..6841acb1dc 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts
@@ -1,25 +1,28 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page.component';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
-import { createDataWithBrowseDefinition } from '../browse-by-switcher/browse-by-switcher.component.spec';
-import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
-import { ThemeService } from '../../shared/theme-support/theme.service';
 
-describe('BrowseByTaxonomyPageComponent', () => {
-  let component: BrowseByTaxonomyPageComponent;
-  let fixture: ComponentFixture<BrowseByTaxonomyPageComponent>;
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { createDataWithBrowseDefinition } from '../browse-by-switcher/browse-by-switcher.component.spec';
+import { BrowseByTaxonomyComponent } from './browse-by-taxonomy.component';
+
+describe('BrowseByTaxonomyComponent', () => {
+  let component: BrowseByTaxonomyComponent;
+  let fixture: ComponentFixture<BrowseByTaxonomyComponent>;
   let themeService: ThemeService;
   let detail1: VocabularyEntryDetail;
   let detail2: VocabularyEntryDetail;
 
   const data = new BehaviorSubject(createDataWithBrowseDefinition(new HierarchicalBrowseDefinition()));
   const activatedRouteStub = {
-    data
+    data,
   };
 
   beforeEach(async () => {
@@ -29,19 +32,22 @@ describe('BrowseByTaxonomyPageComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [ TranslateModule.forRoot() ],
-      declarations: [ BrowseByTaxonomyPageComponent ],
+      declarations: [
+        BrowseByTaxonomyComponent,
+      ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByTaxonomyPageComponent);
+    fixture = TestBed.createComponent(BrowseByTaxonomyComponent);
     component = fixture.componentInstance;
+    spyOn(component, 'updateQueryParams').and.callThrough();
     fixture.detectChanges();
     detail1 = new VocabularyEntryDetail();
     detail2 = new VocabularyEntryDetail();
@@ -61,6 +67,7 @@ describe('BrowseByTaxonomyPageComponent', () => {
     expect(component.selectedItems).toContain(detail1);
     expect(component.selectedItems.length).toBe(1);
     expect(component.filterValues).toEqual(['HUMANITIES and RELIGION,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
   });
 
   it('should handle select event with multiple selected items', () => {
@@ -70,6 +77,7 @@ describe('BrowseByTaxonomyPageComponent', () => {
     expect(component.selectedItems).toContain(detail1, detail2);
     expect(component.selectedItems.length).toBe(2);
     expect(component.filterValues).toEqual(['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
   });
 
   it('should handle deselect event', () => {
@@ -82,6 +90,33 @@ describe('BrowseByTaxonomyPageComponent', () => {
     expect(component.selectedItems).toContain(detail2);
     expect(component.selectedItems.length).toBe(1);
     expect(component.filterValues).toEqual(['TECHNOLOGY,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
+  });
+
+  describe('updateQueryParams', () => {
+    beforeEach(() => {
+      component.facetType = 'subject';
+      component.filterValues = ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'];
+    });
+
+    it('should update the queryParams with the selected filterValues', () => {
+      component.updateQueryParams();
+
+      expect(component.queryParams).toEqual({
+        'f.subject': ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'],
+      });
+    });
+
+    it('should include the scope if present', () => {
+      component.scope = '67f849f1-2499-4872-8c61-9e2b47d71068';
+
+      component.updateQueryParams();
+
+      expect(component.queryParams).toEqual({
+        'f.subject': ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'],
+        'scope': '67f849f1-2499-4872-8c61-9e2b47d71068',
+      });
+    });
   });
 
   afterEach(() => {
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
new file mode 100644
index 0000000000..92dc7a4a6e
--- /dev/null
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -0,0 +1,169 @@
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { Context } from '../../core/shared/context.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { hasValue } from '../../shared/empty.util';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+
+@Component({
+  selector: 'ds-browse-by-taxonomy',
+  templateUrl: './browse-by-taxonomy.component.html',
+  styleUrls: ['./browse-by-taxonomy.component.scss'],
+})
+/**
+ * Component for browsing items by metadata in a hierarchical controlled vocabulary
+ */
+@rendersBrowseBy(BrowseByDataType.Hierarchy)
+export class BrowseByTaxonomyComponent implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * The optional context
+   */
+  @Input() context: Context;
+
+  /**
+   * The {@link BrowseByDataType} of this Component
+   */
+  @Input() browseByType: BrowseByDataType;
+
+  /**
+   * The ID of the {@link Community} or {@link Collection} of the scope to display
+   */
+  @Input() scope: string;
+
+  /**
+   * Display the h1 title in the section
+   */
+  @Input() displayTitle = true;
+
+  scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
+
+  /**
+   * The {@link VocabularyOptions} object
+   */
+  vocabularyOptions: VocabularyOptions;
+
+  /**
+   * The selected vocabulary entries
+   */
+  selectedItems: VocabularyEntryDetail[] = [];
+
+  /**
+   * The query parameters, contain the selected entries
+   */
+  filterValues: string[];
+
+  /**
+   * The facet the use when filtering
+   */
+  facetType: string;
+
+  /**
+   * The used vocabulary
+   */
+  vocabularyName: string;
+
+  /**
+   * The parameters used in the URL
+   */
+  queryParams: Params;
+
+  /**
+   * Resolved browse-by definition
+   */
+  browseDefinition$: Observable<BrowseDefinition>;
+
+  /**
+   * Subscriptions to track
+   */
+  subs: Subscription[] = [];
+
+  public constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.browseDefinition$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => {
+        return data.browseDefinition;
+      }),
+    );
+    this.subs.push(this.browseDefinition$.subscribe((browseDefinition: HierarchicalBrowseDefinition) => {
+      this.facetType = browseDefinition.facetType;
+      this.vocabularyName = browseDefinition.vocabulary;
+      this.vocabularyOptions = { name: this.vocabularyName, closed: true };
+    }));
+    this.subs.push(this.scope$.subscribe(() => {
+      this.updateQueryParams();
+    }));
+  }
+
+  ngOnChanges(): void {
+    this.scope$.next(this.scope);
+  }
+
+  /**
+   * Adds detail to selectedItems, transforms it to be used as query parameter
+   * and adds that to filterValues.
+   *
+   * @param detail VocabularyEntryDetail to be added
+   */
+  onSelect(detail: VocabularyEntryDetail): void {
+    this.selectedItems.push(detail);
+    this.filterValues = this.selectedItems
+      .map((item: VocabularyEntryDetail) => `${item.value},equals`);
+    this.updateQueryParams();
+  }
+
+  /**
+   * Removes detail from selectedItems and filterValues.
+   *
+   * @param detail VocabularyEntryDetail to be removed
+   */
+  onDeselect(detail: VocabularyEntryDetail): void {
+    this.selectedItems = this.selectedItems.filter((entry: VocabularyEntryDetail) => {
+      return entry.id !== detail.id;
+    });
+    this.filterValues = this.filterValues.filter((value: string) => {
+      return value !== `${detail.value},equals`;
+    });
+    this.updateQueryParams();
+  }
+
+  /**
+   * Updates queryParams based on the current facetType and filterValues.
+   */
+  updateQueryParams(): void {
+    this.queryParams = {
+      ['f.' + this.facetType]: this.filterValues,
+    };
+    if (hasValue(this.scope)) {
+      this.queryParams.scope = this.scope;
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
deleted file mode 100644
index 58df79ebe8..0000000000
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component, Inject } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasValue } from '../../shared/empty.util';
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions, getBrowseSearchOptions
-} from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { BrowseService } from '../../core/browse/browse.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-
-@Component({
-  selector: 'ds-browse-by-title-page',
-  styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-/**
- * Component for browsing items by title (dc.title)
- */
-export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
-
-  public constructor(protected route: ActivatedRoute,
-                     protected browseService: BrowseService,
-                     protected dsoService: DSpaceObjectDataService,
-                     protected paginationService: PaginationService,
-                     protected router: Router,
-                     @Inject(APP_CONFIG) public appConfig: AppConfig,
-                     public dsoNameService: DSONameService,
-  ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
-  }
-
-  ngOnInit(): void {
-    const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
-    this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
-    this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
-    this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-        this.startsWith = +params.startsWith || params.startsWith;
-        this.browseId = params.id || this.defaultBrowseId;
-        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
-        this.updateParent(params.scope);
-        this.updateLogo();
-      }));
-    this.updateStartsWithTextOptions();
-  }
-
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-
-}
diff --git a/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts
deleted file mode 100644
index 4a1bcc0bc1..0000000000
--- a/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByTitlePageComponent
- */
-@Component({
-  selector: 'ds-themed-browse-by-title-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Title)
-export class ThemedBrowseByTitlePageComponent
-  extends ThemedComponent<BrowseByTitlePageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByTitlePageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-title-page/browse-by-title-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-title-page.component`);
-  }
-}
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
similarity index 76%
rename from src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
rename to src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
index e32c0ac430..83d52db2ae 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
@@ -1,32 +1,39 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Item } from '../../core/shared/item.model';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
-import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { Community } from '../../core/shared/community.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { BrowseService } from '../../core/browse/browse.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { BrowseService } from '../../core/browse/browse.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
+import { BrowseByTitleComponent } from './browse-by-title.component';
 
-
-describe('BrowseByTitlePageComponent', () => {
-  let comp: BrowseByTitlePageComponent;
-  let fixture: ComponentFixture<BrowseByTitlePageComponent>;
+describe('BrowseByTitleComponent', () => {
+  let comp: BrowseByTitleComponent;
+  let fixture: ComponentFixture<BrowseByTitleComponent>;
   let itemDataService: ItemDataService;
   let route: ActivatedRoute;
 
@@ -35,9 +42,9 @@ describe('BrowseByTitlePageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const mockItems = [
@@ -46,24 +53,24 @@ describe('BrowseByTitlePageComponent', () => {
       metadata: [
         {
           key: 'dc.title',
-          value: 'Fake Title'
-        }
-      ]
-    })
+          value: 'Fake Title',
+        },
+      ],
+    }),
   ];
 
   const mockBrowseService = {
     getBrowseItemsFor: () => toRemoteData(mockItems),
-    getBrowseEntriesFor: () => toRemoteData([])
+    getBrowseEntriesFor: () => toRemoteData([]),
   };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
-    data: observableOf({ metadata: 'title' })
+    data: observableOf({ metadata: 'title' }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -71,21 +78,21 @@ describe('BrowseByTitlePageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByTitlePageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByTitleComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByTitlePageComponent);
+    fixture = TestBed.createComponent(BrowseByTitleComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
     itemDataService = (comp as any).itemDataService;
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
new file mode 100644
index 0000000000..d7e5ca4494
--- /dev/null
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -0,0 +1,52 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import { combineLatest as observableCombineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from '../browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+
+@Component({
+  selector: 'ds-browse-by-title',
+  styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'],
+  templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
+})
+/**
+ * Component for browsing items by title (dc.title)
+ */
+@rendersBrowseBy(BrowseByDataType.Title)
+export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
+
+  ngOnInit(): void {
+    const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    // include the thumbnail configuration in browse search options
+    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
+    this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
+    this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    this.subs.push(
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+        this.startsWith = +params.startsWith || params.startsWith;
+        this.browseId = params.id || this.defaultBrowseId;
+        this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
+      }));
+    this.updateStartsWithTextOptions();
+  }
+
+}
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index c0e2d3f9ff..4fcbc61ec5 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -1,49 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component';
-import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component';
-import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
-import { BrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/browse-by-taxonomy-page.component';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
-import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
-import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
-import { ThemedBrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component';
+import { NgModule } from '@angular/core';
+
 import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
+import { BrowseByDateComponent } from './browse-by-date/browse-by-date.component';
+import { BrowseByMetadataComponent } from './browse-by-metadata/browse-by-metadata.component';
+import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
+import { BrowseByTaxonomyComponent } from './browse-by-taxonomy/browse-by-taxonomy.component';
+import { BrowseByTitleComponent } from './browse-by-title/browse-by-title.component';
+
+const DECLARATIONS = [
+  BrowseBySwitcherComponent,
+];
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
-  BrowseByTitlePageComponent,
-  BrowseByMetadataPageComponent,
-  BrowseByDatePageComponent,
-  BrowseByTaxonomyPageComponent,
-
-  ThemedBrowseByMetadataPageComponent,
-  ThemedBrowseByDatePageComponent,
-  ThemedBrowseByTitlePageComponent,
-  ThemedBrowseByTaxonomyPageComponent,
+  BrowseByTitleComponent,
+  BrowseByMetadataComponent,
+  BrowseByDateComponent,
+  BrowseByTaxonomyComponent,
 ];
 
 @NgModule({
   imports: [
     SharedBrowseByModule,
     CommonModule,
-    ComcolModule,
     DsoPageModule,
     FormModule,
+    SharedModule,
   ],
   declarations: [
-    BrowseBySwitcherComponent,
-    ThemedBrowseBySwitcherComponent,
-    ...ENTRY_COMPONENTS
+    ...DECLARATIONS,
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
-    BrowseBySwitcherComponent
-  ]
+    ...DECLARATIONS,
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class BrowseByModule {
   /**
@@ -53,7 +48,7 @@ export class BrowseByModule {
   static withEntryComponents() {
     return {
       ngModule: SharedBrowseByModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index ebb03df3b9..b0fe0cdf17 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -1,29 +1,41 @@
-import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, SimpleChange, SimpleChanges } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnInit,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormOptionConfig,
   DynamicFormService,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  hasNoValue,
+  isNotNull,
+} from 'src/app/shared/empty.util';
 
-import { Collection } from '../../core/shared/collection.model';
-import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CommunityDataService } from '../../core/data/community-data.service';
 import { AuthService } from '../../core/auth/auth.service';
-import { RequestService } from '../../core/data/request.service';
 import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
 import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
-import { collectionFormEntityTypeSelectionConfig, collectionFormModels, } from './collection-form.models';
-import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
-import { hasNoValue, isNotNull } from 'src/app/shared/empty.util';
-
+import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  collectionFormEntityTypeSelectionConfig,
+  collectionFormModels,
+} from './collection-form.models';
 
 /**
  * Form used for creating and editing collections
@@ -31,7 +43,7 @@ import { hasNoValue, isNotNull } from 'src/app/shared/empty.util';
 @Component({
   selector: 'ds-collection-form',
   styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html',
 })
 export class CollectionFormComponent extends ComColFormComponent<Collection> implements OnInit, OnChanges {
   /**
@@ -92,30 +104,29 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
     }
 
     const entities$: Observable<ItemType[]> = this.entityTypeService.findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
-      getFirstSucceededRemoteListPayload()
+      getFirstSucceededRemoteListPayload(),
     );
 
     // retrieve all entity types to populate the dropdowns selection
     entities$.subscribe((entityTypes: ItemType[]) => {
 
-        entityTypes
-          .filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE)
-          .forEach((type: ItemType, index: number) => {
-          this.entityTypeSelection.add({
-            disabled: false,
-            label: type.label,
-            value: type.label
-          } as DynamicFormOptionConfig<string>);
-          if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
-            this.entityTypeSelection.select(index);
-            this.entityTypeSelection.disabled = true;
-          }
-        });
+      entityTypes = entityTypes.filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE);
+      entityTypes.forEach((type: ItemType, index: number) => {
+        this.entityTypeSelection.add({
+          disabled: false,
+          label: type.label,
+          value: type.label,
+        } as DynamicFormOptionConfig<string>);
+        if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
+          this.entityTypeSelection.select(index);
+          this.entityTypeSelection.disabled = true;
+        }
+      });
 
-        this.formModel = [...collectionFormModels, this.entityTypeSelection];
+      this.formModel = entityTypes.length === 0 ? collectionFormModels : [...collectionFormModels, this.entityTypeSelection];
 
-        super.ngOnInit();
-        this.chd.detectChanges();
+      super.ngOnInit();
+      this.chd.detectChanges();
     });
 
   }
diff --git a/src/app/collection-page/collection-form/collection-form.models.ts b/src/app/collection-page/collection-form/collection-form.models.ts
index 1a009d95a1..22998af674 100644
--- a/src/app/collection-page/collection-form/collection-form.models.ts
+++ b/src/app/collection-page/collection-form/collection-form.models.ts
@@ -1,11 +1,16 @@
-import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicInputModel,
+  DynamicTextAreaModel,
+} from '@ng-dynamic-forms/core';
 import { DynamicSelectModelConfig } from '@ng-dynamic-forms/core/lib/model/select/dynamic-select.model';
+
 import { environment } from '../../../environments/environment';
 
 export const collectionFormEntityTypeSelectionConfig: DynamicSelectModelConfig<string> = {
   id: 'entityType',
   name: 'dspace.entity.type',
-  disabled: false
+  disabled: false,
 };
 
 /**
@@ -18,10 +23,10 @@ export const collectionFormModels: DynamicFormControlModel[] = [
     name: 'dc.title',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'Please enter a name for this title'
+      required: 'Please enter a name for this title',
     },
   }),
   new DynamicTextAreaModel({
@@ -48,5 +53,5 @@ export const collectionFormModels: DynamicFormControlModel[] = [
     id: 'license',
     name: 'dc.rights.license',
     spellCheck: environment.form.spellCheck,
-  })
+  }),
 ];
diff --git a/src/app/collection-page/collection-form/collection-form.module.ts b/src/app/collection-page/collection-form/collection-form.module.ts
index ddf18f0586..0d1f69c18e 100644
--- a/src/app/collection-page/collection-form/collection-form.module.ts
+++ b/src/app/collection-page/collection-form/collection-form.module.ts
@@ -1,22 +1,22 @@
 import { NgModule } from '@angular/core';
 
-import { CollectionFormComponent } from './collection-form.component';
-import { SharedModule } from '../../shared/shared.module';
 import { ComcolModule } from '../../shared/comcol/comcol.module';
 import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { CollectionFormComponent } from './collection-form.component';
 
 @NgModule({
   imports: [
     ComcolModule,
     FormModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     CollectionFormComponent,
   ],
   exports: [
-    CollectionFormComponent
-  ]
+    CollectionFormComponent,
+  ],
 })
 export class CollectionFormModule {
 
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index a48c4d15bf..77f85d5f78 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'collection.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -23,7 +23,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index db844b588f..54b2c42168 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -1,52 +1,66 @@
-import { CollectionItemMapperComponent } from './collection-item-mapper.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { CommonModule } from '@angular/common';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { SearchFormComponent } from '../../shared/search-form/search-form.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { SearchServiceStub } from '../../shared/testing/search-service.stub';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { FormsModule } from '@angular/forms';
-import { Collection } from '../../core/shared/collection.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { EventEmitter } from '@angular/core';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { By } from '@angular/platform-browser';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { RouteService } from '../../core/services/route.service';
+import { Collection } from '../../core/shared/collection.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { ErrorComponent } from '../../shared/error/error.component';
+import { HostWindowService } from '../../shared/host-window.service';
+import { LoadingComponent } from '../../shared/loading/loading.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
 import { ObjectSelectService } from '../../shared/object-select/object-select.service';
-import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { of as observableOf } from 'rxjs';
-import { RouteService } from '../../core/services/route.service';
-import { ErrorComponent } from '../../shared/error/error.component';
-import { LoadingComponent } from '../../shared/loading/loading.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchFormComponent } from '../../shared/search-form/search-form.component';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { SearchServiceStub } from '../../shared/testing/search-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { CollectionItemMapperComponent } from './collection-item-mapper.component';
 
 describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -64,32 +78,32 @@ describe('CollectionItemMapperComponent', () => {
     name: 'test-collection',
     _links: {
       mappedItems: {
-        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems'
+        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems',
       },
       self: {
-        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4'
-      }
-    }
+        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+      },
+    },
   });
   const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
     sort: new SortOptions('dc.title', SortDirection.ASC),
-    scope: mockCollection.id
+    scope: mockCollection.id,
   }));
   const url = 'http://test.url';
   const urlWithParam = url + '?param=value';
   const routerStub = Object.assign(new RouterStub(), {
     url: urlWithParam,
     navigateByUrl: {},
-    navigate: {}
+    navigate: {},
   });
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
@@ -99,31 +113,31 @@ describe('CollectionItemMapperComponent', () => {
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockCollectionRD
-      })
+        dso: mockCollectionRD,
+      }),
     },
     snapshot: {
       queryParamMap: new Map([
         ['query', 'test'],
-      ])
-    }
+      ]),
+    },
   };
   const translateServiceStub = {
     get: () => observableOf('test-message of collection ' + mockCollection.name),
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
-    onDefaultLangChange: new EventEmitter()
+    onDefaultLangChange: new EventEmitter(),
   };
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   });
   const collectionDataServiceStub = {
     getMappedItems: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearMappedItemsRequests: () => {}
+    clearMappedItemsRequests: () => {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const routeServiceStub = {
@@ -135,20 +149,20 @@ describe('CollectionItemMapperComponent', () => {
     },
     getQueryParamsWithPrefix: () => {
       return observableOf('');
-    }
+    },
   };
   const fixedFilterServiceStub = {
     getQueryByFilterName: () => {
       return observableOf('');
-    }
+    },
   };
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -161,9 +175,9 @@ describe('CollectionItemMapperComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -186,15 +200,15 @@ describe('CollectionItemMapperComponent', () => {
         { provide: GroupDataService, useValue: groupDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
-      ]
+      ],
     }).overrideComponent(CollectionItemMapperComponent, {
       set: {
         providers: [
           {
             provide: SEARCH_CONFIG_SERVICE,
-            useClass: SearchConfigurationServiceStub
-          }
-        ] }
+            useClass: SearchConfigurationServiceStub,
+          },
+        ] },
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 776b82f9b4..31bbec4519 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -1,35 +1,59 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { map, startWith, switchMap, take } from 'rxjs/operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
-  toDSpaceObjectListRD
+  toDSpaceObjectListRD,
 } from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { isNotEmpty } from '../../shared/empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -38,14 +62,14 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
+    fadeInOut,
   ],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 /**
  * Component used to map items to a collection
@@ -58,7 +82,7 @@ export class CollectionItemMapperComponent implements OnInit {
    * A view on the tabset element
    * Used to switch tabs programmatically
    */
-  @ViewChild('tabs', {static: false}) tabs;
+  @ViewChild('tabs', { static: false }) tabs;
 
   /**
    * The collection to map items to
@@ -115,13 +139,13 @@ export class CollectionItemMapperComponent implements OnInit {
   ngOnInit(): void {
     this.collectionRD$ = this.route.parent.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
-      getFirstSucceededRemoteData()
+      getFirstSucceededRemoteData(),
     );
 
     this.collectionName$ = this.collectionRD$.pipe(
       map((rd: RemoteData<Collection>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadItemLists();
@@ -136,7 +160,7 @@ export class CollectionItemMapperComponent implements OnInit {
     const collectionAndOptions$ = observableCombineLatest(
       this.collectionRD$,
       this.searchOptions$,
-      this.shouldUpdate$
+      this.shouldUpdate$,
     );
     this.collectionItemsRD$ = collectionAndOptions$.pipe(
       switchMap(([collectionRD, options, shouldUpdate]) => {
@@ -148,9 +172,9 @@ export class CollectionItemMapperComponent implements OnInit {
           elementsPerPage: options.pagination.pageSize,
           sort: this.defaultSortOptions,
         }),!shouldUpdate, false, followLink('owningCollection')).pipe(
-          getAllSucceededRemoteData()
+          getAllSucceededRemoteData(),
         );
-      })
+      }),
     );
     this.mappedItemsRD$ = collectionAndOptions$.pipe(
       switchMap(([collectionRD, options, shouldUpdate]) => {
@@ -158,12 +182,12 @@ export class CollectionItemMapperComponent implements OnInit {
           query: this.buildQuery(collectionRD.payload.id, options.query),
           scope: undefined,
           dsoTypes: [DSpaceObjectType.ITEM],
-          sort: this.defaultSortOptions
+          sort: this.defaultSortOptions,
         }), 10000, undefined, undefined, followLink('owningCollection')).pipe(
           toDSpaceObjectListRD(),
-          startWith(undefined)
+          startWith(undefined),
         );
-      })
+      }),
     );
   }
 
@@ -178,18 +202,18 @@ export class CollectionItemMapperComponent implements OnInit {
       map((collectionRD: RemoteData<Collection>) => collectionRD.payload),
       switchMap((collection: Collection) =>
         observableCombineLatest(ids.map((id: string) => {
-            if (remove) {
-              return this.itemDataService.removeMappingFromCollection(id, collection.id).pipe(
-                getFirstCompletedRemoteData()
-              );
-            } else {
-              return this.itemDataService.mapToCollection(id, collection._links.self.href).pipe(
-                getFirstCompletedRemoteData()
-              );
-            }
+          if (remove) {
+            return this.itemDataService.removeMappingFromCollection(id, collection.id).pipe(
+              getFirstCompletedRemoteData(),
+            );
+          } else {
+            return this.itemDataService.mapToCollection(id, collection._links.self.href).pipe(
+              getFirstCompletedRemoteData(),
+            );
           }
-        ))
-      )
+        },
+        )),
+      ),
     );
 
     this.showNotifications(responses$, remove);
@@ -209,7 +233,7 @@ export class CollectionItemMapperComponent implements OnInit {
       if (successful.length > 0) {
         const successMessages = observableCombineLatest(
           this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.head`),
-          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length })
+          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length }),
         );
 
         successMessages.subscribe(([head, content]) => {
@@ -220,7 +244,7 @@ export class CollectionItemMapperComponent implements OnInit {
       if (unsuccessful.length > 0) {
         const unsuccessMessages = observableCombineLatest(
           this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.head`),
-          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length })
+          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length }),
         );
 
         unsuccessMessages.subscribe(([head, content]) => {
@@ -279,7 +303,7 @@ export class CollectionItemMapperComponent implements OnInit {
     this.collectionRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((collection: Collection) => {
       this.router.navigate(['/collections/', collection.id]);
     });
diff --git a/src/app/collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts
index c7866515b2..caecd6ef43 100644
--- a/src/app/collection-page/collection-page-administrator.guard.ts
+++ b/src/app/collection-page/collection-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Collection } from '../core/shared/collection.model';
-import { CollectionPageResolver } from './collection-page.resolver';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../core/auth/auth.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
 import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { AuthService } from '../core/auth/auth.service';
+import { Collection } from '../core/shared/collection.model';
+import { CollectionPageResolver } from './collection-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Collection} pages requiring administrator rights
diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 9dc25b778e..75ce2fe9d2 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -1,27 +1,31 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { CollectionPageResolver } from './collection-page.resolver';
-import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
+import { BrowseByGuard } from '../browse-by/browse-by-guard';
+import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
-import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
-import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
 import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { LinkService } from '../core/cache/builders/link.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import {
-  ITEMTEMPLATE_PATH,
-  COLLECTION_EDIT_PATH,
-  COLLECTION_CREATE_PATH
-} from './collection-page-routing-paths';
-import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard';
-import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { ThemedCollectionPageComponent } from './themed-collection-page.component';
-import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { LinkService } from '../core/cache/builders/link.service';
+import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
+import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { CollectionPageResolver } from './collection-page.resolver';
+import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard';
+import {
+  COLLECTION_CREATE_PATH,
+  COLLECTION_EDIT_PATH,
+  ITEMTEMPLATE_PATH,
+} from './collection-page-routing-paths';
+import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
+import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
+import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
+import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
+import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
+import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 
 @NgModule({
   imports: [
@@ -29,14 +33,14 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
       {
         path: COLLECTION_CREATE_PATH,
         component: CreateCollectionPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
+        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard],
       },
       {
         path: ':id',
         resolve: {
           dso: CollectionPageResolver,
           breadcrumb: CollectionBreadcrumbResolver,
-          menu: DSOEditMenuResolver
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -44,7 +48,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: COLLECTION_EDIT_PATH,
             loadChildren: () => import('./edit-collection-page/edit-collection-page.module')
               .then((m) => m.EditCollectionPageModule),
-            canActivate: [CollectionPageAdministratorGuard]
+            canActivate: [CollectionPageAdministratorGuard],
           },
           {
             path: 'delete',
@@ -58,15 +62,31 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             canActivate: [AuthenticatedGuard],
             resolve: {
               item: ItemTemplatePageResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' }
+            data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' },
           },
           {
             path: '',
             component: ThemedCollectionPageComponent,
-            pathMatch: 'full',
-          }
+            children: [
+              {
+                path: '',
+                pathMatch: 'full',
+                component: ComcolSearchSectionComponent,
+              },
+              {
+                path: 'browse/:id',
+                pathMatch: 'full',
+                component: ComcolBrowseByComponent,
+                canActivate: [BrowseByGuard],
+                resolve: {
+                  breadcrumb: BrowseByI18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'browse.metadata' },
+              },
+            ],
+          },
         ],
         data: {
           menu: {
@@ -84,7 +104,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
           },
         },
       },
-    ])
+    ]),
   ],
   providers: [
     CollectionPageResolver,
@@ -94,7 +114,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     CreateCollectionPageGuard,
     CollectionPageAdministratorGuard,
-  ]
+  ],
 })
 export class CollectionPageRoutingModule {
 
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 02c63d316d..d5da37c12f 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,81 +1,61 @@
 <div class="container">
-    <div class="collection-page"
-         *ngVar="(collectionRD$ | async) as collectionRD">
-              <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-                      <div *ngIf="collectionRD?.payload as collection">
-              <ds-view-tracker [object]="collection"></ds-view-tracker>
-              <div class="d-flex flex-row border-bottom mb-4 pb-4">
-                <header class="comcol-header mr-auto">
-                  <!-- Collection Name -->
-                  <ds-comcol-page-header
-                          [name]="dsoNameService.getName(collection)">
-                  </ds-comcol-page-header>
-                  <!-- Collection logo -->
-                  <ds-comcol-page-logo *ngIf="logoRD$"
-                                   [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'">
-                  </ds-comcol-page-logo>
+  <div class="collection-page"
+       *ngVar="(collectionRD$ | async) as collectionRD">
+    <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
+      <div *ngIf="collectionRD?.payload as collection">
+        <ds-view-tracker [object]="collection"></ds-view-tracker>
+        <div class="d-flex flex-row border-bottom mb-4 pb-4">
+          <header class="comcol-header mr-auto">
+            <!-- Collection Name -->
+            <ds-comcol-page-header
+                [name]="dsoNameService.getName(collection)">
+            </ds-comcol-page-header>
+            <!-- Collection logo -->
+            <ds-comcol-page-logo *ngIf="logoRD$"
+                                 [logo]="(logoRD$ | async)?.payload"
+                                 [alternateText]="'collection.logo' | translate">
+            </ds-comcol-page-logo>
 
-                  <!-- Handle -->
-                  <ds-themed-comcol-page-handle
-                          [content]="collection.handle"
-                          [title]="'collection.page.handle'" >
-                  </ds-themed-comcol-page-handle>
-                  <!-- Introductory text -->
-                  <ds-comcol-page-content
-                          [content]="collection.introductoryText"
-                          [hasInnerHtml]="true">
-                  </ds-comcol-page-content>
-                  <!-- News -->
-                  <ds-comcol-page-content
-                          [content]="collection.sidebarText"
-                          [hasInnerHtml]="true"
-                          [title]="'collection.page.news'">
-                  </ds-comcol-page-content>
-                </header>
-                <ds-dso-edit-menu></ds-dso-edit-menu>
-                <div class="pl-2 space-children-mr">
-                  <ds-dso-page-subscription-button [dso]="collection"></ds-dso-page-subscription-button>
-                </div>
-              </div>
-              <section class="comcol-page-browse-section">
-              <!-- Browse-By Links -->
-              <ds-themed-comcol-page-browse-by
-                      [id]="collection.id"
-                      [contentType]="collection.type">
-              </ds-themed-comcol-page-browse-by>
+            <!-- Handle -->
+            <ds-themed-comcol-page-handle
+                [content]="collection.handle"
+                [title]="'collection.page.handle'">
+            </ds-themed-comcol-page-handle>
+            <!-- Introductory text -->
+            <ds-comcol-page-content
+                [content]="collection.introductoryText"
+                [hasInnerHtml]="true">
+            </ds-comcol-page-content>
+            <!-- News -->
+            <ds-comcol-page-content
+                [content]="collection.sidebarText"
+                [hasInnerHtml]="true"
+                [title]="'collection.page.news'">
+            </ds-comcol-page-content>
+          </header>
+          <ds-dso-edit-menu></ds-dso-edit-menu>
+        </div>
+        <section class="comcol-page-browse-section">
+          <!-- Browse-By Links -->
+          <ds-themed-comcol-page-browse-by
+              [id]="collection.id"
+              [contentType]="collection.type">
+          </ds-themed-comcol-page-browse-by>
 
-            <ng-container *ngVar="(itemRD$ | async) as itemRD">
-                <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn>
-                    <h3 class="sr-only">{{'collection.page.browse.recent.head' | translate}}</h3>
-                    <ds-viewable-collection
-                            [config]="paginationConfig"
-                            [sortConfig]="sortConfig"
-                            [objects]="itemRD"
-                            [hideGear]="true">
-                    </ds-viewable-collection>
-                </div>
-                <ds-error *ngIf="itemRD?.hasFailed"
-                          message="{{'error.recent-submissions' | translate}}"></ds-error>
-                <ds-themed-loading *ngIf="!itemRD || itemRD.isLoading"
-                            message="{{'loading.recent-submissions' | translate}}"></ds-themed-loading>
-                <div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
-                        {{'collection.page.browse.recent.empty' | translate}}
-                </div>
-            </ng-container>
-            </section>
-            <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
+          <router-outlet></router-outlet>
+        </section>
+        <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
           <!-- Copyright -->
           <ds-comcol-page-content
-                      [content]="collection.copyrightText"
-                      [hasInnerHtml]="true">
+              [content]="collection.copyrightText"
+              [hasInnerHtml]="true">
           </ds-comcol-page-content>
         </footer>
       </div>
     </div>
-        <ds-error *ngIf="collectionRD?.hasFailed"
-            message="{{'error.collection' | translate}}"></ds-error>
-        <ds-themed-loading *ngIf="collectionRD?.isLoading"
-            message="{{'loading.collection' | translate}}"></ds-themed-loading>
+    <ds-error *ngIf="collectionRD?.hasFailed"
+              message="{{'error.collection' | translate}}"></ds-error>
+    <ds-themed-loading *ngIf="collectionRD?.isLoading"
+                       message="{{'loading.collection' | translate}}"></ds-themed-loading>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 16704cef52..86f99518ee 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,36 +1,40 @@
-import { ChangeDetectionStrategy, Component, OnInit, Inject } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs';
-import { filter, map, mergeMap, startWith, switchMap, take } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
-import { SearchService } from '../core/shared/search/search.service';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { CollectionDataService } from '../core/data/collection-data.service';
-import { PaginatedList } from '../core/data/paginated-list.model';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
-
-import { Collection } from '../core/shared/collection.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { Item } from '../core/shared/item.model';
 import {
-  getAllSucceededRemoteDataPayload,
-  getFirstSucceededRemoteData,
-  toDSpaceObjectListRD
-} from '../core/shared/operators';
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { fadeIn, fadeInOut } from '../shared/animations/fade';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { AuthService } from '../core/auth/auth.service';
-import { PaginationService } from '../core/pagination/pagination.service';
+import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { SortOptions } from '../core/cache/models/sort-options.model';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { getCollectionPageRoute } from './collection-page-routing-paths';
+import { RemoteData } from '../core/data/remote-data';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
-import { DSONameService } from '../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../src/config/app-config.interface';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { Collection } from '../core/shared/collection.model';
+import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { getCollectionPageRoute } from './collection-page-routing-paths';
 
 @Component({
   selector: 'ds-collection-page',
@@ -39,19 +43,14 @@ import { APP_CONFIG, AppConfig } from '../../../src/config/app-config.interface'
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class CollectionPageComponent implements OnInit {
   collectionRD$: Observable<RemoteData<Collection>>;
-  itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
   logoRD$: Observable<RemoteData<Bitstream>>;
   paginationConfig: PaginationComponentOptions;
   sortConfig: SortOptions;
-  private paginationChanges$: Subject<{
-    paginationConfig: PaginationComponentOptions,
-    sortConfig: SortOptions
-  }>;
 
   /**
    * Whether the current user is a Community admin
@@ -64,68 +63,30 @@ export class CollectionPageComponent implements OnInit {
   collectionPageRoute$: Observable<string>;
 
   constructor(
-    private collectionDataService: CollectionDataService,
-    private searchService: SearchService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private authService: AuthService,
-    private paginationService: PaginationService,
-    private authorizationDataService: AuthorizationDataService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected authService: AuthService,
+    protected authorizationDataService: AuthorizationDataService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) public appConfig: AppConfig,
   ) {
-    this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
-      id: 'cp',
-      currentPage: 1,
-      pageSize: this.appConfig.browseBy.pageSize,
-    });
-
-    this.sortConfig = new SortOptions('dc.date.accessioned', SortDirection.DESC);
   }
 
   ngOnInit(): void {
     this.collectionRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
       redirectOn4xx(this.router, this.authService),
-      take(1)
+      take(1),
     );
     this.logoRD$ = this.collectionRD$.pipe(
       map((rd: RemoteData<Collection>) => rd.payload),
       filter((collection: Collection) => hasValue(collection)),
-      mergeMap((collection: Collection) => collection.logo)
+      mergeMap((collection: Collection) => collection.logo),
     );
     this.isCollectionAdmin$ = this.authorizationDataService.isAuthorized(FeatureID.IsCollectionAdmin);
 
-    this.paginationChanges$ = new BehaviorSubject({
-      paginationConfig: this.paginationConfig,
-      sortConfig: this.sortConfig
-    });
-
-    const currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
-    const currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, this.sortConfig);
-
-    this.itemRD$ = observableCombineLatest([currentPagination$, currentSort$]).pipe(
-      switchMap(([currentPagination, currentSort]) => this.collectionRD$.pipe(
-        getFirstSucceededRemoteData(),
-        map((rd) => rd.payload.id),
-        switchMap((id: string) => {
-          return this.searchService.search<Item>(
-            new PaginatedSearchOptions({
-              scope: id,
-              pagination: currentPagination,
-              sort: currentSort,
-              dsoTypes: [DSpaceObjectType.ITEM]
-            }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
-            .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
-        }),
-        startWith(undefined) // Make sure switching pages shows loading component
-      )
-      )
-    );
-
     this.collectionPageRoute$ = this.collectionRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((collection) => getCollectionPageRoute(collection.id))
+      map((collection) => getCollectionPageRoute(collection.id)),
     );
   }
 
@@ -133,9 +94,5 @@ export class CollectionPageComponent implements OnInit {
     return isNotEmpty(object);
   }
 
-  ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.paginationConfig.id);
-  }
-
 
 }
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index 6bcefed2b7..4651270ffe 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -1,23 +1,33 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
+import { BrowseByPageModule } from '../browse-by/browse-by-page.module';
+import { SearchService } from '../core/shared/search/search.service';
+import { DsoSharedModule } from '../dso-shared/dso-shared.module';
+import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module';
+import { ComcolModule } from '../shared/comcol/comcol.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { SharedModule } from '../shared/shared.module';
-
+import { StatisticsModule } from '../statistics/statistics.module';
+import { CollectionFormModule } from './collection-form/collection-form.module';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
 import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
-import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module';
-import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
-import { SearchService } from '../core/shared/search/search.service';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import { DsoSharedModule } from '../dso-shared/dso-shared.module';
-import { DsoPageModule } from '../shared/dso-page/dso-page.module';
+
+const DECLARATIONS = [
+  CollectionPageComponent,
+  ThemedCollectionPageComponent,
+  CreateCollectionPageComponent,
+  DeleteCollectionPageComponent,
+  EditItemTemplatePageComponent,
+  ThemedEditItemTemplatePageComponent,
+  CollectionItemMapperComponent,
+];
 
 @NgModule({
   imports: [
@@ -30,15 +40,10 @@ import { DsoPageModule } from '../shared/dso-page/dso-page.module';
     ComcolModule,
     DsoSharedModule,
     DsoPageModule,
+    BrowseByPageModule,
   ],
   declarations: [
-    CollectionPageComponent,
-    ThemedCollectionPageComponent,
-    CreateCollectionPageComponent,
-    DeleteCollectionPageComponent,
-    EditItemTemplatePageComponent,
-    ThemedEditItemTemplatePageComponent,
-    CollectionItemMapperComponent
+    ...DECLARATIONS,
   ],
   providers: [
     SearchService,
diff --git a/src/app/collection-page/collection-page.resolver.spec.ts b/src/app/collection-page/collection-page.resolver.spec.ts
index 4b1ea9834c..32d8952ff7 100644
--- a/src/app/collection-page/collection-page.resolver.spec.ts
+++ b/src/app/collection-page/collection-page.resolver.spec.ts
@@ -1,6 +1,7 @@
 import { first } from 'rxjs/operators';
-import { CollectionPageResolver } from './collection-page.resolver';
+
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { CollectionPageResolver } from './collection-page.resolver';
 
 describe('CollectionPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('CollectionPageResolver', () => {
 
     beforeEach(() => {
       collectionService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
       store = jasmine.createSpyObj('store', {
         dispatch: {},
@@ -26,7 +27,7 @@ describe('CollectionPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts
index 2f5b3ed37a..303e8c2c74 100644
--- a/src/app/collection-page/collection-page.resolver.ts
+++ b/src/app/collection-page/collection-page.resolver.ts
@@ -1,13 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Collection } from '../core/shared/collection.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
+
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { RemoteData } from '../core/data/remote-data';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Collection } from '../core/shared/collection.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -15,7 +23,7 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
  */
 export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
   followLink('parentCommunity', {},
-    followLink('parentCommunity')
+    followLink('parentCommunity'),
   ),
   followLink('logo'),
 ];
@@ -27,7 +35,7 @@ export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
 export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
   constructor(
     private collectionService: CollectionDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
   }
 
@@ -43,9 +51,9 @@ export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
       route.params.id,
       true,
       false,
-      ...COLLECTION_PAGE_LINKS_TO_FOLLOW
+      ...COLLECTION_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
 
     collectionRD$.subscribe((collectionRD: RemoteData<Collection>) => {
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
index 5a4295cb26..bef2301ce3 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
@@ -1,20 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { CreateCollectionPageComponent } from './create-collection-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { RequestService } from '../../core/data/request.service';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
 import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CreateCollectionPageComponent } from './create-collection-page.component';
 
 describe('CreateCollectionPageComponent', () => {
   let comp: CreateCollectionPageComponent;
@@ -29,14 +34,14 @@ describe('CreateCollectionPageComponent', () => {
         { provide: CollectionDataService, useValue: {} },
         {
           provide: CommunityDataService,
-          useValue: { findById: () => observableOf({ payload: { name: 'test' } }) }
+          useValue: { findById: () => observableOf({ payload: { name: 'test' } }) },
         },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: {}}
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index a8cf594c3b..cd65affb10 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
-import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
-import { Collection } from '../../core/shared/collection.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { Collection } from '../../core/shared/collection.model';
+import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that represents the page where a user can create a new Collection
@@ -16,7 +17,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-create-collection',
   styleUrls: ['./create-collection-page.component.scss'],
-  templateUrl: './create-collection-page.component.html'
+  templateUrl: './create-collection-page.component.html',
 })
 export class CreateCollectionPageComponent extends CreateComColPageComponent<Collection> {
   protected frontendURL = '/collections/';
@@ -30,7 +31,7 @@ export class CreateCollectionPageComponent extends CreateComColPageComponent<Col
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
     super(collectionDataService, dsoNameService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
index 91c2c47466..b476f38889 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
@@ -1,8 +1,12 @@
-import { CreateCollectionPageGuard } from './create-collection-page.guard';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+import { Community } from '../../core/shared/community.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { CreateCollectionPageGuard } from './create-collection-page.guard';
 
 describe('CreateCollectionPageGuard', () => {
   describe('canActivate', () => {
@@ -20,7 +24,7 @@ describe('CreateCollectionPageGuard', () => {
           } else if (id === 'error-id') {
             return createFailedRemoteDataObject$('not found', 404);
           }
-        }
+        },
       };
       router = new RouterMock();
 
@@ -32,7 +36,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -41,7 +45,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -50,7 +54,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -59,7 +63,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
   });
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
index ca84231912..3e26f51b11 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
@@ -1,13 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { map, tap } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 
 /**
  * Prevent creation of a collection without a parent community provided
@@ -37,7 +51,7 @@ export class CreateCollectionPageGuard implements CanActivate {
           if (!isValid) {
             this.router.navigate(['/404']);
           }
-        })
-    );
+        }),
+      );
   }
 }
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ba54bbabd5..53c3b45cfa 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -2,7 +2,7 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
@@ -11,7 +11,7 @@
                     </button>
                     <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
-                      <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
+                      <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
                   </div>
                 </div>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
index 9fc88932d0..986faafedb 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { DeleteCollectionPageComponent } from './delete-collection-page.component';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { RequestService } from '../../core/data/request.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { DeleteCollectionPageComponent } from './delete-collection-page.component';
 
 describe('DeleteCollectionPageComponent', () => {
   let comp: DeleteCollectionPageComponent;
@@ -26,9 +31,9 @@ describe('DeleteCollectionPageComponent', () => {
         { provide: CollectionDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {} }
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 0a1b87e58b..87b21d3432 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
-import { TranslateService } from '@ngx-translate/core';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that represents the page where a user can delete an existing Collection
@@ -13,7 +17,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-delete-collection',
   styleUrls: ['./delete-collection-page.component.scss'],
-  templateUrl: './delete-collection-page.component.html'
+  templateUrl: './delete-collection-page.component.html',
 })
 export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Collection> {
   protected frontendURL = '/collections/';
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts
index 04da8bbcd9..de28e4a23c 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts
@@ -1,25 +1,69 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
+import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { CollectionAccessControlComponent } from './collection-access-control.component';
 
-xdescribe('CollectionAccessControlComponent', () => {
+describe('CollectionAccessControlComponent', () => {
   let component: CollectionAccessControlComponent;
   let fixture: ComponentFixture<CollectionAccessControlComponent>;
+  const testCommunity = Object.assign(new Community(),
+    {
+      type: 'community',
+      metadata: {
+        'dc.title': [{ value: 'community' }],
+      },
+      uuid: 'communityUUID',
+      parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
+
+      _links: {
+        parentCommunity: 'site',
+        self: '/' + 'communityUUID',
+      },
+    },
+  );
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: of({
+          dso: createSuccessfulRemoteDataObject(testCommunity),
+        }),
+      },
+    },
+  };
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ CollectionAccessControlComponent ]
+      declarations: [ CollectionAccessControlComponent ],
+      providers: [{ provide: ActivatedRoute, useValue: routeStub }],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CollectionAccessControlComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
+    component.ngOnInit();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should set itemRD$', (done) => {
+    component.itemRD$.subscribe(result => {
+      expect(result).toEqual(createSuccessfulRemoteDataObject(testCommunity));
+      done();
+    });
+  });
 });
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
index 4192fe5a9a..490a8d13ce 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -1,9 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { Community } from '../../../core/shared/community.model';
-import { ActivatedRoute } from '@angular/router';
-import { map } from 'rxjs/operators';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 
 @Component({
@@ -18,7 +22,7 @@ export class CollectionAccessControlComponent  implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.parent.data.pipe(
-      map((data) => data.dso)
+      map((data) => data.dso),
     ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Community>>;
   }
 }
diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
index c8e529443a..95d8b0ba04 100644
--- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
@@ -1,15 +1,21 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
 import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
 
 describe('CollectionAuthorizationsComponent', () => {
   let comp: CollectionAuthorizationsComponent<DSpaceObject>;
@@ -19,8 +25,8 @@ describe('CollectionAuthorizationsComponent', () => {
     uuid: 'collection',
     id: 'collection',
     _links: {
-      self: { href: 'collection-selflink' }
-    }
+      self: { href: 'collection-selflink' },
+    },
   });
 
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -29,16 +35,16 @@ describe('CollectionAuthorizationsComponent', () => {
     parent: {
       parent: {
         data: observableOf({
-          dso: collectionRD
-        })
-      }
-    }
+          dso: collectionRD,
+        }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        CommonModule
+        CommonModule,
       ],
       declarations: [CollectionAuthorizationsComponent],
       providers: [
diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
index d1b59a0c90..ad8ccbd690 100644
--- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
@@ -1,8 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
@@ -27,7 +32,7 @@ export class CollectionAuthorizationsComponent<TDomain extends DSpaceObject> imp
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
index 38c9d22f4e..4fbe60d6b1 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h3>
+    <h2>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h2>
     <ds-curation-form
             [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
index 2cf25734e1..1925478e3b 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { CollectionCurateComponent } from './collection-curate.component';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { Collection } from '../../../core/shared/collection.model';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CollectionCurateComponent } from './collection-curate.component';
 
 describe('CollectionCurateComponent', () => {
   let comp: CollectionCurateComponent;
@@ -17,30 +25,30 @@ describe('CollectionCurateComponent', () => {
   let dsoNameService;
 
   const collection = Object.assign(new Collection(), {
-    metadata: {'dc.title': ['Collection Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+    metadata: { 'dc.title': ['Collection Name'], 'dc.identifier.uri': [ { value: '123456789/1' }] },
   });
 
   beforeEach(waitForAsync(() => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(collection)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(collection),
+        }),
+      },
     };
 
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
-      getName: 'Collection Name'
+      getName: 'Collection Name',
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [CollectionCurateComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: DSONameService, useValue: dsoNameService}
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -58,7 +66,7 @@ describe('CollectionCurateComponent', () => {
     });
     it('should contain the collection information provided in the route', () => {
       comp.dsoRD$.subscribe((value) => {
-        expect(value.payload.handle
+        expect(value.payload.handle,
         ).toEqual('123456789/1');
       });
       comp.collectionName$.subscribe((value) => {
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
index e20f229cd6..ea2f0265fa 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -1,9 +1,14 @@
 import { Component } from '@angular/core';
-import { filter, map, take } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Observable } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { hasValue } from '../../../shared/empty.util';
 
@@ -34,7 +39,7 @@ export class CollectionCurateComponent {
       filter((rd: RemoteData<Collection>) => hasValue(rd)),
       map((rd: RemoteData<Collection>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
   }
 }
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index ffd8f71343..1cf40159ec 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,17 +1,17 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
-  <label>{{ 'collection.edit.template.label' | translate}}</label>
+  <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
     <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
-      <i class="fas fa-plus"></i>
+      <i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
-      <i class="fas fa-trash-alt"></i>
+      <i class="fas fa-trash-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
             [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
-      <i class="fas fa-edit"></i>
+      <i class="fas fa-edit" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
     </button>
   </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
index 7cc54bd994..3e87f05148 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
@@ -1,20 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../../shared/shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionMetadataComponent } from './collection-metadata.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
-import { Collection } from '../../../core/shared/collection.model';
 import { RequestService } from '../../../core/data/request.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
+import { CollectionMetadataComponent } from './collection-metadata.component';
 
 describe('CollectionMetadataComponent', () => {
   let comp: CollectionMetadataComponent;
@@ -24,16 +37,16 @@ describe('CollectionMetadataComponent', () => {
 
   const template = Object.assign(new Item(), {
     _links: {
-      self: { href: 'template-selflink' }
-    }
+      self: { href: 'template-selflink' },
+    },
   });
   const collection = Object.assign(new Collection(), {
     uuid: 'collection-id',
     id: 'collection-id',
     name: 'Fake Collection',
     _links: {
-      self: { href: 'collection-selflink' }
-    }
+      self: { href: 'collection-selflink' },
+    },
   });
   const collectionTemplateHref = 'rest/api/test/collections/template';
 
@@ -46,10 +59,10 @@ describe('CollectionMetadataComponent', () => {
 
   const notificationsService = jasmine.createSpyObj('notificationsService', {
     success: {},
-    error: {}
+    error: {},
   });
   const requestService = jasmine.createSpyObj('requestService', {
-    setStaleByHrefSubstring: {}
+    setStaleByHrefSubstring: {},
   });
 
   const routerMock = {
@@ -67,9 +80,9 @@ describe('CollectionMetadataComponent', () => {
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: RequestService, useValue: requestService },
-        { provide: Router, useValue: routerMock}
+        { provide: Router, useValue: routerMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index 634363527f..d71732840a 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -1,20 +1,39 @@
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute, NavigationEnd, Router, Scroll } from '@angular/router';
-import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
-import { combineLatest as combineLatestObservable, Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+  Scroll,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
-import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
 import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
 
 /**
  * Component for editing a collection's metadata
@@ -40,7 +59,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     protected requestService: RequestService,
-    protected chd: ChangeDetectorRef
+    protected chd: ChangeDetectorRef,
   ) {
     super(collectionDataService, router, route, notificationsService, translate);
   }
@@ -69,7 +88,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
   initTemplateItem() {
     this.itemTemplateRD$ = this.dsoRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid))
+      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid)),
     );
   }
 
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
index c375a23ddf..21a252b4cf 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
@@ -1,22 +1,32 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CollectionRolesComponent } from './collection-roles.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { SharedModule } from '../../../shared/shared.module';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ComcolModule } from '../../../shared/comcol/comcol.module';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RequestService } from '../../../core/data/request.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ComcolModule } from '../../../shared/comcol/comcol.module';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CollectionRolesComponent } from './collection-roles.component';
 
 describe('CollectionRolesComponent', () => {
 
@@ -54,10 +64,10 @@ describe('CollectionRolesComponent', () => {
                   },
                 ],
               },
-            })
+            }),
           ),
-        })
-      }
+        }),
+      },
     };
 
     const requestService = {
@@ -74,7 +84,7 @@ describe('CollectionRolesComponent', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [
         CollectionRolesComponent,
@@ -84,9 +94,9 @@ describe('CollectionRolesComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: RequestService, useValue: requestService },
         { provide: GroupDataService, useValue: groupDataService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(CollectionRolesComponent);
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index 0177cc3a38..586a8fa8a6 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -1,11 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
 
 /**
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 4d7b3e657e..7edaadb0a1 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,6 +1,6 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
     <div class="container-fluid space-children-mr" *ngIf="shouldShow">
-        <h4>{{ 'collection.source.controls.head' | translate }}</h4>
+        <h3>{{ 'collection.source.controls.head' | translate }}</h3>
         <div>
             <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
             <span>{{contentSource?.harvestStatus}}</span>
@@ -18,7 +18,7 @@
             <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
 
-        <button *ngIf="!(testConfigRunning$ |async)" class="btn btn-secondary"
+        <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
                 [disabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
@@ -28,7 +28,7 @@
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
-        <button *ngIf="!(importRunning$ |async)" class="btn btn-primary"
+        <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
                 [disabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
@@ -38,7 +38,7 @@
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
-        <button *ngIf="!(reImportRunning$ |async)" class="btn btn-primary"
+        <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
                 [disabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 3eb83ebe8a..db922cba65 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -1,27 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ContentSource } from '../../../../core/shared/content-source.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
-import { RequestService } from '../../../../core/data/request.service';
+import { HttpClient } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
 import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
 import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
-import { HttpClient } from '@angular/common/http';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { Process } from '../../../../process-page/processes/process.model';
-import { of as observableOf } from 'rxjs';
-import { CollectionSourceControlsComponent } from './collection-source-controls.component';
+import { RequestService } from '../../../../core/data/request.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { By } from '@angular/platform-browser';
-import { VarDirective } from '../../../../shared/utils/var.directive';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import { Process } from '../../../../process-page/processes/process.model';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { CollectionSourceControlsComponent } from './collection-source-controls.component';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
@@ -51,44 +56,44 @@ describe('CollectionSourceControlsComponent', () => {
         {
           id: 'dc',
           label: 'Simple Dublin Core',
-          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/'
+          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/',
         },
         {
           id: 'qdc',
           label: 'Qualified Dublin Core',
-          nameSpace: 'http://purl.org/dc/terms/'
+          nameSpace: 'http://purl.org/dc/terms/',
         },
         {
           id: 'dim',
           label: 'DSpace Intermediate Metadata',
-          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim'
-        }
+          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim',
+        },
       ],
       oaiSource: 'oai-harvest-source',
       oaiSetId: 'oai-set-id',
-      _links: {self: {href: 'contentsource-selflink'}}
+      _links: { self: { href: 'contentsource-selflink' } },
     });
     process = Object.assign(new Process(), {
       processId: 'process-id', processStatus: 'COMPLETED',
-      _links: {output: {href: 'output-href'}}
+      _links: { output: { href: 'output-href' } },
     });
 
-    bitstream = Object.assign(new Bitstream(), {_links: {content: {href: 'content-href'}}});
+    bitstream = Object.assign(new Bitstream(), { _links: { content: { href: 'content-href' } } });
 
     collection = Object.assign(new Collection(), {
       uuid: 'fake-collection-id',
-      _links: {self: {href: 'collection-selflink'}}
+      _links: { self: { href: 'collection-selflink' } },
     });
     notificationsService = new NotificationsServiceStub();
     collectionService = jasmine.createSpyObj('collectionService', {
       getContentSource: createSuccessfulRemoteDataObject$(contentSource),
-      findByHref: createSuccessfulRemoteDataObject$(collection)
+      findByHref: createSuccessfulRemoteDataObject$(collection),
     });
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
       invoke: createSuccessfulRemoteDataObject$(process),
     });
     processDataService = jasmine.createSpyObj('processDataService', {
-      findById: createSuccessfulRemoteDataObject$(process),
+      autoRefreshUntilCompletion: createSuccessfulRemoteDataObject$(process),
     });
     bitstreamService = jasmine.createSpyObj('bitstreamService', {
       findByHref: createSuccessfulRemoteDataObject$(bitstream),
@@ -102,15 +107,15 @@ describe('CollectionSourceControlsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule],
       declarations: [CollectionSourceControlsComponent, VarDirective],
       providers: [
-        {provide: ScriptDataService, useValue: scriptDataService},
-        {provide: ProcessDataService, useValue: processDataService},
-        {provide: RequestService, useValue: requestService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: CollectionDataService, useValue: collectionService},
-        {provide: HttpClient, useValue: httpClient},
-        {provide: BitstreamDataService, useValue: bitstreamService}
+        { provide: ScriptDataService, useValue: scriptDataService },
+        { provide: ProcessDataService, useValue: processDataService },
+        { provide: RequestService, useValue: requestService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: CollectionDataService, useValue: collectionService },
+        { provide: HttpClient, useValue: httpClient },
+        { provide: BitstreamDataService, useValue: bitstreamService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -132,12 +137,12 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-g', value: null},
-        {name: '-a', value: contentSource.oaiSource},
-        {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)},
+        { name: '-g', value: null },
+        { name: '-a', value: contentSource.oaiSource },
+        { name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId) },
       ], []);
 
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(bitstreamService.findByHref).toHaveBeenCalledWith(process._links.output.href);
       expect(notificationsService.info).toHaveBeenCalledWith(jasmine.anything() as any, 'Script text');
     });
@@ -148,10 +153,10 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-r', value: null},
-        {name: '-c', value: collection.uuid},
+        { name: '-r', value: null },
+        { name: '-c', value: collection.uuid },
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });
@@ -161,10 +166,10 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-o', value: null},
-        {name: '-c', value: collection.uuid},
+        { name: '-o', value: null },
+        { name: '-c', value: collection.uuid },
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 7113c25e9f..e6f1cef898 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,26 +1,40 @@
-import { Component, Input, OnDestroy } from '@angular/core';
-import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
-import { ContentSource } from '../../../../core/shared/content-source.model';
-import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
+import { HttpClient } from '@angular/common/http';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
+import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ContentSource } from '../../../../core/shared/content-source.model';
+import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import {
-  getAllCompletedRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
-import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RequestService } from '../../../../core/data/request.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
 import { Process } from '../../../../process-page/processes/process.model';
-import { TranslateService } from '@ngx-translate/core';
-import { HttpClient } from '@angular/common/http';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 
 /**
  * Component that contains the controls to run, reset and test the harvest
@@ -30,7 +44,7 @@ import { ContentSourceSetSerializer } from '../../../../core/shared/content-sour
   styleUrls: ['./collection-source-controls.component.scss'],
   templateUrl: './collection-source-controls.component.html',
 })
-export class CollectionSourceControlsComponent implements OnDestroy {
+export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
 
   /**
    * Should the controls be enabled.
@@ -49,6 +63,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
 
   contentSource$: Observable<ContentSource>;
   private subs: Subscription[] = [];
+  private autoRefreshIDs: string[] = [];
 
   testConfigRunning$ = new BehaviorSubject(false);
   importRunning$ = new BehaviorSubject(false);
@@ -61,7 +76,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
               private collectionService: CollectionDataService,
               private translateService: TranslateService,
               private httpClient: HttpClient,
-              private bitstreamService: BitstreamDataService
+              private bitstreamService: BitstreamDataService,
   ) {
   }
 
@@ -70,7 +85,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
     this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe(
       getAllSucceededRemoteDataPayload(),
       switchMap((collection) => this.collectionService.getContentSource(collection.uuid, false)),
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -81,9 +96,9 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   testConfiguration(contentSource) {
     this.testConfigRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-g', value: null},
-      {name: '-a', value: contentSource.oaiSource},
-      {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)},
+      { name: '-g', value: null },
+      { name: '-a', value: contentSource.oaiSource },
+      { name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId) },
     ], []).pipe(
       getFirstCompletedRemoteData(),
       tap((rd) => {
@@ -95,36 +110,28 @@ export class CollectionSourceControlsComponent implements OnDestroy {
       }),
       // filter out responses that aren't successful since the pinging of the process only needs to happen when the invocation was successful.
       filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-      switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-      getAllCompletedRemoteData(),
-      filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+      switchMap((rd) => {
+        this.autoRefreshIDs.push(rd.payload.processId);
+        return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+      }),
       map((rd) => rd.payload),
-      hasValueOperator(),
     ).subscribe((process: Process) => {
-        if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-          process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-          // Ping the current process state every 5s
-          setTimeout(() => {
-            this.requestService.setStaleByHrefSubstring(process._links.self.href);
-          }, 5000);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-          this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
-          this.testConfigRunning$.next(false);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-          this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
-            this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => {
-              const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
-                .replaceAll('The script has started', '')
-                .replaceAll('The script has completed', '');
-              this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
-            });
-          });
-          this.testConfigRunning$.next(false);
-        }
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+        this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
+        this.testConfigRunning$.next(false);
       }
-    ));
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+        this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
+          this.httpClient.get(bitstream._links.content.href, { responseType: 'text' }).subscribe((data: any) => {
+            const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
+              .replaceAll('The script has started', '')
+              .replaceAll('The script has completed', '');
+            this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
+          });
+        });
+        this.testConfigRunning$.next(false);
+      }
+    }));
   }
 
   /**
@@ -133,8 +140,8 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   importNow() {
     this.importRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-r', value: null},
-      {name: '-c', value: this.collection.uuid},
+      { name: '-r', value: null },
+      { name: '-c', value: this.collection.uuid },
     ], [])
       .pipe(
         getFirstCompletedRemoteData(),
@@ -147,31 +154,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
         map((rd) => rd.payload),
-        hasValueOperator(),
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
-            this.importRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.importRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
+          this.importRunning$.next(false);
         }
-      ));
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.importRunning$.next(false);
+        }
+      }));
   }
 
   /**
@@ -180,8 +178,8 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   resetAndReimport() {
     this.reImportRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-o', value: null},
-      {name: '-c', value: this.collection.uuid},
+      { name: '-o', value: null },
+      { name: '-c', value: this.collection.uuid },
     ], [])
       .pipe(
         getFirstCompletedRemoteData(),
@@ -194,31 +192,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
         map((rd) => rd.payload),
-        hasValueOperator(),
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
-            this.reImportRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.reImportRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
+          this.reImportRunning$.next(false);
         }
-      ));
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.reImportRunning$.next(false);
+        }
+      }));
   }
 
   ngOnDestroy(): void {
@@ -227,5 +216,9 @@ export class CollectionSourceControlsComponent implements OnDestroy {
         sub.unsubscribe();
       }
     });
+
+    this.autoRefreshIDs.forEach((id) => {
+      this.processDataService.stopAutoRefreshing(id);
+    });
   }
 }
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index d7b0d0c475..7b4ac97421 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
-        <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+        <button class=" btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+                [disabled]="(hasChanges() | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,13 +12,13 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [disabled]="(hasChanges() | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
         </button>
     </div>
-    <h4>{{ 'collection.edit.tabs.source.head' | translate }}</h4>
+    <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
     <div *ngIf="contentSource" class="form-check mb-4">
         <input type="checkbox" class="form-check-input" id="externalSourceCheck"
                [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
@@ -26,7 +26,7 @@
                for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
     </div>
     <ds-themed-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-themed-loading>
-    <h4 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h4>
+    <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
 </div>
 <div class="row">
     <ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"
@@ -44,8 +44,8 @@
     <div class="row">
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
-                <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                        [disabled]="!(hasChanges() | async)"
+                <button class=" btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+                        [disabled]="(hasChanges() | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [disabled]="(hasChanges() | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -66,7 +66,7 @@
     </div>
 </div>
 <ds-collection-source-controls
-        [isEnabled]="!(hasChanges()|async)"
+        [isEnabled]="(hasChanges() | async) !== true"
         [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
         [collection]="(collectionRD$ |async)?.payload"
 >
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
index e7e98d9523..fb00b3243b 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
@@ -1,25 +1,48 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionSourceComponent } from './collection-source.component';
-import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import {
+  ContentSource,
+  ContentSourceHarvestType,
+} from '../../../core/shared/content-source.model';
+import { hasValue } from '../../../shared/empty.util';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
-import { hasValue } from '../../../shared/empty.util';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { RouterStub } from '../../../shared/testing/router.stub';
-import { By } from '@angular/platform-browser';
-import { Collection } from '../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { CollectionSourceComponent } from './collection-source.component';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -50,29 +73,29 @@ describe('CollectionSourceComponent', () => {
         {
           id: 'dc',
           label: 'Simple Dublin Core',
-          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/'
+          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/',
         },
         {
           id: 'qdc',
           label: 'Qualified Dublin Core',
-          nameSpace: 'http://purl.org/dc/terms/'
+          nameSpace: 'http://purl.org/dc/terms/',
         },
         {
           id: 'dim',
           label: 'DSpace Intermediate Metadata',
-          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim'
-        }
+          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim',
+        },
       ],
-      _links: { self: { href: 'contentsource-selflink' } }
+      _links: { self: { href: 'contentsource-selflink' } },
     });
     fieldUpdate = {
       field: contentSource,
-      changeType: undefined
+      changeType: undefined,
     };
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
-          [contentSource.uuid]: fieldUpdate
+          [contentSource.uuid]: fieldUpdate,
         }),
         saveAddFieldUpdate: {},
         discardFieldUpdates: {},
@@ -82,15 +105,15 @@ describe('CollectionSourceComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
     location = jasmine.createSpyObj('location', ['back']);
     formService = Object.assign({
@@ -103,18 +126,18 @@ describe('CollectionSourceComponent', () => {
           return new UntypedFormGroup(controls);
         }
         return undefined;
-      }
+      },
     });
     router = Object.assign(new RouterStub(), {
-      url: 'http://test-url.com/test-url'
+      url: 'http://test-url.com/test-url',
     });
     collection = Object.assign(new Collection(), {
-      uuid: 'fake-collection-id'
+      uuid: 'fake-collection-id',
     });
     collectionService = jasmine.createSpyObj('collectionService', {
       getContentSource: createSuccessfulRemoteDataObject$(contentSource),
       updateContentSource: observableOf(contentSource),
-      getHarvesterEndpoint: observableOf('harvester-endpoint')
+      getHarvesterEndpoint: observableOf('harvester-endpoint'),
     });
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']);
 
@@ -129,9 +152,9 @@ describe('CollectionSourceComponent', () => {
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
         { provide: Router, useValue: router },
         { provide: CollectionDataService, useValue: collectionService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 2d1308cc83..168ef543e8 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -1,5 +1,14 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
@@ -8,29 +17,46 @@ import {
   DynamicInputModel,
   DynamicOptionControlModel,
   DynamicRadioGroupModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
-import { Location } from '@angular/common';
 import { TranslateService } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { UntypedFormGroup } from '@angular/forms';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model';
-import { Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Collection } from '../../../core/shared/collection.model';
-import { first, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
 import cloneDeep from 'lodash/cloneDeep';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { MetadataConfig } from '../../../core/shared/metadata-config.model';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import { RequestService } from '../../../core/data/request.service';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../environments/environment';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import {
+  ContentSource,
+  ContentSourceHarvestType,
+} from '../../../core/shared/content-source.model';
+import { MetadataConfig } from '../../../core/shared/metadata-config.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 
 /**
  * Component for managing the content source of the collection
@@ -84,11 +110,11 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     name: 'oaiSource',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'You must provide a set id of the target collection.'
-    }
+      required: 'You must provide a set id of the target collection.',
+    },
   });
 
   /**
@@ -96,7 +122,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   oaiSetIdModel = new DynamicInputModel({
     id: 'oaiSetId',
-    name: 'oaiSetId'
+    name: 'oaiSetId',
   });
 
   /**
@@ -104,7 +130,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   metadataConfigIdModel = new DynamicSelectModel({
     id: 'metadataConfigId',
-    name: 'metadataConfigId'
+    name: 'metadataConfigId',
   });
 
   /**
@@ -115,15 +141,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     name: 'harvestType',
     options: [
       {
-        value: ContentSourceHarvestType.Metadata
+        value: ContentSourceHarvestType.Metadata,
       },
       {
-        value: ContentSourceHarvestType.MetadataAndRef
+        value: ContentSourceHarvestType.MetadataAndRef,
       },
       {
-        value: ContentSourceHarvestType.MetadataAndBitstreams
-      }
-    ]
+        value: ContentSourceHarvestType.MetadataAndBitstreams,
+      },
+    ],
   });
 
   /**
@@ -139,22 +165,22 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     new DynamicFormGroupModel({
       id: 'oaiSourceContainer',
       group: [
-        this.oaiSourceModel
-      ]
+        this.oaiSourceModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'oaiSetContainer',
       group: [
         this.oaiSetIdModel,
-        this.metadataConfigIdModel
-      ]
+        this.metadataConfigIdModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'harvestTypeContainer',
       group: [
-        this.harvestTypeModel
-      ]
-    })
+        this.harvestTypeModel,
+      ],
+    }),
   ];
 
   /**
@@ -163,40 +189,40 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
   formLayout: DynamicFormLayout = {
     oaiSource: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     oaiSetId: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     metadataConfigId: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     harvestType: {
       grid: {
         host: 'col-12',
-        option: 'btn-outline-secondary'
-      }
+        option: 'btn-outline-secondary',
+      },
     },
     oaiSetContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     oaiSourceContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     harvestTypeContainer: {
       grid: {
-        host: 'row'
-      }
-    }
+        host: 'row',
+      },
+    },
   };
 
   /**
@@ -279,7 +305,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     const initialContentSource = cloneDeep(this.contentSource);
     this.objectUpdatesService.initialize(this.url, [initialContentSource], new Date());
     this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe(
-      map((updates: FieldUpdates) => updates[initialContentSource.uuid])
+      map((updates: FieldUpdates) => updates[initialContentSource.uuid]),
     );
     this.updateSub = this.update$.subscribe((update: FieldUpdate) => {
       if (update) {
@@ -294,15 +320,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
         if (hasValue(field)) {
           this.formGroup.patchValue({
             oaiSourceContainer: {
-              oaiSource: field.oaiSource
+              oaiSource: field.oaiSource,
             },
             oaiSetContainer: {
               oaiSetId: field.oaiSetId,
-              metadataConfigId: configId
+              metadataConfigId: configId,
             },
             harvestTypeContainer: {
-              harvestType: field.harvestType
-            }
+              harvestType: field.harvestType,
+            },
           });
           this.contentSource = cloneDeep(field);
         }
@@ -320,8 +346,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     if (this.metadataConfigIdModel.options.length > 0) {
       this.formGroup.patchValue({
         oaiSetContainer: {
-          metadataConfigId: this.metadataConfigIdModel.options[0].value
-        }
+          metadataConfigId: this.metadataConfigIdModel.options[0].value,
+        },
       });
     }
   }
@@ -333,7 +359,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.inputModels.forEach(
       (fieldModel: DynamicFormControlModel) => {
         this.updateFieldTranslation(fieldModel);
-      }
+      },
     );
   }
 
@@ -378,7 +404,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
       getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.getHarvesterEndpoint(uuid)),
-      take(1)
+      take(1),
     ).subscribe((endpoint) => this.requestService.removeByHrefSubstring(endpoint));
     this.requestService.setStaleByHrefSubstring(this.contentSource._links.self.href);
     // Update harvester
@@ -386,7 +412,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
       getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)),
-      take(1)
+      take(1),
     ).subscribe((result: ContentSource | INotification) => {
       if (hasValue((result as any).harvestType)) {
         this.clearNotifications();
@@ -433,7 +459,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.inputModels.forEach(
       (fieldModel: DynamicInputModel) => {
         this.updateContentSourceField(fieldModel, updateHarvestType);
-      }
+      },
     );
     this.saveFieldUpdate();
   }
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
index 00f05f50c0..f3d51f3f61 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
@@ -1,39 +1,44 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+
 describe('EditCollectionPageComponent', () => {
   let comp: EditCollectionPageComponent;
   let fixture: ComponentFixture<EditCollectionPageComponent>;
 
   const routeStub = {
     data: observableOf({
-      dso: { payload: {} }
+      dso: { payload: {} },
     }),
     routeConfig: {
       children: [
         {
           path: 'mockUrl',
           data: {
-            hideReturnButton: false
-          }
-        }
-      ]
+            hideReturnButton: false,
+          },
+        },
+      ],
     },
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: 'mockUrl'
-        }
-      }
-    }
+          path: 'mockUrl',
+        },
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -44,7 +49,7 @@ describe('EditCollectionPageComponent', () => {
         { provide: CollectionDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index 62fbb3ee3d..ca0a98be72 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { Collection } from '../../core/shared/collection.model';
+import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCollectionPageRoute } from '../collection-page-routing-paths';
 
 /**
@@ -9,14 +13,14 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-collection',
-  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
 })
 export class EditCollectionPageComponent extends EditComColPageComponent<Collection> {
   type = 'collection';
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     super(router, route);
   }
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
index 8d0cb179f1..e3791011b1 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
@@ -1,22 +1,21 @@
-import { NgModule } from '@angular/core';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { FormModule } from '../../shared/form/form.module';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
+import { CollectionFormModule } from '../collection-form/collection-form.module';
+import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
-import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
-import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
-import { CollectionFormModule } from '../collection-form/collection-form.module';
-import {
-  CollectionSourceControlsComponent
-} from './collection-source/collection-source-controls/collection-source-controls.component';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-import { FormModule } from '../../shared/form/form.module';
-import { ComcolModule } from '../../shared/comcol/comcol.module';
-import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
-import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { CollectionSourceControlsComponent } from './collection-source/collection-source-controls/collection-source-controls.component';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
 
 /**
  * Module that contains all components related to the Edit Collection page administrator functionality
@@ -40,8 +39,8 @@ import { AccessControlFormModule } from '../../shared/access-control-form-contai
     CollectionSourceComponent,
     CollectionAccessControlComponent,
     CollectionSourceControlsComponent,
-    CollectionAuthorizationsComponent
-  ]
+    CollectionAuthorizationsComponent,
+  ],
 })
 export class EditCollectionPageModule {
 
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
index c4481985c0..3a5aae54ed 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
@@ -1,19 +1,20 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { CollectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
 import { CollectionItemMapperComponent } from '../collection-item-mapper/collection-item-mapper.component';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
-import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
-import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
-import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { CollectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard';
-import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
 
 /**
  * Routing module that handles the routing for the Edit Collection page administrator functionality
@@ -24,7 +25,7 @@ import { CollectionAccessControlComponent } from './collection-access-control/co
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'collection.edit' },
         component: EditCollectionPageComponent,
@@ -33,7 +34,7 @@ import { CollectionAccessControlComponent } from './collection-access-control/co
           {
             path: '',
             redirectTo: 'metadata',
-            pathMatch: 'full'
+            pathMatch: 'full',
           },
           {
             path: 'metadata',
@@ -41,30 +42,30 @@ import { CollectionAccessControlComponent } from './collection-access-control/co
             data: {
               title: 'collection.edit.tabs.metadata.title',
               hideReturnButton: true,
-              showBreadcrumbs: true
-            }
+              showBreadcrumbs: true,
+            },
           },
           {
             path: 'roles',
             component: CollectionRolesComponent,
-            data: { title: 'collection.edit.tabs.roles.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.roles.title', showBreadcrumbs: true },
           },
           {
             path: 'source',
             component: CollectionSourceComponent,
-            data: { title: 'collection.edit.tabs.source.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.source.title', showBreadcrumbs: true },
           },
           {
             path: 'curate',
             component: CollectionCurateComponent,
-            data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true },
           },
           {
             path: 'access-control',
             component: CollectionAccessControlComponent,
-            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true },
           },
-/*          {
+          /*          {
             path: 'authorizations',
             component: CollectionAuthorizationsComponent,
             data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
@@ -76,39 +77,39 @@ import { CollectionAccessControlComponent } from './collection-access-control/co
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: CollectionAuthorizationsComponent,
-                data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
-              }
-            ]
+                data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true },
+              },
+            ],
           },
           {
             path: 'mapper',
             component: CollectionItemMapperComponent,
-            data: { title: 'collection.edit.tabs.item-mapper.title', hideReturnButton: true, showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.item-mapper.title', hideReturnButton: true, showBreadcrumbs: true },
           },
-        ]
-      }
-    ])
+        ],
+      },
+    ]),
   ],
   providers: [
     ResourcePolicyResolver,
-    ResourcePolicyTargetResolver
-  ]
+    ResourcePolicyTargetResolver,
+  ],
 })
 export class EditCollectionPageRoutingModule {
 
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index 20afd701ff..8d095dd229 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
-        <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h2>
+        <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <ds-themed-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-themed-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
index 72b776dd7d..068f799681 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
@@ -1,16 +1,24 @@
-import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared/shared.module';
-import { RouterTestingModule } from '@angular/router/testing';
 import { CommonModule } from '@angular/common';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { Collection } from '../../core/shared/collection.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
 import { getCollectionEditRoute } from '../collection-page-routing-paths';
+import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
 
 describe('EditItemTemplatePageComponent', () => {
   let comp: EditItemTemplatePageComponent;
@@ -22,19 +30,19 @@ describe('EditItemTemplatePageComponent', () => {
     collection = Object.assign(new Collection(), {
       uuid: 'collection-id',
       id: 'collection-id',
-      name: 'Fake Collection'
+      name: 'Fake Collection',
     });
     itemTemplateService = jasmine.createSpyObj('itemTemplateService', {
-      findByCollectionID: createSuccessfulRemoteDataObject$({})
+      findByCollectionID: createSuccessfulRemoteDataObject$({}),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       declarations: [EditItemTemplatePageComponent],
       providers: [
         { provide: ItemTemplateDataService, useValue: itemTemplateService },
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } }
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index 6425996fd2..9dfe14e72d 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,15 +1,23 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { ActivatedRoute } from '@angular/router';
-import { first, map, switchMap } from 'rxjs/operators';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-import { getCollectionEditRoute } from '../collection-page-routing-paths';
 import { Item } from '../../core/shared/item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { AlertType } from '../../shared/alert/aletr-type';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AlertType } from '../../shared/alert/alert-type';
+import { getCollectionEditRoute } from '../collection-page-routing-paths';
 
 @Component({
   selector: 'ds-edit-item-template-page',
diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
index 95f0d888e4..ced1ca9323 100644
--- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
+++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
@@ -1,9 +1,9 @@
 import { first } from 'rxjs/operators';
 
-import { ItemTemplatePageResolver } from './item-template-page.resolver';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ItemTemplatePageResolver } from './item-template-page.resolver';
 
 describe('ItemTemplatePageResolver', () => {
   describe('resolve', () => {
@@ -14,7 +14,7 @@ describe('ItemTemplatePageResolver', () => {
 
     beforeEach(() => {
       itemTemplateService = {
-        findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
       dsoNameService = new DSONameServiceMock();
       resolver = new ItemTemplatePageResolver(dsoNameService as DSONameService, itemTemplateService);
@@ -27,7 +27,7 @@ describe('ItemTemplatePageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
index 586617c44c..08553d9e93 100644
--- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
+++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
@@ -1,12 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-import { Observable } from 'rxjs';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific collection's item template before the route is activated
diff --git a/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
index b53f4e6c45..3cf4eafdc7 100644
--- a/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
 
diff --git a/src/app/collection-page/themed-collection-page.component.ts b/src/app/collection-page/themed-collection-page.component.ts
index 2faf418423..ff4e246e7d 100644
--- a/src/app/collection-page/themed-collection-page.component.ts
+++ b/src/app/collection-page/themed-collection-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CollectionPageComponent } from './collection-page.component';
 
diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
index e2a2bb748f..95acc9dd86 100644
--- a/src/app/community-list-page/community-list-datasource.ts
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -1,10 +1,18 @@
-import { hasValue } from '../shared/empty.util';
-import { CommunityListService} from './community-list-service';
-import { CollectionViewer, DataSource } from '@angular/cdk/collections';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {
+  CollectionViewer,
+  DataSource,
+} from '@angular/cdk/collections';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { finalize } from 'rxjs/operators';
-import { FlatNode } from './flat-node.model';
+
 import { FindListOptions } from '../core/data/find-list-options.model';
+import { hasValue } from '../shared/empty.util';
+import { CommunityListService } from './community-list-service';
+import { FlatNode } from './flat-node.model';
 
 /**
  * DataSource object needed by a CDK Tree to render its nodes.
diff --git a/src/app/community-list-page/community-list-page.component.html b/src/app/community-list-page/community-list-page.component.html
index 9759f4405d..4392fb87d0 100644
--- a/src/app/community-list-page/community-list-page.component.html
+++ b/src/app/community-list-page/community-list-page.component.html
@@ -1,4 +1,4 @@
 <div class="container">
-  <h2>{{ 'communityList.title' | translate }}</h2>
+  <h1>{{ 'communityList.title' | translate }}</h1>
   <ds-themed-community-list></ds-themed-community-list>
 </div>
diff --git a/src/app/community-list-page/community-list-page.component.spec.ts b/src/app/community-list-page/community-list-page.component.spec.ts
index 080a0a9e18..60933a0677 100644
--- a/src/app/community-list-page/community-list-page.component.spec.ts
+++ b/src/app/community-list-page/community-list-page.component.spec.ts
@@ -1,9 +1,17 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { CommunityListPageComponent } from './community-list-page.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { CommunityListPageComponent } from './community-list-page.component';
 
 describe('CommunityListPageComponent', () => {
   let component: CommunityListPageComponent;
@@ -15,7 +23,7 @@ describe('CommunityListPageComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
+            useClass: TranslateLoaderMock,
           },
         }),
       ],
diff --git a/src/app/community-list-page/community-list-page.module.ts b/src/app/community-list-page/community-list-page.module.ts
index 15946b2e89..330e3f0346 100644
--- a/src/app/community-list-page/community-list-page.module.ts
+++ b/src/app/community-list-page/community-list-page.module.ts
@@ -1,19 +1,20 @@
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
+import { CommunityListComponent } from './community-list/community-list.component';
+import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
 import { CommunityListPageComponent } from './community-list-page.component';
 import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
-import { CommunityListComponent } from './community-list/community-list.component';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
-import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
-import { CdkTreeModule } from '@angular/cdk/tree';
 
 
 const DECLARATIONS = [
   CommunityListPageComponent,
   CommunityListComponent,
   ThemedCommunityListPageComponent,
-  ThemedCommunityListComponent
+  ThemedCommunityListComponent,
 ];
 /**
  * The page which houses a title and the community list, as described in community-list.component
@@ -26,7 +27,7 @@ const DECLARATIONS = [
     CdkTreeModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
     ...DECLARATIONS,
diff --git a/src/app/community-list-page/community-list-page.routing.module.ts b/src/app/community-list-page/community-list-page.routing.module.ts
index 1754b1b7cf..98d305c312 100644
--- a/src/app/community-list-page/community-list-page.routing.module.ts
+++ b/src/app/community-list-page/community-list-page.routing.module.ts
@@ -1,10 +1,10 @@
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { CdkTreeModule } from '@angular/cdk/tree';
 
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { CommunityListService } from './community-list-service';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 /**
  * RouterModule to help navigate to the page with the community list tree
@@ -17,14 +17,14 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         component: ThemedCommunityListPageComponent,
         pathMatch: 'full',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: { title: 'communityList.tabTitle', breadcrumbKey: 'communityList' }
-      }
+        data: { title: 'communityList.tabTitle', breadcrumbKey: 'communityList' },
+      },
     ]),
     CdkTreeModule,
   ],
-  providers: [CommunityListService]
+  providers: [CommunityListService],
 })
 export class CommunityListPageRoutingModule {
 }
diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts
index 410dd9f804..28d3cfe1a9 100644
--- a/src/app/community-list-page/community-list-service.spec.ts
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -1,23 +1,36 @@
-import { inject, TestBed } from '@angular/core/testing';
+import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { AppState } from '../app.reducer';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { buildPaginatedList } from '../core/data/paginated-list.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { StoreMock } from '../shared/testing/store.mock';
-import { CommunityListService, toFlatNode } from './community-list-service';
-import { CollectionDataService } from '../core/data/collection-data.service';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { Community } from '../core/shared/community.model';
-import { Collection } from '../core/shared/collection.model';
-import { PageInfo } from '../core/shared/page-info.model';
-import { FlatNode } from './flat-node.model';
-import { FindListOptions } from '../core/data/find-list-options.model';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment.test';
 
+import { AppState } from '../app.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../core/data/collection-data.service';
+import { CommunityDataService } from '../core/data/community-data.service';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import { PageInfo } from '../core/shared/page-info.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { StoreMock } from '../shared/testing/store.mock';
+import {
+  CommunityListService,
+  toFlatNode,
+} from './community-list-service';
+import { FlatNode } from './flat-node.model';
+
 describe('CommunityListService', () => {
   let store: StoreMock<AppState>;
   const standardElementsPerPage = 2;
@@ -38,34 +51,34 @@ describe('CommunityListService', () => {
       id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
       uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     }),
-      Object.assign(new Community(), {
-        id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-        uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      })
+    Object.assign(new Community(), {
+      id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+      uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    }),
     ];
     mockCollectionsPage1 = [
       Object.assign(new Collection(), {
         id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
         uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
-        name: 'Collection 1'
+        name: 'Collection 1',
       }),
       Object.assign(new Collection(), {
         id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
         uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
-        name: 'Collection 2'
-      })
+        name: 'Collection 2',
+      }),
     ];
     mockCollectionsPage2 = [
       Object.assign(new Collection(), {
         id: 'a5159760-f362-4659-9e81-e3253ad91ede',
         uuid: 'a5159760-f362-4659-9e81-e3253ad91ede',
-        name: 'Collection 3'
+        name: 'Collection 3',
       }),
       Object.assign(new Collection(), {
         id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
         uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
-        name: 'Collection 4'
-      })
+        name: 'Collection 4',
+      }),
     ];
     mockListOfTopCommunitiesPage1 = [
       Object.assign(new Community(), {
@@ -164,7 +177,7 @@ describe('CommunityListService', () => {
         } else {
           return createFailedRemoteDataObject$();
         }
-      }
+      },
     };
     collectionDataServiceStub = {
       findByParent(parentUUID: string, options: FindListOptions = {}) {
@@ -189,7 +202,7 @@ describe('CommunityListService', () => {
         } else {
           return createFailedRemoteDataObject$();
         }
-      }
+      },
     };
     TestBed.configureTestingModule({
       providers: [CommunityListService,
@@ -217,7 +230,7 @@ describe('CommunityListService', () => {
 
           service.loadCommunities({
             currentPage: 2,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, null)
             .pipe(take(1))
             .subscribe((value) => {
@@ -246,7 +259,7 @@ describe('CommunityListService', () => {
         beforeEach((done) => {
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, null)
             .pipe(take(1))
             .subscribe((value) => {
@@ -279,7 +292,7 @@ describe('CommunityListService', () => {
           });
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -307,7 +320,7 @@ describe('CommunityListService', () => {
           const expandedNodes = [communityFlatNode];
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -332,7 +345,7 @@ describe('CommunityListService', () => {
           const expandedNodes = [communityFlatNode];
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -429,8 +442,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }],
+          },
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
@@ -461,8 +474,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+          },
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
@@ -495,8 +508,8 @@ describe('CommunityListService', () => {
             collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
             metadata: {
               'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-              'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-            }
+              'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+            },
           });
           let flatNodeList;
           beforeEach((done) => {
@@ -540,8 +553,8 @@ describe('CommunityListService', () => {
               collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
               metadata: {
                 'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-                'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-              }
+                'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+              },
             });
             const communityFlatNode = toFlatNode(communityWithCollections, observableOf(true), 0, true, null);
             communityFlatNode.currentCollectionPage = 2;
@@ -591,8 +604,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+          },
         });
         service.getIsExpandable(communityWithSubcoms).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
@@ -607,8 +620,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockCollectionsPage1)),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }],
+          },
         });
         service.getIsExpandable(communityWithCollections).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
@@ -625,8 +638,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 3' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 3' }],
+          },
         });
         service.getIsExpandable(communityWithNoSubcomsOrColls).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(false);
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index 99e9dbeb0d..705dcc7e5d 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -1,31 +1,57 @@
 /* eslint-disable max-classes-per-file */
-import { Inject, Injectable } from '@angular/core';
-import { createSelector, Store } from '@ngrx/store';
-
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { filter, map, switchMap } from 'rxjs/operators';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  createSelector,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+import { v4 as uuidv4 } from 'uuid';
 
 import { AppState } from '../app.reducer';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { Community } from '../core/shared/community.model';
-import { Collection } from '../core/shared/collection.model';
-import { PageInfo } from '../core/shared/page-info.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { RemoteData } from '../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model';
+import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
+import { getCommunityPageRoute } from '../community-page/community-page-routing-paths';
 import { CollectionDataService } from '../core/data/collection-data.service';
+import { CommunityDataService } from '../core/data/community-data.service';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../core/shared/operators';
+import { PageInfo } from '../core/shared/page-info.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { followLink } from '../shared/utils/follow-link-config.model';
 import { CommunityListSaveAction } from './community-list.actions';
 import { CommunityListState } from './community-list.reducer';
-import { getCommunityPageRoute } from '../community-page/community-page-routing-paths';
-import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../core/shared/operators';
-import { followLink } from '../shared/utils/follow-link-config.model';
 import { FlatNode } from './flat-node.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
-import { FindListOptions } from '../core/data/find-list-options.model';
-import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
 
-// Helper method to combine an flatten an array of observables of flatNode arrays
+// Helper method to combine and flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Observable<FlatNode[]>[]): Observable<FlatNode[]> =>
   observableCombineLatest([...obsList]).pipe(
     map((matrix: any[][]) => [].concat(...matrix)),
@@ -45,7 +71,7 @@ export const toFlatNode = (
   isExpandable: Observable<boolean>,
   level: number,
   isExpanded: boolean,
-  parent?: FlatNode
+  parent?: FlatNode,
 ): FlatNode => ({
   isExpandable$: isExpandable,
   name: c.name,
@@ -64,7 +90,7 @@ export const toFlatNode = (
 export const showMoreFlatNode = (
   id: string,
   level: number,
-  parent: FlatNode
+  parent: FlatNode,
 ): FlatNode => ({
   isExpandable$: observableOf(false),
   name: 'Show More Flatnode',
@@ -94,13 +120,13 @@ export class CommunityListService {
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private communityDataService: CommunityDataService,
     private collectionDataService: CollectionDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
     this.pageSize = appConfig.communityList.pageSize;
   }
 
   private configOnePage: FindListOptions = Object.assign(new FindListOptions(), {
-    elementsPerPage: 1
+    elementsPerPage: 1,
   });
 
   saveCommunityListStateToStore(expandedNodes: FlatNode[], loadingNode: FlatNode): void {
@@ -137,7 +163,7 @@ export class CommunityListService {
           newPageInfo = Object.assign({}, coms[0].pageInfo, { currentPage });
         }
         return buildPaginatedList(newPageInfo, newPage);
-      })
+      }),
     );
     return topComs$.pipe(
       switchMap((topComs: PaginatedList<Community>) => this.transformListOfCommunities(topComs, 0, null, expandedNodes)),
@@ -150,15 +176,15 @@ export class CommunityListService {
    */
   private getTopCommunities(options: FindListOptions): Observable<PaginatedList<Community>> {
     return this.communityDataService.findTop({
-        currentPage: options.currentPage,
-        elementsPerPage: this.pageSize,
-        sort: {
-          field: options.sort.field,
-          direction: options.sort.direction
-        }
+      currentPage: options.currentPage,
+      elementsPerPage: this.pageSize,
+      sort: {
+        field: options.sort.field,
+        direction: options.sort.direction,
       },
-      followLink('subcommunities', { findListOptions: this.configOnePage }),
-      followLink('collections', { findListOptions: this.configOnePage }))
+    },
+    followLink('subcommunities', { findListOptions: this.configOnePage }),
+    followLink('collections', { findListOptions: this.configOnePage }))
       .pipe(
         getFirstSucceededRemoteData(),
         map((results) => results.payload),
@@ -173,9 +199,9 @@ export class CommunityListService {
    * @param expandedNodes                 List of expanded nodes; if a node is not expanded its subcommunities and collections need not be added to the list
    */
   public transformListOfCommunities(listOfPaginatedCommunities: PaginatedList<Community>,
-                                    level: number,
-                                    parent: FlatNode,
-                                    expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    level: number,
+    parent: FlatNode,
+    expandedNodes: FlatNode[]): Observable<FlatNode[]> {
     if (isNotEmpty(listOfPaginatedCommunities.page)) {
       let currentPage = listOfPaginatedCommunities.currentPage;
       if (isNotEmpty(parent)) {
@@ -186,7 +212,7 @@ export class CommunityListService {
           return this.transformCommunity(community, level, parent, expandedNodes);
         });
       if (currentPage < listOfPaginatedCommunities.totalPages && currentPage === listOfPaginatedCommunities.currentPage) {
-        obsList = [...obsList, observableOf([showMoreFlatNode('community', level, parent)])];
+        obsList = [...obsList, observableOf([showMoreFlatNode(`community-${uuidv4()}`, level, parent)])];
       }
 
       return combineAndFlatten(obsList);
@@ -199,7 +225,7 @@ export class CommunityListService {
    * Transforms a community in a list of FlatNodes containing firstly a flatnode of the community itself,
    *      followed by flatNodes of its possible subcommunities and collection
    * It gets called recursively for each subcommunity to add its subcommunities and collections to the list
-   * Number of subcommunities and collections added, is dependant on the current page the parent is at for respectively subcommunities and collections.
+   * Number of subcommunities and collections added, is dependent on the current page the parent is at for respectively subcommunities and collections.
    * @param community         Community being transformed
    * @param level             Depth of the community in the list, subcommunities and collections go one level deeper
    * @param parent            Flatnode of the parent community
@@ -222,11 +248,11 @@ export class CommunityListService {
       let subcoms = [];
       for (let i = 1; i <= currentCommunityPage; i++) {
         const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
-            elementsPerPage: this.pageSize,
-            currentPage: i
-          },
-          followLink('subcommunities', { findListOptions: this.configOnePage }),
-          followLink('collections', { findListOptions: this.configOnePage }))
+          elementsPerPage: this.pageSize,
+          currentPage: i,
+        },
+        followLink('subcommunities', { findListOptions: this.configOnePage }),
+        followLink('collections', { findListOptions: this.configOnePage }))
           .pipe(
             getFirstCompletedRemoteData(),
             switchMap((rd: RemoteData<PaginatedList<Community>>) => {
@@ -235,7 +261,7 @@ export class CommunityListService {
               } else {
                 return observableOf([]);
               }
-            })
+            }),
           );
 
         subcoms = [...subcoms, nextSetOfSubcommunitiesPage];
@@ -248,7 +274,7 @@ export class CommunityListService {
       for (let i = 1; i <= currentCollectionPage; i++) {
         const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
           elementsPerPage: this.pageSize,
-          currentPage: i
+          currentPage: i,
         })
           .pipe(
             getFirstCompletedRemoteData(),
@@ -257,7 +283,7 @@ export class CommunityListService {
                 let nodes = rd.payload.page
                   .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
                 if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) {
-                  nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
+                  nodes = [...nodes, showMoreFlatNode(`collection-${uuidv4()}`, level + 1, communityFlatNode)];
                 }
                 return nodes;
               } else {
@@ -275,14 +301,12 @@ export class CommunityListService {
 
   /**
    * Checks if a community has subcommunities or collections by querying the respective services with a pageSize = 0
-   *      Returns an observable that combines the result.payload.totalElements fo the observables that the
+   *      Returns an observable that combines the result.payload.totalElements of the observables that the
    *          respective services return when queried
    * @param community     Community being checked whether it is expandable (if it has subcommunities or collections)
    */
   public getIsExpandable(community: Community): Observable<boolean> {
-    let hasSubcoms$: Observable<boolean>;
-    let hasColls$: Observable<boolean>;
-    hasSubcoms$ = this.communityDataService.findByParent(community.uuid, this.configOnePage)
+    const hasSubcoms$ = this.communityDataService.findByParent(community.uuid, this.configOnePage)
       .pipe(
         map((rd: RemoteData<PaginatedList<Community>>) => {
           if (hasValue(rd) && hasValue(rd.payload)) {
@@ -293,7 +317,7 @@ export class CommunityListService {
         }),
       );
 
-    hasColls$ = this.collectionDataService.findByParent(community.uuid, this.configOnePage)
+    const hasColls$ = this.collectionDataService.findByParent(community.uuid, this.configOnePage)
       .pipe(
         map((rd: RemoteData<PaginatedList<Collection>>) => {
           if (hasValue(rd) && hasValue(rd.payload)) {
@@ -304,12 +328,9 @@ export class CommunityListService {
         }),
       );
 
-    let hasChildren$: Observable<boolean>;
-    hasChildren$ = observableCombineLatest(hasSubcoms$, hasColls$).pipe(
-      map(([hasSubcoms, hasColls]: [boolean, boolean]) => hasSubcoms || hasColls)
+    return observableCombineLatest(hasSubcoms$, hasColls$).pipe(
+      map(([hasSubcoms, hasColls]: [boolean, boolean]) => hasSubcoms || hasColls),
     );
-
-    return hasChildren$;
   }
 
 }
diff --git a/src/app/community-list-page/community-list.actions.ts b/src/app/community-list-page/community-list.actions.ts
index 8e8d6d87cf..47c72af9f7 100644
--- a/src/app/community-list-page/community-list.actions.ts
+++ b/src/app/community-list-page/community-list.actions.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from '../shared/ngrx/type';
 import { FlatNode } from './flat-node.model';
 
@@ -7,7 +8,7 @@ import { FlatNode } from './flat-node.model';
  */
 
 export const CommunityListActionTypes = {
-  SAVE: type('dspace/community-list-page/SAVE')
+  SAVE: type('dspace/community-list-page/SAVE'),
 };
 
 /**
diff --git a/src/app/community-list-page/community-list.reducer.spec.ts b/src/app/community-list-page/community-list.reducer.spec.ts
index 0d0f5c7580..abbd16d4cd 100644
--- a/src/app/community-list-page/community-list.reducer.spec.ts
+++ b/src/app/community-list-page/community-list.reducer.spec.ts
@@ -1,11 +1,12 @@
 import { of as observableOf } from 'rxjs';
+
 import { buildPaginatedList } from '../core/data/paginated-list.model';
 import { Community } from '../core/shared/community.model';
 import { PageInfo } from '../core/shared/page-info.model';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { toFlatNode } from './community-list-service';
 import { CommunityListSaveAction } from './community-list.actions';
 import { CommunityListReducer } from './community-list.reducer';
+import { toFlatNode } from './community-list-service';
 
 describe('communityListReducer', () => {
   const mockSubcommunities1Page1 = [Object.assign(new Community(), {
@@ -20,7 +21,7 @@ describe('communityListReducer', () => {
       subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
       collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       name: 'community1',
-    }), observableOf(true), 0, false, null
+    }), observableOf(true), 0, false, null,
   );
 
   it ('should set init state of the expandedNodes and loadingNode', () => {
diff --git a/src/app/community-list-page/community-list.reducer.ts b/src/app/community-list-page/community-list.reducer.ts
index 99c8350cf4..7afcabf067 100644
--- a/src/app/community-list-page/community-list.reducer.ts
+++ b/src/app/community-list-page/community-list.reducer.ts
@@ -1,4 +1,8 @@
-import { CommunityListActions, CommunityListActionTypes, CommunityListSaveAction } from './community-list.actions';
+import {
+  CommunityListActions,
+  CommunityListActionTypes,
+  CommunityListSaveAction,
+} from './community-list.actions';
 import { FlatNode } from './flat-node.model';
 
 /**
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index d6fd77e79b..ea34e02d56 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,14 +1,14 @@
 <ds-themed-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-themed-loading>
-<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
+<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl" [trackBy]="trackBy">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
                  class="example-tree-node show-more-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="align-middle pt-2">
-        <button *ngIf="node!==loadingNode" (click)="getNextPage(node)"
+        <button *ngIf="(dataSource.loading$ | async) !== true" (click)="getNextPage(node)"
            class="btn btn-outline-primary btn-sm" role="button">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
         </button>
@@ -24,32 +24,32 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
                  class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle
-              [title]="'toggle ' + dsoNameService.getName(node.payload)"
-              [attr.aria-label]="'toggle ' + dsoNameService.getName(node.payload)"
+      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default" cdkTreeNodeToggle
+              [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
               (click)="toggleExpanded(node)"
-              [ngClass]="(hasChild(null, node)| async) ? 'visible' : 'invisible'"
-              [attr.data-test]="(hasChild(null, node)| async) ? 'expand-button' : ''">
+              data-test="expand-button">
         <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
               aria-hidden="true"></span>
+        <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
       </button>
+      <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
+      <span *ngIf="(hasChild(null, node) | async) !== true" aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="d-flex flex-row">
-        <h5 class="align-middle pt-2">
-          <a [routerLink]="node.route" class="lead">
-            {{ dsoNameService.getName(node.payload) }}
-          </a>
+        <span class="align-middle pt-2 lead">
+          <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
           <span class="pr-2">&nbsp;</span>
           <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead">{{node.payload.archivedItemsCount}}</span>
-        </h5>
+        </span>
       </div>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
@@ -58,10 +58,9 @@
     </ds-truncatable>
     <div class="d-flex" *ngIf="node===loadingNode && dataSource.loading$ | async"
          cdkTreeNodePadding>
-      <button type="button" class="btn btn-default invisible">
-        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-              aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <ds-themed-loading class="ds-themed-loading"></ds-themed-loading>
     </div>
   </cdk-tree-node>
@@ -69,22 +68,19 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
                  class="example-tree-node childless-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <h6 class="align-middle pt-2">
-        <a [routerLink]="node.route" class="lead">
-          {{ dsoNameService.getName(node.payload) }}
-        </a>
+        <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
       </h6>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
diff --git a/src/app/community-list-page/community-list/community-list.component.scss b/src/app/community-list-page/community-list/community-list.component.scss
new file mode 100644
index 0000000000..2e33380a29
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.scss
@@ -0,0 +1,4 @@
+::ng-deep .fa-chevron-right::before {
+  display: block;
+  width: 16px;
+}
diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts
index ce6b27dbeb..434a14a85f 100644
--- a/src/app/community-list-page/community-list/community-list.component.spec.ts
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -1,22 +1,43 @@
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { CommunityListComponent } from './community-list.component';
-import { CommunityListService, showMoreFlatNode, toFlatNode } from '../community-list-service';
 import { CdkTreeModule } from '@angular/cdk/tree';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Community } from '../../core/shared/community.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Collection } from '../../core/shared/collection.model';
-import { of as observableOf } from 'rxjs';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { FlatNode } from '../flat-node.model';
 import { RouterLinkWithHref } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  CommunityListService,
+  showMoreFlatNode,
+  toFlatNode,
+} from '../community-list-service';
+import { FlatNode } from '../flat-node.model';
+import { CommunityListComponent } from './community-list.component';
 
 describe('CommunityListComponent', () => {
   let component: CommunityListComponent;
@@ -27,11 +48,11 @@ describe('CommunityListComponent', () => {
     uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     name: 'subcommunity1',
   }),
-    Object.assign(new Community(), {
-      id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      name: 'subcommunity2',
-    })
+  Object.assign(new Community(), {
+    id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    name: 'subcommunity2',
+  }),
   ];
   const mockCollectionsPage1 = [
     Object.assign(new Collection(), {
@@ -43,7 +64,7 @@ describe('CommunityListComponent', () => {
       id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
       uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
       name: 'collection2',
-    })
+    }),
   ];
   const mockCollectionsPage2 = [
     Object.assign(new Collection(), {
@@ -55,7 +76,7 @@ describe('CommunityListComponent', () => {
       id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
       uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
       name: 'collection4',
-    })
+    }),
   ];
 
   const mockTopCommunitiesWithChildrenArrays = [
@@ -86,7 +107,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community1',
-      }), observableOf(true), 0, false, null
+      }), observableOf(true), 0, false, null,
     ),
     toFlatNode(
       Object.assign(new Community(), {
@@ -95,7 +116,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
         name: 'community2',
-      }), observableOf(true), 0, false, null
+      }), observableOf(true), 0, false, null,
     ),
     toFlatNode(
       Object.assign(new Community(), {
@@ -104,7 +125,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community3',
-      }), observableOf(false), 0, false, null
+      }), observableOf(false), 0, false, null,
     ),
   ];
   let communityListServiceStub;
@@ -138,7 +159,7 @@ describe('CommunityListComponent', () => {
         }
         if (expandedNodes === null || isEmpty(expandedNodes)) {
           if (showMoreTopComNode) {
-            return observableOf([...mockTopFlatnodesUnexpanded.slice(0, endPageIndex), showMoreFlatNode('community', 0, null)]);
+            return observableOf([...mockTopFlatnodesUnexpanded.slice(0, endPageIndex), showMoreFlatNode(`community-${uuidv4()}`, 0, null)]);
           } else {
             return observableOf(mockTopFlatnodesUnexpanded.slice(0, endPageIndex));
           }
@@ -165,32 +186,32 @@ describe('CommunityListComponent', () => {
                   const endSubComIndex = this.pageSize * expandedParent.currentCommunityPage;
                   flatnodes = [...flatnodes, ...subComFlatnodes.slice(0, endSubComIndex)];
                   if (subComFlatnodes.length > endSubComIndex) {
-                    flatnodes = [...flatnodes, showMoreFlatNode('community', topNode.level + 1, expandedParent)];
+                    flatnodes = [...flatnodes, showMoreFlatNode(`community-${uuidv4()}`, topNode.level + 1, expandedParent)];
                   }
                 }
                 if (isNotEmpty(collFlatnodes)) {
                   const endColIndex = this.pageSize * expandedParent.currentCollectionPage;
                   flatnodes = [...flatnodes, ...collFlatnodes.slice(0, endColIndex)];
                   if (collFlatnodes.length > endColIndex) {
-                    flatnodes = [...flatnodes, showMoreFlatNode('collection', topNode.level + 1, expandedParent)];
+                    flatnodes = [...flatnodes, showMoreFlatNode(`collection-${uuidv4()}`, topNode.level + 1, expandedParent)];
                   }
                 }
               }
             }
           });
           if (showMoreTopComNode) {
-            flatnodes = [...flatnodes, showMoreFlatNode('community', 0, null)];
+            flatnodes = [...flatnodes, showMoreFlatNode(`community-${uuidv4()}`, 0, null)];
           }
           return observableOf(flatnodes);
         }
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
+            useClass: TranslateLoaderMock,
           },
         }),
         CdkTreeModule,
@@ -198,7 +219,7 @@ describe('CommunityListComponent', () => {
         RouterLinkWithHref],
       declarations: [CommunityListComponent],
       providers: [CommunityListComponent,
-        { provide: CommunityListService, useValue: communityListServiceStub },],
+        { provide: CommunityListService, useValue: communityListServiceStub }],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     })
       .compileComponents();
@@ -242,7 +263,7 @@ describe('CommunityListComponent', () => {
       const showMoreLink = fixture.debugElement.query(By.css('.show-more-node .btn-outline-primary'));
       showMoreLink.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -299,12 +320,14 @@ describe('CommunityListComponent', () => {
 
   describe('second top community node is expanded and has more children (collections) than page size of collection', () => {
     describe('children of second top com are added (page-limited pageSize 2)', () => {
-      let allNodes;
+      let allNodes: DebugElement[];
       beforeEach(fakeAsync(() => {
-        const chevronExpand = fixture.debugElement.queryAll(By.css('.expandable-node button'));
-        const chevronExpandSpan = fixture.debugElement.queryAll(By.css('.expandable-node button span'));
-        if (chevronExpandSpan[1].nativeElement.classList.contains('fa-chevron-right')) {
-          chevronExpand[1].nativeElement.click();
+        const toggleButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.expandable-node button'));
+        const toggleButtonText: DebugElement = toggleButtons[1].query(By.css('span'));
+        expect(toggleButtonText).not.toBeNull();
+
+        if (toggleButtonText.nativeElement.classList.contains('fa-chevron-right')) {
+          toggleButtons[1].nativeElement.click();
           tick();
           fixture.detectChanges();
         }
@@ -314,17 +337,18 @@ describe('CommunityListComponent', () => {
         allNodes = [...expandableNodesFound, ...childlessNodesFound];
       }));
       it('tree contains 2 (page-limited) top com, 2 (page-limited) coll of 2nd top com, a show more for those page-limited coll and show more for page-limited top com', () => {
-        mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
-          })).toBeTruthy();
-        });
-        mockCollectionsPage1.map((coll) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === coll.name);
-          })).toBeTruthy();
-        });
+        const allNodeNames: string[] = allNodes.map((node: DebugElement) => node.nativeElement.innerText.trim());
         expect(allNodes.length).toEqual(4);
+        const flatNodes: string[] = mockTopFlatnodesUnexpanded.slice(0, 2).map((flatNode: FlatNode) => flatNode.name);
+        for (const flatNode of flatNodes) {
+          expect(allNodeNames).toContain(flatNode);
+        }
+        expect(flatNodes.length).toBe(2);
+        const page1CollectionNames: string[] = mockCollectionsPage1.map((collection: Collection) => collection.name);
+        for (const collectionName of page1CollectionNames) {
+          expect(allNodeNames).toContain(collectionName);
+        }
+        expect(page1CollectionNames.length).toBe(2);
         const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node'));
         expect(showMoreEl.length).toEqual(2);
       });
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 5b2f930813..369e51ea12 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -1,13 +1,21 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { take } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CommunityListService} from '../community-list-service';
-import { CommunityListDatasource } from '../community-list-datasource';
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { isEmpty } from '../../shared/empty.util';
-import { FlatNode } from '../flat-node.model';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { take } from 'rxjs/operators';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { isEmpty } from '../../shared/empty.util';
+import { CommunityListDatasource } from '../community-list-datasource';
+import { CommunityListService } from '../community-list-service';
+import { FlatNode } from '../flat-node.model';
 
 /**
  * A tree-structured list of nodes representing the communities, their subCommunities and collections.
@@ -19,6 +27,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-community-list',
   templateUrl: './community-list.component.html',
+  styleUrls: ['./community-list.component.scss'],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
@@ -26,12 +35,11 @@ export class CommunityListComponent implements OnInit, OnDestroy {
   public loadingNode: FlatNode;
 
   treeControl = new FlatTreeControl<FlatNode>(
-    (node: FlatNode) => node.level, (node: FlatNode) => true
+    (node: FlatNode) => node.level, (node: FlatNode) => true,
   );
-
   dataSource: CommunityListDatasource;
-
   paginationConfig: FindListOptions;
+  trackBy = (index, node: FlatNode) => node.id;
 
   constructor(
     protected communityListService: CommunityListService,
@@ -58,24 +66,34 @@ export class CommunityListComponent implements OnInit, OnDestroy {
     this.communityListService.saveCommunityListStateToStore(this.expandedNodes, this.loadingNode);
   }
 
-  // whether or not this node has children (subcommunities or collections)
+  /**
+   * Whether this node has children (subcommunities or collections)
+   * @param _
+   * @param node
+   */
   hasChild(_: number, node: FlatNode) {
     return node.isExpandable$;
   }
 
-  // whether or not it is a show more node (contains no data, but is indication that there are more topcoms, subcoms or collections
+  /**
+   * Whether this is a show more node that contains no data, but indicates that there is
+   * one or more community or collection.
+   * @param _
+   * @param node
+   */
   isShowMore(_: number, node: FlatNode) {
     return node.isShowMoreNode;
   }
 
   /**
-   * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree so this node is expanded
+   * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree
+   * so this node is expanded
    * @param node  Node we want to expand
    */
   toggleExpanded(node: FlatNode) {
     this.loadingNode = node;
     if (node.isExpanded) {
-      this.expandedNodes = this.expandedNodes.filter((node2) => node2.name !== node.name);
+      this.expandedNodes = this.expandedNodes.filter((node2) => node2.id !== node.id);
       node.isExpanded = false;
     } else {
       this.expandedNodes.push(node);
@@ -92,26 +110,28 @@ export class CommunityListComponent implements OnInit, OnDestroy {
 
   /**
    * Makes sure the next page of a node is added to the tree (top community, sub community of collection)
-   *      > Finds its parent (if not top community) and increases its corresponding collection/subcommunity currentPage
-   *      > Reloads tree with new page added to corresponding top community lis, sub community list or collection list
-   * @param node  The show more node indicating whether it's an increase in top communities, sub communities or collections
+   *      > Finds its parent (if not top community) and increases its corresponding collection/subcommunity
+   *      currentPage
+   *      > Reloads tree with new page added to corresponding top community lis, sub community list or
+   *      collection list
+   * @param node  The show more node indicating whether it's an increase in top communities, sub communities
+   *              or collections
    */
   getNextPage(node: FlatNode): void {
     this.loadingNode = node;
     if (node.parent != null) {
-      if (node.id === 'collection') {
+      if (node.id.startsWith('collection')) {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCollectionPage++;
       }
-      if (node.id === 'community') {
+      if (node.id.startsWith('community')) {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCommunityPage++;
       }
-      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     } else {
       this.paginationConfig.currentPage++;
-      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     }
+    this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
   }
 
 }
diff --git a/src/app/community-list-page/community-list/themed-community-list.component.ts b/src/app/community-list-page/community-list/themed-community-list.component.ts
index 4a986e737c..9e494bdf47 100644
--- a/src/app/community-list-page/community-list/themed-community-list.component.ts
+++ b/src/app/community-list-page/community-list/themed-community-list.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CommunityListComponent } from './community-list.component';
-import { Component } from '@angular/core';
 
 
 @Component({
diff --git a/src/app/community-list-page/flat-node.model.ts b/src/app/community-list-page/flat-node.model.ts
index 0aabbeb489..125ffc1e59 100644
--- a/src/app/community-list-page/flat-node.model.ts
+++ b/src/app/community-list-page/flat-node.model.ts
@@ -1,6 +1,7 @@
 import { Observable } from 'rxjs';
-import { Community } from '../core/shared/community.model';
+
 import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
 
 /**
diff --git a/src/app/community-list-page/show-more-flat-node.model.ts b/src/app/community-list-page/show-more-flat-node.model.ts
index 801c9e7388..c7b7162d21 100644
--- a/src/app/community-list-page/show-more-flat-node.model.ts
+++ b/src/app/community-list-page/show-more-flat-node.model.ts
@@ -1,6 +1,6 @@
 /**
  * The show more links in the community tree are also represented by a flatNode so we know where in
- *  the tree it should be rendered an who its parent is (needed for the action resulting in clicking this link)
+ *  the tree it should be rendered and who its parent is (needed for the action resulting in clicking this link)
  */
 export class ShowMoreFlatNode {
 }
diff --git a/src/app/community-list-page/themed-community-list-page.component.ts b/src/app/community-list-page/themed-community-list-page.component.ts
index 20fa97bedd..2b5113bac9 100644
--- a/src/app/community-list-page/themed-community-list-page.component.ts
+++ b/src/app/community-list-page/themed-community-list-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityListPageComponent } from './community-list-page.component';
 
diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
index fa4809738d..0ac871ebb9 100644
--- a/src/app/community-page/community-form/community-form.component.ts
+++ b/src/app/community-page/community-form/community-form.component.ts
@@ -1,19 +1,26 @@
-import { Component, Input, OnChanges, SimpleChange, SimpleChanges } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormService,
   DynamicInputModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../../core/auth/auth.service';
+import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
 import { Community } from '../../core/shared/community.model';
 import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
-import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { RequestService } from '../../core/data/request.service';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { environment } from '../../../environments/environment';
 
 /**
  * Form used for creating and editing communities
@@ -21,7 +28,7 @@ import { environment } from '../../../environments/environment';
 @Component({
   selector: 'ds-community-form',
   styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html',
 })
 export class CommunityFormComponent extends ComColFormComponent<Community> implements OnChanges {
   /**
@@ -44,10 +51,10 @@ export class CommunityFormComponent extends ComColFormComponent<Community> imple
       name: 'dc.title',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Please enter a name for this title'
+        required: 'Please enter a name for this title',
       },
     }),
     new DynamicTextAreaModel({
@@ -85,7 +92,7 @@ export class CommunityFormComponent extends ComColFormComponent<Community> imple
   ngOnChanges(changes: SimpleChanges) {
     const dsoChange: SimpleChange = changes.dso;
     if (this.dso && dsoChange && !dsoChange.isFirstChange()) {
-       super.ngOnInit();
+      super.ngOnInit();
     }
   }
 }
diff --git a/src/app/community-page/community-form/community-form.module.ts b/src/app/community-page/community-form/community-form.module.ts
index 925d218973..fb337a7c98 100644
--- a/src/app/community-page/community-form/community-form.module.ts
+++ b/src/app/community-page/community-form/community-form.module.ts
@@ -1,22 +1,22 @@
 import { NgModule } from '@angular/core';
 
-import { CommunityFormComponent } from './community-form.component';
-import { SharedModule } from '../../shared/shared.module';
 import { ComcolModule } from '../../shared/comcol/comcol.module';
 import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { CommunityFormComponent } from './community-form.component';
 
 @NgModule({
   imports: [
     ComcolModule,
     FormModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     CommunityFormComponent,
   ],
   exports: [
-    CommunityFormComponent
-  ]
+    CommunityFormComponent,
+  ],
 })
 export class CommunityFormModule {
 
diff --git a/src/app/community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts
index fd7ce5f7bf..4a3816b225 100644
--- a/src/app/community-page/community-page-administrator.guard.ts
+++ b/src/app/community-page/community-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Community } from '../core/shared/community.model';
-import { CommunityPageResolver } from './community-page.resolver';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../core/auth/auth.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
 import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { AuthService } from '../core/auth/auth.service';
+import { Community } from '../core/shared/community.model';
+import { CommunityPageResolver } from './community-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Community} pages requiring administrator rights
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
index c37f8832f8..2d86223801 100644
--- a/src/app/community-page/community-page-routing.module.ts
+++ b/src/app/community-page/community-page-routing.module.ts
@@ -1,20 +1,29 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { CommunityPageResolver } from './community-page.resolver';
-import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { BrowseByGuard } from '../browse-by/browse-by-guard';
+import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
-import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
 import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { LinkService } from '../core/cache/builders/link.service';
-import { COMMUNITY_EDIT_PATH, COMMUNITY_CREATE_PATH } from './community-page-routing-paths';
-import { CommunityPageAdministratorGuard } from './community-page-administrator.guard';
-import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { ThemedCommunityPageComponent } from './themed-community-page.component';
-import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
+import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { CommunityPageResolver } from './community-page.resolver';
+import { CommunityPageAdministratorGuard } from './community-page-administrator.guard';
+import {
+  COMMUNITY_CREATE_PATH,
+  COMMUNITY_EDIT_PATH,
+} from './community-page-routing-paths';
+import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
+import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
+import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
+import { ThemedCommunityPageComponent } from './themed-community-page.component';
 
 @NgModule({
   imports: [
@@ -22,14 +31,14 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
       {
         path: COMMUNITY_CREATE_PATH,
         component: CreateCommunityPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard]
+        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard],
       },
       {
         path: ':id',
         resolve: {
           dso: CommunityPageResolver,
           breadcrumb: CommunityBreadcrumbResolver,
-          menu: DSOEditMenuResolver
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -37,7 +46,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: COMMUNITY_EDIT_PATH,
             loadChildren: () => import('./edit-community-page/edit-community-page.module')
               .then((m) => m.EditCommunityPageModule),
-            canActivate: [CommunityPageAdministratorGuard]
+            canActivate: [CommunityPageAdministratorGuard],
           },
           {
             path: 'delete',
@@ -48,8 +57,33 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
           {
             path: '',
             component: ThemedCommunityPageComponent,
-            pathMatch: 'full',
-          }
+            children: [
+              {
+                path: '',
+                pathMatch: 'full',
+                component: ComcolSearchSectionComponent,
+              },
+              {
+                path: 'subcoms-cols',
+                pathMatch: 'full',
+                component: SubComColSectionComponent,
+                resolve: {
+                  breadcrumb: I18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'community.subcoms-cols' },
+              },
+              {
+                path: 'browse/:id',
+                pathMatch: 'full',
+                component: ComcolBrowseByComponent,
+                canActivate: [BrowseByGuard],
+                resolve: {
+                  breadcrumb: BrowseByI18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'browse.metadata' },
+              },
+            ],
+          },
         ],
         data: {
           menu: {
@@ -67,7 +101,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
           },
         },
       },
-    ])
+    ]),
   ],
   providers: [
     CommunityPageResolver,
@@ -76,7 +110,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     CreateCommunityPageGuard,
     CommunityPageAdministratorGuard,
-  ]
+  ],
 })
 export class CommunityPageRoutingModule {
 
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 6d5262d933..b3e577af7d 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -7,7 +7,7 @@
           <!-- Community name -->
           <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
           <!-- Community logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
           </ds-comcol-page-logo>
           <!-- Handle -->
           <ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
@@ -17,13 +17,10 @@
           </ds-comcol-page-content>
           <!-- News -->
           <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
-            [title]="'community.page.news'">
+                                  [title]="'community.page.news'">
           </ds-comcol-page-content>
         </header>
         <ds-dso-edit-menu></ds-dso-edit-menu>
-        <div class="pl-2 space-children-mr">
-          <ds-dso-page-subscription-button [dso]="communityPayload"></ds-dso-page-subscription-button>
-        </div>
       </div>
       <section class="comcol-page-browse-section">
 
@@ -31,10 +28,9 @@
         <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
         </ds-themed-comcol-page-browse-by>
 
-        <ds-themed-community-page-sub-community-list [community]="communityPayload"></ds-themed-community-page-sub-community-list>
-        <ds-themed-community-page-sub-collection-list [community]="communityPayload"></ds-themed-community-page-sub-collection-list>
+        <router-outlet></router-outlet>
       </section>
-      <footer  *ngIf="communityPayload.copyrightText"  class="border-top my-5 pt-4">
+      <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
         <!-- Copyright -->
         <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
         </ds-comcol-page-content>
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index a5bbff3cee..916de6f67b 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -1,32 +1,38 @@
-import { mergeMap, filter, map } from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
+import {
+  filter,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { Community } from '../core/shared/community.model';
-
-import { MetadataService } from '../core/metadata/metadata.service';
-
-import { fadeInOut } from '../shared/animations/fade';
-import { hasValue } from '../shared/empty.util';
-import { getAllSucceededRemoteDataPayload} from '../core/shared/operators';
 import { AuthService } from '../core/auth/auth.service';
+import { DSONameService } from '../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { getCommunityPageRoute } from './community-page-routing-paths';
+import { RemoteData } from '../core/data/remote-data';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { Community } from '../core/shared/community.model';
+import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
+import { fadeInOut } from '../shared/animations/fade';
+import { hasValue } from '../shared/empty.util';
+import { getCommunityPageRoute } from './community-page-routing-paths';
 
 @Component({
   selector: 'ds-community-page',
   styleUrls: ['./community-page.component.scss'],
   templateUrl: './community-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 /**
  * This component represents a detail page for a single community
@@ -53,8 +59,6 @@ export class CommunityPageComponent implements OnInit {
   communityPageRoute$: Observable<string>;
 
   constructor(
-    private communityDataService: CommunityDataService,
-    private metadata: MetadataService,
     private route: ActivatedRoute,
     private router: Router,
     private authService: AuthService,
@@ -67,7 +71,7 @@ export class CommunityPageComponent implements OnInit {
   ngOnInit(): void {
     this.communityRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Community>),
-      redirectOn4xx(this.router, this.authService)
+      redirectOn4xx(this.router, this.authService),
     );
     this.logoRD$ = this.communityRD$.pipe(
       map((rd: RemoteData<Community>) => rd.payload),
@@ -75,7 +79,7 @@ export class CommunityPageComponent implements OnInit {
       mergeMap((community: Community) => community.logo));
     this.communityPageRoute$ = this.communityRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((community) => getCommunityPageRoute(community.id))
+      map((community) => getCommunityPageRoute(community.id)),
     );
     this.isCommunityAdmin$ = this.authorizationDataService.isAuthorized(FeatureID.IsCommunityAdmin);
   }
diff --git a/src/app/community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
index 45ffb2a786..07434c9673 100644
--- a/src/app/community-page/community-page.module.ts
+++ b/src/app/community-page/community-page.module.ts
@@ -1,34 +1,34 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
+import { BrowseByPageModule } from '../browse-by/browse-by-page.module';
+import { ComcolModule } from '../shared/comcol/comcol.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { SharedModule } from '../shared/shared.module';
-
-import { CommunityPageComponent } from './community-page.component';
-import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
-import { CommunityPageRoutingModule } from './community-page-routing.module';
-import { CommunityPageSubCommunityListComponent } from './sub-community-list/community-page-sub-community-list.component';
-import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
-import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { CommunityFormModule } from './community-form/community-form.module';
+import { CommunityPageComponent } from './community-page.component';
+import { CommunityPageRoutingModule } from './community-page-routing.module';
+import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
+import { CommunityPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+import { ThemedCollectionPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
+import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
+import { CommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import {
-  ThemedCommunityPageSubCommunityListComponent
-} from './sub-community-list/themed-community-page-sub-community-list.component';
-import {
-  ThemedCollectionPageSubCollectionListComponent
-} from './sub-collection-list/themed-community-page-sub-collection-list.component';
-import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
-const DECLARATIONS = [CommunityPageComponent,
+const DECLARATIONS = [
+  CommunityPageComponent,
   ThemedCommunityPageComponent,
   ThemedCommunityPageSubCommunityListComponent,
   CommunityPageSubCollectionListComponent,
   ThemedCollectionPageSubCollectionListComponent,
   CommunityPageSubCommunityListComponent,
   CreateCommunityPageComponent,
-  DeleteCommunityPageComponent];
+  DeleteCommunityPageComponent,
+  SubComColSectionComponent,
+];
 
 @NgModule({
   imports: [
@@ -39,13 +39,14 @@ const DECLARATIONS = [CommunityPageComponent,
     CommunityFormModule,
     ComcolModule,
     DsoPageModule,
+    BrowseByPageModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...DECLARATIONS
-  ]
+    ...DECLARATIONS,
+  ],
 })
 
 export class CommunityPageModule {
diff --git a/src/app/community-page/community-page.resolver.spec.ts b/src/app/community-page/community-page.resolver.spec.ts
index f181dbfff6..70bb0075e3 100644
--- a/src/app/community-page/community-page.resolver.spec.ts
+++ b/src/app/community-page/community-page.resolver.spec.ts
@@ -1,6 +1,7 @@
 import { first } from 'rxjs/operators';
-import { CommunityPageResolver } from './community-page.resolver';
+
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { CommunityPageResolver } from './community-page.resolver';
 
 describe('CommunityPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('CommunityPageResolver', () => {
 
     beforeEach(() => {
       communityService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
       store = jasmine.createSpyObj('store', {
         dispatch: {},
@@ -26,7 +27,7 @@ describe('CommunityPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts
index 01de9294f3..bb90c4d457 100644
--- a/src/app/community-page/community-page.resolver.ts
+++ b/src/app/community-page/community-page.resolver.ts
@@ -1,13 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { Community } from '../core/shared/community.model';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { ResolvedAction } from '../core/resolving/resolver.actions';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { CommunityDataService } from '../core/data/community-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Community } from '../core/shared/community.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -17,7 +25,7 @@ export const COMMUNITY_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Community>[] = [
   followLink('logo'),
   followLink('subcommunities'),
   followLink('collections'),
-  followLink('parentCommunity')
+  followLink('parentCommunity'),
 ];
 
 /**
@@ -27,7 +35,7 @@ export const COMMUNITY_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Community>[] = [
 export class CommunityPageResolver implements Resolve<RemoteData<Community>> {
   constructor(
     private communityService: CommunityDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
   }
 
@@ -43,7 +51,7 @@ export class CommunityPageResolver implements Resolve<RemoteData<Community>> {
       route.params.id,
       true,
       false,
-      ...COMMUNITY_PAGE_LINKS_TO_FOLLOW
+      ...COMMUNITY_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/community-page/create-community-page/create-community-page.component.spec.ts b/src/app/community-page/create-community-page/create-community-page.component.spec.ts
index fbff82efd8..08da572a4d 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.spec.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { CreateCommunityPageComponent } from './create-community-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CreateCommunityPageComponent } from './create-community-page.component';
 
 describe('CreateCommunityPageComponent', () => {
   let comp: CreateCommunityPageComponent;
@@ -26,9 +31,9 @@ describe('CreateCommunityPageComponent', () => {
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: {} }
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index eea0908388..65ae0abc90 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { Community } from '../../core/shared/community.model';
 import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 /**
  * Component that represents the page where a user can create a new Community
@@ -15,7 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-create-community',
   styleUrls: ['./create-community-page.component.scss'],
-  templateUrl: './create-community-page.component.html'
+  templateUrl: './create-community-page.component.html',
 })
 export class CreateCommunityPageComponent extends CreateComColPageComponent<Community> {
   protected frontendURL = '/communities/';
@@ -28,7 +29,7 @@ export class CreateCommunityPageComponent extends CreateComColPageComponent<Comm
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
     super(communityDataService, dsoNameService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
diff --git a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
index 8c7b994a85..8f1f3fb18a 100644
--- a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
+++ b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
@@ -1,8 +1,12 @@
-import { CreateCommunityPageGuard } from './create-community-page.guard';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+import { Community } from '../../core/shared/community.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { CreateCommunityPageGuard } from './create-community-page.guard';
 
 describe('CreateCommunityPageGuard', () => {
   describe('canActivate', () => {
@@ -20,7 +24,7 @@ describe('CreateCommunityPageGuard', () => {
           } else if (id === 'error-id') {
             return createFailedRemoteDataObject$('not found', 404);
           }
-        }
+        },
       };
       router = new RouterMock();
 
@@ -32,7 +36,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -41,7 +45,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -50,7 +54,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -59,7 +63,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
   });
diff --git a/src/app/community-page/create-community-page/create-community-page.guard.ts b/src/app/community-page/create-community-page/create-community-page.guard.ts
index 835fbb6589..847273b367 100644
--- a/src/app/community-page/create-community-page/create-community-page.guard.ts
+++ b/src/app/community-page/create-community-page/create-community-page.guard.ts
@@ -1,13 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { map, tap } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 
 /**
  * Prevent creation of a community with an invalid parent community provided
@@ -37,8 +51,8 @@ export class CreateCommunityPageGuard implements CanActivate {
           if (!isValid) {
             this.router.navigate(['/404']);
           }
-        }
-      )
-    );
+        },
+        ),
+      );
   }
 }
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 6bb8460bc9..b241a7027c 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -2,16 +2,16 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
                         <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
-                            <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
+                            <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
                         <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
-                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
-                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
+                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
+                            <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
index 55d0508c10..0892c4d66c 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
@@ -1,17 +1,22 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SharedModule } from '../../shared/shared.module';
 import { DeleteCommunityPageComponent } from './delete-community-page.component';
-import { RequestService } from '../../core/data/request.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
 
 describe('DeleteCommunityPageComponent', () => {
   let comp: DeleteCommunityPageComponent;
@@ -26,9 +31,9 @@ describe('DeleteCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {}}
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 65b7c81b38..c6888a893b 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 /**
  * Component that represents the page where a user can delete an existing Community
@@ -13,7 +17,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-delete-community',
   styleUrls: ['./delete-community-page.component.scss'],
-  templateUrl: './delete-community-page.component.html'
+  templateUrl: './delete-community-page.component.html',
 })
 export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Community> {
   protected frontendURL = '/communities/';
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts
index d895cfd820..aa01183519 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts
@@ -1,25 +1,71 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
+import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { CommunityAccessControlComponent } from './community-access-control.component';
 
-xdescribe('CommunityAccessControlComponent', () => {
+describe('CommunityAccessControlComponent', () => {
   let component: CommunityAccessControlComponent;
   let fixture: ComponentFixture<CommunityAccessControlComponent>;
+  const testCommunity = Object.assign(new Community(),
+    {
+      type: 'community',
+      metadata: {
+        'dc.title': [{ value: 'community' }],
+      },
+      uuid: 'communityUUID',
+      parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
+
+      _links: {
+        parentCommunity: 'site',
+        self: '/' + 'communityUUID',
+      },
+    },
+  );
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: of({
+          dso: createSuccessfulRemoteDataObject(testCommunity),
+        }),
+      },
+    },
+  };
+
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ CommunityAccessControlComponent ]
+      declarations: [ CommunityAccessControlComponent ],
+      providers: [{ provide: ActivatedRoute, useValue: routeStub }],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
+
   beforeEach(() => {
     fixture = TestBed.createComponent(CommunityAccessControlComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
+    component.ngOnInit();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should set itemRD$', (done) => {
+    component.itemRD$.subscribe(result => {
+      expect(result).toEqual(createSuccessfulRemoteDataObject(testCommunity));
+      done();
+    });
+  });
 });
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
index 8a216e38df..e70af7062e 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -1,10 +1,14 @@
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
 import { Community } from '../../../core/shared/community.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-community-access-control',
@@ -18,7 +22,7 @@ export class CommunityAccessControlComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.parent.data.pipe(
-      map((data) => data.dso)
+      map((data) => data.dso),
     ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Community>>;
   }
 }
diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
index 719cf83a26..c02b390cb2 100644
--- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
@@ -1,15 +1,21 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
+import { Collection } from '../../../core/shared/collection.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { CommunityAuthorizationsComponent } from './community-authorizations.component';
-import { Collection } from '../../../core/shared/collection.model';
 
 describe('CommunityAuthorizationsComponent', () => {
   let comp: CommunityAuthorizationsComponent<DSpaceObject>;
@@ -19,8 +25,8 @@ describe('CommunityAuthorizationsComponent', () => {
     uuid: 'community',
     id: 'community',
     _links: {
-      self: { href: 'community-selflink' }
-    }
+      self: { href: 'community-selflink' },
+    },
   });
 
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -29,16 +35,16 @@ describe('CommunityAuthorizationsComponent', () => {
     parent: {
       parent: {
         data: observableOf({
-          dso: communityRD
-        })
-      }
-    }
+          dso: communityRD,
+        }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        CommonModule
+        CommonModule,
       ],
       declarations: [CommunityAuthorizationsComponent],
       providers: [
diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
index 7a9f224311..c31f798060 100644
--- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
+++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
@@ -1,7 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
@@ -25,7 +32,7 @@ export class CommunityAuthorizationsComponent<TDomain extends DSpaceObject> impl
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
index 6c041d1725..5e11fdfbce 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h3>
+    <h2>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h2>
     <ds-curation-form
            [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
index 1b1ee2c9f9..8928543a3a 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { CommunityCurateComponent } from './community-curate.component';
 import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CommunityCurateComponent } from './community-curate.component';
 
 describe('CommunityCurateComponent', () => {
   let comp: CommunityCurateComponent;
@@ -17,30 +25,30 @@ describe('CommunityCurateComponent', () => {
   let dsoNameService;
 
   const community = Object.assign(new Community(), {
-    metadata: {'dc.title': ['Community Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+    metadata: { 'dc.title': ['Community Name'], 'dc.identifier.uri': [ { value: '123456789/1' }] },
   });
 
   beforeEach(waitForAsync(() => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(community)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(community),
+        }),
+      },
     };
 
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
-      getName: 'Community Name'
+      getName: 'Community Name',
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [CommunityCurateComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: DSONameService, useValue: dsoNameService}
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -58,7 +66,7 @@ describe('CommunityCurateComponent', () => {
     });
     it('should contain the community information provided in the route', () => {
       comp.dsoRD$.subscribe((value) => {
-        expect(value.payload.handle
+        expect(value.payload.handle,
         ).toEqual('123456789/1');
       });
       comp.communityName$.subscribe((value) => {
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
index 8ae04af8f1..aa28644ae7 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
@@ -1,10 +1,18 @@
-import { Component, OnInit } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { filter, map, take } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
 import { hasValue } from '../../../shared/empty.util';
 
 /**
@@ -35,7 +43,7 @@ export class CommunityCurateComponent implements OnInit {
       filter((rd: RemoteData<Community>) => hasValue(rd)),
       map((rd: RemoteData<Community>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
   }
 
diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
index c597fac0bd..ec4a502a6e 100644
--- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
@@ -1,15 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../../shared/shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CommunityMetadataComponent } from './community-metadata.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { CommunityDataService } from '../../../core/data/community-data.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SharedModule } from '../../../shared/shared.module';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CommunityMetadataComponent } from './community-metadata.component';
 
 describe('CommunityMetadataComponent', () => {
   let comp: CommunityMetadataComponent;
@@ -22,9 +27,9 @@ describe('CommunityMetadataComponent', () => {
       providers: [
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
index a2dbfa6eb6..9a6b93a0ce 100644
--- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
+++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Community } from '../../../core/shared/community.model';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
+import { CommunityDataService } from '../../../core/data/community-data.service';
+import { Community } from '../../../core/shared/community.model';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+
 /**
  * Component for editing a community's metadata
  */
@@ -22,7 +26,7 @@ export class CommunityMetadataComponent extends ComcolMetadataComponent<Communit
     protected router: Router,
     protected route: ActivatedRoute,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
   ) {
     super(communityDataService, router, route, notificationsService, translate);
   }
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
index f1f9e77caa..895c61862a 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
@@ -1,22 +1,32 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { CommunityRolesComponent } from './community-roles.component';
-import { Community } from '../../../core/shared/community.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RequestService } from '../../../core/data/request.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { SharedModule } from '../../../shared/shared.module';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Community } from '../../../core/shared/community.model';
 import { ComcolModule } from '../../../shared/comcol/comcol.module';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CommunityRolesComponent } from './community-roles.component';
 
 describe('CommunityRolesComponent', () => {
 
@@ -39,10 +49,10 @@ describe('CommunityRolesComponent', () => {
                   href: 'adminGroup link',
                 },
               },
-            })
+            }),
           ),
-        })
-      }
+        }),
+      },
     };
 
     const requestService = {
@@ -59,7 +69,7 @@ describe('CommunityRolesComponent', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [
         CommunityRolesComponent,
@@ -69,9 +79,9 @@ describe('CommunityRolesComponent', () => {
         { provide: ActivatedRoute, useValue: route },
         { provide: RequestService, useValue: requestService },
         { provide: GroupDataService, useValue: groupDataService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(CommunityRolesComponent);
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 9468aa7048..5f6c57defc 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -1,11 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-import { Community } from '../../../core/shared/community.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
 import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 
 /**
  * Component for managing a community's roles
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
index 3a4c3351c3..824aef3ba4 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
@@ -1,13 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { EditCommunityPageComponent } from './edit-community-page.component';
+
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCommunityPageComponent } from './edit-community-page.component';
 
 describe('EditCommunityPageComponent', () => {
   let comp: EditCommunityPageComponent;
@@ -15,25 +20,25 @@ describe('EditCommunityPageComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      dso: { payload: {} }
+      dso: { payload: {} },
     }),
     routeConfig: {
       children: [
         {
           path: 'mockUrl',
           data: {
-            hideReturnButton: false
-          }
-        }
-      ]
+            hideReturnButton: false,
+          },
+        },
+      ],
     },
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: 'mockUrl'
-        }
-      }
-    }
+          path: 'mockUrl',
+        },
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -44,7 +49,7 @@ describe('EditCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index 54a6ee4944..5bd31e9ba0 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,6 +1,10 @@
 import { Component } from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { Community } from '../../core/shared/community.model';
-import { ActivatedRoute, Router } from '@angular/router';
 import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCommunityPageRoute } from '../community-page-routing-paths';
 
@@ -9,14 +13,14 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-community',
-  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
   type = 'community';
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     super(router, route);
   }
diff --git a/src/app/community-page/edit-community-page/edit-community-page.module.ts b/src/app/community-page/edit-community-page/edit-community-page.module.ts
index 5190d6a008..13555e3800 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.module.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.module.ts
@@ -1,19 +1,18 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
-import { EditCommunityPageComponent } from './edit-community-page.component';
+import { CommunityFormModule } from '../community-form/community-form.module';
+import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
 import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
-import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
-import { CommunityFormModule } from '../community-form/community-form.module';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../shared/comcol/comcol.module';
-import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
-import {
-  AccessControlFormModule
-} from '../../shared/access-control-form-container/access-control-form.module';
+import { EditCommunityPageComponent } from './edit-community-page.component';
+import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality
@@ -34,8 +33,8 @@ import {
     CommunityMetadataComponent,
     CommunityRolesComponent,
     CommunityAuthorizationsComponent,
-    CommunityAccessControlComponent
-  ]
+    CommunityAccessControlComponent,
+  ],
 })
 export class EditCommunityPageModule {
 
diff --git a/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts b/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
index 994c6b5e96..4b0fa5d70b 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
@@ -1,17 +1,18 @@
-import { EditCommunityPageComponent } from './edit-community-page.component';
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
+import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
-import { CommunityCurateComponent } from './community-curate/community-curate.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
-import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
-import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
+import { EditCommunityPageComponent } from './edit-community-page.component';
 
 /**
  * Routing module that handles the routing for the Edit Community page administrator functionality
@@ -22,7 +23,7 @@ import { CommunityAccessControlComponent } from './community-access-control/comm
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'community.edit' },
         component: EditCommunityPageComponent,
@@ -31,7 +32,7 @@ import { CommunityAccessControlComponent } from './community-access-control/comm
           {
             path: '',
             redirectTo: 'metadata',
-            pathMatch: 'full'
+            pathMatch: 'full',
           },
           {
             path: 'metadata',
@@ -39,23 +40,23 @@ import { CommunityAccessControlComponent } from './community-access-control/comm
             data: {
               title: 'community.edit.tabs.metadata.title',
               hideReturnButton: true,
-              showBreadcrumbs: true
-            }
+              showBreadcrumbs: true,
+            },
           },
           {
             path: 'roles',
             component: CommunityRolesComponent,
-            data: { title: 'community.edit.tabs.roles.title', showBreadcrumbs: true }
+            data: { title: 'community.edit.tabs.roles.title', showBreadcrumbs: true },
           },
           {
             path: 'curate',
             component: CommunityCurateComponent,
-            data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true }
+            data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true },
           },
           {
             path: 'access-control',
             component: CommunityAccessControlComponent,
-            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true },
           },
           /*{
             path: 'authorizations',
@@ -69,34 +70,34 @@ import { CommunityAccessControlComponent } from './community-access-control/comm
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: CommunityAuthorizationsComponent,
-                data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true, hideReturnButton: true }
-              }
-            ]
-          }
-        ]
-      }
-    ])
+                data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true, hideReturnButton: true },
+              },
+            ],
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     ResourcePolicyResolver,
-    ResourcePolicyTargetResolver
-  ]
+    ResourcePolicyTargetResolver,
+  ],
 })
 export class EditCommunityPageRoutingModule {
 
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
similarity index 90%
rename from src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
index 69f16ee3ac..b5fbf1a01d 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(subCollectionsRDObs | async) as subCollectionsRD">
   <div *ngIf="subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0" @fadeIn>
-    <h2>{{'community.sub-collection-list.head' | translate}}</h2>
+    <h3>{{'community.sub-collection-list.head' | translate}}</h3>
     <ds-viewable-collection
       [config]="config"
       [sortConfig]="sortConfig"
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts
new file mode 100644
index 0000000000..2a6ec9510c
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts
@@ -0,0 +1,208 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { Community } from '../../../../core/shared/community.model';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { ThemeService } from '../../../../shared/theme-support/theme.service';
+import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
+
+describe('CommunityPageSubCollectionListComponent', () => {
+  let comp: CommunityPageSubCollectionListComponent;
+  let fixture: ComponentFixture<CommunityPageSubCollectionListComponent>;
+  let collectionDataServiceStub: any;
+  let themeService;
+  let subCollList = [];
+
+  const collections = [Object.assign(new Community(), {
+    id: '123456789-1',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-4',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 7' },
+      ],
+    },
+  }),
+  ];
+
+  const mockCommunity = Object.assign(new Community(), {
+    id: '123456789',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' },
+      ],
+    },
+  });
+
+  collectionDataServiceStub = {
+    findByParent(parentUUID: string, options: FindListOptions = {}) {
+      let currentPage = options.currentPage;
+      let elementsPerPage = options.elementsPerPage;
+      if (currentPage === undefined) {
+        currentPage = 1;
+      }
+      elementsPerPage = 5;
+      const startPageIndex = (currentPage - 1) * elementsPerPage;
+      let endPageIndex = (currentPage * elementsPerPage);
+      if (endPageIndex > subCollList.length) {
+        endPageIndex = subCollList.length;
+      }
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
+
+    },
+  };
+
+  const paginationService = new PaginationServiceStub();
+
+  themeService = getMockThemeService();
+
+  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
+    addTag: '',
+  });
+
+  const groupDataService = jasmine.createSpyObj('groupsDataService', {
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    getGroupRegistryRouterLink: '',
+    getUUIDFromString: '',
+  });
+
+  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'test',
+      values: [
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
+  });
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule,
+        NoopAnimationsModule,
+      ],
+      declarations: [CommunityPageSubCollectionListComponent],
+      providers: [
+        { provide: CollectionDataService, useValue: collectionDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: SelectableListService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityPageSubCollectionListComponent);
+    comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+  });
+
+
+  it('should display a list of collections', async () => {
+    subCollList = collections;
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const collList: DebugElement[] = fixture.debugElement.queryAll(By.css('ul[data-test="objects"] li'));
+    expect(collList.length).toEqual(5);
+    expect(collList[0].nativeElement.textContent).toContain('Collection 1');
+    expect(collList[1].nativeElement.textContent).toContain('Collection 2');
+    expect(collList[2].nativeElement.textContent).toContain('Collection 3');
+    expect(collList[3].nativeElement.textContent).toContain('Collection 4');
+    expect(collList[4].nativeElement.textContent).toContain('Collection 5');
+  });
+
+  it('should not display the header when list of collections is empty', () => {
+    subCollList = [];
+    fixture.detectChanges();
+
+    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
+    expect(subComHead.length).toEqual(0);
+  });
+});
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
similarity index 58%
rename from src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index 3a77149e5b..f526f76641 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,25 +1,36 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
-
-import { RemoteData } from '../../core/data/remote-data';
-import { Collection } from '../../core/shared/collection.model';
-import { Community } from '../../core/shared/community.model';
-import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { hasValue } from '../../shared/empty.util';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { fadeIn } from '../../../../shared/animations/fade';
+import { hasValue } from '../../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
   styleUrls: ['./community-page-sub-collection-list.component.scss'],
   templateUrl: './community-page-sub-collection-list.component.html',
-  animations:[fadeIn]
+  animations:[fadeIn],
 })
 export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
   @Input() community: Community;
@@ -50,6 +61,8 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
    */
   subCollectionsRDObs: BehaviorSubject<RemoteData<PaginatedList<Collection>>> = new BehaviorSubject<RemoteData<PaginatedList<Collection>>>({} as any);
 
+  subscriptions: Subscription[] = [];
+
   constructor(
     protected cds: CollectionDataService,
     protected paginationService: PaginationService,
@@ -74,24 +87,25 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
    * Initialise the list of collections
    */
   initPage() {
-     const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
-     const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
+    const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
+    const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
 
-    observableCombineLatest([pagination$, sort$]).pipe(
+    this.subscriptions.push(observableCombineLatest([pagination$, sort$]).pipe(
       switchMap(([currentPagination, currentSort]) => {
         return this.cds.findByParent(this.community.id, {
           currentPage: currentPagination.currentPage,
           elementsPerPage: currentPagination.pageSize,
-          sort: {field: currentSort.field, direction: currentSort.direction}
+          sort: { field: currentSort.field, direction: currentSort.direction },
         });
-      })
+      }),
     ).subscribe((results) => {
       this.subCollectionsRDObs.next(results);
-    });
+    }));
   }
 
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.config.id);
+    this.paginationService.clearPagination(this.config?.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
similarity index 64%
rename from src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
index f1f49f204c..edc15260f6 100644
--- a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
@@ -1,12 +1,16 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Community } from '../../../../core/shared/community.model';
+import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
-import { Component, Input } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
 
 @Component({
   selector: 'ds-themed-community-page-sub-collection-list',
   styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedCollectionPageSubCollectionListComponent extends ThemedComponent<CommunityPageSubCollectionListComponent> {
   @Input() community: Community;
@@ -18,7 +22,7 @@ export class ThemedCollectionPageSubCollectionListComponent extends ThemedCompon
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/community-page/sub-collection-list/community-page-sub-collection-list.component`);
+    return import(`../../../../../themes/${themeName}/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
new file mode 100644
index 0000000000..515e08ffdf
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
@@ -0,0 +1,8 @@
+<ng-container *ngIf="(community$ | async) as community">
+  <ds-themed-community-page-sub-community-list
+      [community]="community">
+  </ds-themed-community-page-sub-community-list>
+  <ds-themed-community-page-sub-collection-list
+      [community]="community">
+  </ds-themed-community-page-sub-collection-list>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.html
rename to src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts
new file mode 100644
index 0000000000..e28ff98ee7
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts
@@ -0,0 +1,37 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { SubComColSectionComponent } from './sub-com-col-section.component';
+
+describe('SubComColSectionComponent', () => {
+  let component: SubComColSectionComponent;
+  let fixture: ComponentFixture<SubComColSectionComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    activatedRoute.parent = new ActivatedRouteStub();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        SubComColSectionComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SubComColSectionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
new file mode 100644
index 0000000000..eb6f827240
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -0,0 +1,35 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
+
+@Component({
+  selector: 'ds-sub-com-col-section',
+  templateUrl: './sub-com-col-section.component.html',
+  styleUrls: ['./sub-com-col-section.component.scss'],
+})
+export class SubComColSectionComponent implements OnInit {
+
+  community$: Observable<Community>;
+
+  constructor(
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.community$ = this.route.parent.data.pipe(
+      map((data: Data) => (data.dso as RemoteData<Community>).payload),
+    );
+  }
+
+}
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
similarity index 90%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
index be2788a9f4..0834d08ba5 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(subCommunitiesRDObs | async) as subCommunitiesRD">
   <div *ngIf="subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0" @fadeIn>
-    <h2>{{'community.sub-community-list.head' | translate}}</h2>
+    <h3>{{'community.sub-community-list.head' | translate}}</h3>
     <ds-viewable-collection
       [config]="config"
       [sortConfig]="sortConfig"
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts
new file mode 100644
index 0000000000..3e99254056
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -0,0 +1,210 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { Community } from '../../../../core/shared/community.model';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { ThemeService } from '../../../../shared/theme-support/theme.service';
+import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
+
+describe('CommunityPageSubCommunityListComponent', () => {
+  let comp: CommunityPageSubCommunityListComponent;
+  let fixture: ComponentFixture<CommunityPageSubCommunityListComponent>;
+  let communityDataServiceStub: any;
+  let themeService;
+  let subCommList = [];
+
+  const subcommunities = [Object.assign(new Community(), {
+    id: '123456789-1',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '12345678942',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 7' },
+      ],
+    },
+  }),
+  ];
+
+  const mockCommunity = Object.assign(new Community(), {
+    id: '123456789',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' },
+      ],
+    },
+  });
+
+  communityDataServiceStub = {
+    findByParent(parentUUID: string, options: FindListOptions = {}) {
+      let currentPage = options.currentPage;
+      let elementsPerPage = options.elementsPerPage;
+      if (currentPage === undefined) {
+        currentPage = 1;
+      }
+      elementsPerPage = 5;
+
+      const startPageIndex = (currentPage - 1) * elementsPerPage;
+      let endPageIndex = (currentPage * elementsPerPage);
+      if (endPageIndex > subCommList.length) {
+        endPageIndex = subCommList.length;
+      }
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
+
+    },
+  };
+
+  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
+    addTag: '',
+  });
+
+  const groupDataService = jasmine.createSpyObj('groupsDataService', {
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    getGroupRegistryRouterLink: '',
+    getUUIDFromString: '',
+  });
+
+  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'test',
+      values: [
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
+  });
+
+  const paginationService = new PaginationServiceStub();
+
+  themeService = getMockThemeService();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule,
+        NoopAnimationsModule,
+      ],
+      declarations: [CommunityPageSubCommunityListComponent],
+      providers: [
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: SelectableListService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent);
+    comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+
+  });
+
+
+  it('should display a list of sub-communities', async () => {
+    subCommList = subcommunities;
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const subComList: DebugElement[] = fixture.debugElement.queryAll(By.css('ul[data-test="objects"] li'));
+    expect(subComList.length).toEqual(5);
+    expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1');
+    expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2');
+    expect(subComList[2].nativeElement.textContent).toContain('SubCommunity 3');
+    expect(subComList[3].nativeElement.textContent).toContain('SubCommunity 4');
+    expect(subComList[4].nativeElement.textContent).toContain('SubCommunity 5');
+  });
+
+  it('should not display the header when list of sub-communities is empty', () => {
+    subCommList = [];
+    fixture.detectChanges();
+
+    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
+    expect(subComHead.length).toEqual(0);
+  });
+});
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
similarity index 67%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 5a0409a051..181e6a3bd4 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,24 +1,35 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
-
-import { RemoteData } from '../../core/data/remote-data';
-import { Community } from '../../core/shared/community.model';
-import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { hasValue } from '../../shared/empty.util';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Community } from '../../../../core/shared/community.model';
+import { fadeIn } from '../../../../shared/animations/fade';
+import { hasValue } from '../../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-community-page-sub-community-list',
   styleUrls: ['./community-page-sub-community-list.component.scss'],
   templateUrl: './community-page-sub-community-list.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 /**
  * Component to render the sub-communities of a Community
@@ -52,6 +63,8 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
    */
   subCommunitiesRDObs: BehaviorSubject<RemoteData<PaginatedList<Community>>> = new BehaviorSubject<RemoteData<PaginatedList<Community>>>({} as any);
 
+  subscriptions: Subscription[] = [];
+
   constructor(
     protected cds: CommunityDataService,
     protected paginationService: PaginationService,
@@ -79,21 +92,22 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
     const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
     const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
 
-    observableCombineLatest([pagination$, sort$]).pipe(
+    this.subscriptions.push(observableCombineLatest([pagination$, sort$]).pipe(
       switchMap(([currentPagination, currentSort]) => {
         return     this.cds.findByParent(this.community.id, {
           currentPage: currentPagination.currentPage,
           elementsPerPage: currentPagination.pageSize,
-          sort: { field: currentSort.field, direction: currentSort.direction }
+          sort: { field: currentSort.field, direction: currentSort.direction },
         });
-      })
+      }),
     ).subscribe((results) => {
       this.subCommunitiesRDObs.next(results);
-    });
+    }));
   }
 
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.config.id);
+    this.paginationService.clearPagination(this.config?.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
similarity index 64%
rename from src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
index 852c53186e..8de902138e 100644
--- a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
@@ -1,12 +1,16 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Community } from '../../../../core/shared/community.model';
+import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
-import { Component, Input } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
 
 @Component({
   selector: 'ds-themed-community-page-sub-community-list',
   styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponent<CommunityPageSubCommunityListComponent> {
 
@@ -19,7 +23,7 @@ export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponen
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-community-list.component`);
+    return import(`../../../../../themes/${themeName}/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
deleted file mode 100644
index bca3c42a95..0000000000
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
-import { Community } from '../../core/shared/community.model';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-
-describe('CommunityPageSubCollectionList Component', () => {
-  let comp: CommunityPageSubCollectionListComponent;
-  let fixture: ComponentFixture<CommunityPageSubCollectionListComponent>;
-  let collectionDataServiceStub: any;
-  let themeService;
-  let subCollList = [];
-
-  const collections = [Object.assign(new Community(), {
-    id: '123456789-1',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Collection 1' }
-      ]
-    }
-  }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-4',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 7' }
-        ]
-      }
-    })
-  ];
-
-  const mockCommunity = Object.assign(new Community(), {
-    id: '123456789',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Test title' }
-      ]
-    }
-  });
-
-  collectionDataServiceStub = {
-    findByParent(parentUUID: string, options: FindListOptions = {}) {
-      let currentPage = options.currentPage;
-      let elementsPerPage = options.elementsPerPage;
-      if (currentPage === undefined) {
-        currentPage = 1;
-      }
-      elementsPerPage = 5;
-      const startPageIndex = (currentPage - 1) * elementsPerPage;
-      let endPageIndex = (currentPage * elementsPerPage);
-      if (endPageIndex > subCollList.length) {
-        endPageIndex = subCollList.length;
-      }
-      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
-
-    }
-  };
-
-  const paginationService = new PaginationServiceStub();
-
-  themeService = getMockThemeService();
-
-  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
-  });
-
-  const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    getGroupRegistryRouterLink: '',
-    getUUIDFromString: '',
-  });
-
-  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-      name: 'test',
-      values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
-  });
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        SharedModule,
-        RouterTestingModule.withRoutes([]),
-        NgbModule,
-        NoopAnimationsModule
-      ],
-      declarations: [CommunityPageSubCollectionListComponent],
-      providers: [
-        { provide: CollectionDataService, useValue: collectionDataServiceStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: SelectableListService, useValue: {} },
-        { provide: ThemeService, useValue: themeService },
-        { provide: GroupDataService, useValue: groupDataService },
-        { provide: LinkHeadService, useValue: linkHeadService },
-        { provide: ConfigurationDataService, useValue: configurationDataService },
-        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CommunityPageSubCollectionListComponent);
-    comp = fixture.componentInstance;
-    comp.community = mockCommunity;
-  });
-
-
-  it('should display a list of collections', () => {
-    waitForAsync(() => {
-      subCollList = collections;
-      fixture.detectChanges();
-
-      const collList = fixture.debugElement.queryAll(By.css('li'));
-      expect(collList.length).toEqual(5);
-      expect(collList[0].nativeElement.textContent).toContain('Collection 1');
-      expect(collList[1].nativeElement.textContent).toContain('Collection 2');
-      expect(collList[2].nativeElement.textContent).toContain('Collection 3');
-      expect(collList[3].nativeElement.textContent).toContain('Collection 4');
-      expect(collList[4].nativeElement.textContent).toContain('Collection 5');
-    });
-  });
-
-  it('should not display the header when list of collections is empty', () => {
-    subCollList = [];
-    fixture.detectChanges();
-
-    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
-    expect(subComHead.length).toEqual(0);
-  });
-});
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
deleted file mode 100644
index 0a14fe6dd1..0000000000
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { By } from '@angular/platform-browser';
-
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
-import { Community } from '../../core/shared/community.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { SharedModule } from '../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-
-describe('CommunityPageSubCommunityListComponent Component', () => {
-  let comp: CommunityPageSubCommunityListComponent;
-  let fixture: ComponentFixture<CommunityPageSubCommunityListComponent>;
-  let communityDataServiceStub: any;
-  let themeService;
-  let subCommList = [];
-
-  const subcommunities = [Object.assign(new Community(), {
-    id: '123456789-1',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'SubCommunity 1' }
-      ]
-    }
-  }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '12345678942',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 7' }
-        ]
-      }
-    })
-  ];
-
-  const mockCommunity = Object.assign(new Community(), {
-    id: '123456789',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Test title' }
-      ]
-    }
-  });
-
-  communityDataServiceStub = {
-    findByParent(parentUUID: string, options: FindListOptions = {}) {
-      let currentPage = options.currentPage;
-      let elementsPerPage = options.elementsPerPage;
-      if (currentPage === undefined) {
-        currentPage = 1;
-      }
-      elementsPerPage = 5;
-
-      const startPageIndex = (currentPage - 1) * elementsPerPage;
-      let endPageIndex = (currentPage * elementsPerPage);
-      if (endPageIndex > subCommList.length) {
-        endPageIndex = subCommList.length;
-      }
-      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
-
-    }
-  };
-
-  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
-  });
-
-  const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    getGroupRegistryRouterLink: '',
-    getUUIDFromString: '',
-  });
-
-  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-      name: 'test',
-      values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
-  });
-
-  const paginationService = new PaginationServiceStub();
-
-  themeService = getMockThemeService();
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        SharedModule,
-        RouterTestingModule.withRoutes([]),
-        NgbModule,
-        NoopAnimationsModule
-      ],
-      declarations: [CommunityPageSubCommunityListComponent],
-      providers: [
-        { provide: CommunityDataService, useValue: communityDataServiceStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: SelectableListService, useValue: {} },
-        { provide: ThemeService, useValue: themeService },
-        { provide: GroupDataService, useValue: groupDataService },
-        { provide: LinkHeadService, useValue: linkHeadService },
-        { provide: ConfigurationDataService, useValue: configurationDataService },
-        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent);
-    comp = fixture.componentInstance;
-    comp.community = mockCommunity;
-
-  });
-
-
-  it('should display a list of sub-communities', () => {
-    waitForAsync(() => {
-      subCommList = subcommunities;
-      fixture.detectChanges();
-
-      const subComList = fixture.debugElement.queryAll(By.css('li'));
-      expect(subComList.length).toEqual(5);
-      expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1');
-      expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2');
-      expect(subComList[2].nativeElement.textContent).toContain('SubCommunity 3');
-      expect(subComList[3].nativeElement.textContent).toContain('SubCommunity 4');
-      expect(subComList[4].nativeElement.textContent).toContain('SubCommunity 5');
-    });
-  });
-
-  it('should not display the header when list of sub-communities is empty', () => {
-    subCommList = [];
-    fixture.detectChanges();
-
-    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
-    expect(subComHead.length).toEqual(0);
-  });
-});
diff --git a/src/app/community-page/themed-community-page.component.ts b/src/app/community-page/themed-community-page.component.ts
index eeb058fb04..8b200b768e 100644
--- a/src/app/community-page/themed-community-page.component.ts
+++ b/src/app/community-page/themed-community-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityPageComponent } from './community-page.component';
 
diff --git a/src/app/core/auth/auth-blocking.guard.spec.ts b/src/app/core/auth/auth-blocking.guard.spec.ts
index 3747edd532..8cc071ec8e 100644
--- a/src/app/core/auth/auth-blocking.guard.spec.ts
+++ b/src/app/core/auth/auth-blocking.guard.spec.ts
@@ -1,12 +1,23 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
 
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import { AuthBlockingGuard } from './auth-blocking.guard';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
 import { authReducer } from './auth.reducer';
+import { AuthBlockingGuard } from './auth-blocking.guard';
 
 describe('AuthBlockingGuard', () => {
   let guard: AuthBlockingGuard;
@@ -21,9 +32,9 @@ describe('AuthBlockingGuard', () => {
         loaded: false,
         blocking: undefined,
         loading: false,
-        authMethods: []
-      }
-    }
+        authMethods: [],
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -33,8 +44,8 @@ describe('AuthBlockingGuard', () => {
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: AuthBlockingGuard, useValue: guard }
-      ]
+        { provide: AuthBlockingGuard, useValue: guard },
+      ],
     }).compileComponents();
   }));
 
@@ -58,9 +69,9 @@ describe('AuthBlockingGuard', () => {
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'auth': {
-              blocking: true
-            }
-          })
+              blocking: true,
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -76,9 +87,9 @@ describe('AuthBlockingGuard', () => {
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'auth': {
-              blocking: false
-            }
-          })
+              blocking: false,
+            },
+          }),
         });
         mockStore.setState(state);
       });
diff --git a/src/app/core/auth/auth-blocking.guard.ts b/src/app/core/auth/auth-blocking.guard.ts
index 9054f66f8b..b6c575d789 100644
--- a/src/app/core/auth/auth-blocking.guard.ts
+++ b/src/app/core/auth/auth-blocking.guard.ts
@@ -1,8 +1,17 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
-import { select, Store } from '@ngrx/store';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { isAuthenticationBlocking } from './selectors';
 
@@ -12,7 +21,7 @@ import { isAuthenticationBlocking } from './selectors';
  * To ensure all rest requests get the correct auth header.
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class AuthBlockingGuard implements CanActivate {
 
diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts
index 063aad612f..55101dd3c5 100644
--- a/src/app/core/auth/auth-request.service.spec.ts
+++ b/src/app/core/auth/auth-request.service.spec.ts
@@ -1,17 +1,22 @@
-import { AuthRequestService } from './auth-request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { PostRequest } from '../data/request.models';
 import { TestScheduler } from 'rxjs/testing';
+
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { ShortLivedToken } from './models/short-lived-token.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { AuthRequestService } from './auth-request.service';
+import { ShortLivedToken } from './models/short-lived-token.model';
 import objectContaining = jasmine.objectContaining;
-import { AuthStatus } from './models/auth-status.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RestRequestMethod } from '../data/rest-request-method';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthStatus } from './models/auth-status.model';
 
 describe(`AuthRequestService`, () => {
   let halService: HALEndpointService;
@@ -30,7 +35,7 @@ describe(`AuthRequestService`, () => {
     constructor(
       hes: HALEndpointService,
       rs: RequestService,
-      rdbs: RemoteDataBuildService
+      rdbs: RemoteDataBuildService,
     ) {
       super(hes, rs, rdbs);
     }
@@ -44,19 +49,19 @@ describe(`AuthRequestService`, () => {
     endpointURL = 'https://rest.api/auth';
     requestID = 'requestID';
     shortLivedToken = Object.assign(new ShortLivedToken(), {
-      value: 'some-token'
+      value: 'some-token',
     });
     shortLivedTokenRD = createSuccessfulRemoteDataObject(shortLivedToken);
 
     halService = jasmine.createSpyObj('halService', {
-      'getEndpoint': cold('a', { a: endpointURL })
+      'getEndpoint': cold('a', { a: endpointURL }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       'generateRequestId': requestID,
       'send': null,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD })
+      'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD }),
     });
 
     service = new TestAuthRequestService(halService, requestService, rdbService);
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 7c1f17dec2..5d11b9f4cb 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,18 +1,29 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, tap, take } from 'rxjs/operators';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../shared/empty.util';
-import { GetRequest, PostRequest, } from '../data/request.models';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
+import {
+  GetRequest,
+  PostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { URLCombiner } from '../url-combiner/url-combiner';
 import { AuthStatus } from './models/auth-status.model';
 import { ShortLivedToken } from './models/short-lived-token.model';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { RestRequest } from '../data/rest-request.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 /**
  * Abstract service to send authentication requests
@@ -23,8 +34,8 @@ export abstract class AuthRequestService {
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
-              private rdbService: RemoteDataBuildService
-              ) {
+              private rdbService: RemoteDataBuildService,
+  ) {
   }
 
   /**
@@ -65,7 +76,7 @@ export abstract class AuthRequestService {
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
       map((endpointURL: string) => new PostRequest(requestId, endpointURL, body, options)),
-      take(1)
+      take(1),
     ).subscribe((request: PostRequest) => {
       this.requestService.send(request);
     });
@@ -90,7 +101,7 @@ export abstract class AuthRequestService {
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method, ...linksToFollow)),
       distinctUntilChanged(),
       map((endpointURL: string) => new GetRequest(requestId, endpointURL, undefined, options)),
-      take(1)
+      take(1),
     ).subscribe((request: GetRequest) => {
       this.requestService.send(request);
     });
@@ -125,7 +136,7 @@ export abstract class AuthRequestService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index 6bc4565682..03b6bc1191 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -1,12 +1,13 @@
 /* eslint-disable max-classes-per-file */
 // import @ngrx
 import { Action } from '@ngrx/store';
+
 // import type function
 import { type } from '../../shared/ngrx/type';
-// import models
-import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthStatus } from './models/auth-status.model';
+// import models
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 export const AuthActionTypes = {
   AUTHENTICATE: type('dspace/auth/AUTHENTICATE'),
@@ -38,7 +39,7 @@ export const AuthActionTypes = {
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
   REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS'),
   SET_USER_AS_IDLE: type('dspace/auth/SET_USER_AS_IDLE'),
-  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE')
+  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE'),
 };
 
 
@@ -426,6 +427,15 @@ export class UnsetUserAsIdleAction implements Action {
   public type: string = AuthActionTypes.UNSET_USER_AS_IDLE;
 }
 
+/**
+ * Authentication error actions that include Error payloads.
+ */
+export type AuthErrorActionsWithErrorPayload
+  = AuthenticatedErrorAction
+  | AuthenticationErrorAction
+  | LogOutErrorAction
+  | RetrieveAuthenticatedEpersonErrorAction;
+
 /**
  * Actions type.
  * @type {AuthActions}
@@ -433,9 +443,7 @@ export class UnsetUserAsIdleAction implements Action {
 export type AuthActions
   = AuthenticateAction
   | AuthenticatedAction
-  | AuthenticatedErrorAction
   | AuthenticatedSuccessAction
-  | AuthenticationErrorAction
   | AuthenticationSuccessAction
   | CheckAuthenticationTokenAction
   | CheckAuthenticationTokenCookieAction
@@ -452,10 +460,9 @@ export type AuthActions
   | RetrieveAuthMethodsErrorAction
   | RetrieveTokenAction
   | RetrieveAuthenticatedEpersonAction
-  | RetrieveAuthenticatedEpersonErrorAction
   | RetrieveAuthenticatedEpersonSuccessAction
   | SetRedirectUrlAction
   | RedirectAfterLoginSuccessAction
   | SetUserAsIdleAction
-  | UnsetUserAsIdleAction;
-
+  | UnsetUserAsIdleAction
+  | AuthErrorActionsWithErrorPayload;
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index 2e6ba917aa..a423455594 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -1,12 +1,38 @@
-import { fakeAsync, TestBed, tick } from '@angular/core/testing';
-
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { Observable, of as observableOf, throwError as observableThrow } from 'rxjs';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrow,
+} from 'rxjs';
 
-import { AuthEffects } from './auth.effects';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import {
+  authMethodsMock,
+  AuthServiceStub,
+} from '../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { StoreActionTypes } from '../../store.actions';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import {
   AuthActionTypes,
   AuthenticatedAction,
@@ -25,17 +51,16 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  RetrieveTokenAction
+  RetrieveTokenAction,
 } from './auth.actions';
-import { authMethodsMock, AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from './auth.service';
+import { AuthEffects } from './auth.effects';
 import { authReducer } from './auth.reducer';
+import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import { StoreActionTypes } from '../../store.actions';
-import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import {
+  isAuthenticated,
+  isAuthenticatedLoaded,
+} from './selectors';
 
 describe('AuthEffects', () => {
   let authEffects: AuthEffects;
@@ -56,9 +81,9 @@ describe('AuthEffects', () => {
           authenticated: false,
           loaded: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   }
 
@@ -66,7 +91,7 @@ describe('AuthEffects', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig)
+        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
       ],
       providers: [
         AuthEffects,
@@ -88,8 +113,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.AUTHENTICATE,
-            payload: { email: 'user', password: 'password' }
-          }
+            payload: { email: 'user', password: 'password' },
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationSuccessAction(token) });
@@ -105,8 +130,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.AUTHENTICATE,
-            payload: { email: 'user', password: 'wrongpassword' }
-          }
+            payload: { email: 'user', password: 'wrongpassword' },
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationErrorAction(new Error('Message Error test')) });
@@ -161,9 +186,9 @@ describe('AuthEffects', () => {
           type: AuthActionTypes.AUTHENTICATED_SUCCESS, payload: {
             authenticated: true,
             authToken: token,
-            userHref: EPersonMock._links.self.href
-          }
-        }
+            userHref: EPersonMock._links.self.href,
+          },
+        },
       });
 
       const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonAction(EPersonMock._links.self.href) });
@@ -211,8 +236,8 @@ describe('AuthEffects', () => {
         spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
           observableOf(
             {
-              authenticated: true
-            })
+              authenticated: true,
+            }),
         );
         spyOn((authEffects as any).authService, 'setExternalAuthStatus');
         actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
@@ -230,7 +255,7 @@ describe('AuthEffects', () => {
       it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {
         spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
           observableOf(
-            { authenticated: false })
+            { authenticated: false }),
         );
         actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
 
@@ -260,8 +285,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON,
-            payload: EPersonMock._links.self.href
-          }
+            payload: EPersonMock._links.self.href,
+          },
         });
 
         const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonSuccessAction(EPersonMock.id) });
@@ -314,8 +339,8 @@ describe('AuthEffects', () => {
       it('should return a AUTHENTICATE_SUCCESS action in response to a RETRIEVE_TOKEN action', () => {
         actions = hot('--a-', {
           a: {
-            type: AuthActionTypes.RETRIEVE_TOKEN
-          }
+            type: AuthActionTypes.RETRIEVE_TOKEN,
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationSuccessAction(token) });
@@ -330,8 +355,8 @@ describe('AuthEffects', () => {
 
         actions = hot('--a-', {
           a: {
-            type: AuthActionTypes.RETRIEVE_TOKEN
-          }
+            type: AuthActionTypes.RETRIEVE_TOKEN,
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationErrorAction(new Error('Message Error test')) });
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 281355b769..2919a40fa8 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,27 +1,47 @@
-import { Injectable, NgZone } from '@angular/core';
-
+import {
+  Injectable,
+  NgZone,
+  Type,
+} from '@angular/core';
+// import @ngrx
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  select,
+  Store,
+} from '@ngrx/store';
 import {
   asyncScheduler,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   queueScheduler,
-  timer
+  timer,
 } from 'rxjs';
-import { catchError, filter, map, observeOn, switchMap, take, tap } from 'rxjs/operators';
-// import @ngrx
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { Action, select, Store } from '@ngrx/store';
+import {
+  catchError,
+  filter,
+  map,
+  observeOn,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-// import services
-import { AuthService } from './auth.service';
-import { EPerson } from '../eperson/models/eperson.model';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
+import { environment } from '../../../environments/environment';
 import { AppState } from '../../app.reducer';
-import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
 import { StoreActionTypes } from '../../store.actions';
-import { AuthMethod } from './models/auth.method';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { RequestActionTypes } from '../data/request.actions';
+import { EPerson } from '../eperson/models/eperson.model';
+import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
+import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
 // import actions
 import {
   AuthActionTypes,
@@ -31,6 +51,7 @@ import {
   AuthenticatedSuccessAction,
   AuthenticationErrorAction,
   AuthenticationSuccessAction,
+  AuthErrorActionsWithErrorPayload,
   CheckAuthenticationTokenCookieAction,
   LogOutErrorAction,
   LogOutSuccessAction,
@@ -45,20 +66,32 @@ import {
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   RetrieveTokenAction,
-  SetUserAsIdleAction
+  SetUserAsIdleAction,
 } from './auth.actions';
-import { hasValue } from '../../shared/empty.util';
-import { environment } from '../../../environments/environment';
-import { RequestActionTypes } from '../data/request.actions';
-import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
-import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
-import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+// import services
+import { AuthService } from './auth.service';
+import { AuthMethod } from './models/auth.method';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
+import {
+  isAuthenticated,
+  isAuthenticatedLoaded,
+} from './selectors';
 
 // Action Types that do not break/prevent the user from an idle state
 const IDLE_TIMER_IGNORE_TYPES: string[]
   = [...Object.values(AuthActionTypes).filter((t: string) => t !== AuthActionTypes.UNSET_USER_AS_IDLE),
-  ...Object.values(RequestActionTypes), ...Object.values(NotificationsActionTypes)];
+    ...Object.values(RequestActionTypes), ...Object.values(NotificationsActionTypes)];
+
+export function errorToAuthAction$<T extends AuthErrorActionsWithErrorPayload>(actionType: Type<T>, error: unknown): Observable<T> {
+  if (error instanceof Error) {
+    return observableOf(new actionType(error));
+  }
+
+  // If we caught something that's not an Error: complain & drop type safety
+  console.warn('AuthEffects caught non-Error object:', error);
+  return observableOf(new actionType(error as any));
+}
 
 @Injectable()
 export class AuthEffects {
@@ -73,14 +106,14 @@ export class AuthEffects {
       return this.authService.authenticate(action.payload.email, action.payload.password).pipe(
         take(1),
         map((response: AuthStatus) => new AuthenticationSuccessAction(response.token)),
-        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticationErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public authenticateSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
-    map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
+    map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)),
   ));
 
   public authenticated$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -88,8 +121,9 @@ export class AuthEffects {
     switchMap((action: AuthenticatedAction) => {
       return this.authService.authenticatedUser(action.payload).pipe(
         map((userHref: string) => new AuthenticatedSuccessAction((userHref !== null), action.payload, userHref)),
-        catchError((error) => observableOf(new AuthenticatedErrorAction(error))),);
-    })
+        catchError((error: unknown) => errorToAuthAction$(AuthenticatedErrorAction, error)),
+      );
+    }),
   ));
 
   public authenticatedSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -97,7 +131,7 @@ export class AuthEffects {
     tap((action: AuthenticatedSuccessAction) => this.authService.storeToken(action.payload.authToken)),
     switchMap((action: AuthenticatedSuccessAction) => this.authService.getRedirectUrl().pipe(
       take(1),
-      map((redirectUrl: string) => [action, redirectUrl])
+      map((redirectUrl: string) => [action, redirectUrl]),
     )),
     map(([action, redirectUrl]: [AuthenticatedSuccessAction, string]) => {
       if (hasValue(redirectUrl)) {
@@ -105,7 +139,7 @@ export class AuthEffects {
       } else {
         return new RetrieveAuthenticatedEpersonAction(action.payload.userHref);
       }
-    })
+    }),
   ));
 
   public redirectAfterLoginSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -113,13 +147,13 @@ export class AuthEffects {
     tap((action: RedirectAfterLoginSuccessAction) => {
       this.authService.clearRedirectUrl();
       this.authService.navigateToRedirectUrl(action.payload);
-    })
+    }),
   ), { dispatch: false });
 
   // It means "reacts to this action but don't send another"
   public authenticatedError$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_ERROR),
-    tap((action: LogOutSuccessAction) => this.authService.removeToken())
+    tap((action: LogOutSuccessAction) => this.authService.removeToken()),
   ), { dispatch: false });
 
   public retrieveAuthenticatedEperson$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -134,17 +168,18 @@ export class AuthEffects {
       }
       return user$.pipe(
         map((user: EPerson) => new RetrieveAuthenticatedEpersonSuccessAction(user.id)),
-        catchError((error) => observableOf(new RetrieveAuthenticatedEpersonErrorAction(error))));
-    })
+        catchError((error: unknown) => errorToAuthAction$(RetrieveAuthenticatedEpersonErrorAction, error)),
+      );
+    }),
   ));
 
   public checkToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN),
     switchMap(() => {
       return this.authService.hasValidAuthenticationToken().pipe(
         map((token: AuthTokenInfo) => new AuthenticatedAction(token)),
-        catchError((error) => observableOf(new CheckAuthenticationTokenCookieAction()))
+        catchError((error: unknown) => observableOf(new CheckAuthenticationTokenCookieAction())),
       );
-    })
+    }),
   ));
 
   public checkTokenCookie$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -160,9 +195,9 @@ export class AuthEffects {
             return new RetrieveAuthMethodsAction(response);
           }
         }),
-        catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticatedErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public retrieveToken$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -171,24 +206,24 @@ export class AuthEffects {
       return this.authService.refreshAuthenticationToken(null).pipe(
         take(1),
         map((token: AuthTokenInfo) => new AuthenticationSuccessAction(token)),
-        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticationErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public refreshToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.REFRESH_TOKEN),
     switchMap((action: RefreshTokenAction) => {
       return this.authService.refreshAuthenticationToken(action.payload).pipe(
         map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token)),
-        catchError((error) => observableOf(new RefreshTokenErrorAction()))
+        catchError((error: unknown) => observableOf(new RefreshTokenErrorAction())),
       );
-    })
+    }),
   ));
 
   // It means "reacts to this action but don't send another"
   public refreshTokenSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS),
-    tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload))
+    tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload)),
   ), { dispatch: false });
 
   /**
@@ -204,7 +239,7 @@ export class AuthEffects {
         take(1),
         filter(([loaded, authenticated]) => loaded && !authenticated),
         tap(() => this.authService.removeToken()),
-        tap(() => this.authService.resetAuthenticationError())
+        tap(() => this.authService.resetAuthenticationError()),
       );
     })), { dispatch: false });
 
@@ -213,9 +248,9 @@ export class AuthEffects {
    * authorizations endpoint, to be sure to have consistent responses after a login with external idp
    *
    */
-   invalidateAuthorizationsRequestCache$ = createEffect(() => this.actions$
+  invalidateAuthorizationsRequestCache$ = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
+      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache()),
     ), { dispatch: false });
 
   public logOut$: Observable<Action> = createEffect(() => this.actions$
@@ -224,24 +259,24 @@ export class AuthEffects {
       switchMap(() => {
         this.authService.stopImpersonating();
         return this.authService.logout().pipe(
-          map((value) => new LogOutSuccessAction()),
-          catchError((error) => observableOf(new LogOutErrorAction(error)))
+          map(() => new LogOutSuccessAction()),
+          catchError((error: unknown) => errorToAuthAction$(LogOutErrorAction, error)),
         );
-      })
+      }),
     ));
 
   public logOutSuccess$: Observable<Action> = createEffect(() => this.actions$
     .pipe(ofType(AuthActionTypes.LOG_OUT_SUCCESS),
       tap(() => this.authService.removeToken()),
       tap(() => this.authService.clearRedirectUrl()),
-      tap(() => this.authService.refreshAfterLogout())
+      tap(() => this.authService.refreshAfterLogout()),
     ), { dispatch: false });
 
   public redirectToLoginTokenExpired$: Observable<Action> = createEffect(() => this.actions$
     .pipe(
       ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED),
       tap(() => this.authService.removeToken()),
-      tap(() => this.authService.redirectToLoginWhenTokenExpired())
+      tap(() => this.authService.redirectToLoginWhenTokenExpired()),
     ), { dispatch: false });
 
   public retrieveMethods$: Observable<Action> = createEffect(() => this.actions$
@@ -251,9 +286,9 @@ export class AuthEffects {
         return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
           .pipe(
             map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
-            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
+            catchError(() => observableOf(new RetrieveAuthMethodsErrorAction())),
           );
-      })
+      }),
     ));
 
   /**
@@ -268,7 +303,7 @@ export class AuthEffects {
     // in, and start a new timer
     switchMap(() =>
       // Start a timer outside of Angular's zone
-      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler))
+      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler)),
     ),
     // Re-enter the zone to dispatch the action
     observeOn(new EnterZoneScheduler(this.zone, queueScheduler)),
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index 04bbc4acaf..d824df472a 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -1,18 +1,20 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-
 import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 
-import { AuthInterceptor } from './auth.interceptor';
-import { AuthService } from './auth.service';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { AuthInterceptor } from './auth.interceptor';
+import { AuthService } from './auth.service';
 
 describe(`AuthInterceptor`, () => {
   let service: DspaceRestService;
@@ -20,10 +22,8 @@ describe(`AuthInterceptor`, () => {
 
   const authServiceStub = new AuthServiceStub();
   const store: Store<TruncatablesState> = jasmine.createSpyObj('store', {
-    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
-    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   beforeEach(() => {
@@ -46,6 +46,10 @@ describe(`AuthInterceptor`, () => {
     httpMock = TestBed.inject(HttpTestingController);
   });
 
+  afterEach(() => {
+    httpMock.verify();
+  });
+
   describe('when has a valid token', () => {
 
     it('should not add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint that is not the logout endpoint', () => {
@@ -95,14 +99,11 @@ describe(`AuthInterceptor`, () => {
     });
 
     it('should redirect to login', () => {
-
-      service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user').subscribe((response) => {
-        expect(response).toBeTruthy();
-      });
-
       service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user');
 
       httpMock.expectNone('dspace-spring-rest/api/submission/workspaceitems');
+      // HttpTestingController.expectNone will throw an error when a requests is made
+      expect().nothing();
     });
   });
 
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 672879f436..84d4c53210 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -1,7 +1,3 @@
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-
-import { catchError, map } from 'rxjs/operators';
-import { Injectable, Injector } from '@angular/core';
 import {
   HttpErrorResponse,
   HttpEvent,
@@ -10,19 +6,36 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HttpResponseBase
+  HttpResponseBase,
 } from '@angular/common/http';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 
 import { AppState } from '../../app.reducer';
-import { AuthService } from './auth.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
 import { RedirectWhenTokenExpiredAction } from './auth.actions';
-import { Store } from '@ngrx/store';
-import { Router } from '@angular/router';
+import { AuthService } from './auth.service';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
@@ -152,12 +165,12 @@ export class AuthInterceptor implements HttpInterceptor {
 
         let authMethodModel: AuthMethod;
         if (splittedRealm.length === 1) {
-          authMethodModel = new AuthMethod(methodName);
+          authMethodModel = new AuthMethod(methodName, Number(j));
           authMethodModels.push(authMethodModel);
         } else if (splittedRealm.length > 1) {
           let location = splittedRealm[1];
           location = this.parseLocation(location);
-          authMethodModel = new AuthMethod(methodName, location);
+          authMethodModel = new AuthMethod(methodName, Number(j), location);
           authMethodModels.push(authMethodModel);
         }
       }
@@ -165,7 +178,7 @@ export class AuthInterceptor implements HttpInterceptor {
       // make sure the email + password login component gets rendered first
       authMethodModels = this.sortAuthMethods(authMethodModels);
     } else {
-      authMethodModels.push(new AuthMethod(AuthMethodType.Password));
+      authMethodModels.push(new AuthMethod(AuthMethodType.Password, 0));
     }
 
     return authMethodModels;
@@ -207,8 +220,8 @@ export class AuthInterceptor implements HttpInterceptor {
               message: 'Unknown auth error',
               status: 500,
               timestamp: Date.now(),
-              path: ''
-              };
+              path: '',
+            };
           }
         } else {
           authStatus.error = error;
@@ -261,7 +274,7 @@ export class AuthInterceptor implements HttpInterceptor {
             // login successfully
             const newToken = response.headers.get('authorization');
             authRes = response.clone({
-              body: this.makeAuthStatusObject(true, newToken)
+              body: this.makeAuthStatusObject(true, newToken),
             });
 
             // clean eventually refresh Requests list
@@ -269,13 +282,13 @@ export class AuthInterceptor implements HttpInterceptor {
           } else if (this.isStatusResponse(response)) {
             authRes = response.clone({
               body: Object.assign(response.body, {
-                authMethods: this.parseAuthMethodsFromHeaders(response.headers)
-              })
+                authMethods: this.parseAuthMethodsFromHeaders(response.headers),
+              }),
             });
           } else {
             // logout successfully
             authRes = response.clone({
-              body: this.makeAuthStatusObject(false)
+              body: this.makeAuthStatusObject(false),
             });
           }
           return authRes;
@@ -283,7 +296,7 @@ export class AuthInterceptor implements HttpInterceptor {
           return response;
         }
       }),
-      catchError((error, caught) => {
+      catchError((error: unknown, caught) => {
         // Intercept an error response
         if (error instanceof HttpErrorResponse) {
 
@@ -298,7 +311,7 @@ export class AuthInterceptor implements HttpInterceptor {
               headers: error.headers,
               status: error.status,
               statusText: error.statusText,
-              url: error.url
+              url: error.url,
             });
             return observableOf(authResponse);
           } else if (this.isUnauthorized(error) && isNotNull(token) && authService.isTokenExpired()) {
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index c0619adf79..7860744aa5 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -1,4 +1,4 @@
-import { authReducer, AuthState } from './auth.reducer';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
 import {
   AddAuthenticationMessageAction,
   AuthenticateAction,
@@ -8,7 +8,6 @@ import {
   AuthenticationErrorAction,
   AuthenticationSuccessAction,
   CheckAuthenticationTokenAction,
-  SetAuthCookieStatus,
   CheckAuthenticationTokenCookieAction,
   LogOutAction,
   LogOutErrorAction,
@@ -24,15 +23,19 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
+  SetAuthCookieStatus,
   SetRedirectUrlAction,
   SetUserAsIdleAction,
-  UnsetUserAsIdleAction
+  UnsetUserAsIdleAction,
 } from './auth.actions';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
-import { AuthStatus } from './models/auth-status.model';
+import {
+  authReducer,
+  AuthState,
+} from './auth.reducer';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 describe('authReducer', () => {
 
@@ -47,7 +50,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticateAction('user', 'password');
     const newState = authReducer(initialState, action);
@@ -58,7 +61,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
 
     expect(newState).toEqual(state);
@@ -72,7 +75,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticationSuccessAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -88,7 +91,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticationErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -100,7 +103,7 @@ describe('authReducer', () => {
       info: undefined,
       authToken: undefined,
       error: 'Test error message',
-      idle: false
+      idle: false,
     };
 
     expect(newState).toEqual(state);
@@ -114,7 +117,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -125,7 +128,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -138,7 +141,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedSuccessAction(true, mockTokenInfo, EPersonMock._links.self.href);
     const newState = authReducer(initialState, action);
@@ -150,7 +153,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -163,7 +166,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -175,7 +178,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -186,7 +189,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new CheckAuthenticationTokenAction();
     const newState = authReducer(initialState, action);
@@ -195,7 +198,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -206,7 +209,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
     };
     const action = new CheckAuthenticationTokenCookieAction();
     const newState = authReducer(initialState, action);
@@ -215,7 +218,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -227,7 +230,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: true,
       externalAuth: false,
-      idle: false
+      idle: false,
     };
     const action = new SetAuthCookieStatus(true);
     const newState = authReducer(initialState, action);
@@ -237,7 +240,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: true,
       externalAuth: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -252,7 +255,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutAction();
@@ -271,7 +274,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutSuccessAction();
@@ -286,7 +289,7 @@ describe('authReducer', () => {
       info: undefined,
       refreshing: false,
       userId: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -301,7 +304,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutErrorAction(mockError);
@@ -315,7 +318,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -329,7 +332,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthenticatedEpersonSuccessAction(EPersonMock.id);
     const newState = authReducer(initialState, action);
@@ -342,7 +345,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -355,7 +358,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthenticatedEpersonErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -367,7 +370,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -382,7 +385,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenAction(newTokenInfo);
@@ -397,7 +400,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -413,7 +416,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenSuccessAction(newTokenInfo);
@@ -428,7 +431,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: false,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -444,7 +447,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     const action = new RefreshTokenErrorAction();
     const newState = authReducer(initialState, action);
@@ -458,7 +461,7 @@ describe('authReducer', () => {
       info: undefined,
       refreshing: false,
       userId: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -473,7 +476,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     state = {
@@ -485,7 +488,7 @@ describe('authReducer', () => {
       error: undefined,
       info: 'Message',
       userId: undefined,
-      idle: false
+      idle: false,
     };
   });
 
@@ -507,7 +510,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new AddAuthenticationMessageAction('Message');
     const newState = authReducer(initialState, action);
@@ -517,7 +520,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: 'Message',
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -530,7 +533,7 @@ describe('authReducer', () => {
       loading: false,
       error: 'Error',
       info: 'Message',
-      idle: false
+      idle: false,
     };
     const action = new ResetAuthenticationMessagesAction();
     const newState = authReducer(initialState, action);
@@ -541,7 +544,7 @@ describe('authReducer', () => {
       loading: false,
       error: undefined,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -552,7 +555,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new SetRedirectUrlAction('redirect.url');
     const newState = authReducer(initialState, action);
@@ -562,7 +565,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       redirectUrl: 'redirect.url',
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -574,7 +577,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       authMethods: [],
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthMethodsAction(new AuthStatus());
     const newState = authReducer(initialState, action);
@@ -584,7 +587,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: true,
       authMethods: [],
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -596,11 +599,11 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       authMethods: [],
-      idle: false
+      idle: false,
     };
-    const authMethods = [
-      new AuthMethod(AuthMethodType.Password),
-      new AuthMethod(AuthMethodType.Shibboleth, 'location')
+    const authMethods: AuthMethod[] = [
+      new AuthMethod(AuthMethodType.Password, 0),
+      new AuthMethod(AuthMethodType.Shibboleth, 1, 'location'),
     ];
     const action = new RetrieveAuthMethodsSuccessAction(authMethods);
     const newState = authReducer(initialState, action);
@@ -610,7 +613,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       authMethods: authMethods,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -622,7 +625,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       authMethods: [],
-      idle: false
+      idle: false,
     };
 
     const action = new RetrieveAuthMethodsErrorAction();
@@ -632,8 +635,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)],
-      idle: false
+      authMethods: [new AuthMethod(AuthMethodType.Password, 0)],
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -644,7 +647,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
 
     const action = new SetUserAsIdleAction();
@@ -654,7 +657,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: true
+      idle: true,
     };
     expect(newState).toEqual(state);
   });
@@ -665,7 +668,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: true
+      idle: true,
     };
 
     const action = new UnsetUserAsIdleAction();
@@ -675,7 +678,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index ba9c41326a..8a399710ea 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -1,4 +1,5 @@
 // import actions
+import { StoreActionTypes } from '../../store.actions';
 import {
   AddAuthenticationMessageAction,
   AuthActions,
@@ -10,14 +11,14 @@ import {
   RedirectWhenTokenExpiredAction,
   RefreshTokenSuccessAction,
   RetrieveAuthenticatedEpersonSuccessAction,
-  RetrieveAuthMethodsSuccessAction, SetAuthCookieStatus,
-  SetRedirectUrlAction
+  RetrieveAuthMethodsSuccessAction,
+  SetAuthCookieStatus,
+  SetRedirectUrlAction,
 } from './auth.actions';
-// import models
-import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
-import { StoreActionTypes } from '../../store.actions';
+// import models
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 /**
  * The auth state.
@@ -76,7 +77,7 @@ const initialState: AuthState = {
   loading: false,
   authMethods: [],
   externalAuth: false,
-  idle: false
+  idle: false,
 };
 
 /**
@@ -92,13 +93,13 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         error: undefined,
         loading: true,
-        info: undefined
+        info: undefined,
       });
 
     case AuthActionTypes.AUTHENTICATED:
       return Object.assign({}, state, {
         loading: true,
-        blocking: true
+        blocking: true,
       });
 
     case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN:
@@ -109,7 +110,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
 
     case AuthActionTypes.SET_AUTH_COOKIE_STATUS:
       return Object.assign({}, state, {
-        externalAuth: (action as SetAuthCookieStatus).payload
+        externalAuth: (action as SetAuthCookieStatus).payload,
       });
 
     case AuthActionTypes.AUTHENTICATED_ERROR:
@@ -120,13 +121,13 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         error: (action as AuthenticationErrorAction).payload.message,
         loaded: true,
         blocking: false,
-        loading: false
+        loading: false,
       });
 
     case AuthActionTypes.AUTHENTICATED_SUCCESS:
       return Object.assign({}, state, {
         authenticated: true,
-        authToken: (action as AuthenticatedSuccessAction).payload.authToken
+        authToken: (action as AuthenticatedSuccessAction).payload.authToken,
       });
 
     case AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS:
@@ -136,7 +137,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: false,
         blocking: false,
         info: undefined,
-        userId: (action as RetrieveAuthenticatedEpersonSuccessAction).payload
+        userId: (action as RetrieveAuthenticatedEpersonSuccessAction).payload,
       });
 
     case AuthActionTypes.AUTHENTICATE_ERROR:
@@ -145,7 +146,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         authToken: undefined,
         error: (action as AuthenticationErrorAction).payload.message,
         blocking: false,
-        loading: false
+        loading: false,
       });
 
     case AuthActionTypes.AUTHENTICATE_SUCCESS:
@@ -155,7 +156,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     case AuthActionTypes.LOG_OUT_ERROR:
       return Object.assign({}, state, {
         authenticated: true,
-        error: (action as LogOutErrorAction).payload.message
+        error: (action as LogOutErrorAction).payload.message,
       });
 
     case AuthActionTypes.REFRESH_TOKEN_ERROR:
@@ -168,7 +169,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: false,
         info: undefined,
         refreshing: false,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.LOG_OUT_SUCCESS:
@@ -181,7 +182,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: true,
         info: undefined,
         refreshing: false,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED:
@@ -193,7 +194,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         blocking: false,
         loading: false,
         info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.REFRESH_TOKEN:
@@ -205,7 +206,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         authToken: (action as RefreshTokenSuccessAction).payload,
         refreshing: false,
-        blocking: false
+        blocking: false,
       });
 
     case AuthActionTypes.ADD_MESSAGE:
@@ -229,14 +230,14 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         loading: false,
         blocking: false,
-        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload
+        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload,
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR:
       return Object.assign({}, state, {
         loading: false,
         blocking: false,
-        authMethods: [new AuthMethod(AuthMethodType.Password)]
+        authMethods: [new AuthMethod(AuthMethodType.Password, 0)],
       });
 
     case AuthActionTypes.SET_REDIRECT_URL:
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index b38d17aecd..7e2f4f5fe1 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -1,46 +1,75 @@
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-import { Observable, of as observableOf } from 'rxjs';
-import { authReducer, AuthState } from './auth.reducer';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { AuthService, IMPERSONATING_COOKIE } from './auth.service';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { CookieService } from '../services/cookie.service';
-import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
-import { AuthRequestService } from './auth-request.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { EPerson } from '../eperson/models/eperson.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { TranslateService } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AppState } from '../../app.reducer';
-import { ClientCookieService } from '../services/client-cookie.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
+import { authMethodsMock } from '../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { RouteService } from '../services/route.service';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  SpecialGroupDataMock,
+  SpecialGroupDataMock$,
+} from '../../shared/testing/special-group.mock';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { EPersonDataService } from '../eperson/eperson-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { authMethodsMock } from '../../shared/testing/auth-service.stub';
-import { AuthMethod } from './models/auth.method';
+import { EPerson } from '../eperson/models/eperson.model';
+import { ClientCookieService } from '../services/client-cookie.service';
+import { CookieService } from '../services/cookie.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SetUserAsIdleAction, UnsetUserAsIdleAction } from './auth.actions';
-import { SpecialGroupDataMock, SpecialGroupDataMock$ } from '../../shared/testing/special-group.mock';
-import { cold } from 'jasmine-marbles';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  SetUserAsIdleAction,
+  UnsetUserAsIdleAction,
+} from './auth.actions';
+import {
+  authReducer,
+  AuthState,
+} from './auth.reducer';
+import {
+  AuthService,
+  IMPERSONATING_COOKIE,
+} from './auth.service';
+import { AuthRequestService } from './auth-request.service';
+import { AuthMethod } from './models/auth.method';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 describe('AuthService test', () => {
 
   const mockEpersonDataService: any = {
     findByHref(href: string): Observable<RemoteData<EPerson>> {
       return createSuccessfulRemoteDataObject$(EPersonMock);
-    }
+    },
   };
 
   let mockStore: Store<AuthState>;
@@ -62,13 +91,13 @@ describe('AuthService test', () => {
     uuid: 'test',
     authenticated: true,
     okay: true,
-    specialGroups: SpecialGroupDataMock$
+    specialGroups: SpecialGroupDataMock$,
   });
 
   function init() {
     mockStore = jasmine.createSpyObj('store', {
       dispatch: {},
-      pipe: observableOf(true)
+      pipe: observableOf(true),
     });
     window = new NativeWindowRef();
     routerStub = new RouterStub();
@@ -80,7 +109,7 @@ describe('AuthService test', () => {
       loading: false,
       authToken: token,
       user: EPersonMock,
-      idle: false
+      idle: false,
     };
     unAuthenticatedState = {
       authenticated: false,
@@ -88,7 +117,7 @@ describe('AuthService test', () => {
       loading: false,
       authToken: undefined,
       user: undefined,
-      idle: false
+      idle: false,
     };
     idleState = {
       authenticated: true,
@@ -96,12 +125,12 @@ describe('AuthService test', () => {
       loading: false,
       authToken: token,
       user: EPersonMock,
-      idle: true
+      idle: true,
     };
     authRequest = new AuthRequestServiceStub();
     routeStub = new ActivatedRouteStub();
     linkService = {
-      resolveLinks: {}
+      resolveLinks: {},
     };
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', ['redirect']);
     spyOn(linkService, 'resolveLinks').and.returnValue({ authenticated: true, eperson: observableOf({ payload: {} }) });
@@ -117,8 +146,8 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
         ],
         declarations: [],
@@ -135,7 +164,7 @@ describe('AuthService test', () => {
           { provide: NotificationsService, useValue: NotificationsServiceStub },
           { provide: TranslateService, useValue: getMockTranslateService() },
           CookieService,
-          AuthService
+          AuthService,
         ],
       });
       authService = TestBed.inject(AuthService);
@@ -238,9 +267,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -249,8 +278,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -313,9 +342,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -325,8 +354,8 @@ describe('AuthService test', () => {
           { provide: RemoteDataBuildService, useValue: linkService },
           ClientCookieService,
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -338,7 +367,7 @@ describe('AuthService test', () => {
         loaded: true,
         loading: false,
         authToken: expiredToken,
-        user: EPersonMock
+        user: EPersonMock,
       };
       store
         .subscribe((state) => {
@@ -528,7 +557,7 @@ describe('AuthService test', () => {
 
       it('should call navigateToRedirectUrl with no url', () => {
         const expectRes = cold('(a|)', {
-          a: SpecialGroupDataMock
+          a: SpecialGroupDataMock,
         });
         expect(authService.getSpecialGroupsFromAuthStatus()).toBeObservable(expectRes);
       });
@@ -543,9 +572,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -554,8 +583,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -583,9 +612,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -594,8 +623,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 6604936cde..7da72b25b6 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,18 +1,34 @@
-import { Inject, Injectable, Optional } from '@angular/core';
-import { Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
-
-import { Observable, of as observableOf } from 'rxjs';
-import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
-import { select, Store } from '@ngrx/store';
+import {
+  Inject,
+  Injectable,
+  Optional,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  REQUEST,
+  RESPONSE,
+} from '@nguniversal/express-engine/tokens';
+import { TranslateService } from '@ngx-translate/core';
 import { CookieAttributes } from 'js-cookie';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { EPerson } from '../eperson/models/eperson.model';
-import { AuthRequestService } from './auth-request.service';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model';
+import { environment } from '../../../environments/environment';
+import { AppState } from '../../app.reducer';
 import {
   hasNoValue,
   hasValue,
@@ -20,42 +36,58 @@ import {
   isEmpty,
   isNotEmpty,
   isNotNull,
-  isNotUndefined
+  isNotUndefined,
 } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { EPersonDataService } from '../eperson/eperson-data.service';
+import { EPerson } from '../eperson/models/eperson.model';
+import { Group } from '../eperson/models/group.model';
 import { CookieService } from '../services/cookie.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
+import {
+  CheckAuthenticationTokenAction,
+  RefreshTokenAction,
+  ResetAuthenticationMessagesAction,
+  SetAuthCookieStatus,
+  SetRedirectUrlAction,
+  SetUserAsIdleAction,
+  UnsetUserAsIdleAction,
+} from './auth.actions';
+import { AuthRequestService } from './auth-request.service';
+import { AuthMethod } from './models/auth.method';
+import { AuthStatus } from './models/auth-status.model';
+import {
+  AuthTokenInfo,
+  TOKENITEM,
+} from './models/auth-token-info.model';
 import {
   getAuthenticatedUserId,
-  getAuthenticationToken, getExternalAuthCookieStatus,
+  getAuthenticationToken,
+  getExternalAuthCookieStatus,
   getRedirectUrl,
   isAuthenticated,
   isAuthenticatedLoaded,
   isIdle,
-  isTokenRefreshing
+  isTokenRefreshing,
 } from './selectors';
-import { AppState } from '../../app.reducer';
-import {
-  CheckAuthenticationTokenAction,
-  RefreshTokenAction,
-  ResetAuthenticationMessagesAction, SetAuthCookieStatus,
-  SetRedirectUrlAction,
-  SetUserAsIdleAction,
-  UnsetUserAsIdleAction
-} from './auth.actions';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { RouteService } from '../services/route.service';
-import { EPersonDataService } from '../eperson/eperson-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
-import { AuthMethod } from './models/auth.method';
-import { HardRedirectService } from '../services/hard-redirect.service';
-import { RemoteData } from '../data/remote-data';
-import { environment } from '../../../environments/environment';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
-import { Group } from '../eperson/models/group.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PageInfo } from '../shared/page-info.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -90,13 +122,13 @@ export class AuthService {
               protected store: Store<AppState>,
               protected hardRedirectService: HardRedirectService,
               private notificationService: NotificationsService,
-              private translateService: TranslateService
+              private translateService: TranslateService,
   ) {
     this.store.pipe(
       // when this service is constructed the store is not fully initialized yet
       filter((state: any) => state?.core?.auth !== undefined),
       select(isAuthenticated),
-      startWith(false)
+      startWith(false),
     ).subscribe((authenticated: boolean) => this._authenticated = authenticated);
   }
 
@@ -119,7 +151,7 @@ export class AuthService {
         if (hasValue(rd.payload) && rd.payload.authenticated) {
           return rd.payload;
         } else {
-          throw (new Error('Invalid email or password'));
+          throw (new Error('auth.errors.invalid-user'));
         }
       }));
 
@@ -136,7 +168,7 @@ export class AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload)),
     );
   }
 
@@ -202,7 +234,7 @@ export class AuthService {
    */
   public retrieveAuthenticatedUserByHref(userHref: string): Observable<EPerson> {
     return this.epersonService.findByHref(userHref).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -212,7 +244,7 @@ export class AuthService {
    */
   public retrieveAuthenticatedUserById(userId: string): Observable<EPerson> {
     return this.epersonService.findById(userId).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -225,7 +257,7 @@ export class AuthService {
       select(getAuthenticatedUserId),
       hasValueOperator(),
       switchMap((id: string) => this.epersonService.findById(id)),
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -248,7 +280,7 @@ export class AuthService {
         } else {
           return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(),[]));
         }
-      })
+      }),
     );
   }
 
@@ -260,15 +292,14 @@ export class AuthService {
       select(getAuthenticationToken),
       take(1),
       map((authTokenInfo: AuthTokenInfo) => {
-        let token: AuthTokenInfo;
         // Retrieve authentication token info and check if is valid
-        token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM);
+        const token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM);
         if (isNotEmpty(token) && token.hasOwnProperty('accessToken') && isNotEmpty(token.accessToken) && !this.isTokenExpired(token)) {
           return token;
         } else {
           throw false;
         }
-      })
+      }),
     );
   }
 
@@ -412,7 +443,7 @@ export class AuthService {
           const token = this.getToken();
           return token.expires - (60 * 5 * 1000) < Date.now();
         }
-      })
+      }),
     );
   }
 
@@ -437,7 +468,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = {expires: expires};
+    const options: CookieAttributes = { expires: expires };
 
     // Save cookie with the token
     return this.storage.set(TOKENITEM, token, options);
@@ -516,7 +547,7 @@ export class AuthService {
         } else {
           return this.storage.get(REDIRECT_COOKIE);
         }
-      })
+      }),
     );
   }
 
@@ -529,7 +560,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = {expires: expires};
+    const options: CookieAttributes = { expires: expires };
     this.storage.set(REDIRECT_COOKIE, url, options);
     this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
   }
@@ -609,7 +640,7 @@ export class AuthService {
    */
   getShortlivedToken(): Observable<string> {
     return this.isAuthenticated().pipe(
-      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null))
+      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null)),
     );
   }
 
diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts
index 1ab1d2e0a5..4a989e0979 100644
--- a/src/app/core/auth/authenticated.guard.ts
+++ b/src/app/core/auth/authenticated.guard.ts
@@ -4,16 +4,28 @@ import {
   CanActivate,
   Router,
   RouterStateSnapshot,
-  UrlTree
+  UrlTree,
 } from '@angular/router';
-
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { map, find, switchMap } from 'rxjs/operators';
-import { select, Store } from '@ngrx/store';
+import {
+  find,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { isAuthenticated, isAuthenticationLoading } from './selectors';
-import { AuthService, LOGIN_ROUTE } from './auth.service';
 import { CoreState } from '../core-state.model';
+import {
+  AuthService,
+  LOGIN_ROUTE,
+} from './auth.service';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from './selectors';
 
 /**
  * Prevent unauthorized activating and loading of routes
@@ -59,7 +71,7 @@ export class AuthenticatedGuard implements CanActivate {
           this.authService.removeToken();
           return this.router.createUrlTree([LOGIN_ROUTE]);
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/auth/browser-auth-request.service.spec.ts b/src/app/core/auth/browser-auth-request.service.spec.ts
index b41d981bcf..9649255b23 100644
--- a/src/app/core/auth/browser-auth-request.service.spec.ts
+++ b/src/app/core/auth/browser-auth-request.service.spec.ts
@@ -1,8 +1,9 @@
-import { AuthRequestService } from './auth-request.service';
-import { RequestService } from '../data/request.service';
-import { BrowserAuthRequestService } from './browser-auth-request.service';
 import { Observable } from 'rxjs';
+
 import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { AuthRequestService } from './auth-request.service';
+import { BrowserAuthRequestService } from './browser-auth-request.service';
 
 describe(`BrowserAuthRequestService`, () => {
   let href: string;
@@ -12,7 +13,7 @@ describe(`BrowserAuthRequestService`, () => {
   beforeEach(() => {
     href = 'https://rest.api/auth/shortlivedtokens';
     requestService = jasmine.createSpyObj('requestService', {
-      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2'
+      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2',
     });
     service = new BrowserAuthRequestService(null, requestService, null);
   });
diff --git a/src/app/core/auth/browser-auth-request.service.ts b/src/app/core/auth/browser-auth-request.service.ts
index 485e2ef9c4..d708cd8982 100644
--- a/src/app/core/auth/browser-auth-request.service.ts
+++ b/src/app/core/auth/browser-auth-request.service.ts
@@ -1,10 +1,14 @@
 import { Injectable } from '@angular/core';
-import { AuthRequestService } from './auth-request.service';
-import { PostRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { AuthRequestService } from './auth-request.service';
 
 /**
  * Client side version of the service to send authentication requests
@@ -15,7 +19,7 @@ export class BrowserAuthRequestService extends AuthRequestService {
   constructor(
     halService: HALEndpointService,
     requestService: RequestService,
-    rdbService: RemoteDataBuildService
+    rdbService: RemoteDataBuildService,
   ) {
     super(halService, requestService, rdbService);
   }
diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts
index d18b1ccf9a..1a6938887d 100644
--- a/src/app/core/auth/models/auth-status.model.ts
+++ b/src/app/core/auth/models/auth-status.model.ts
@@ -1,7 +1,17 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
@@ -10,12 +20,10 @@ import { GROUP } from '../../eperson/models/group.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { AuthMethod } from './auth.method';
 import { AuthError } from './auth-error.model';
 import { AUTH_STATUS } from './auth-status.resource-type';
 import { AuthTokenInfo } from './auth-token-info.model';
-import { AuthMethod } from './auth.method';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { PaginatedList } from '../../data/paginated-list.model';
 
 /**
  * Object that represents the authenticated status of a user
@@ -28,14 +36,14 @@ export class AuthStatus implements CacheableObject {
    * The unique identifier of this auth status
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The type for this AuthStatus
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The UUID of this auth status
@@ -43,25 +51,25 @@ export class AuthStatus implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('auth-status'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * True if REST API is up and running, should never return false
    */
   @autoserialize
-  okay: boolean;
+    okay: boolean;
 
   /**
    * If the auth status represents an authenticated state
    */
   @autoserialize
-  authenticated: boolean;
+    authenticated: boolean;
 
   /**
    * The {@link HALLink}s for this AuthStatus
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     eperson: HALLink;
     specialGroups: HALLink;
@@ -72,32 +80,32 @@ export class AuthStatus implements CacheableObject {
    * Will be undefined unless the eperson {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The SpecialGroup of this auth status
    * Will be undefined unless the SpecialGroup {@link HALLink} has been resolved.
    */
   @link(GROUP, true)
-  specialGroups?: Observable<RemoteData<PaginatedList<Group>>>;
+    specialGroups?: Observable<RemoteData<PaginatedList<Group>>>;
 
   /**
    * True if the token is valid, false if there was no token or the token wasn't valid
    */
   @autoserialize
-  token?: AuthTokenInfo;
+    token?: AuthTokenInfo;
 
   /**
    * Authentication error if there was one for this status
    */
   // TODO should be refactored to use the RemoteData error
   @autoserialize
-  error?: AuthError;
+    error?: AuthError;
 
   /**
    * All authentication methods enabled at the backend
    */
   @autoserialize
-  authMethods: AuthMethod[];
+    authMethods: AuthMethod[];
 
 }
diff --git a/src/app/core/auth/models/auth.method.ts b/src/app/core/auth/models/auth.method.ts
index 0579ae0cd1..b84e7a308a 100644
--- a/src/app/core/auth/models/auth.method.ts
+++ b/src/app/core/auth/models/auth.method.ts
@@ -2,11 +2,12 @@ import { AuthMethodType } from './auth.method-type';
 
 export class AuthMethod {
   authMethodType: AuthMethodType;
+  position: number;
   location?: string;
 
-  // isStandalonePage? = true;
+  constructor(authMethodName: string, position: number, location?: string) {
+    this.position = position;
 
-  constructor(authMethodName: string, location?: string) {
     switch (authMethodName) {
       case 'ip': {
         this.authMethodType = AuthMethodType.Ip;
diff --git a/src/app/core/auth/models/short-lived-token.model.ts b/src/app/core/auth/models/short-lived-token.model.ts
index 3786bd8e6a..d91a26e990 100644
--- a/src/app/core/auth/models/short-lived-token.model.ts
+++ b/src/app/core/auth/models/short-lived-token.model.ts
@@ -1,10 +1,15 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { ResourceType } from '../../shared/resource-type';
-import { SHORT_LIVED_TOKEN } from './short-lived-token.resource-type';
-import { HALLink } from '../../shared/hal-link.model';
 import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SHORT_LIVED_TOKEN } from './short-lived-token.resource-type';
 
 /**
  * A short-lived token that can be used to authenticate a rest request
@@ -17,19 +22,19 @@ export class ShortLivedToken implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The value for this ShortLivedToken
    */
   @autoserializeAs('token')
-  value: string;
+    value: string;
 
   /**
    * The {@link HALLink}s for this ShortLivedToken
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts
index aba739edf6..6360377626 100644
--- a/src/app/core/auth/selectors.ts
+++ b/src/app/core/auth/selectors.ts
@@ -1,5 +1,7 @@
 import { createSelector } from '@ngrx/store';
 
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 /**
  * Every reducer module's default export is the reducer function itself. In
  * addition, each module should export a type or interface that describes
@@ -7,8 +9,6 @@ import { createSelector } from '@ngrx/store';
  * notation packages up all of the exports into a single object.
  */
 import { AuthState } from './auth.reducer';
-import { CoreState } from '../core-state.model';
-import { coreSelector } from '../core.selectors';
 
 /**
  * Returns the user state.
diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts
index 5b0221e5df..b119f6b3b7 100644
--- a/src/app/core/auth/server-auth-request.service.spec.ts
+++ b/src/app/core/auth/server-auth-request.service.spec.ts
@@ -1,14 +1,22 @@
-import { AuthRequestService } from './auth-request.service';
-import { RequestService } from '../data/request.service';
-import { ServerAuthRequestService } from './server-auth-request.service';
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Observable, of as observableOf } from 'rxjs';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import {
   XSRF_REQUEST_HEADER,
-  XSRF_RESPONSE_HEADER
+  XSRF_RESPONSE_HEADER,
 } from '../xsrf/xsrf.constants';
+import { AuthRequestService } from './auth-request.service';
+import { ServerAuthRequestService } from './server-auth-request.service';
 
 describe(`ServerAuthRequestService`, () => {
   let href: string;
@@ -22,20 +30,20 @@ describe(`ServerAuthRequestService`, () => {
   beforeEach(() => {
     href = 'https://rest.api/auth/shortlivedtokens';
     requestService = jasmine.createSpyObj('requestService', {
-      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2'
+      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2',
     });
     let headers = new HttpHeaders();
     headers = headers.set(XSRF_RESPONSE_HEADER, mockToken);
     httpResponse = {
       body: { bar: false },
       headers: headers,
-      statusText: '200'
+      statusText: '200',
     } as HttpResponse<any>;
     httpClient = jasmine.createSpyObj('httpClient', {
       get: observableOf(httpResponse),
     });
     halService = jasmine.createSpyObj('halService', {
-      'getRootHref': '/api'
+      'getRootHref': '/api',
     });
     service = new ServerAuthRequestService(halService, requestService, null, httpClient);
   });
diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts
index 058322acce..5f1828c71c 100644
--- a/src/app/core/auth/server-auth-request.service.ts
+++ b/src/app/core/auth/server-auth-request.service.ts
@@ -1,21 +1,22 @@
-import { Injectable } from '@angular/core';
-import { AuthRequestService } from './auth-request.service';
-import { PostRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import {
-  HttpHeaders,
   HttpClient,
-  HttpResponse
+  HttpHeaders,
+  HttpResponse,
 } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import {
+  DSPACE_XSRF_COOKIE,
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
-  DSPACE_XSRF_COOKIE
 } from '../xsrf/xsrf.constants';
-import { map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { AuthRequestService } from './auth-request.service';
 
 /**
  * Server side version of the service to send authentication requests
@@ -45,11 +46,11 @@ export class ServerAuthRequestService extends AuthRequestService {
       map((response: HttpResponse<any>) => response.headers.get(XSRF_RESPONSE_HEADER)),
       // Use that token to create an HttpHeaders object
       map((xsrfToken: string) => new HttpHeaders()
-          .set('Content-Type', 'application/json; charset=utf-8')
-          // set the token as the XSRF header
-          .set(XSRF_REQUEST_HEADER, xsrfToken)
-          // and as the DSPACE-XSRF-COOKIE
-          .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)),
+        .set('Content-Type', 'application/json; charset=utf-8')
+      // set the token as the XSRF header
+        .set(XSRF_REQUEST_HEADER, xsrfToken)
+      // and as the DSPACE-XSRF-COOKIE
+        .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)),
       map((headers: HttpHeaders) =>
         // Create a new PostRequest using those headers and the given href
         new PostRequest(
@@ -59,8 +60,8 @@ export class ServerAuthRequestService extends AuthRequestService {
           {
             headers: headers,
           },
-        )
-      )
+        ),
+      ),
     );
   }
 
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index fc8ab18bfb..f51215abad 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -1,15 +1,17 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
-
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteData } from '../data/remote-data';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
-import { RemoteData } from '../data/remote-data';
 
 /**
  * The auth service.
@@ -57,7 +59,7 @@ export class ServerAuthService extends AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload)),
     );
   }
 }
diff --git a/src/app/core/auth/token-response-parsing.service.spec.ts b/src/app/core/auth/token-response-parsing.service.spec.ts
index a440325560..f4244e98b2 100644
--- a/src/app/core/auth/token-response-parsing.service.spec.ts
+++ b/src/app/core/auth/token-response-parsing.service.spec.ts
@@ -1,6 +1,6 @@
-import { TokenResponseParsingService } from './token-response-parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { TokenResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { TokenResponseParsingService } from './token-response-parsing.service';
 
 describe('TokenResponseParsingService', () => {
   let service: TokenResponseParsingService;
@@ -13,10 +13,10 @@ describe('TokenResponseParsingService', () => {
     it('should return a TokenResponse containing the token', () => {
       const data = {
         payload: {
-          token: 'valid-token'
+          token: 'valid-token',
         },
         statusCode: 200,
-        statusText: 'OK'
+        statusText: 'OK',
       } as RawRestResponse;
       const expected = new TokenResponse(data.payload.token, true, 200, 'OK');
       expect(service.parse(undefined, data)).toEqual(expected);
@@ -26,7 +26,7 @@ describe('TokenResponseParsingService', () => {
       const data = {
         payload: {},
         statusCode: 200,
-        statusText: 'OK'
+        statusText: 'OK',
       } as RawRestResponse;
       const expected = new TokenResponse(null, false, 200, 'OK');
       expect(service.parse(undefined, data)).toEqual(expected);
@@ -36,7 +36,7 @@ describe('TokenResponseParsingService', () => {
       const data = {
         payload: {},
         statusCode: 400,
-        statusText: 'BAD REQUEST'
+        statusText: 'BAD REQUEST',
       } as RawRestResponse;
       const expected = new TokenResponse(null, false, 400, 'BAD REQUEST');
       expect(service.parse(undefined, data)).toEqual(expected);
diff --git a/src/app/core/auth/token-response-parsing.service.ts b/src/app/core/auth/token-response-parsing.service.ts
index 1ba7a16b14..3990d0f44e 100644
--- a/src/app/core/auth/token-response-parsing.service.ts
+++ b/src/app/core/auth/token-response-parsing.service.ts
@@ -1,9 +1,13 @@
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { RestResponse, TokenResponse } from '../cache/response.models';
-import { isNotEmpty } from '../../shared/empty.util';
 import { Injectable } from '@angular/core';
+
+import { isNotEmpty } from '../../shared/empty.util';
+import {
+  RestResponse,
+  TokenResponse,
+} from '../cache/response.models';
+import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
 @Injectable()
 /**
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index b2ddade682..f003bd0f85 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -1,17 +1,17 @@
 import { Injectable } from '@angular/core';
 
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BitstreamDataService } from '../data/bitstream-data.service';
+import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamBreadcrumbsService } from './bitstream-breadcrumbs.service';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
   constructor(
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
index 333886ed3d..11a3a74350 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
@@ -1,35 +1,46 @@
 import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
-import { DSONameService } from './dso-name.service';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { LinkService } from '../cache/builders/link.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { RemoteData } from '../data/remote-data';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getDSORoute } from '../../app-routing-paths';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { LinkService } from '../cache/builders/link.service';
 import { BitstreamDataService } from '../data/bitstream-data.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { RemoteData } from '../data/remote-data';
 import { Bitstream } from '../shared/bitstream.model';
 import { Bundle } from '../shared/bundle.model';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
-import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { DSONameService } from './dso-name.service';
 
 /**
  * Service to calculate DSpaceObject breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
   constructor(
     protected bitstreamService: BitstreamDataService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
   ) {
     super(linkService, dsoNameService);
   }
@@ -53,7 +64,7 @@ export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
         return observableOf([]);
 
       }),
-      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb])
+      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb]),
     );
   }
 
@@ -74,12 +85,12 @@ export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
               } else {
                 return observableOf(undefined);
               }
-            })
+            }),
           );
         } else {
           return observableOf(undefined);
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/breadcrumbs/breadcrumbsProviderService.ts b/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
index 4f5dd0a583..83d9a2caaa 100644
--- a/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
+++ b/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
@@ -1,6 +1,7 @@
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
 import { Observable } from 'rxjs';
 
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+
 /**
  * Service to calculate breadcrumbs for a single part of the route
  */
diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
index 46c49add06..d337da22c7 100644
--- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { Collection } from '../shared/collection.model';
-import { CollectionDataService } from '../data/collection-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
 import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { CollectionDataService } from '../data/collection-data.service';
+import { Collection } from '../shared/collection.model';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Collection
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CollectionBreadcrumbResolver extends DSOBreadcrumbResolver<Collection> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CollectionDataService) {
diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
index 309927771d..4cbffe9a6a 100644
--- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+
+import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { CommunityDataService } from '../data/community-data.service';
 import { Community } from '../shared/community.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Community
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CommunityBreadcrumbResolver extends DSOBreadcrumbResolver<Community> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CommunityDataService) {
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
index e35e26e46f..59fda031b2 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
@@ -1,8 +1,9 @@
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { Collection } from '../shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { getTestScheduler } from 'jasmine-marbles';
+
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { Collection } from '../shared/collection.model';
 import { CollectionBreadcrumbResolver } from './collection-breadcrumb.resolver';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 
 describe('DSOBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -21,7 +22,7 @@ describe('DSOBreadcrumbResolver', () => {
       testCollection = Object.assign(new Collection(), { uuid });
       dsoBreadcrumbService = {};
       collectionService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(testCollection)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(testCollection),
       };
       resolver = new CollectionBreadcrumbResolver(dsoBreadcrumbService, collectionService);
     });
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
index 8be4e5e099..712f40a3c5 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
@@ -1,15 +1,23 @@
-import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map } from 'rxjs/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { map } from 'rxjs/operators';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { hasValue } from '../../shared/empty.util';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject
@@ -43,7 +51,7 @@ export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceO
         } else {
           return undefined;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
index 6b89c576d6..3869defa70 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
@@ -1,17 +1,24 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { getMockLinkService } from '../../shared/mocks/link-service.mock';
-import { LinkService } from '../cache/builders/link.service';
-import { Item } from '../shared/item.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../shared/community.model';
-import { Collection } from '../shared/collection.model';
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { DSONameService } from './dso-name.service';
+import { of as observableOf } from 'rxjs';
+
 import { getDSORoute } from '../../app-routing-paths';
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { getMockLinkService } from '../../shared/mocks/link-service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { LinkService } from '../cache/builders/link.service';
+import { Collection } from '../shared/collection.model';
+import { Community } from '../shared/community.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { Item } from '../shared/item.model';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { DSONameService } from './dso-name.service';
 
 describe('DSOBreadcrumbsService', () => {
   let service: DSOBreadcrumbsService;
@@ -43,46 +50,46 @@ describe('DSOBreadcrumbsService', () => {
       {
         type: 'community',
         metadata: {
-          'dc.title': [{ value: 'community' }]
+          'dc.title': [{ value: 'community' }],
         },
         uuid: communityUUID,
         parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
 
         _links: {
           parentCommunity: 'site',
-          self: communityPath + communityUUID
-        }
-      }
+          self: communityPath + communityUUID,
+        },
+      },
     );
 
     testCollection = Object.assign(new Collection(),
       {
         type: 'collection',
         metadata: {
-          'dc.title': [{ value: 'collection' }]
+          'dc.title': [{ value: 'collection' }],
         },
         uuid: collectionUUID,
         parentCommunity: createSuccessfulRemoteDataObject$(testCommunity),
         _links: {
           parentCommunity: communityPath + communityUUID,
-          self: communityPath + collectionUUID
-        }
-      }
+          self: communityPath + collectionUUID,
+        },
+      },
     );
 
     testItem = Object.assign(new Item(),
       {
         type: 'item',
         metadata: {
-          'dc.title': [{ value: 'item' }]
+          'dc.title': [{ value: 'item' }],
         },
         uuid: itemUUID,
         owningCollection: createSuccessfulRemoteDataObject$(testCollection),
         _links: {
           owningCollection: collectionPath + collectionUUID,
-          self: itemPath + itemUUID
-        }
-      }
+          self: itemPath + itemUUID,
+        },
+      },
     );
 
     dsoNameService = { getName: (dso) => getName(dso) };
@@ -93,8 +100,8 @@ describe('DSOBreadcrumbsService', () => {
     TestBed.configureTestingModule({
       providers: [
         { provide: LinkService, useValue: getMockLinkService() },
-        { provide: DSONameService, useValue: dsoNameService }
-      ]
+        { provide: DSONameService, useValue: dsoNameService },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
index 9a22cd0e35..7d2e3697e1 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
@@ -1,27 +1,35 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getDSORoute } from '../../app-routing-paths';
 import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { hasValue } from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { LinkService } from '../cache/builders/link.service';
+import { RemoteData } from '../data/remote-data';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
 import { DSONameService } from './dso-name.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { LinkService } from '../cache/builders/link.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { find, map, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../data/remote-data';
-import { hasValue } from '../../shared/empty.util';
-import { Injectable } from '@angular/core';
-import { getDSORoute } from '../../app-routing-paths';
 
 /**
  * Service to calculate DSpaceObject breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DSOBreadcrumbsService implements BreadcrumbsProviderService<ChildHALResource & DSpaceObject> {
   constructor(
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
   ) {
 
   }
@@ -46,7 +54,7 @@ export class DSOBreadcrumbsService implements BreadcrumbsProviderService<ChildHA
         return observableOf([]);
 
       }),
-      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb])
+      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb]),
     );
   }
 }
diff --git a/src/app/core/breadcrumbs/dso-name.service.spec.ts b/src/app/core/breadcrumbs/dso-name.service.spec.ts
index 9f2f76599a..90b08dca14 100644
--- a/src/app/core/breadcrumbs/dso-name.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.spec.ts
@@ -22,7 +22,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return ['Person', Item, DSpaceObject];
-      }
+      },
     });
 
     mockOrgUnitName = 'Molecular Spectroscopy';
@@ -32,7 +32,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return ['OrgUnit', Item, DSpaceObject];
-      }
+      },
     });
 
     mockDSOName = 'Lorem Ipsum';
@@ -42,7 +42,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return [DSpaceObject];
-      }
+      },
     });
 
     service = new DSONameService({ instant: (a) => a } as any);
diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index ddd97705b0..988141209f 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -1,7 +1,11 @@
 import { Injectable } from '@angular/core';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { TranslateService } from '@ngx-translate/core';
+
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { Metadata } from '../shared/metadata.utils';
 
 /**
@@ -9,7 +13,7 @@ import { Metadata } from '../shared/metadata.utils';
  * on its render types.
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DSONameService {
 
@@ -50,12 +54,12 @@ export class DSONameService {
       }
     },
     OrgUnit: (dso: DSpaceObject): string => {
-      return dso.firstMetadataValue('organization.legalName');
+      return dso.firstMetadataValue('organization.legalName') || this.translateService.instant('dso.name.untitled');
     },
     Default: (dso: DSpaceObject): string => {
       // If object doesn't have dc.title metadata use name property
       return dso.firstMetadataValue('dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
-    }
+    },
   };
 
   /**
@@ -106,7 +110,7 @@ export class DSONameService {
       }
       return `${familyName}, ${givenName}`;
     } else if (entityType === 'OrgUnit') {
-      return this.firstMetadataValue(object, dso, 'organization.legalName');
+      return this.firstMetadataValue(object, dso, 'organization.legalName') || this.translateService.instant('dso.name.untitled');
     }
     return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
   }
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
index 0d1870487a..05ef2969f7 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
@@ -1,5 +1,5 @@
-import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
 import { URLCombiner } from '../url-combiner/url-combiner';
+import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
 
 describe('I18nBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -17,13 +17,13 @@ describe('I18nBreadcrumbResolver', () => {
       route = {
         data: { breadcrumbKey: i18nKey },
         routeConfig: {
-          path: segment
+          path: segment,
         },
         parent: {
           routeConfig: {
-            path: parentSegment
-          }
-        } as any
+            path: parentSegment,
+          },
+        } as any,
       };
       expectedPath = new URLCombiner(parentSegment, segment).toString();
       i18nBreadcrumbService = {};
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
index b3fadbbaa9..afcd461de8 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
@@ -1,15 +1,20 @@
-import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { hasNoValue } from '../../shared/empty.util';
 import { currentPathFromSnapshot } from '../../shared/utils/route.utils';
+import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
 
 /**
  * The class that resolves a BreadcrumbConfig object with an i18n key string for a route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class I18nBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>> {
   constructor(protected breadcrumbService: I18nBreadcrumbsService) {
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
index ac2f244037..3fcd911a46 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
@@ -1,7 +1,14 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { BREADCRUMB_MESSAGE_POSTFIX, I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  BREADCRUMB_MESSAGE_POSTFIX,
+  I18nBreadcrumbsService,
+} from './i18n-breadcrumbs.service';
 
 describe('I18nBreadcrumbsService', () => {
   let service: I18nBreadcrumbsService;
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
index 15563bdde8..5746f6faf2 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
@@ -1,7 +1,11 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
 import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
-import { Observable, of as observableOf } from 'rxjs';
-import { Injectable } from '@angular/core';
 
 /**
  * The postfix for i18n breadcrumbs
@@ -12,7 +16,7 @@ export const BREADCRUMB_MESSAGE_POSTFIX = '.breadcrumbs';
  * Service to calculate i18n breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class I18nBreadcrumbsService implements BreadcrumbsProviderService<string> {
 
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 3005b6f09a..f609cbf3bc 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: ItemDataService) {
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..db89d02f75
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts
@@ -0,0 +1,52 @@
+import { NavigationBreadcrumbResolver } from './navigation-breadcrumb.resolver';
+
+describe('NavigationBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: NavigationBreadcrumbResolver;
+    let NavigationBreadcrumbService: any;
+    let i18nKey: string;
+    let relatedI18nKey: string;
+    let route: any;
+    let expectedPath;
+    let state;
+    beforeEach(() => {
+      i18nKey = 'example.key';
+      relatedI18nKey = 'related.key';
+      route = {
+        data: {
+          breadcrumbKey: i18nKey,
+          relatedRoutes: [
+            {
+              path: '',
+              data: { breadcrumbKey: relatedI18nKey },
+            },
+          ],
+        },
+        routeConfig: {
+          path: 'example',
+        },
+        parent: {
+          routeConfig: {
+            path: '',
+          },
+          url: [{
+            path: 'base',
+          }],
+        } as any,
+      };
+
+      state = {
+        url: '/base/example',
+      };
+      expectedPath = '/base/example:/base';
+      NavigationBreadcrumbService = {};
+      resolver = new NavigationBreadcrumbResolver(NavigationBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route, state);
+      const expectedConfig = { provider: NavigationBreadcrumbService, key: `${i18nKey}:${relatedI18nKey}`, url: expectedPath };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..594c1a694f
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service';
+
+/**
+ * The class that resolves a BreadcrumbConfig object with an i18n key string for a route and related parents
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NavigationBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>> {
+
+  private parentRoutes: ActivatedRouteSnapshot[] = [];
+  constructor(protected breadcrumbService: NavigationBreadcrumbsService) {
+  }
+
+  /**
+   * Method to collect all parent routes snapshot from current route snapshot
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   */
+  private getParentRoutes(route: ActivatedRouteSnapshot): void {
+    if (route.parent) {
+      this.parentRoutes.push(route.parent);
+      this.getParentRoutes(route.parent);
+    }
+  }
+  /**
+   * Method for resolving an I18n breadcrumb configuration object
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    this.getParentRoutes(route);
+    const relatedRoutes = route.data.relatedRoutes;
+    const parentPaths = this.parentRoutes.map(parent => parent.routeConfig?.path);
+    const relatedParentRoutes = relatedRoutes.filter(relatedRoute => parentPaths.includes(relatedRoute.path));
+    const baseUrlSegmentPath = route.parent.url[route.parent.url.length - 1].path;
+    const baseUrl = state.url.substring(0, state.url.lastIndexOf(baseUrlSegmentPath) + baseUrlSegmentPath.length);
+
+
+    const combinedParentBreadcrumbKeys = relatedParentRoutes.reduce((previous, current) => {
+      return `${previous}:${current.data.breadcrumbKey}`;
+    }, route.data.breadcrumbKey);
+    const combinedUrls = relatedParentRoutes.reduce((previous, current) => {
+      return `${previous}:${baseUrl}${current.path}`;
+    }, state.url);
+
+    return { provider: this.breadcrumbService, key: combinedParentBreadcrumbKeys, url: combinedUrls };
+  }
+}
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts
new file mode 100644
index 0000000000..2da8b06eab
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+
+/**
+ * The postfix for i18n breadcrumbs
+ */
+export const BREADCRUMB_MESSAGE_POSTFIX = '.breadcrumbs';
+
+/**
+ * Service to calculate i18n breadcrumbs for a single part of the route
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NavigationBreadcrumbsService implements BreadcrumbsProviderService<string> {
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
+    const keys = key.split(':');
+    const urls = url.split(':');
+    const breadcrumbs = keys.map((currentKey, index) => new Breadcrumb(currentKey + BREADCRUMB_MESSAGE_POSTFIX, urls[index] ));
+    return observableOf(breadcrumbs.reverse());
+  }
+}
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts
new file mode 100644
index 0000000000..646b967fe5
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts
@@ -0,0 +1,47 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BREADCRUMB_MESSAGE_POSTFIX } from './i18n-breadcrumbs.service';
+import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service';
+
+describe('NavigationBreadcrumbsService', () => {
+  let service: NavigationBreadcrumbsService;
+  let exampleString;
+  let exampleURL;
+  let childrenString;
+  let childrenUrl;
+  let parentString;
+  let parentUrl;
+
+  function init() {
+    exampleString = 'example.string:parent.string';
+    exampleURL = 'example.com:parent.com';
+    childrenString = 'example.string';
+    childrenUrl = 'example.com';
+    parentString = 'parent.string';
+    parentUrl = 'parent.com';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new NavigationBreadcrumbsService();
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return an array of breadcrumbs based on strings by adding the postfix', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleString, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [
+        new Breadcrumb(childrenString + BREADCRUMB_MESSAGE_POSTFIX, childrenUrl),
+        new Breadcrumb(parentString + BREADCRUMB_MESSAGE_POSTFIX, parentUrl),
+      ].reverse() });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..7a0e9d43ed
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts
@@ -0,0 +1,31 @@
+import { PublicationClaimBreadcrumbResolver } from './publication-claim-breadcrumb.resolver';
+
+describe('PublicationClaimBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: PublicationClaimBreadcrumbResolver;
+    let publicationClaimBreadcrumbService: any;
+    const fullPath = '/test/publication-claim/openaire:6bee076d-4f2a-4555-a475-04a267769b2a';
+    const expectedKey = '6bee076d-4f2a-4555-a475-04a267769b2a';
+    const expectedId = 'openaire:6bee076d-4f2a-4555-a475-04a267769b2a';
+    let route;
+
+    beforeEach(() => {
+      route = {
+        paramMap: {
+          get: function (param) {
+            return this[param];
+          },
+          targetId: expectedId,
+        },
+      };
+      publicationClaimBreadcrumbService = {};
+      resolver = new PublicationClaimBreadcrumbResolver(publicationClaimBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route as any, { url: fullPath } as any);
+      const expectedConfig = { provider: publicationClaimBreadcrumbService, key: expectedKey };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..7bcff921e1
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PublicationClaimBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>  {
+  constructor(protected breadcrumbService: PublicationClaimBreadcrumbService) {
+  }
+
+  /**
+   * Method that resolve Publication Claim item into a breadcrumb
+   * The parameter are retrieved by the url since part of the Publication Claim route config
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    const targetId = route.paramMap.get('targetId').split(':')[1];
+    return { provider: this.breadcrumbService, key: targetId };
+  }
+}
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts
new file mode 100644
index 0000000000..8424b5edda
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts
@@ -0,0 +1,55 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of } from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service';
+
+describe('PublicationClaimBreadcrumbService', () => {
+  let service: PublicationClaimBreadcrumbService;
+  let dsoNameService: any = {
+    getName: (str) => str,
+  };
+  let translateService: any = {
+    instant: (str) => str,
+  };
+
+  let dataService: any = {
+    findById: (str) => createSuccessfulRemoteDataObject$(str),
+  };
+
+  let authorizationService: any = {
+    isAuthorized: (str) => of(true),
+  };
+
+  let exampleKey;
+
+  const ADMIN_PUBLICATION_CLAIMS_PATH = 'admin/notifications/publication-claim';
+  const ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY = 'admin.notifications.publicationclaim.page.title';
+
+  function init() {
+    exampleKey = 'suggestion.suggestionFor.breadcrumb';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new PublicationClaimBreadcrumbService(dataService,dsoNameService,translateService, authorizationService);
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a string', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleKey);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY, ADMIN_PUBLICATION_CLAIMS_PATH),
+        new Breadcrumb(exampleKey, undefined)],
+      });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts
new file mode 100644
index 0000000000..43b7ed5761
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+import { ItemDataService } from '../data/item-data.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+import { DSONameService } from './dso-name.service';
+
+/**
+ * Service to calculate Publication claims breadcrumbs
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class PublicationClaimBreadcrumbService implements BreadcrumbsProviderService<string> {
+  private ADMIN_PUBLICATION_CLAIMS_PATH = 'admin/notifications/publication-claim';
+  private ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY = 'admin.notifications.publicationclaim.page.title';
+
+  constructor(private dataService: ItemDataService,
+              private dsoNameService: DSONameService,
+              private tranlsateService: TranslateService,
+              protected authorizationService: AuthorizationDataService) {
+  }
+
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   */
+  getBreadcrumbs(key: string): Observable<Breadcrumb[]> {
+    return combineLatest([this.dataService.findById(key).pipe(getFirstCompletedRemoteData()),this.authorizationService.isAuthorized(FeatureID.AdministratorOf)]).pipe(
+      map(([item, isAdmin]) => {
+        const itemName = this.dsoNameService.getName(item.payload);
+        return isAdmin ? [new Breadcrumb(this.tranlsateService.instant(this.ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY), this.ADMIN_PUBLICATION_CLAIMS_PATH),
+          new Breadcrumb(this.tranlsateService.instant('suggestion.suggestionFor.breadcrumb', { name: itemName }), undefined)] :
+          [new Breadcrumb(this.tranlsateService.instant('suggestion.suggestionFor.breadcrumb', { name: itemName }), undefined)];
+      }),
+    );
+  }
+}
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..ea6045c85e
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts
@@ -0,0 +1,31 @@
+import { QualityAssuranceBreadcrumbResolver } from './quality-assurance-breadcrumb.resolver';
+
+describe('QualityAssuranceBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: QualityAssuranceBreadcrumbResolver;
+    let qualityAssuranceBreadcrumbService: any;
+    let route: any;
+    const fullPath = '/test/quality-assurance/';
+    const expectedKey = 'testSourceId:testTopicId';
+
+    beforeEach(() => {
+      route = {
+        paramMap: {
+          get: function (param) {
+            return this[param];
+          },
+          sourceId: 'testSourceId',
+          topicId: 'testTopicId',
+        },
+      };
+      qualityAssuranceBreadcrumbService = {};
+      resolver = new QualityAssuranceBreadcrumbResolver(qualityAssuranceBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route as any, { url: fullPath + 'testSourceId' } as any);
+      const expectedConfig = { provider: qualityAssuranceBreadcrumbService, key: expectedKey, url: fullPath };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..832cd5d08c
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QualityAssuranceBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>  {
+  constructor(protected breadcrumbService: QualityAssuranceBreadcrumbService) {}
+
+  /**
+   * Method that resolve QA item into a breadcrumb
+   * The parameter are retrieved by the url since part of the QA route config
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    const sourceId = route.paramMap.get('sourceId');
+    const topicId = route.paramMap.get('topicId');
+    let key = sourceId;
+
+    if (topicId) {
+      key += `:${topicId}`;
+    }
+    const fullPath = state.url;
+    const url = fullPath.substr(0, fullPath.indexOf(sourceId));
+
+    return { provider: this.breadcrumbService, key, url };
+  }
+}
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts
new file mode 100644
index 0000000000..f8d30754ca
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts
@@ -0,0 +1,43 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';
+
+describe('QualityAssuranceBreadcrumbService', () => {
+  let service: QualityAssuranceBreadcrumbService;
+  let translateService: any = {
+    instant: (str) => str,
+  };
+
+  let exampleString;
+  let exampleURL;
+  let exampleQaKey;
+
+  function init() {
+    exampleString = 'sourceId';
+    exampleURL = '/test/quality-assurance/';
+    exampleQaKey = 'admin.quality-assurance.breadcrumbs';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new QualityAssuranceBreadcrumbService(translateService);
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a string', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleString, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleQaKey, exampleURL),
+        new Breadcrumb(exampleString, exampleURL + exampleString)],
+      });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts
new file mode 100644
index 0000000000..580a5e5f8e
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+
+/**
+ * Service to calculate QA breadcrumbs for a single part of the route
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderService<string> {
+
+  private QUALITY_ASSURANCE_BREADCRUMB_KEY = 'admin.quality-assurance.breadcrumbs';
+  constructor(
+    private translationService: TranslateService,
+  ) {
+
+  }
+
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
+    const args = key.split(':');
+    const sourceId = args[0];
+    const topicId = args.length > 2 ? args[args.length - 1] : args[1];
+
+    if (topicId) {
+      return observableOf( [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+        new Breadcrumb(sourceId, `${url}${sourceId}`),
+        new Breadcrumb(topicId, undefined)]);
+    } else {
+      return observableOf([new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+        new Breadcrumb(sourceId, `${url}${sourceId}`)]);
+    }
+
+  }
+}
diff --git a/src/app/core/browse/browse-definition-data.service.spec.ts b/src/app/core/browse/browse-definition-data.service.spec.ts
index f321c2551c..affa63a548 100644
--- a/src/app/core/browse/browse-definition-data.service.spec.ts
+++ b/src/app/core/browse/browse-definition-data.service.spec.ts
@@ -1,11 +1,12 @@
-import { BrowseDefinitionDataService } from './browse-definition-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 import { EMPTY } from 'rxjs';
-import { FindListOptions } from '../data/find-list-options.model';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { RequestService } from '../data/request.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RequestService } from '../data/request.service';
+import { BrowseDefinitionDataService } from './browse-definition-data.service';
 
 describe(`BrowseDefinitionDataService`, () => {
   let requestService: RequestService;
@@ -18,7 +19,7 @@ describe(`BrowseDefinitionDataService`, () => {
   const options = new FindListOptions();
   const linksToFollow = [
     followLink('entries'),
-    followLink('items')
+    followLink('items'),
   ];
 
   function initTestService() {
diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index bc495a51f4..b823f42076 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -1,33 +1,47 @@
 // eslint-disable-next-line max-classes-per-file
 import { Injectable } from '@angular/core';
-import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
-import { dataService } from '../data/base/data-service.decorator';
-import { isNotEmpty, isNotEmptyOperator, hasValue } from '../../shared/empty.util';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { take } from 'rxjs/operators';
-import { BrowseDefinitionRestRequest } from '../data/request.models';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../data/base/find-all-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { BrowseDefinitionRestRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
+import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 
 /**
  * Create a GET request for the given href, and send it.
  * Use a GET request specific for BrowseDefinitions.
  */
 export const createAndSendBrowseDefinitionGetRequest = (requestService: RequestService,
-                                                        responseMsToLive: number,
-                                                        href$: string | Observable<string>,
-                                                        useCachedVersionIfAvailable: boolean = true): void => {
+  responseMsToLive: number,
+  href$: string | Observable<string>,
+  useCachedVersionIfAvailable: boolean = true): void => {
   if (isNotEmpty(href$)) {
     if (typeof href$ === 'string') {
       href$ = observableOf(href$);
@@ -35,7 +49,7 @@ export const createAndSendBrowseDefinitionGetRequest = (requestService: RequestS
 
     href$.pipe(
       isNotEmptyOperator(),
-      take(1)
+      take(1),
     ).subscribe((href: string) => {
       const requestId = requestService.generateRequestId();
       const request = new BrowseDefinitionRestRequest(requestId, href);
@@ -150,7 +164,7 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     const hrefObs = this.getSearchByHref(
       'byFields',
       { searchParams },
-      ...linksToFollow
+      ...linksToFollow,
     );
 
     return this.findByHref(
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 9f166e3d19..f9999439e1 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -1,20 +1,31 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import {
+  createPaginatedList,
+  getFirstUsedArgumentOfSpyMethod,
+} from '../../shared/testing/utils.test';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
-import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
-import { BrowseService } from './browse.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList, getFirstUsedArgumentOfSpyMethod } from '../../shared/testing/utils.test';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { RequestEntry } from '../data/request-entry.model';
 import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
-import { ValueListBrowseDefinition } from '../shared/value-list-browse-definition.model';
 import { HierarchicalBrowseDefinition } from '../shared/hierarchical-browse-definition.model';
+import { ValueListBrowseDefinition } from '../shared/value-list-browse-definition.model';
+import { BrowseService } from './browse.service';
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 describe('BrowseService', () => {
   let scheduler: TestScheduler;
@@ -31,26 +42,26 @@ describe('BrowseService', () => {
       sortOptions: [
         {
           name: 'title',
-          metadata: 'dc.title'
+          metadata: 'dc.title',
         },
         {
           name: 'dateissued',
-          metadata: 'dc.date.issued'
+          metadata: 'dc.date.issued',
         },
         {
           name: 'dateaccessioned',
-          metadata: 'dc.date.accessioned'
-        }
+          metadata: 'dc.date.accessioned',
+        },
       ],
       defaultSortOrder: 'ASC',
       type: 'browse',
       metadataKeys: [
-        'dc.date.issued'
+        'dc.date.issued',
       ],
       _links: {
         self: { href: 'https://rest.api/discover/browses/dateissued' },
-        items: { href: 'https://rest.api/discover/browses/dateissued/items' }
-      }
+        items: { href: 'https://rest.api/discover/browses/dateissued/items' },
+      },
     }),
     Object.assign(new ValueListBrowseDefinition(), {
       id: 'author',
@@ -58,28 +69,28 @@ describe('BrowseService', () => {
       sortOptions: [
         {
           name: 'title',
-          metadata: 'dc.title'
+          metadata: 'dc.title',
         },
         {
           name: 'dateissued',
-          metadata: 'dc.date.issued'
+          metadata: 'dc.date.issued',
         },
         {
           name: 'dateaccessioned',
-          metadata: 'dc.date.accessioned'
-        }
+          metadata: 'dc.date.accessioned',
+        },
       ],
       defaultSortOrder: 'ASC',
       type: 'browse',
       metadataKeys: [
         'dc.contributor.*',
-        'dc.creator'
+        'dc.creator',
       ],
       _links: {
         self: { href: 'https://rest.api/discover/browses/author' },
         entries: { href: 'https://rest.api/discover/browses/author/entries' },
-        items: { href: 'https://rest.api/discover/browses/author/items' }
-      }
+        items: { href: 'https://rest.api/discover/browses/author/items' },
+      },
     }),
     Object.assign(new HierarchicalBrowseDefinition(), {
       id: 'srsc',
@@ -88,14 +99,14 @@ describe('BrowseService', () => {
       vocabulary: 'srsc',
       type: 'browse',
       metadata: [
-        'dc.subject'
+        'dc.subject',
       ],
       _links: {
         vocabulary: { 'href': 'https://rest.api/submission/vocabularies/srsc/' },
         items: { 'href': 'https://rest.api/discover/browses/srsc/items' },
         entries: { 'href': 'https://rest.api/discover/browses/srsc/entries' },
-        self: { 'href': 'https://rest.api/discover/browses/srsc' }
-      }
+        self: { 'href': 'https://rest.api/discover/browses/srsc' },
+      },
     }),
   ];
 
@@ -104,13 +115,13 @@ describe('BrowseService', () => {
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: browseDefinitions } as any
+      response: { isSuccessful: successful, payload: browseDefinitions } as any,
     } as RequestEntry);
   };
 
   function initTestService() {
     browseDefinitionDataService = jasmine.createSpyObj('browseDefinitionDataService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(browseDefinitions))
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(browseDefinitions)),
     });
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new BrowseService(
@@ -118,7 +129,7 @@ describe('BrowseService', () => {
       halService,
       browseDefinitionDataService,
       hrefOnlyDataService,
-      rdbService
+      rdbService,
     );
   }
 
@@ -164,7 +175,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
 
@@ -178,7 +189,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
 
@@ -193,7 +204,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
     });
@@ -208,7 +219,7 @@ describe('BrowseService', () => {
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('--a-', {
-            a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions))
+            a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions)),
           }));
       });
 
@@ -290,7 +301,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expectedURL
+          a: expectedURL,
         }));
       });
 
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index b210b34949..a724673d32 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -1,33 +1,45 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
-import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import {
+  distinctUntilChanged,
+  map,
+  startWith,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { SortDirection } from '../cache/models/sort-options.model';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
-import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
 import { BrowseEntry } from '../shared/browse-entry.model';
+import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import {
   getBrowseDefinitionLinks,
   getFirstOccurrence,
-  getRemoteDataPayload,
   getFirstSucceededRemoteData,
-  getPaginatedListPayload
+  getPaginatedListPayload,
+  getRemoteDataPayload,
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { BrowseDefinitionDataService } from './browse-definition-data.service';
-import { SortDirection } from '../cache/models/sort-options.model';
-
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
-  followLink('thumbnail')
+  followLink('thumbnail'),
 ];
 
 /**
@@ -102,10 +114,10 @@ export class BrowseService {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();
         }
         return href;
-      })
+      }),
     );
     if (options.fetchThumbnail ) {
-      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, undefined, undefined, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
@@ -153,7 +165,7 @@ export class BrowseService {
       }),
     );
     if (options.fetchThumbnail) {
-      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, undefined, undefined, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }
@@ -187,12 +199,12 @@ export class BrowseService {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();
         }
         return href;
-      })
+      }),
     );
 
     return this.hrefOnlyDataService.findListByHref<Item>(href$).pipe(
       getFirstSucceededRemoteData(),
-      getFirstOccurrence()
+      getFirstOccurrence(),
     );
 
   }
@@ -248,7 +260,7 @@ export class BrowseService {
           }
 
           return isNotEmpty(matchingKeys);
-        })
+        }),
       ),
       map((def: BrowseDefinition) => {
         if (isEmpty(def) || isEmpty(def._links) || isEmpty(def._links[linkPath])) {
@@ -258,7 +270,7 @@ export class BrowseService {
         }
       }),
       startWith(undefined),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/cache/builders/build-decorators.spec.ts b/src/app/core/cache/builders/build-decorators.spec.ts
index 150a07f006..53f4cb2f7f 100644
--- a/src/app/core/cache/builders/build-decorators.spec.ts
+++ b/src/app/core/cache/builders/build-decorators.spec.ts
@@ -1,7 +1,12 @@
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import { getLinkDefinition, link } from './build-decorators';
+import {
+  dataService,
+  getDataServiceFor,
+  getLinkDefinition,
+  link,
+} from './build-decorators';
 
 class TestHALResource implements HALResource {
   _links: {
@@ -46,5 +51,17 @@ describe('build decorators', () => {
         expect(result).toBeUndefined();
       });
     });
+
+    describe(`set data service`, () => {
+      it(`should throw error`, () => {
+        expect(dataService(null)).toThrow();
+      });
+
+      it(`should set properly data service for type`, () => {
+        const target = new TestHALResource();
+        dataService(testType)(target);
+        expect(getDataServiceFor(testType)).toEqual(target);
+      });
+    });
   });
 });
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index 9e5ebaed85..be3ffc0f4d 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -1,25 +1,34 @@
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { InjectionToken } from '@angular/core';
 
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
+import { CacheableObject } from '../cacheable-object.model';
 import { getResourceTypeValueFor } from '../object-cache.reducer';
-import { InjectionToken } from '@angular/core';
 import { TypedObject } from '../typed-object.model';
 
+export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<any>>('getDataServiceFor', {
+  providedIn: 'root',
+  factory: () => getDataServiceFor,
+});
 export const LINK_DEFINITION_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>, linkName: keyof T['_links']) => LinkDefinition<T>>('getLinkDefinition', {
   providedIn: 'root',
   factory: () => getLinkDefinition,
 });
 export const LINK_DEFINITION_MAP_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>) => Map<keyof T['_links'], LinkDefinition<T>>>('getLinkDefinitions', {
   providedIn: 'root',
-  factory: () => getLinkDefinitions
+  factory: () => getLinkDefinitions,
 });
 
 const resolvedLinkKey = Symbol('resolvedLink');
 
 const resolvedLinkMap = new Map();
 const typeMap = new Map();
+const dataServiceMap = new Map();
 const linkMap = new Map();
 
 /**
@@ -38,6 +47,39 @@ export function getClassForType(type: string | ResourceType) {
   return typeMap.get(getResourceTypeValueFor(type));
 }
 
+/**
+ * A class decorator to indicate that this class is a dataservice
+ * for a given resource type.
+ *
+ * "dataservice" in this context means that it has findByHref and
+ * findAllByHref methods.
+ *
+ * @param resourceType the resource type the class is a dataservice for
+ */
+export function dataService(resourceType: ResourceType): any {
+  return (target: any) => {
+    if (hasNoValue(resourceType)) {
+      throw new Error(`Invalid @dataService annotation on ${target}, resourceType needs to be defined`);
+    }
+    const existingDataservice = dataServiceMap.get(resourceType.value);
+
+    if (hasValue(existingDataservice)) {
+      throw new Error(`Multiple dataservices for ${resourceType.value}: ${existingDataservice} and ${target}`);
+    }
+
+    dataServiceMap.set(resourceType.value, target);
+  };
+}
+
+/**
+ * Return the dataservice matching the given resource type
+ *
+ * @param resourceType the resource type you want the matching dataservice for
+ */
+export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType) {
+  return dataServiceMap.get(resourceType.value);
+}
+
 /**
  * A class to represent the data that can be set by the @link decorator
  */
@@ -65,7 +107,7 @@ export const link = <T extends HALResource>(
   resourceType: ResourceType,
   isList = false,
   linkName?: keyof T['_links'],
-  ) => {
+) => {
   return (target: T, propertyName: string) => {
     let targetMap = linkMap.get(target.constructor);
 
@@ -81,7 +123,7 @@ export const link = <T extends HALResource>(
       resourceType,
       isList,
       linkName,
-      propertyName
+      propertyName,
     });
 
     linkMap.set(target.constructor, targetMap);
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index 0ddfe05870..0bb5e4f238 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -1,15 +1,22 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { isEmpty } from 'rxjs/operators';
+
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { FindListOptions } from '../../data/find-list-options.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
+import {
+  LINK_DEFINITION_FACTORY,
+  LINK_DEFINITION_MAP_FACTORY,
+} from './build-decorators';
 import { LinkService } from './link.service';
-import { LINK_DEFINITION_FACTORY, LINK_DEFINITION_MAP_FACTORY } from './build-decorators';
-import { isEmpty } from 'rxjs/operators';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
 
 const TEST_MODEL = new ResourceType('testmodel');
 let result: any;
@@ -54,15 +61,15 @@ describe('LinkService', () => {
       value: 'a test value',
       _links: {
         self: {
-          href: 'http://self.link'
+          href: 'http://self.link',
         },
         predecessor: {
-          href: 'http://predecessor.link'
+          href: 'http://predecessor.link',
         },
         successor: {
-          href: 'http://successor.link'
+          href: 'http://successor.link',
         },
-      }
+      },
     });
     testDataService = new TestDataService();
     spyOn(testDataService, 'findListByHref').and.callThrough();
@@ -70,7 +77,7 @@ describe('LinkService', () => {
     TestBed.configureTestingModule({
       providers: [LinkService, {
         provide: TestDataService,
-        useValue: testDataService
+        useValue: testDataService,
       }, {
         provide: DATA_SERVICE_FACTORY,
         useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService),
@@ -79,7 +86,7 @@ describe('LinkService', () => {
         useValue: jasmine.createSpy('getLinkDefinition').and.returnValue({
           resourceType: TEST_MODEL,
           linkName: 'predecessor',
-          propertyName: 'predecessor'
+          propertyName: 'predecessor',
         }),
       }, {
         provide: LINK_DEFINITION_MAP_FACTORY,
@@ -93,9 +100,9 @@ describe('LinkService', () => {
             resourceType: TEST_MODEL,
             linkName: 'successor',
             propertyName: 'successor',
-          }
+          },
         ]),
-      }]
+      }],
     });
     service = TestBed.inject(LinkService);
   });
@@ -115,7 +122,7 @@ describe('LinkService', () => {
           resourceType: TEST_MODEL,
           linkName: 'predecessor',
           propertyName: 'predecessor',
-          isList: true
+          isList: true,
         });
         service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
       });
@@ -213,12 +220,12 @@ describe('LinkService', () => {
         value: 'a test value',
         _links: {
           self: {
-            href: 'http://self.link'
+            href: 'http://self.link',
           },
           predecessor: {
-            href: 'http://predecessor.link'
-          }
-        }
+            href: 'http://predecessor.link',
+          },
+        },
       });
     });
 
@@ -237,7 +244,7 @@ describe('LinkService', () => {
         ((service as any).getLinkDefinition as jasmine.Spy).and.returnValue({
           resourceType: TEST_MODEL,
           linkName: 'successor',
-          propertyName: 'successor'
+          propertyName: 'successor',
         });
         result = service.resolveLinks(testModel, followLink('successor'));
       });
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index afc7ab88e4..78cd28085e 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -1,19 +1,31 @@
-import { Inject, Injectable, Injector } from '@angular/core';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import {
+  Inject,
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { HALDataService } from '../../data/base/hal-data-service.interface';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
-import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { ResourceType } from '../../shared/resource-type';
 import {
   LINK_DEFINITION_FACTORY,
   LINK_DEFINITION_MAP_FACTORY,
   LinkDefinition,
 } from './build-decorators';
-import { RemoteData } from '../../data/remote-data';
-import { EMPTY, Observable } from 'rxjs';
-import { ResourceType } from '../../shared/resource-type';
-import { HALDataService } from '../../data/base/hal-data-service.interface';
-import { PaginatedList } from '../../data/paginated-list.model';
 
 /**
  * A Service to handle the resolving and removing
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index d9b856bb77..ec756ce85e 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -1,26 +1,43 @@
-import { createFailedRemoteDataObject, createPendingRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { buildPaginatedList, PaginatedList } from '../../data/paginated-list.model';
-import { Item } from '../../shared/item.model';
-import { PageInfo } from '../../shared/page-info.model';
-import { RemoteDataBuildService } from './remote-data-build.service';
-import { ObjectCacheService } from '../object-cache.service';
-import { ITEM } from '../../shared/item.resource-type';
-import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
-import { LinkService } from './link.service';
-import { RequestService } from '../../data/request.service';
-import { UnCacheableObject } from '../../shared/uncacheable-object.model';
-import { RemoteData } from '../../data/remote-data';
-import { Observable, of as observableOf } from 'rxjs';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { take } from 'rxjs/operators';
-import { HALLink } from '../../shared/hal-link.model';
-import { RequestEntryState } from '../../data/request-entry-state.model';
-import { RequestEntry } from '../../data/request-entry.model';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
 import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
-import { fakeAsync, tick } from '@angular/core/testing';
+
+import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
+import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject,
+  createPendingRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
+import { PageInfo } from '../../shared/page-info.model';
+import { UnCacheableObject } from '../../shared/uncacheable-object.model';
+import { ObjectCacheService } from '../object-cache.service';
+import { LinkService } from './link.service';
+import { RemoteDataBuildService } from './remote-data-build.service';
 
 describe('RemoteDataBuildService', () => {
   let service: RemoteDataBuildService;
@@ -49,7 +66,7 @@ describe('RemoteDataBuildService', () => {
     linkService = getMockLinkService();
     requestService = getMockRequestService();
     unCacheableObject = {
-      foo: 'bar'
+      foo: 'bar',
     };
     pageInfo = new PageInfo();
     selfLink1 = 'https://rest.api/some/object';
@@ -64,31 +81,31 @@ describe('RemoteDataBuildService', () => {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'Item nr 1'
-            }
-          ]
+              value: 'Item nr 1',
+            },
+          ],
         },
         _links: {
           self: {
-            href: selfLink1
-          }
-        }
+            href: selfLink1,
+          },
+        },
       }),
       Object.assign(new Item(), {
         metadata: {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'Item nr 2'
-            }
-          ]
+              value: 'Item nr 2',
+            },
+          ],
         },
         _links: {
           self: {
-            href: selfLink2
-          }
-        }
-      })
+            href: selfLink2,
+          },
+        },
+      }),
     ];
     paginatedList = buildPaginatedList(pageInfo, array);
     normalizedPaginatedList = buildPaginatedList(pageInfo, array, true);
@@ -96,43 +113,43 @@ describe('RemoteDataBuildService', () => {
     paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
     entrySuccessCacheable = {
       request: {
-        uuid: '17820127-0ee5-4ed4-b6da-e654bdff8487'
+        uuid: '17820127-0ee5-4ed4-b6da-e654bdff8487',
       },
       state: RequestEntryState.Success,
       response: {
         statusCode: 200,
         payloadLink: {
-          href: selfLink1
-        }
-      }
+          href: selfLink1,
+        },
+      },
     } as RequestEntry;
     entrySuccessUnCacheable = {
       request: {
-        uuid: '0aa5ec06-d6a7-4e73-952e-1e0462bd1501'
+        uuid: '0aa5ec06-d6a7-4e73-952e-1e0462bd1501',
       },
       state: RequestEntryState.Success,
       response: {
         statusCode: 200,
         unCacheableObject,
-      }
+      },
     } as RequestEntry;
     entrySuccessNoContent = {
       request: {
-        uuid: '780a7295-6102-4a43-9775-80f2a4ff673c'
+        uuid: '780a7295-6102-4a43-9775-80f2a4ff673c',
       },
       state: RequestEntryState.Success,
       response: {
-        statusCode: 204
+        statusCode: 204,
       },
     } as RequestEntry;
     entryError = {
       request: {
-        uuid: '1609dcbc-8442-4877-966e-864f151cc40c'
+        uuid: '1609dcbc-8442-4877-966e-864f151cc40c',
       },
       state: RequestEntryState.Error,
       response: {
         statusCode: 500,
-      }
+      },
     } as RequestEntry;
     requestEntry$ = observableOf(entrySuccessCacheable);
     linksToFollow = [
@@ -427,8 +444,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            payloadLink: { href: 'payload-link' }
-          }
+            payloadLink: { href: 'payload-link' },
+          },
         };
       });
 
@@ -441,8 +458,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            payloadLink: undefined
-          }
+            payloadLink: undefined,
+          },
         };
       });
 
@@ -459,8 +476,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            unCacheableObject: Object.assign({})
-          }
+            unCacheableObject: Object.assign({}),
+          },
         };
       });
 
@@ -472,7 +489,7 @@ describe('RemoteDataBuildService', () => {
     describe('when the entry\'s response doesn\'t contain an uncacheable object', () => {
       beforeEach(() => {
         entry = {
-          response: {}
+          response: {},
         };
       });
 
@@ -487,7 +504,7 @@ describe('RemoteDataBuildService', () => {
       it(`should return a new instance of that type`, () => {
         const source: any = {
           type: ITEM,
-          uuid: 'some-uuid'
+          uuid: 'some-uuid',
         };
 
         const result = (service as any).plainObjectToInstance(source);
@@ -503,7 +520,7 @@ describe('RemoteDataBuildService', () => {
       it(`should return a new plain JS object`, () => {
         const source: any = {
           type: 'foobar',
-          uuid: 'some-uuid'
+          uuid: 'some-uuid',
         };
 
         const result = (service as any).plainObjectToInstance(source);
@@ -528,7 +545,7 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         paginatedLinksToFollow = [
           followLink('page', {}, ...linksToFollow),
-          ...linksToFollow
+          ...linksToFollow,
         ];
       });
       describe(`and the given list doesn't have a page property already`, () => {
@@ -843,15 +860,15 @@ describe('RemoteDataBuildService', () => {
     it('should only emit after the callback is done', () => {
       testScheduler.run(({ cold: tsCold, expectObservable }) => {
         buildFromRequestUUIDSpy.and.returnValue(
-          tsCold('-p----s', RDs)
+          tsCold('-p----s', RDs),
         );
         callback.and.returnValue(
-          tsCold('      --t', BOOLEAN)
+          tsCold('      --t', BOOLEAN),
         );
 
         const done$ = service.buildFromRequestUUIDAndAwait('some-href', callback);
         expectObservable(done$).toBe(
-          '       -p------s', RDs       // resulting duration between pending & successful includes the callback
+          '       -p------s', RDs,       // resulting duration between pending & successful includes the callback
         );
       });
     });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 075bf3ca0c..e5a6114872 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -5,27 +5,50 @@ import {
   Observable,
   of as observableOf,
 } from 'rxjs';
-import { map, switchMap, filter, distinctUntilKeyChanged, startWith } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty, hasNoValue, isUndefined } from '../../../shared/empty.util';
+import {
+  distinctUntilKeyChanged,
+  filter,
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isUndefined,
+} from '../../../shared/empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../data/paginated-list.model';
+import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
 import { RemoteData } from '../../data/remote-data';
 import { RequestService } from '../../data/request.service';
-import { ObjectCacheService } from '../object-cache.service';
-import { LinkService } from './link.service';
-import { HALLink } from '../../shared/hal-link.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { getClassForType } from './build-decorators';
-import { HALResource } from '../../shared/hal-resource.model';
-import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
-import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
-import { getResourceTypeValueFor } from '../object-cache.reducer';
-import { hasSucceeded, isStale, RequestEntryState } from '../../data/request-entry-state.model';
-import { getRequestFromRequestHref, getRequestFromRequestUUID } from '../../shared/request.operators';
 import { RequestEntry } from '../../data/request-entry.model';
+import {
+  hasSucceeded,
+  isStale,
+  RequestEntryState,
+} from '../../data/request-entry-state.model';
 import { ResponseState } from '../../data/response-state.model';
+import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { HALLink } from '../../shared/hal-link.model';
+import { HALResource } from '../../shared/hal-resource.model';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
+import {
+  getRequestFromRequestHref,
+  getRequestFromRequestUUID,
+} from '../../shared/request.operators';
+import { getResourceTypeValueFor } from '../object-cache.reducer';
+import { ObjectCacheService } from '../object-cache.service';
+import { getClassForType } from './build-decorators';
+import { LinkService } from './link.service';
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -77,7 +100,7 @@ export class RemoteDataBuildService {
           }
         }
         return [obj];
-      })
+      }),
     );
   }
 
@@ -151,7 +174,7 @@ export class RemoteDataBuildService {
           paginatedList.page = page
             .map((obj: any) => this.plainObjectToInstance<T>(obj))
             .map((obj: any) =>
-              this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+              this.linkService.resolveLinks(obj, ...pageLink.linksToFollow),
             );
           if (isNotEmpty(otherLinks)) {
             return this.linkService.resolveLinks(paginatedList, ...otherLinks);
@@ -161,9 +184,10 @@ export class RemoteDataBuildService {
       } else {
         // in case the elements of the paginated list were already filled in, because they're UnCacheableObjects
         paginatedList.page = paginatedList.page
+          .filter((obj: any) => obj != null)
           .map((obj: any) => this.plainObjectToInstance<T>(obj))
           .map((obj: any) =>
-            this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+            this.linkService.resolveLinks(obj, ...pageLink.linksToFollow),
           );
         if (isNotEmpty(otherLinks)) {
           return observableOf(this.linkService.resolveLinks(paginatedList, ...otherLinks));
@@ -229,7 +253,7 @@ export class RemoteDataBuildService {
         } else {
           return [rd];
         }
-      })
+      }),
     );
   }
 
@@ -272,12 +296,13 @@ export class RemoteDataBuildService {
           return isStale(r2.state) ? r1 : r2;
         }
       }),
-      distinctUntilKeyChanged('lastUpdated')
     );
 
     const payload$ = this.buildPayload<T>(requestEntry$, href$, ...linksToFollow);
 
-    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$).pipe(
+      distinctUntilKeyChanged('lastUpdated'),
+    );
   }
 
   /**
@@ -293,12 +318,12 @@ export class RemoteDataBuildService {
   toRemoteDataObservable<T>(requestEntry$: Observable<RequestEntry>, payload$: Observable<T>) {
     return observableCombineLatest([
       requestEntry$,
-      payload$
+      payload$,
     ]).pipe(
       filter(([entry,payload]: [RequestEntry, T]) =>
         hasValue(entry) &&
         // filter out cases where the state is successful, but the payload isn't yet set
-        !(hasSucceeded(entry.state) && isUndefined(payload))
+        !(hasSucceeded(entry.state) && isUndefined(payload)),
       ),
       map(([entry, payload]: [RequestEntry, T]) => {
         let response = entry.response;
@@ -313,9 +338,9 @@ export class RemoteDataBuildService {
           entry.state,
           response.errorMessage,
           payload,
-          response.statusCode
+          response.statusCode,
         );
-      })
+      }),
     );
   }
 
@@ -406,7 +431,7 @@ export class RemoteDataBuildService {
           state,
           errorMessage,
           payload,
-          statusCode
+          statusCode,
         );
       }));
   }
diff --git a/src/app/core/cache/cacheable-object.model.ts b/src/app/core/cache/cacheable-object.model.ts
index b7d1609d58..86d041dab7 100644
--- a/src/app/core/cache/cacheable-object.model.ts
+++ b/src/app/core/cache/cacheable-object.model.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:max-classes-per-file */
-import { HALResource } from '../shared/hal-resource.model';
 import { HALLink } from '../shared/hal-link.model';
+import { HALResource } from '../shared/hal-resource.model';
 import { TypedObject } from './typed-object.model';
 
 /**
diff --git a/src/app/core/cache/models/self-link.model.ts b/src/app/core/cache/models/self-link.model.ts
index a87acdd506..903a779495 100644
--- a/src/app/core/cache/models/self-link.model.ts
+++ b/src/app/core/cache/models/self-link.model.ts
@@ -3,9 +3,9 @@ import { autoserialize } from 'cerialize';
 export class SelfLink {
 
   @autoserialize
-  self: string;
+    self: string;
 
   @autoserialize
-  uuid: string;
+    uuid: string;
 
 }
diff --git a/src/app/core/cache/object-cache.actions.ts b/src/app/core/cache/object-cache.actions.ts
index c18a20ffd6..5f8f60e1f1 100644
--- a/src/app/core/cache/object-cache.actions.ts
+++ b/src/app/core/cache/object-cache.actions.ts
@@ -1,8 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
 
 import { type } from '../../shared/ngrx/type';
-import { Operation } from 'fast-json-patch';
 import { CacheableObject } from './cacheable-object.model';
 
 /**
@@ -15,7 +15,7 @@ export const ObjectCacheActionTypes = {
   ADD_PATCH: type('dspace/core/cache/object/ADD_PATCH'),
   APPLY_PATCH: type('dspace/core/cache/object/APPLY_PATCH'),
   ADD_DEPENDENTS: type('dspace/core/cache/object/ADD_DEPENDENTS'),
-  REMOVE_DEPENDENTS: type('dspace/core/cache/object/REMOVE_DEPENDENTS')
+  REMOVE_DEPENDENTS: type('dspace/core/cache/object/REMOVE_DEPENDENTS'),
 };
 
 /**
diff --git a/src/app/core/cache/object-cache.effects.spec.ts b/src/app/core/cache/object-cache.effects.spec.ts
index 3a50a5dbc7..66270be4c2 100644
--- a/src/app/core/cache/object-cache.effects.spec.ts
+++ b/src/app/core/cache/object-cache.effects.spec.ts
@@ -1,10 +1,14 @@
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { ObjectCacheEffects } from './object-cache.effects';
-import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
 import { StoreActionTypes } from '../../store.actions';
+import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
+import { ObjectCacheEffects } from './object-cache.effects';
 
 describe('ObjectCacheEffects', () => {
   let cacheEffects: ObjectCacheEffects;
diff --git a/src/app/core/cache/object-cache.effects.ts b/src/app/core/cache/object-cache.effects.ts
index fa2bf6f690..0de59a152c 100644
--- a/src/app/core/cache/object-cache.effects.ts
+++ b/src/app/core/cache/object-cache.effects.ts
@@ -1,6 +1,10 @@
-import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { map } from 'rxjs/operators';
 
 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
@@ -16,9 +20,9 @@ export class ObjectCacheEffects {
    * This assumes that the server cached everything a negligible
    * time ago, and will likely need to be revisited later
    */
-   fixTimestampsOnRehydrate = createEffect(() => this.actions$
+  fixTimestampsOnRehydrate = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
+      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime())),
     ));
 
   constructor(private actions$: Actions) {
diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index 919edc8e57..7dda02a0f5 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 import { Operation } from 'fast-json-patch';
+
 import { Item } from '../shared/item.model';
 import {
   AddDependentsObjectCacheAction,
@@ -11,7 +12,6 @@ import {
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction,
 } from './object-cache.actions';
-
 import { objectCacheReducer } from './object-cache.reducer';
 
 class NullAction extends RemoveFromObjectCacheAction {
@@ -54,7 +54,7 @@ describe('objectCacheReducer', () => {
         type: Item.type,
         self: selfLink2,
         foo: 'baz',
-        _links: { self: { href: selfLink2 } }
+        _links: { self: { href: selfLink2 } },
       },
       alternativeLinks: [altLink3, altLink4],
       timeCompleted: new Date().getTime(),
@@ -62,8 +62,8 @@ describe('objectCacheReducer', () => {
       requestUUIDs: [requestUUID2],
       dependentRequestUUIDs: [requestUUID1],
       patches: [],
-      isDirty: false
-    }
+      isDirty: false,
+    },
   };
   deepFreeze(testState);
 
@@ -126,6 +126,10 @@ describe('objectCacheReducer', () => {
     deepFreeze(state);
 
     objectCacheReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should remove the specified object from the cache in response to the REMOVE action', () => {
@@ -149,6 +153,10 @@ describe('objectCacheReducer', () => {
     const action = new RemoveFromObjectCacheAction(selfLink1);
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set the timestamp of all objects in the cache in response to a RESET_TIMESTAMPS action', () => {
@@ -164,16 +172,24 @@ describe('objectCacheReducer', () => {
     const action = new ResetObjectCacheTimestampsAction(new Date().getTime());
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the ADD_PATCH action without affecting the previous state', () => {
     const action = new AddPatchObjectCacheAction(selfLink1, [{
       op: 'replace',
       path: '/name',
-      value: 'random string'
+      value: 'random string',
     }]);
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should when the ADD_PATCH action dispatched', () => {
diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index dc3f50db68..631ecd2209 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -1,18 +1,26 @@
 /* eslint-disable max-classes-per-file */
+import {
+  applyPatch,
+  Operation,
+} from 'fast-json-patch';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { CacheEntry } from './cache-entry';
+import { CacheableObject } from './cacheable-object.model';
 import {
   AddDependentsObjectCacheAction,
   AddPatchObjectCacheAction,
   AddToObjectCacheAction,
   ApplyPatchObjectCacheAction,
   ObjectCacheAction,
-  ObjectCacheActionTypes, RemoveDependentsObjectCacheAction,
+  ObjectCacheActionTypes,
+  RemoveDependentsObjectCacheAction,
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction,
 } from './object-cache.actions';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { CacheEntry } from './cache-entry';
-import { applyPatch, Operation } from 'fast-json-patch';
-import { CacheableObject } from './cacheable-object.model';
 
 /**
  * An interface to represent a JsonPatch
@@ -177,8 +185,8 @@ function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheActio
       dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
       isDirty: isNotEmpty(existing.patches),
       patches: existing.patches || [],
-      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
-    } as ObjectCacheEntry
+      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks],
+    } as ObjectCacheEntry,
   });
 }
 
@@ -217,7 +225,7 @@ function resetObjectCacheTimestamps(state: ObjectCacheState, action: ResetObject
   const newState = Object.create(null);
   Object.keys(state).forEach((key) => {
     newState[key] = Object.assign({}, state[key], {
-      timeCompleted: action.payload
+      timeCompleted: action.payload,
     });
   });
   return newState;
@@ -241,7 +249,7 @@ function addPatchObjectCache(state: ObjectCacheState, action: AddPatchObjectCach
     const patches = newState[uuid].patches;
     newState[uuid] = Object.assign({}, newState[uuid], {
       patches: [...patches, { operations } as Patch],
-      isDirty: true
+      isDirty: true,
     });
   }
   return newState;
@@ -286,8 +294,8 @@ function addDependentsObjectCacheState(state: ObjectCacheState, action: AddDepen
         ...new Set([
           ...newState[href]?.dependentRequestUUIDs || [],
           ...action.payload.dependentRequestUUIDs,
-        ])
-      ]
+        ]),
+      ],
     });
   }
 
@@ -308,7 +316,7 @@ function removeDependentsObjectCacheState(state: ObjectCacheState, action: Remov
 
   if (hasValue(newState[href])) {
     newState[href] = Object.assign({}, newState[href], {
-      dependentRequestUUIDs: []
+      dependentRequestUUIDs: [],
     });
   }
 
diff --git a/src/app/core/cache/object-cache.service.spec.ts b/src/app/core/cache/object-cache.service.spec.ts
index 6af797be29..3d27f7252c 100644
--- a/src/app/core/cache/object-cache.service.spec.ts
+++ b/src/app/core/cache/object-cache.service.spec.ts
@@ -1,33 +1,44 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { cold } from 'jasmine-marbles';
-import { Store, StoreModule } from '@ngrx/store';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
 import { Operation } from 'fast-json-patch';
-import { empty, of as observableOf } from 'rxjs';
+import { cold } from 'jasmine-marbles';
+import { TestColdObservable } from 'jasmine-marbles/src/test-observables';
+import {
+  empty,
+  of as observableOf,
+} from 'rxjs';
 import { first } from 'rxjs/operators';
+import { TestScheduler } from 'rxjs/testing';
 
-import { coreReducers} from '../core.reducers';
+import { storeModuleConfig } from '../../app.reducer';
+import { coreReducers } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { IndexName } from '../index/index-name.model';
+import { HALLink } from '../shared/hal-link.model';
 import { Item } from '../shared/item.model';
 import {
   AddDependentsObjectCacheAction,
-  RemoveDependentsObjectCacheAction,
   AddPatchObjectCacheAction,
   AddToObjectCacheAction,
   ApplyPatchObjectCacheAction,
+  RemoveDependentsObjectCacheAction,
   RemoveFromObjectCacheAction,
 } from './object-cache.actions';
 import { Patch } from './object-cache.reducer';
 import { ObjectCacheService } from './object-cache.service';
 import { AddToSSBAction } from './server-sync-buffer.actions';
-import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
-import { HALLink } from '../shared/hal-link.model';
-import { storeModuleConfig } from '../../app.reducer';
-import { TestColdObservable } from 'jasmine-marbles/src/test-observables';
-import { IndexName } from '../index/index-name.model';
-import { CoreState } from '../core-state.model';
-import { TestScheduler } from 'rxjs/testing';
 
 describe('ObjectCacheService', () => {
   let service: ObjectCacheService;
@@ -69,8 +80,8 @@ describe('ObjectCacheService', () => {
       type: Item.type,
       _links: {
         self: { href: selfLink },
-        anotherLink: { href: anotherLink }
-      }
+        anotherLink: { href: anotherLink },
+      },
     };
     cacheEntry = {
       data: objectToCache,
@@ -96,8 +107,8 @@ describe('ObjectCacheService', () => {
         'cache/syncbuffer': {},
         'cache/object-updates': {},
         'data/request': {},
-        'index': {}
-      }
+        'index': {},
+      },
     };
   }
 
@@ -105,12 +116,12 @@ describe('ObjectCacheService', () => {
 
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(coreReducers, storeModuleConfig)
+        StoreModule.forRoot(coreReducers, storeModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: ObjectCacheService, useValue: service }
-      ]
+        { provide: ObjectCacheService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
@@ -120,7 +131,7 @@ describe('ObjectCacheService', () => {
     mockStore = store as MockStore<CoreState>;
     mockStore.setState(initialState);
     linkServiceStub = {
-      removeResolvedLinks: (a) => a
+      removeResolvedLinks: (a) => a,
     };
     spyOn(linkServiceStub, 'removeResolvedLinks').and.callThrough();
     spyOn(store, 'dispatch');
@@ -209,7 +220,7 @@ describe('ObjectCacheService', () => {
   describe('getList', () => {
     it('should return an observable of the array of cached objects with the specified self link and type', () => {
       const item = Object.assign(new Item(), {
-        _links: { self: { href: selfLink } }
+        _links: { self: { href: selfLink } },
       });
       spyOn(service, 'getObjectByHref').and.returnValue(observableOf(item));
 
@@ -251,7 +262,7 @@ describe('ObjectCacheService', () => {
               'something',
               'something-else',
               'specific-request',
-            ]
+            ],
           })));
         });
 
@@ -266,7 +277,7 @@ describe('ObjectCacheService', () => {
             requestUUIDs: [
               'something',
               'something-else',
-            ]
+            ],
           })));
         });
 
@@ -292,9 +303,9 @@ describe('ObjectCacheService', () => {
       const state = Object.assign({}, initialState, {
         core: Object.assign({}, initialState.core, {
           'cache/object': {
-            [selfLink]: cacheEntry
-          }
-        })
+            [selfLink]: cacheEntry,
+          },
+        }),
       });
       mockStore.setState(state);
       const expected: TestColdObservable = cold('a', { a: cacheEntry });
@@ -310,14 +321,14 @@ describe('ObjectCacheService', () => {
       const state = Object.assign({}, initialState, {
         core: Object.assign({}, initialState.core, {
           'cache/object': {
-            [selfLink]: cacheEntry
+            [selfLink]: cacheEntry,
           },
           'index': {
             'object/alt-link-to-self-link': {
-              [anotherLink]: selfLink
-            }
-          }
-        })
+              [anotherLink]: selfLink,
+            },
+          },
+        }),
       });
       mockStore.setState(state);
       (service as any).getByAlternativeLink(anotherLink).subscribe();
@@ -335,8 +346,8 @@ describe('ObjectCacheService', () => {
     it('isDirty should return true when the patches list in the cache entry is not empty', () => {
       cacheEntry.patches = [
         {
-          operations: operations
-        } as Patch
+          operations: operations,
+        } as Patch,
       ];
       const result = (service as any).isDirty(cacheEntry);
       expect(result).toBe(true);
@@ -371,9 +382,9 @@ describe('ObjectCacheService', () => {
               [anotherLink]: selfLink,
               ['objectWithoutDependentsAlt']: 'objectWithoutDependents',
               ['objectWithDependentsAlt']: 'objectWithDependents',
-            }
-          }
-        })
+            },
+          },
+        }),
       });
       mockStore.setState(state);
     });
@@ -421,11 +432,11 @@ describe('ObjectCacheService', () => {
         testScheduler.run(({ cold: tsCold, flush }) => {
           const href$ = tsCold('--y-n-n', {
             y: selfLink,
-            n: 'NOPE'
+            n: 'NOPE',
           });
           const dependsOnHref$ = tsCold('-y-n-n', {
             y: 'objectWithoutDependents',
-            n: 'NOPE'
+            n: 'NOPE',
           });
 
           service.addDependency(href$, dependsOnHref$);
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index 9ca0216210..09ea6450bb 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -1,32 +1,68 @@
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { applyPatch, Operation } from 'fast-json-patch';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  applyPatch,
+  Operation,
+} from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { selfLinkFromAlternativeLinkSelector, selfLinkFromUuidSelector } from '../index/index.selectors';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import {
+  selfLinkFromAlternativeLinkSelector,
+  selfLinkFromUuidSelector,
+} from '../index/index.selectors';
+import { IndexName } from '../index/index-name.model';
 import { GenericConstructor } from '../shared/generic-constructor';
+import { HALLink } from '../shared/hal-link.model';
 import { getClassForType } from './builders/build-decorators';
 import { LinkService } from './builders/link.service';
-import { AddDependentsObjectCacheAction, AddPatchObjectCacheAction, AddToObjectCacheAction, ApplyPatchObjectCacheAction, RemoveDependentsObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';
-
-import { ObjectCacheEntry, ObjectCacheState } from './object-cache.reducer';
-import { AddToSSBAction } from './server-sync-buffer.actions';
-import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
-import { HALLink } from '../shared/hal-link.model';
 import { CacheableObject } from './cacheable-object.model';
-import { IndexName } from '../index/index-name.model';
+import {
+  AddDependentsObjectCacheAction,
+  AddPatchObjectCacheAction,
+  AddToObjectCacheAction,
+  ApplyPatchObjectCacheAction,
+  RemoveDependentsObjectCacheAction,
+  RemoveFromObjectCacheAction,
+} from './object-cache.actions';
+import {
+  ObjectCacheEntry,
+  ObjectCacheState,
+} from './object-cache.reducer';
+import { AddToSSBAction } from './server-sync-buffer.actions';
 
 /**
  * The base selector function to select the object cache in the store
  */
 const objectCacheSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['cache/object']
+  (state: CoreState) => state['cache/object'],
 );
 
 /**
@@ -46,7 +82,7 @@ const entryFromSelfLinkSelector =
 export class ObjectCacheService {
   constructor(
     private store: Store<CoreState>,
-    private linkService: LinkService
+    private linkService: LinkService,
   ) {
   }
 
@@ -82,12 +118,12 @@ export class ObjectCacheService {
     const cacheEntry$ = this.getByHref(href);
     const altLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => entry.alternativeLinks), take(1));
     const childLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => {
-        return Object
-          .entries(entry.data._links)
-          .filter(([key, value]: [string, HALLink]) => key !== 'self')
-          .map(([key, value]: [string, HALLink]) => value.href);
-      }),
-      take(1)
+      return Object
+        .entries(entry.data._links)
+        .filter(([key, value]: [string, HALLink]) => key !== 'self')
+        .map(([key, value]: [string, HALLink]) => value.href);
+    }),
+    take(1),
     );
     this.removeLinksFromAlternativeLinkIndex(altLinks$);
     this.removeLinksFromAlternativeLinkIndex(childLinks$);
@@ -96,8 +132,8 @@ export class ObjectCacheService {
 
   private removeLinksFromAlternativeLinkIndex(links$: Observable<string[]>) {
     links$.subscribe((links: string[]) => links.forEach((link: string) => {
-        this.store.dispatch(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link));
-      }
+      this.store.dispatch(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link));
+    },
     ));
   }
 
@@ -113,8 +149,8 @@ export class ObjectCacheService {
     Observable<T> {
     return this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      mergeMap((selfLink: string) => this.getObjectByHref<T>(selfLink)
-      )
+      mergeMap((selfLink: string) => this.getObjectByHref<T>(selfLink),
+      ),
     );
   }
 
@@ -129,14 +165,14 @@ export class ObjectCacheService {
   getObjectByHref<T extends CacheableObject>(href: string): Observable<T> {
     return this.getByHref(href).pipe(
       map((entry: ObjectCacheEntry) => {
-          if (isNotEmpty(entry.patches)) {
-            const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations));
-            const patchedData = applyPatch(entry.data, flatPatch, undefined, false).newDocument;
-            return Object.assign({}, entry, { data: patchedData });
-          } else {
-            return entry;
-          }
+        if (isNotEmpty(entry.patches)) {
+          const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations));
+          const patchedData = applyPatch(entry.data, flatPatch, undefined, false).newDocument;
+          return Object.assign({}, entry, { data: patchedData });
+        } else {
+          return entry;
         }
+      },
       ),
       map((entry: ObjectCacheEntry) => {
         const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
@@ -144,7 +180,7 @@ export class ObjectCacheService {
           throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
         }
         return Object.assign(new type(), entry.data) as T;
-      })
+      }),
     );
   }
 
@@ -162,13 +198,13 @@ export class ObjectCacheService {
       this.getBySelfLink(href),
     ]).pipe(
       map((results: ObjectCacheEntry[]) => results.find((entry: ObjectCacheEntry) => hasValue(entry))),
-      filter((entry: ObjectCacheEntry) => hasValue(entry))
+      filter((entry: ObjectCacheEntry) => hasValue(entry)),
     );
   }
 
   private getBySelfLink(selfLink: string): Observable<ObjectCacheEntry> {
     return this.store.pipe(
-      select(entryFromSelfLinkSelector(selfLink))
+      select(entryFromSelfLinkSelector(selfLink)),
     );
   }
 
@@ -204,7 +240,7 @@ export class ObjectCacheService {
   getRequestUUIDByObjectUUID(uuid: string): Observable<string> {
     return this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      mergeMap((selfLink: string) => this.getRequestUUIDBySelfLink(selfLink))
+      mergeMap((selfLink: string) => this.getRequestUUIDBySelfLink(selfLink)),
     );
   }
 
@@ -232,7 +268,7 @@ export class ObjectCacheService {
       return observableOf([]);
     } else {
       return observableCombineLatest(
-        selfLinks.map((selfLink: string) => this.getObjectByHref<T>(selfLink))
+        selfLinks.map((selfLink: string) => this.getObjectByHref<T>(selfLink)),
       );
     }
   }
@@ -252,7 +288,7 @@ export class ObjectCacheService {
     /* NB: that this is only a solution because the select method is synchronous, see: https://github.com/ngrx/store/issues/296#issuecomment-269032571*/
     this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      take(1)
+      take(1),
     ).subscribe((selfLink: string) => result = this.hasByHref(selfLink));
 
     return result;
@@ -290,9 +326,9 @@ export class ObjectCacheService {
   hasByHref$(href: string): Observable<boolean> {
     return observableCombineLatest(
       this.getBySelfLink(href),
-      this.getByAlternativeLink(href)
+      this.getByAlternativeLink(href),
     ).pipe(
-      map((entries: ObjectCacheEntry[]) => entries.some((entry) => hasValue(entry)))
+      map((entries: ObjectCacheEntry[]) => entries.some((entry) => hasValue(entry))),
     );
   }
 
@@ -358,7 +394,7 @@ export class ObjectCacheService {
     observableCombineLatest([
       href$,
       dependsOnHref$.pipe(
-        switchMap(dependsOnHref => this.resolveSelfLink(dependsOnHref))
+        switchMap(dependsOnHref => this.resolveSelfLink(dependsOnHref)),
       ),
     ]).pipe(
       switchMap(([href, dependsOnSelfLink]: [string, string]) => {
@@ -373,7 +409,7 @@ export class ObjectCacheService {
           this.getByHref(href).pipe(
             // only add the latest request to keep dependency index from growing indefinitely
             map((entry: ObjectCacheEntry) => entry?.requestUUIDs?.[0]),
-          )
+          ),
         ]);
       }),
       take(1),
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 197bf130fb..9a09a49bc8 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,10 +1,10 @@
 /* eslint-disable max-classes-per-file */
-import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
+import { RequestError } from '../data/request-error.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALLink } from '../shared/hal-link.model';
+import { PageInfo } from '../shared/page-info.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';
-import { RequestError } from '../data/request-error.model';
 
 export class RestResponse {
   public toCache = true;
@@ -13,7 +13,7 @@ export class RestResponse {
   constructor(
     public isSuccessful: boolean,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
   }
 }
@@ -29,7 +29,7 @@ export class DSOSuccessResponse extends RestResponse {
     public resourceSelfLinks: string[],
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -43,7 +43,7 @@ export class EndpointMapSuccessResponse extends RestResponse {
   constructor(
     public endpointMap: EndpointMap,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
     super(true, statusCode, statusText);
   }
@@ -64,7 +64,7 @@ export class ConfigSuccessResponse extends RestResponse {
     public configDefinition: ConfigObject,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -78,7 +78,7 @@ export class TokenResponse extends RestResponse {
     public token: string,
     public isSuccessful: boolean,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
     super(isSuccessful, statusCode, statusText);
   }
@@ -89,7 +89,7 @@ export class PostPatchSuccessResponse extends RestResponse {
     public dataDefinition: any,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -100,7 +100,7 @@ export class EpersonSuccessResponse extends RestResponse {
     public epersonDefinition: DSpaceObject[],
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -112,7 +112,7 @@ export class MessageResponse extends RestResponse {
   constructor(
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -124,7 +124,7 @@ export class TaskResponse extends RestResponse {
   constructor(
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -135,7 +135,7 @@ export class FilteredDiscoveryQueryResponse extends RestResponse {
     public filterQuery: string,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
diff --git a/src/app/core/cache/server-sync-buffer.effects.spec.ts b/src/app/core/cache/server-sync-buffer.effects.spec.ts
index 833c6b580f..889b3b7454 100644
--- a/src/app/core/cache/server-sync-buffer.effects.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.spec.ts
@@ -1,12 +1,22 @@
 import { TestBed } from '@angular/core/testing';
-
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { cold, hot } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { storeModuleConfig } from '../../app.reducer';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { RequestService } from '../data/request.service';
 import { RestRequestMethod } from '../data/rest-request-method';
@@ -16,11 +26,9 @@ import { ObjectCacheService } from './object-cache.service';
 import {
   CommitSSBAction,
   EmptySSBAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
 import { ServerSyncBufferEffects } from './server-sync-buffer.effects';
-import { storeModuleConfig } from '../../app.reducer';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
 
 describe('ServerSyncBufferEffects', () => {
   let ssbEffects: ServerSyncBufferEffects;
@@ -32,9 +40,9 @@ describe('ServerSyncBufferEffects', () => {
         autoSync:
           {
             timePerMethod: {},
-            defaultTime: 0
-          }
-      }
+            defaultTime: 0,
+          },
+      },
   };
   const selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
   let store;
@@ -52,21 +60,21 @@ describe('ServerSyncBufferEffects', () => {
           provide: ObjectCacheService, useValue: {
             getObjectBySelfLink: (link) => {
               const object = Object.assign(new DSpaceObject(), {
-                _links: { self: { href: link } }
+                _links: { self: { href: link } },
               });
               return observableOf(object);
             },
             getByHref: (link) => {
               const object = Object.assign(new DSpaceObject(), {
                 _links: {
-                  self: { href: link }
-                }
+                  self: { href: link },
+                },
               });
               return observableOf(object);
-            }
-          }
+            },
+          },
         },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
         // other providers
       ],
     });
@@ -88,12 +96,12 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.ADD,
-            payload: { href: selfLink, method: RestRequestMethod.PUT }
-          }
+            payload: { href: selfLink, method: RestRequestMethod.PUT },
+          },
         });
 
         expectObservable(ssbEffects.setTimeoutForServerSync).toBe('b', {
-          b: new CommitSSBAction(RestRequestMethod.PUT)
+          b: new CommitSSBAction(RestRequestMethod.PUT),
         });
       });
     });
@@ -108,8 +116,8 @@ describe('ServerSyncBufferEffects', () => {
             (state as any).core['cache/syncbuffer'] = {
               buffer: [{
                 href: selfLink,
-                method: RestRequestMethod.PATCH
-              }]
+                method: RestRequestMethod.PATCH,
+              }],
             };
           });
       });
@@ -117,13 +125,13 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.COMMIT,
-            payload: RestRequestMethod.PATCH
-          }
+            payload: RestRequestMethod.PATCH,
+          },
         });
 
         const expected = cold('(bc)', {
           b: new ApplyPatchObjectCacheAction(selfLink),
-          c: new EmptySSBAction(RestRequestMethod.PATCH)
+          c: new EmptySSBAction(RestRequestMethod.PATCH),
         });
 
         expect(ssbEffects.commitServerSyncBuffer).toBeObservable(expected);
@@ -136,7 +144,7 @@ describe('ServerSyncBufferEffects', () => {
           .subscribe((state) => {
             (state as any).core = Object({});
             (state as any).core['cache/syncbuffer'] = {
-              buffer: []
+              buffer: [],
             };
           });
       });
@@ -145,8 +153,8 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.COMMIT,
-            payload: { method: RestRequestMethod.PATCH }
-          }
+            payload: { method: RestRequestMethod.PATCH },
+          },
         });
         const expected = cold('b', { b: new NoOpAction() });
 
diff --git a/src/app/core/cache/server-sync-buffer.effects.ts b/src/app/core/cache/server-sync-buffer.effects.ts
index 9571d4af5b..6f346d5bb3 100644
--- a/src/app/core/cache/server-sync-buffer.effects.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.ts
@@ -1,27 +1,55 @@
-import { delay, exhaustMap, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  delay,
+  exhaustMap,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import { PatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { ApplyPatchObjectCacheAction } from './object-cache.actions';
+import { ObjectCacheEntry } from './object-cache.reducer';
+import { ObjectCacheService } from './object-cache.service';
 import {
   AddToSSBAction,
   CommitSSBAction,
   EmptySSBAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
-import { Action, createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { ServerSyncBufferEntry, ServerSyncBufferState } from './server-sync-buffer.reducer';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { RequestService } from '../data/request.service';
-import { PatchRequest } from '../data/request.models';
-import { ObjectCacheService } from './object-cache.service';
-import { ApplyPatchObjectCacheAction } from './object-cache.actions';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { environment } from '../../../environments/environment';
-import { ObjectCacheEntry } from './object-cache.reducer';
-import { Operation } from 'fast-json-patch';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
-import { CoreState } from '../core-state.model';
+import {
+  ServerSyncBufferEntry,
+  ServerSyncBufferState,
+} from './server-sync-buffer.reducer';
 
 @Injectable()
 export class ServerSyncBufferEffects {
@@ -32,7 +60,7 @@ export class ServerSyncBufferEffects {
    * Then dispatch a CommitSSBAction
    * When the delay is running, no new AddToSSBActions are processed in this effect
    */
-   setTimeoutForServerSync = createEffect(() => this.actions$
+  setTimeoutForServerSync = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.ADD),
       exhaustMap((action: AddToSSBAction) => {
@@ -41,7 +69,7 @@ export class ServerSyncBufferEffects {
         return observableOf(new CommitSSBAction(action.payload.method)).pipe(
           delay(timeoutInSeconds * 1000),
         );
-      })
+      }),
     ));
 
   /**
@@ -50,7 +78,7 @@ export class ServerSyncBufferEffects {
    * When the list of actions is not empty, also dispatch an EmptySSBAction
    * When the list is empty dispatch a NO_ACTION placeholder action
    */
-   commitServerSyncBuffer = createEffect(() => this.actions$
+  commitServerSyncBuffer = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.COMMIT),
       switchMap((action: CommitSSBAction) => {
@@ -78,14 +106,14 @@ export class ServerSyncBufferEffects {
             /* Add extra action to array, to make sure the ServerSyncBuffer is emptied afterwards */
             if (isNotEmpty(actions) && isNotUndefined(actions[0])) {
               return observableCombineLatest(...actions).pipe(
-              switchMap((array) => [...array, new EmptySSBAction(action.payload)])
-            );
+                switchMap((array) => [...array, new EmptySSBAction(action.payload)]),
+              );
             } else {
               return observableOf(new NoOpAction());
             }
-          })
+          }),
         );
-      })
+      }),
     ));
 
   /**
@@ -96,7 +124,7 @@ export class ServerSyncBufferEffects {
    */
   private applyPatch(href: string): Observable<Action> {
     const patchObject = this.objectCache.getByHref(href).pipe(
-      take(1)
+      take(1),
     );
 
     return patchObject.pipe(
@@ -108,7 +136,7 @@ export class ServerSyncBufferEffects {
           }
         }
         return new ApplyPatchObjectCacheAction(href);
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/cache/server-sync-buffer.reducer.spec.ts b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
index 51ba010c1e..d986581ce2 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
@@ -1,9 +1,13 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
-import { RemoveFromObjectCacheAction } from './object-cache.actions';
-import { serverSyncBufferReducer } from './server-sync-buffer.reducer';
+
 import { RestRequestMethod } from '../data/rest-request-method';
-import { AddToSSBAction, EmptySSBAction } from './server-sync-buffer.actions';
+import { RemoveFromObjectCacheAction } from './object-cache.actions';
+import {
+  AddToSSBAction,
+  EmptySSBAction,
+} from './server-sync-buffer.actions';
+import { serverSyncBufferReducer } from './server-sync-buffer.reducer';
 
 class NullAction extends RemoveFromObjectCacheAction {
   type = null;
@@ -27,8 +31,8 @@ describe('serverSyncBufferReducer', () => {
         {
           href: selfLink2,
           method: RestRequestMethod.GET,
-        }
-      ]
+        },
+      ],
   };
   const newSelfLink = 'https://localhost:8080/api/core/items/1ce6b5ae-97e1-4e5a-b4b0-f9029bad10c0';
 
@@ -52,12 +56,20 @@ describe('serverSyncBufferReducer', () => {
     const action = new AddToSSBAction(selfLink1, RestRequestMethod.POST);
     // testState has already been frozen above
     serverSyncBufferReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the EMPTY action without affecting the previous state', () => {
     const action = new EmptySSBAction();
     // testState has already been frozen above
     serverSyncBufferReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should empty the buffer if the EmptySSBAction is dispatched without a payload', () => {
@@ -79,7 +91,7 @@ describe('serverSyncBufferReducer', () => {
     // testState has already been frozen above
     const newState = serverSyncBufferReducer(testState, action);
     expect(newState.buffer).toContain({
-      href: newSelfLink, method: RestRequestMethod.PUT
+      href: newSelfLink, method: RestRequestMethod.PUT,
     })
     ;
   });
diff --git a/src/app/core/cache/server-sync-buffer.reducer.ts b/src/app/core/cache/server-sync-buffer.reducer.ts
index 3e8944aa73..f1ae894315 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.ts
@@ -1,11 +1,14 @@
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
+import { RestRequestMethod } from '../data/rest-request-method';
 import {
   AddToSSBAction,
   EmptySSBAction,
   ServerSyncBufferAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
-import { RestRequestMethod } from '../data/rest-request-method';
 
 /**
  * An entry in the ServerSyncBufferState
@@ -86,9 +89,9 @@ function addToServerSyncQueue(state: ServerSyncBufferState, action: AddToSSBActi
  *    the new state, with a new entry added to the buffer
  */
 function emptyServerSyncQueue(state: ServerSyncBufferState, action: EmptySSBAction): ServerSyncBufferState {
-    let newBuffer = [];
-    if (hasValue(action.payload)) {
-      newBuffer = state.buffer.filter((entry) => entry.method !== action.payload);
-    }
-    return Object.assign({}, state, { buffer: newBuffer });
+  let newBuffer = [];
+  if (hasValue(action.payload)) {
+    newBuffer = state.buffer.filter((entry) => entry.method !== action.payload);
+  }
+  return Object.assign({}, state, { buffer: newBuffer });
 }
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.html b/src/app/core/coar-notify/notify-info/notify-info.component.html
new file mode 100644
index 0000000000..3370f83d03
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.html
@@ -0,0 +1,18 @@
+<div class="container">
+    <head>
+        <title>{{ 'coar-notify-support.title' | translate }}</title>
+    </head>
+    <body>
+    <h1>{{ 'coar-notify-support.title' | translate }}</h1>
+    <p [innerHTML]="('coar-notify-support-title.content' | translate)"></p>
+
+    <h2>{{ 'coar-notify-support.ldn-inbox.title' | translate }}</h2>
+    <p [innerHTML]="('coar-notify-support.ldn-inbox.content' | translate).replace('{ldnInboxUrl}', generateCoarRestApiLinksHTML() | async)"></p>
+
+    <h2>{{ 'coar-notify-support.message-moderation.title' | translate }}</h2>
+    <p>
+      {{ 'coar-notify-support.message-moderation.content' | translate }}
+      <a routerLink="/info/feedback" >{{ 'coar-notify-support.message-moderation.feedback-form' | translate }}</a>
+    </p>
+    </body>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.scss b/src/app/core/coar-notify/notify-info/notify-info.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.scss
rename to src/app/core/coar-notify/notify-info/notify-info.component.scss
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts
new file mode 100644
index 0000000000..e91b065dfc
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts
@@ -0,0 +1,40 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { NotifyInfoComponent } from './notify-info.component';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoComponent', () => {
+  let component: NotifyInfoComponent;
+  let fixture: ComponentFixture<NotifyInfoComponent>;
+  let notifyInfoServiceSpy: any;
+
+  beforeEach(async () => {
+    notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', ['getCoarLdnLocalInboxUrls']);
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ NotifyInfoComponent ],
+      providers: [
+        { provide: NotifyInfoService, useValue: notifyInfoServiceSpy },
+      ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotifyInfoComponent);
+    component = fixture.componentInstance;
+    component.coarRestApiUrl = of([]);
+    spyOn(component, 'generateCoarRestApiLinksHTML').and.returnValue(of(''));
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.ts b/src/app/core/coar-notify/notify-info/notify-info.component.ts
new file mode 100644
index 0000000000..bfa268440b
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.ts
@@ -0,0 +1,47 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  map,
+  Observable,
+  of,
+} from 'rxjs';
+
+import { NotifyInfoService } from './notify-info.service';
+
+@Component({
+  selector: 'ds-notify-info',
+  templateUrl: './notify-info.component.html',
+  styleUrls: ['./notify-info.component.scss'],
+})
+/**
+ * Component for displaying COAR notification information.
+ */
+export class NotifyInfoComponent implements OnInit {
+  /**
+   * Observable containing the COAR REST INBOX API URLs.
+   */
+  coarRestApiUrl: Observable<string[]> = of([]);
+
+  constructor(private notifyInfoService: NotifyInfoService) {}
+
+  ngOnInit() {
+    this.coarRestApiUrl = this.notifyInfoService.getCoarLdnLocalInboxUrls();
+  }
+
+  /**
+   * Generates HTML code for COAR REST API links.
+   * @returns An Observable that emits the generated HTML code.
+   */
+  generateCoarRestApiLinksHTML() {
+    return this.coarRestApiUrl.pipe(
+      // transform the data into HTML
+      map((urls) => {
+        return urls.map(url => `
+          <code><a href="${url}" target="_blank"><span class="api-url">${url}</span></a></code>
+        `).join(',');
+      }),
+    );
+  }
+}
diff --git a/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts
new file mode 100644
index 0000000000..7c8cc3f320
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts
@@ -0,0 +1,49 @@
+import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+
+import { NotifyInfoGuard } from './notify-info.guard';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoGuard', () => {
+  let guard: NotifyInfoGuard;
+  let notifyInfoServiceSpy: any;
+  let router: any;
+
+  beforeEach(() => {
+    notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', ['isCoarConfigEnabled']);
+    router = jasmine.createSpyObj('Router', ['parseUrl']);
+    TestBed.configureTestingModule({
+      providers: [
+        NotifyInfoGuard,
+        { provide: NotifyInfoService, useValue: notifyInfoServiceSpy },
+        { provide: Router, useValue: router },
+      ],
+    });
+    guard = TestBed.inject(NotifyInfoGuard);
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+
+  it('should return true if COAR config is enabled', (done) => {
+    notifyInfoServiceSpy.isCoarConfigEnabled.and.returnValue(of(true));
+
+    guard.canActivate(null, null).subscribe((result) => {
+      expect(result).toBe(true);
+      done();
+    });
+  });
+
+  it('should call parseUrl method of Router if COAR config is not enabled', (done) => {
+    notifyInfoServiceSpy.isCoarConfigEnabled.and.returnValue(of(false));
+    router.parseUrl.and.returnValue(of('/404'));
+
+    guard.canActivate(null, null).subscribe(() => {
+      expect(router.parseUrl).toHaveBeenCalledWith('/404');
+      done();
+    });
+  });
+
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.guard.ts b/src/app/core/coar-notify/notify-info/notify-info.guard.ts
new file mode 100644
index 0000000000..91f3bf6cde
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.guard.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { NotifyInfoService } from './notify-info.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NotifyInfoGuard implements CanActivate {
+  constructor(
+        private notifyInfoService: NotifyInfoService,
+        private router: Router,
+  ) {}
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot,
+  ): Observable<boolean | UrlTree> {
+    return this.notifyInfoService.isCoarConfigEnabled().pipe(
+      map(coarLdnEnabled => {
+        if (coarLdnEnabled) {
+          return true;
+        } else {
+          return this.router.parseUrl('/404');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts
new file mode 100644
index 0000000000..d32ad729dd
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts
@@ -0,0 +1,57 @@
+import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ConfigurationDataService } from '../../data/configuration-data.service';
+import { AuthorizationDataService } from '../../data/feature-authorization/authorization-data.service';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoService', () => {
+  let service: NotifyInfoService;
+  let configurationDataService: any;
+  let authorizationDataService: any;
+  beforeEach(() => {
+    authorizationDataService = {
+      isAuthorized: jasmine.createSpy('isAuthorized').and.returnValue(of(true)),
+    };
+    configurationDataService = {
+      findByPropertyName: jasmine.createSpy('findByPropertyName').and.returnValue(of({})),
+    };
+    TestBed.configureTestingModule({
+      providers: [
+        NotifyInfoService,
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+      ],
+    });
+    service = TestBed.inject(NotifyInfoService);
+    authorizationDataService = TestBed.inject(AuthorizationDataService);
+    configurationDataService = TestBed.inject(ConfigurationDataService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should retrieve and map coar configuration', (done: DoneFn) => {
+    (configurationDataService.findByPropertyName as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ values: ['true'] }));
+
+    service.isCoarConfigEnabled().subscribe((result) => {
+      expect(result).toBe(true);
+      done();
+    });
+  });
+
+  it('should retrieve and map LDN local inbox URLs', (done: DoneFn) => {
+    (configurationDataService.findByPropertyName as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ values: ['inbox1', 'inbox2'] }));
+
+    service.getCoarLdnLocalInboxUrls().subscribe((result) => {
+      expect(result).toEqual(['inbox1', 'inbox2']);
+      done();
+    });
+  });
+
+  it('should return the inbox relation link', () => {
+    expect(service.getInboxRelationLink()).toBe('http://www.w3.org/ns/ldp#inbox');
+  });
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.ts b/src/app/core/coar-notify/notify-info/notify-info.service.ts
new file mode 100644
index 0000000000..a70a5d5cc0
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.service.ts
@@ -0,0 +1,59 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { ConfigurationDataService } from '../../data/configuration-data.service';
+import { AuthorizationDataService } from '../../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../data/feature-authorization/feature-id';
+import { ConfigurationProperty } from '../../shared/configuration-property.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../shared/operators';
+
+/**
+ * Service to check COAR availability and LDN services information for the COAR Notify functionalities
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NotifyInfoService {
+
+  /**
+     *  The relation link for the inbox
+     */
+  private _inboxRelationLink = 'http://www.w3.org/ns/ldp#inbox';
+
+  constructor(
+        private configService: ConfigurationDataService,
+        protected authorizationService: AuthorizationDataService,
+  ) {}
+
+  isCoarConfigEnabled(): Observable<boolean> {
+    return this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled);
+  }
+
+  /**
+     * Get the url of the local inbox from the REST configuration
+     * @returns the url of the local inbox
+     */
+  getCoarLdnLocalInboxUrls(): Observable<string[]> {
+    return this.configService.findByPropertyName('ldn.notify.inbox').pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((response: ConfigurationProperty) => {
+        return response.values;
+      }),
+    );
+  }
+
+  /**
+     * Method to get the relation link for the inbox
+     * @returns the relation link for the inbox
+     */
+  getInboxRelationLink(): string {
+    return this._inboxRelationLink;
+  }
+}
diff --git a/src/app/core/config/bulk-access-config-data.service.ts b/src/app/core/config/bulk-access-config-data.service.ts
index 28b4029ea2..edae249a8f 100644
--- a/src/app/core/config/bulk-access-config-data.service.ts
+++ b/src/app/core/config/bulk-access-config-data.service.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { ConfigDataService } from './config-data.service';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
 import { BULK_ACCESS_CONDITION_OPTIONS } from './models/config-type';
 
 /**
diff --git a/src/app/core/config/config-data.service.spec.ts b/src/app/core/config/config-data.service.spec.ts
index 38340d1ad5..a9979f1bb5 100644
--- a/src/app/core/config/config-data.service.spec.ts
+++ b/src/app/core/config/config-data.service.spec.ts
@@ -1,15 +1,16 @@
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { ConfigDataService } from './config-data.service';
-import { RequestService } from '../data/request.service';
-import { GetRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { FindListOptions } from '../data/find-list-options.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { GetRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
 
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
diff --git a/src/app/core/config/config-data.service.ts b/src/app/core/config/config-data.service.ts
index 58b023e62c..51ca655921 100644
--- a/src/app/core/config/config-data.service.ts
+++ b/src/app/core/config/config-data.service.ts
@@ -1,11 +1,11 @@
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ConfigObject } from './models/config.model';
-import { RemoteData } from '../data/remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteData } from '../data/remote-data';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { ConfigObject } from './models/config.model';
 
 /**
  * Abstract data service to retrieve configuration objects from the REST server.
diff --git a/src/app/core/config/models/bulk-access-condition-options.model.ts b/src/app/core/config/models/bulk-access-condition-options.model.ts
index d84e14b95d..c491343852 100644
--- a/src/app/core/config/models/bulk-access-condition-options.model.ts
+++ b/src/app/core/config/models/bulk-access-condition-options.model.ts
@@ -1,8 +1,13 @@
-import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ConfigObject } from './config.model';
 import { AccessesConditionOption } from './config-accesses-conditions-options.model';
 import { BULK_ACCESS_CONDITION_OPTIONS } from './config-type';
@@ -20,19 +25,19 @@ export class BulkAccessConditionOptions extends ConfigObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserializeAs(String, 'name')
-  uuid: string;
+    uuid: string;
 
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  itemAccessConditionOptions: AccessesConditionOption[];
+    itemAccessConditionOptions: AccessesConditionOption[];
 
   @autoserialize
-  bitstreamAccessConditionOptions: AccessesConditionOption[];
+    bitstreamAccessConditionOptions: AccessesConditionOption[];
 
   _links: { self: HALLink };
 }
diff --git a/src/app/core/config/models/config-accesses-conditions-options.model.ts b/src/app/core/config/models/config-accesses-conditions-options.model.ts
index 244b501908..64199be0eb 100644
--- a/src/app/core/config/models/config-accesses-conditions-options.model.ts
+++ b/src/app/core/config/models/config-accesses-conditions-options.model.ts
@@ -3,43 +3,43 @@
  */
 export class AccessesConditionOption {
 
-    /**
+  /**
      * The name for this Access Condition
      */
-    name: string;
+  name: string;
 
-    /**
+  /**
      * The groupName for this Access Condition
      */
-    groupName: string;
+  groupName: string;
 
-    /**
+  /**
      * A boolean representing if this Access Condition has a start date
      */
-    hasStartDate: boolean;
+  hasStartDate: boolean;
 
-    /**
+  /**
      * A boolean representing if this Access Condition has an end date
      */
-    hasEndDate: boolean;
+  hasEndDate: boolean;
 
-    /**
+  /**
      * Maximum value of the start date
      */
-    endDateLimit?: string;
+  endDateLimit?: string;
 
-    /**
+  /**
      * Maximum value of the end date
      */
-    startDateLimit?: string;
+  startDateLimit?: string;
 
-    /**
+  /**
      * Maximum value of the start date
      */
-    maxStartDate?: string;
+  maxStartDate?: string;
 
-    /**
+  /**
      * Maximum value of the end date
      */
-    maxEndDate?: string;
+  maxEndDate?: string;
 }
diff --git a/src/app/core/config/models/config-submission-access.model.ts b/src/app/core/config/models/config-submission-access.model.ts
index 7db96acf2b..4617dc4719 100644
--- a/src/app/core/config/models/config-submission-access.model.ts
+++ b/src/app/core/config/models/config-submission-access.model.ts
@@ -1,9 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { AccessesConditionOption } from './config-accesses-conditions-options.model';
 import { SUBMISSION_ACCESSES_TYPE } from './config-type';
-import { HALLink } from '../../shared/hal-link.model';
 
 /**
  * Class for the configuration describing the item accesses condition
@@ -17,25 +22,25 @@ export class SubmissionAccessModel extends ConfigObject {
    * A list of available item access conditions
    */
   @autoserialize
-  accessConditionOptions: AccessesConditionOption[];
+    accessConditionOptions: AccessesConditionOption[];
 
   /**
    * Boolean that indicates whether the current item must be findable via search or browse.
    */
   @autoserialize
-  discoverable: boolean;
+    discoverable: boolean;
 
   /**
    * Boolean that indicates whether or not the user can change the discoverable flag.
    */
   @autoserialize
-  canChangeDiscoverable: boolean;
+    canChangeDiscoverable: boolean;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
   };
 
diff --git a/src/app/core/config/models/config-submission-accesses.model.ts b/src/app/core/config/models/config-submission-accesses.model.ts
index 3f8004928d..b3c097cc8a 100644
--- a/src/app/core/config/models/config-submission-accesses.model.ts
+++ b/src/app/core/config/models/config-submission-accesses.model.ts
@@ -1,7 +1,8 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { SUBMISSION_ACCESSES_TYPE } from './config-type';
 import { SubmissionAccessModel } from './config-submission-access.model';
+import { SUBMISSION_ACCESSES_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionAccessModel)
diff --git a/src/app/core/config/models/config-submission-definition.model.ts b/src/app/core/config/models/config-submission-definition.model.ts
index b07917e032..2d6b1ad604 100644
--- a/src/app/core/config/models/config-submission-definition.model.ts
+++ b/src/app/core/config/models/config-submission-definition.model.ts
@@ -1,9 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { HALLink } from '../../shared/hal-link.model';
-import { SubmissionSectionModel } from './config-submission-section.model';
 import { ConfigObject } from './config.model';
+import { SubmissionSectionModel } from './config-submission-section.model';
 import { SUBMISSION_DEFINITION_TYPE } from './config-type';
 
 /**
@@ -18,20 +23,20 @@ export class SubmissionDefinitionModel extends ConfigObject {
    * A boolean representing if this submission definition is the default or not
    */
   @autoserialize
-  isDefault: boolean;
+    isDefault: boolean;
 
   /**
    * A list of SubmissionSectionModel that are present in this submission definition
    */
   // TODO refactor using remotedata
   @deserialize
-  sections: PaginatedList<SubmissionSectionModel>;
+    sections: PaginatedList<SubmissionSectionModel>;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     collections: HALLink,
     sections: HALLink
diff --git a/src/app/core/config/models/config-submission-definitions.model.ts b/src/app/core/config/models/config-submission-definitions.model.ts
index 08f1ef17bb..790334da9b 100644
--- a/src/app/core/config/models/config-submission-definitions.model.ts
+++ b/src/app/core/config/models/config-submission-definitions.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionDefinitionModel } from './config-submission-definition.model';
 import { SUBMISSION_DEFINITIONS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-form.model.ts b/src/app/core/config/models/config-submission-form.model.ts
index 90f94882bd..f6011adc76 100644
--- a/src/app/core/config/models/config-submission-form.model.ts
+++ b/src/app/core/config/models/config-submission-form.model.ts
@@ -1,7 +1,11 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { ConfigObject } from './config.model';
-import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
 import { SUBMISSION_FORM_TYPE } from './config-type';
 
 /**
@@ -23,5 +27,5 @@ export class SubmissionFormModel extends ConfigObject {
    * An array of [FormRowModel] that are present in this form
    */
   @autoserialize
-  rows: FormRowModel[];
+    rows: FormRowModel[];
 }
diff --git a/src/app/core/config/models/config-submission-forms.model.ts b/src/app/core/config/models/config-submission-forms.model.ts
index 506905d88c..4cf71d85d9 100644
--- a/src/app/core/config/models/config-submission-forms.model.ts
+++ b/src/app/core/config/models/config-submission-forms.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionFormModel } from './config-submission-form.model';
 import { SUBMISSION_FORMS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index bdc884dfa4..0d4ae9aa10 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
@@ -22,31 +27,31 @@ export class SubmissionSectionModel extends ConfigObject {
    * The header for this section
    */
   @autoserialize
-  header: string;
+    header: string;
 
   /**
    * A boolean representing if this submission section is the mandatory or not
    */
   @autoserialize
-  mandatory: boolean;
+    mandatory: boolean;
 
   /**
    * A string representing the kind of section object
    */
   @autoserialize
-  sectionType: SectionsType;
+    sectionType: SectionsType;
 
   /**
    * The [SubmissionSectionVisibility] object for this section
    */
   @autoserialize
-  visibility: SubmissionSectionVisibility;
+    visibility: SubmissionSectionVisibility;
 
   /**
    * The {@link HALLink}s for this SubmissionSectionModel
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     config: HALLink;
   };
diff --git a/src/app/core/config/models/config-submission-sections.model.ts b/src/app/core/config/models/config-submission-sections.model.ts
index 423ea99b1e..86894b6e44 100644
--- a/src/app/core/config/models/config-submission-sections.model.ts
+++ b/src/app/core/config/models/config-submission-sections.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionSectionModel } from './config-submission-section.model';
 import { SUBMISSION_SECTIONS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-upload.model.ts b/src/app/core/config/models/config-submission-upload.model.ts
index f6897da2e3..edc4626f83 100644
--- a/src/app/core/config/models/config-submission-upload.model.ts
+++ b/src/app/core/config/models/config-submission-upload.model.ts
@@ -1,12 +1,23 @@
-import { autoserialize, inheritSerialization, deserialize } from 'cerialize';
-import { typedObject, link } from '../../cache/builders/build-decorators';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { RemoteData } from '../../data/remote-data';
+import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { AccessConditionOption } from './config-access-condition-option.model';
 import { SubmissionFormsModel } from './config-submission-forms.model';
-import { SUBMISSION_UPLOAD_TYPE, SUBMISSION_FORMS_TYPE } from './config-type';
-import { HALLink } from '../../shared/hal-link.model';
-import { RemoteData } from '../../data/remote-data';
-import { Observable } from 'rxjs';
+import {
+  SUBMISSION_FORMS_TYPE,
+  SUBMISSION_UPLOAD_TYPE,
+} from './config-type';
 
 @typedObject
 @inheritSerialization(ConfigObject)
@@ -16,22 +27,22 @@ export class SubmissionUploadModel extends ConfigObject {
    * A list of available bitstream access conditions
    */
   @autoserialize
-  accessConditionOptions: AccessConditionOption[];
+    accessConditionOptions: AccessConditionOption[];
 
   /**
    * An object representing the configuration describing the bitstream metadata form
    */
   @link(SUBMISSION_FORMS_TYPE)
-  metadata?: Observable<RemoteData<SubmissionFormsModel>>;
+    metadata?: Observable<RemoteData<SubmissionFormsModel>>;
 
   @autoserialize
-  required: boolean;
+    required: boolean;
 
   @autoserialize
-  maxSize: number;
+    maxSize: number;
 
   @deserialize
-  _links: {
+    _links: {
     metadata: HALLink
     self: HALLink
   };
diff --git a/src/app/core/config/models/config-submission-uploads.model.ts b/src/app/core/config/models/config-submission-uploads.model.ts
index 8fb7dc66b9..235cdd31a1 100644
--- a/src/app/core/config/models/config-submission-uploads.model.ts
+++ b/src/app/core/config/models/config-submission-uploads.model.ts
@@ -1,7 +1,8 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { SUBMISSION_UPLOADS_TYPE } from './config-type';
 import { SubmissionUploadModel } from './config-submission-upload.model';
+import { SUBMISSION_UPLOADS_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionUploadModel)
diff --git a/src/app/core/config/models/config.model.ts b/src/app/core/config/models/config.model.ts
index 170aa334ed..c1db44e891 100644
--- a/src/app/core/config/models/config.model.ts
+++ b/src/app/core/config/models/config.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 export abstract class ConfigObject implements CacheableObject {
 
@@ -23,13 +27,13 @@ export abstract class ConfigObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     [name: string]: HALLink
   };
diff --git a/src/app/core/config/submission-accesses-config-data.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
index d2da0fce42..16986405fd 100644
--- a/src/app/core/config/submission-accesses-config-data.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ConfigDataService } from './config-data.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionAccessesModel } from './models/config-submission-accesses.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../data/base/data-service.decorator';
+import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/config/submission-forms-config-data.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
index f4c0690685..fb8e0e60da 100644
--- a/src/app/core/config/submission-forms-config-data.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigObject } from './models/config.model';
-import { SUBMISSION_FORMS_TYPE } from './models/config-type';
-import { SubmissionFormsModel } from './models/config-submission-forms.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
+import { ConfigObject } from './models/config.model';
+import { SubmissionFormsModel } from './models/config-submission-forms.model';
+import { SUBMISSION_FORMS_TYPE } from './models/config-type';
 
 /**
  * Data service to retrieve submission form configuration objects from the REST server.
diff --git a/src/app/core/config/submission-uploads-config-data.service.ts b/src/app/core/config/submission-uploads-config-data.service.ts
index 8f838352a9..b98c8b4f91 100644
--- a/src/app/core/config/submission-uploads-config-data.service.ts
+++ b/src/app/core/config/submission-uploads-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ConfigDataService } from './config-data.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionUploadsModel } from './models/config-submission-uploads.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../data/base/data-service.decorator';
+import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/core-state.model.ts b/src/app/core/core-state.model.ts
index b8211fdb55..2128901754 100644
--- a/src/app/core/core-state.model.ts
+++ b/src/app/core/core-state.model.ts
@@ -1,16 +1,14 @@
-import {
-    BitstreamFormatRegistryState
-} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { BitstreamFormatRegistryState } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { AuthState } from './auth/auth.reducer';
 import { ObjectCacheState } from './cache/object-cache.reducer';
 import { ServerSyncBufferState } from './cache/server-sync-buffer.reducer';
 import { ObjectUpdatesState } from './data/object-updates/object-updates.reducer';
+import { RequestState } from './data/request-state.model';
 import { HistoryState } from './history/history.reducer';
 import { MetaIndexState } from './index/index.reducer';
-import { AuthState } from './auth/auth.reducer';
 import { JsonPatchOperationsState } from './json-patch/json-patch-operations.reducer';
 import { MetaTagState } from './metadata/meta-tag.reducer';
 import { RouteState } from './services/route.reducer';
-import { RequestState } from './data/request-state.model';
 
 /**
  * The core sub-state in the NgRx store
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index b569df290d..5af2fe580a 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -1,12 +1,13 @@
-import { ObjectCacheEffects } from './cache/object-cache.effects';
-import { UUIDIndexEffects } from './index/index.effects';
-import { RequestEffects } from './data/request.effects';
+import { MenuEffects } from '../shared/menu/menu.effects';
 import { AuthEffects } from './auth/auth.effects';
-import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
+import { ObjectCacheEffects } from './cache/object-cache.effects';
 import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
-import { RouteEffects } from './services/route.effects';
+import { RequestEffects } from './data/request.effects';
+import { UUIDIndexEffects } from './index/index.effects';
+import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
 import { RouterEffects } from './router/router.effects';
+import { RouteEffects } from './services/route.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -18,4 +19,5 @@ export const coreEffects = [
   ObjectUpdatesEffects,
   RouteEffects,
   RouterEffects,
+  MenuEffects,
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index dbca773375..10433caa26 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,12 +1,30 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-
+import {
+  ModuleWithProviders,
+  NgModule,
+  Optional,
+  SkipSelf,
+} from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
+import {
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
 
-import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import { environment } from '../../environments/environment';
+import { LdnItemfiltersService } from '../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
+import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
+import { storeModuleConfig } from '../app.reducer';
+import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { MyDSpaceGuard } from '../my-dspace-page/my-dspace.guard';
-
+import { Process } from '../process-page/processes/process.model';
+import { Script } from '../process-page/scripts/script.model';
+import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
@@ -14,18 +32,27 @@ import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint
 import {
   MOCK_RESPONSE_MAP,
   mockResponseMap,
-  ResponseMapMock
+  ResponseMapMock,
 } from '../shared/mocks/dspace-rest/mocks/response-map.mock';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
 import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
 import { ObjectSelectService } from '../shared/object-select/object-select.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { Subscription } from '../shared/subscriptions/models/subscription.model';
+import { CoarNotifyConfigDataService } from '../submission/sections/section-coar-notify/coar-notify-config-data.service';
+import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
 import { AuthenticatedGuard } from './auth/authenticated.guard';
 import { AuthStatus } from './auth/models/auth-status.model';
+import { ShortLivedToken } from './auth/models/short-lived-token.model';
+import { TokenResponseParsingService } from './auth/token-response-parsing.service';
 import { BrowseService } from './browse/browse.service';
 import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
 import { ObjectCacheService } from './cache/object-cache.service';
+import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
+import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
 import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model';
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
@@ -33,9 +60,14 @@ import { SubmissionUploadsModel } from './config/models/config-submission-upload
 import { SubmissionFormsConfigDataService } from './config/submission-forms-config-data.service';
 import { coreEffects } from './core.effects';
 import { coreReducers } from './core.reducers';
+import { CoreState } from './core-state.model';
+import { AccessStatusDataService } from './data/access-status-data.service';
+import { ArrayMoveChangeAnalyzer } from './data/array-move-change-analyzer.service';
+import { BitstreamDataService } from './data/bitstream-data.service';
 import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
 import { CollectionDataService } from './data/collection-data.service';
 import { CommunityDataService } from './data/community-data.service';
+import { ConfigurationDataService } from './data/configuration-data.service';
 import { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service';
 import { DebugResponseParsingService } from './data/debug-response-parsing.service';
 import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
@@ -47,141 +79,132 @@ import { EntityTypeDataService } from './data/entity-type-data.service';
 import { ExternalSourceDataService } from './data/external-source-data.service';
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
+import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
+import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { SiteRegisterGuard } from './data/feature-authorization/feature-authorization-guard/site-register.guard';
+import { FeatureDataService } from './data/feature-authorization/feature-data.service';
 import { FilteredDiscoveryPageResponseParsingService } from './data/filtered-discovery-page-response-parsing.service';
 import { ItemDataService } from './data/item-data.service';
+import { ItemTemplateDataService } from './data/item-template-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
+import { MetadataFieldDataService } from './data/metadata-field-data.service';
+import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
+import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RelationshipTypeDataService } from './data/relationship-type-data.service';
+import { ProcessDataService } from './data/processes/process-data.service';
+import { ScriptDataService } from './data/processes/script-data.service';
 import { RelationshipDataService } from './data/relationship-data.service';
-import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
+import { RelationshipTypeDataService } from './data/relationship-type-data.service';
+import { Root } from './data/root.model';
+import { RootDataService } from './data/root-data.service';
 import { SearchResponseParsingService } from './data/search-response-parsing.service';
 import { SiteDataService } from './data/site-data.service';
+import { VersionDataService } from './data/version-data.service';
+import { VersionHistoryDataService } from './data/version-history-data.service';
+import { WorkflowActionDataService } from './data/workflow-action-data.service';
 import { DspaceRestService } from './dspace-rest/dspace-rest.service';
+import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
+import { EndUserAgreementCookieGuard } from './end-user-agreement/end-user-agreement-cookie.guard';
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement/end-user-agreement-current-user.guard';
 import { EPersonDataService } from './eperson/eperson-data.service';
+import { GroupDataService } from './eperson/group-data.service';
 import { EPerson } from './eperson/models/eperson.model';
 import { Group } from './eperson/models/group.model';
+import { FeedbackDataService } from './feedback/feedback-data.service';
 import { JsonPatchOperationsBuilder } from './json-patch/builder/json-patch-operations-builder';
+import { MetadataService } from './metadata/metadata.service';
 import { MetadataField } from './metadata/metadata-field.model';
 import { MetadataSchema } from './metadata/metadata-schema.model';
-import { MetadataService } from './metadata/metadata.service';
+import { SuggestionSource } from './notifications/models/suggestion-source.model';
+import { SuggestionTarget } from './notifications/models/suggestion-target.model';
+import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
+import { OrcidHistory } from './orcid/model/orcid-history.model';
+import { OrcidQueue } from './orcid/model/orcid-queue.model';
+import { OrcidAuthService } from './orcid/orcid-auth.service';
+import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
+import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
+import { ResearcherProfile } from './profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
 import { RegistryService } from './registry/registry.service';
+import { ReloadGuard } from './reload/reload.guard';
+import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
 import { RoleService } from './roles/role.service';
-import { FeedbackDataService } from './feedback/feedback-data.service';
-
+import { LinkHeadService } from './services/link-head.service';
 import { ServerResponseService } from './services/server-response.service';
-import { NativeWindowFactory, NativeWindowService } from './services/window.service';
-import { BitstreamFormat } from './shared/bitstream-format.model';
+import {
+  NativeWindowFactory,
+  NativeWindowService,
+} from './services/window.service';
+import { Authorization } from './shared/authorization.model';
 import { Bitstream } from './shared/bitstream.model';
+import { BitstreamFormat } from './shared/bitstream-format.model';
 import { BrowseDefinition } from './shared/browse-definition.model';
 import { BrowseEntry } from './shared/browse-entry.model';
 import { Bundle } from './shared/bundle.model';
 import { Collection } from './shared/collection.model';
 import { Community } from './shared/community.model';
+import { ConfigurationProperty } from './shared/configuration-property.model';
 import { DSpaceObject } from './shared/dspace-object.model';
-import { ExternalSourceEntry } from './shared/external-source-entry.model';
 import { ExternalSource } from './shared/external-source.model';
+import { ExternalSourceEntry } from './shared/external-source-entry.model';
+import { Feature } from './shared/feature.model';
+import { FlatBrowseDefinition } from './shared/flat-browse-definition.model';
 import { HALEndpointService } from './shared/hal-endpoint.service';
-import { ItemType } from './shared/item-relationships/item-type.model';
-import { RelationshipType } from './shared/item-relationships/relationship-type.model';
-import { Relationship } from './shared/item-relationships/relationship.model';
+import { HierarchicalBrowseDefinition } from './shared/hierarchical-browse-definition.model';
 import { Item } from './shared/item.model';
+import { ItemType } from './shared/item-relationships/item-type.model';
+import { Relationship } from './shared/item-relationships/relationship.model';
+import { RelationshipType } from './shared/item-relationships/relationship-type.model';
+import { ItemRequest } from './shared/item-request.model';
 import { License } from './shared/license.model';
-import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
+import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
+import { Registration } from './shared/registration.model';
+import { SearchService } from './shared/search/search.service';
 import { SearchConfigurationService } from './shared/search/search-configuration.service';
 import { SearchFilterService } from './shared/search/search-filter.service';
-import { SearchService } from './shared/search/search.service';
+import { SearchConfig } from './shared/search/search-filters/search-config.model';
+import { SequenceService } from './shared/sequence.service';
 import { Site } from './shared/site.model';
+import { TemplateItem } from './shared/template-item.model';
 import { UUIDService } from './shared/uuid.service';
+import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
+import { Version } from './shared/version.model';
+import { VersionHistory } from './shared/version-history.model';
+import { UsageReport } from './statistics/models/usage-report.model';
+import { CorrectionTypeDataService } from './submission/correctiontype-data.service';
+import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
+import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
 import { WorkflowItem } from './submission/models/workflowitem.model';
 import { WorkspaceItem } from './submission/models/workspaceitem.model';
+import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
+import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
+import { SubmissionDuplicateDataService } from './submission/submission-duplicate-data.service';
 import { SubmissionJsonPatchOperationsService } from './submission/submission-json-patch-operations.service';
 import { SubmissionResponseParsingService } from './submission/submission-response-parsing.service';
 import { SubmissionRestService } from './submission/submission-rest.service';
+import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
+import { VocabularyService } from './submission/vocabularies/vocabulary.service';
+import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
 import { WorkflowItemDataService } from './submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from './submission/workspaceitem-data.service';
+import { SupervisionOrderDataService } from './supervision-order/supervision-order-data.service';
 import { ClaimedTaskDataService } from './tasks/claimed-task-data.service';
+import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
 import { ClaimedTask } from './tasks/models/claimed-task-object.model';
 import { PoolTask } from './tasks/models/pool-task-object.model';
+import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workflow-info.model';
+import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';
 import { TaskObject } from './tasks/models/task-object.model';
+import { WorkflowAction } from './tasks/models/workflow-action-object.model';
 import { PoolTaskDataService } from './tasks/pool-task-data.service';
 import { TaskResponseParsingService } from './tasks/task-response-parsing.service';
-import { ArrayMoveChangeAnalyzer } from './data/array-move-change-analyzer.service';
-import { BitstreamDataService } from './data/bitstream-data.service';
-import { environment } from '../../environments/environment';
-import { storeModuleConfig } from '../app.reducer';
-import { VersionDataService } from './data/version-data.service';
-import { VersionHistoryDataService } from './data/version-history-data.service';
-import { Version } from './shared/version.model';
-import { VersionHistory } from './shared/version-history.model';
-import { Script } from '../process-page/scripts/script.model';
-import { Process } from '../process-page/processes/process.model';
-import { ProcessDataService } from './data/processes/process-data.service';
-import { ScriptDataService } from './data/processes/script-data.service';
-import { WorkflowActionDataService } from './data/workflow-action-data.service';
-import { WorkflowAction } from './tasks/models/workflow-action-object.model';
-import { ItemTemplateDataService } from './data/item-template-data.service';
-import { TemplateItem } from './shared/template-item.model';
-import { Feature } from './shared/feature.model';
-import { Authorization } from './shared/authorization.model';
-import { FeatureDataService } from './data/feature-authorization/feature-data.service';
-import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
-import {
-  SiteAdministratorGuard
-} from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
-import { Registration } from './shared/registration.model';
-import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
-import { MetadataFieldDataService } from './data/metadata-field-data.service';
-import { TokenResponseParsingService } from './auth/token-response-parsing.service';
-import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
-import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
-import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
-import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
-import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
-import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
-import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
-import { VocabularyService } from './submission/vocabularies/vocabulary.service';
-import { ConfigurationDataService } from './data/configuration-data.service';
-import { ConfigurationProperty } from './shared/configuration-property.model';
-import { ReloadGuard } from './reload/reload.guard';
-import { EndUserAgreementCurrentUserGuard } from './end-user-agreement/end-user-agreement-current-user.guard';
-import { EndUserAgreementCookieGuard } from './end-user-agreement/end-user-agreement-cookie.guard';
-import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
-import { SiteRegisterGuard } from './data/feature-authorization/feature-authorization-guard/site-register.guard';
-import { ShortLivedToken } from './auth/models/short-lived-token.model';
-import { UsageReport } from './statistics/models/usage-report.model';
-import { RootDataService } from './data/root-data.service';
-import { Root } from './data/root.model';
-import { SearchConfig } from './shared/search/search-filters/search-config.model';
-import { SequenceService } from './shared/sequence.service';
-import { CoreState } from './core-state.model';
-import { GroupDataService } from './eperson/group-data.service';
-import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
-import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workflow-info.model';
-import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
-import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';
-import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model';
-import { AccessStatusDataService } from './data/access-status-data.service';
-import { LinkHeadService } from './services/link-head.service';
-import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
-import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
-import { ResearcherProfile } from './profile/model/researcher-profile.model';
-import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
-import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
-import { OrcidQueue } from './orcid/model/orcid-queue.model';
-import { OrcidHistory } from './orcid/model/orcid-history.model';
-import { OrcidAuthService } from './orcid/orcid-auth.service';
-import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
-import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
-import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
-import { Subscription } from '../shared/subscriptions/models/subscription.model';
-import { SupervisionOrderDataService } from './supervision-order/supervision-order-data.service';
-import { ItemRequest } from './shared/item-request.model';
-import { HierarchicalBrowseDefinition } from './shared/hierarchical-browse-definition.model';
-import { FlatBrowseDefinition } from './shared/flat-browse-definition.model';
-import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
-import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
-import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -198,7 +221,7 @@ export const restServiceFactory = (mocks: ResponseMapMock, http: HttpClient) =>
 const IMPORTS = [
   CommonModule,
   StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
-  EffectsModule.forFeature(coreEffects)
+  EffectsModule.forFeature(coreEffects),
 ];
 
 const DECLARATIONS = [];
@@ -218,6 +241,7 @@ const PROVIDERS = [
   HALEndpointService,
   HostWindowService,
   ItemDataService,
+  SubmissionDuplicateDataService,
   MetadataService,
   ObjectCacheService,
   PaginationComponentOptions,
@@ -304,7 +328,12 @@ const PROVIDERS = [
   OrcidAuthService,
   OrcidQueueDataService,
   OrcidHistoryDataService,
-  SupervisionOrderDataService
+  SupervisionOrderDataService,
+  CorrectionTypeDataService,
+  LdnServicesService,
+  LdnItemfiltersService,
+  CoarNotifyConfigDataService,
+  NotifyRequestsStatusDataService,
 ];
 
 /**
@@ -369,9 +398,12 @@ export const models =
     ShortLivedToken,
     Registration,
     UsageReport,
+    QualityAssuranceTopicObject,
+    QualityAssuranceEventObject,
     Root,
     SearchConfig,
     SubmissionAccessesModel,
+    QualityAssuranceSourceObject,
     AccessStatusObject,
     ResearcherProfile,
     OrcidQueue,
@@ -380,22 +412,29 @@ export const models =
     IdentifierData,
     Subscription,
     ItemRequest,
-    BulkAccessConditionOptions
+    BulkAccessConditionOptions,
+    SuggestionTarget,
+    SuggestionSource,
+    LdnService,
+    Itemfilter,
+    SubmissionCoarNotifyConfig,
+    NotifyRequestsStatus,
+    AdminNotifyMessage,
   ];
 
 @NgModule({
   imports: [
-    ...IMPORTS
+    ...IMPORTS,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...EXPORTS
+    ...EXPORTS,
   ],
   providers: [
-    ...PROVIDERS
-  ]
+    ...PROVIDERS,
+  ],
 })
 
 export class CoreModule {
@@ -403,8 +442,8 @@ export class CoreModule {
     return {
       ngModule: CoreModule,
       providers: [
-        ...PROVIDERS
-      ]
+        ...PROVIDERS,
+      ],
     };
   }
 
diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index c0165c5384..fda1e05df0 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -1,19 +1,17 @@
-import { ActionReducerMap, } from '@ngrx/store';
+import { ActionReducerMap } from '@ngrx/store';
 
-import { objectCacheReducer } from './cache/object-cache.reducer';
-import { indexReducer } from './index/index.reducer';
-import { requestReducer } from './data/request.reducer';
+import { bitstreamFormatReducer } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { authReducer } from './auth/auth.reducer';
-import { jsonPatchOperationsReducer } from './json-patch/json-patch-operations.reducer';
+import { objectCacheReducer } from './cache/object-cache.reducer';
 import { serverSyncBufferReducer } from './cache/server-sync-buffer.reducer';
-import { objectUpdatesReducer } from './data/object-updates/object-updates.reducer';
-import { routeReducer } from './services/route.reducer';
-import {
-  bitstreamFormatReducer
-} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
-import { historyReducer } from './history/history.reducer';
-import { metaTagReducer } from './metadata/meta-tag.reducer';
 import { CoreState } from './core-state.model';
+import { objectUpdatesReducer } from './data/object-updates/object-updates.reducer';
+import { requestReducer } from './data/request.reducer';
+import { historyReducer } from './history/history.reducer';
+import { indexReducer } from './index/index.reducer';
+import { jsonPatchOperationsReducer } from './json-patch/json-patch-operations.reducer';
+import { metaTagReducer } from './metadata/meta-tag.reducer';
+import { routeReducer } from './services/route.reducer';
 
 export const coreReducers: ActionReducerMap<CoreState> = {
   'bitstreamFormats': bitstreamFormatReducer,
@@ -26,5 +24,5 @@ export const coreReducers: ActionReducerMap<CoreState> = {
   'auth': authReducer,
   'json/patch': jsonPatchOperationsReducer,
   'metaTag': metaTagReducer,
-  'route': routeReducer
+  'route': routeReducer,
 };
diff --git a/src/app/core/core.selectors.ts b/src/app/core/core.selectors.ts
index 77c7974de2..899afb9be9 100644
--- a/src/app/core/core.selectors.ts
+++ b/src/app/core/core.selectors.ts
@@ -1,4 +1,5 @@
 import { createFeatureSelector } from '@ngrx/store';
+
 import { CoreState } from './core-state.model';
 
 /**
diff --git a/src/app/core/data/access-status-data.service.spec.ts b/src/app/core/data/access-status-data.service.spec.ts
index 18b8cb5d65..1240585027 100644
--- a/src/app/core/data/access-status-data.service.spec.ts
+++ b/src/app/core/data/access-status-data.service.spec.ts
@@ -1,17 +1,21 @@
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import { Observable } from 'rxjs';
+
+import { hasNoValue } from '../../shared/empty.util';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { GetRequest } from './request.models';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { hasNoValue } from '../../shared/empty.util';
-import { AccessStatusDataService } from './access-status-data.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { Item } from '../shared/item.model';
+import { AccessStatusDataService } from './access-status-data.service';
+import { RemoteData } from './remote-data';
+import { GetRequest } from './request.models';
+import { RequestService } from './request.service';
 
 const url = 'fake-url';
 
@@ -29,12 +33,12 @@ describe('AccessStatusDataService', () => {
     name: 'test-item',
     _links: {
       accessStatus: {
-        href: `https://rest.api/items/${itemId}/accessStatus`
+        href: `https://rest.api/items/${itemId}/accessStatus`,
       },
       self: {
-        href: `https://rest.api/items/${itemId}`
-      }
-    }
+        href: `https://rest.api/items/${itemId}`,
+      },
+    },
   });
 
   describe('when the requests are successful', () => {
@@ -69,10 +73,10 @@ describe('AccessStatusDataService', () => {
     }
     rdbService = jasmine.createSpyObj('rdbService', {
       buildFromRequestUUID: buildResponse$,
-      buildSingle: buildResponse$
+      buildSingle: buildResponse$,
     });
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index e8b77245e8..56db0e55e7 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -1,15 +1,16 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
-import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
 import { Item } from '../shared/item.model';
 import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Data service responsible for retrieving the access status of Items
diff --git a/src/app/core/data/array-move-change-analyzer.service.spec.ts b/src/app/core/data/array-move-change-analyzer.service.spec.ts
index 025791d6dc..cf11decde4 100644
--- a/src/app/core/data/array-move-change-analyzer.service.spec.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.spec.ts
@@ -1,7 +1,8 @@
-import { ArrayMoveChangeAnalyzer } from './array-move-change-analyzer.service';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { Operation } from 'fast-json-patch';
 
+import { ArrayMoveChangeAnalyzer } from './array-move-change-analyzer.service';
+
 /**
  * Helper class for creating move tests
  * Define a "from" and "to" index to move objects within the array before comparing
@@ -28,7 +29,7 @@ describe('ArrayMoveChangeAnalyzer', () => {
         '4d7d0798-a8fa-45b8-b4fc-deb2819606c8',
         'e56eb99e-2f7c-4bee-9b3f-d3dcc83386b1',
         '0f608168-cdfc-46b0-92ce-889f7d3ac684',
-        '546f9f5c-15dc-4eec-86fe-648007ac9e1c'
+        '546f9f5c-15dc-4eec-86fe-648007ac9e1c',
       ];
     });
 
@@ -72,7 +73,7 @@ describe('ArrayMoveChangeAnalyzer', () => {
         '4d7d0798-a8fa-45b8-b4fc-deb2819606c8',
         undefined,
         undefined,
-        '546f9f5c-15dc-4eec-86fe-648007ac9e1c'
+        '546f9f5c-15dc-4eec-86fe-648007ac9e1c',
       ];
     });
 
diff --git a/src/app/core/data/array-move-change-analyzer.service.ts b/src/app/core/data/array-move-change-analyzer.service.ts
index 36744e9f96..95d86f1032 100644
--- a/src/app/core/data/array-move-change-analyzer.service.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.ts
@@ -1,6 +1,7 @@
-import { MoveOperation } from 'fast-json-patch';
-import { Injectable } from '@angular/core';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
+import { Injectable } from '@angular/core';
+import { MoveOperation } from 'fast-json-patch';
+
 import { hasValue } from '../../shared/empty.util';
 
 /**
diff --git a/src/app/core/data/base-response-parsing.service.spec.ts b/src/app/core/data/base-response-parsing.service.spec.ts
index da9fa7a643..f6707d3582 100644
--- a/src/app/core/data/base-response-parsing.service.spec.ts
+++ b/src/app/core/data/base-response-parsing.service.spec.ts
@@ -1,9 +1,9 @@
 /* eslint-disable max-classes-per-file */
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { GetRequest} from './request.models';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { BaseResponseParsingService } from './base-response-parsing.service';
+import { GetRequest } from './request.models';
 import { RestRequest } from './rest-request.model';
 
 class TestService extends BaseResponseParsingService {
@@ -35,7 +35,7 @@ describe('BaseResponseParsingService', () => {
   beforeEach(() => {
     obj = undefined;
     objectCache = jasmine.createSpyObj('objectCache', {
-      add: {}
+      add: {},
     });
     service = new TestService(objectCache);
   });
@@ -58,8 +58,8 @@ describe('BaseResponseParsingService', () => {
       beforeEach(() => {
         obj = Object.assign(new DSpaceObject(), {
           _links: {
-            self: { href: 'obj-selflink' }
-          }
+            self: { href: 'obj-selflink' },
+          },
         });
       });
 
@@ -79,8 +79,8 @@ describe('BaseResponseParsingService', () => {
         data = {
           type: 'NotARealType',
           _links: {
-            self: { href: 'data-selflink' }
-          }
+            self: { href: 'data-selflink' },
+          },
         };
       });
 
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index 18e6623683..63b4961b31 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -1,14 +1,21 @@
 /* eslint-disable max-classes-per-file */
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
+import { environment } from '../../../environments/environment';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { getClassForType } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { Serializer } from '../serializer';
-import { PageInfo } from '../shared/page-info.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { GenericConstructor } from '../shared/generic-constructor';
-import { PaginatedList, buildPaginatedList } from './paginated-list.model';
-import { getClassForType } from '../cache/builders/build-decorators';
-import { environment } from '../../../environments/environment';
-import { CacheableObject } from '../cache/cacheable-object.model';
+import { PageInfo } from '../shared/page-info.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
 import { RestRequest } from './rest-request.model';
 
 
@@ -64,7 +71,7 @@ export abstract class BaseResponseParsingService {
                 } else if (isRestDataObject(data._embedded[property])) {
                   object[property] = this.retrieveObjectOrUrl(parsedObj);
                 } else if (Array.isArray(parsedObj)) {
-                    object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj));
+                  object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj));
                 }
               }
             });
@@ -96,14 +103,14 @@ export abstract class BaseResponseParsingService {
       list = this.flattenSingleKeyObject(list);
     }
     const page: ObjectDomain[] = this.processArray(list, request);
-    return buildPaginatedList<ObjectDomain>(pageInfo, page,);
+    return buildPaginatedList<ObjectDomain>(pageInfo, page);
   }
 
   protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
     let array: ObjectDomain[] = [];
     data.forEach((datum) => {
-        array = [...array, this.process(datum, request)];
-      }
+      array = [...array, this.process(datum, request)];
+    },
     );
     return array;
   }
@@ -139,7 +146,7 @@ export abstract class BaseResponseParsingService {
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 098f075c10..3f44ad5e5a 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -5,22 +5,37 @@
  *
  * http://www.dspace.org/license/
  */
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf, combineLatest as observableCombineLatest } from 'rxjs';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { HALLink } from '../../shared/hal-link.model';
+import { FindListOptions } from '../find-list-options.model';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { fakeAsync, tick } from '@angular/core/testing';
 import { BaseDataService } from './base-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 const endpoint = 'https://rest.api/core';
 
@@ -46,38 +61,22 @@ describe('BaseDataService', () => {
   let requestService;
   let halService;
   let rdbService;
-  let objectCache;
+  let objectCache: ObjectCacheServiceStub;
   let selfLink;
   let linksToFollow;
   let testScheduler;
-  let remoteDataMocks;
+  let remoteDataMocks: { [responseType: string]: RemoteData<any> };
+  let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
     rdbService = getMockRemoteDataBuildService();
-    objectCache = {
-
-      addPatch: () => {
-        /* empty */
-      },
-      getObjectBySelfLink: () => {
-        /* empty */
-      },
-      getByHref: () => {
-        /* empty */
-      },
-      addDependency: () => {
-        /* empty */
-      },
-      removeDependents: () => {
-        /* empty */
-      },
-    } as any;
+    objectCache = new ObjectCacheServiceStub();
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -88,23 +87,53 @@ describe('BaseDataService', () => {
 
     const timeStamp = new Date().getTime();
     const msToLive = 15 * 60 * 1000;
-    const payload = { foo: 'bar' };
+    const payload = {
+      foo: 'bar',
+      followLink1: {},
+      followLink2: {},
+      _links: {
+        self: Object.assign(new HALLink(), {
+          href: 'self-test-link',
+        }),
+        followLink1: Object.assign(new HALLink(), {
+          href: 'follow-link-1',
+        }),
+        followLink2: [
+          Object.assign(new HALLink(), {
+            href: 'follow-link-2-1',
+          }),
+          Object.assign(new HALLink(), {
+            href: 'follow-link-2-2',
+          }),
+        ],
+      },
+    };
     const statusCodeSuccess = 200;
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
       RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
       ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
       Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
       SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
       Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
       ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
+    remoteDataPageMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
 
     return new TestService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
     );
   }
@@ -303,19 +332,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
@@ -354,19 +385,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
@@ -375,6 +408,27 @@ describe('BaseDataService', () => {
 
     });
 
+    it('should link all the followLinks of a cached object by calling addDependency', () => {
+      spyOn(objectCache, 'addDependency').and.callThrough();
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d', {
+          a: remoteDataMocks.Success,
+          b: remoteDataMocks.RequestPending,
+          c: remoteDataMocks.ResponsePending,
+          d: remoteDataMocks.Success,
+        }));
+        const expected = '--b-c-d';
+        const values = {
+          b: remoteDataMocks.RequestPending,
+          c: remoteDataMocks.ResponsePending,
+          d: remoteDataMocks.Success,
+        };
+
+        expectObservable(service.findByHref(selfLink, false, false, ...linksToFollow)).toBe(expected, values);
+        flush();
+        expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
+      });
+    });
   });
 
   describe(`findListByHref`, () => {
@@ -387,8 +441,8 @@ describe('BaseDataService', () => {
     it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
       testScheduler.run(({ cold }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, findListOptions, [], ...linksToFollow);
@@ -398,8 +452,8 @@ describe('BaseDataService', () => {
     it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
@@ -414,8 +468,8 @@ describe('BaseDataService', () => {
     it(`should call rdbService.buildList with the result from buildHrefFromFindOptions and linksToFollow`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(rdbService.buildList).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
@@ -426,12 +480,12 @@ describe('BaseDataService', () => {
     it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findListByHref call as a callback`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.SuccessStale }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.SuccessStale }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
-        spyOn(service, 'findListByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(service, 'findListByHref').and.returnValue(cold('a', { a: remoteDataPageMocks.SuccessStale }));
         // prove that the spy we just added hasn't been called yet
         expect(service.findListByHref).not.toHaveBeenCalled();
         // call the callback passed to reRequestStaleRemoteData
@@ -446,7 +500,7 @@ describe('BaseDataService', () => {
     it(`should return a the output from reRequestStaleRemoteData`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
         const expected = 'a';
         const values = {
@@ -466,19 +520,19 @@ describe('BaseDataService', () => {
       it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           }));
           const expected = 'a-b-c-d-e';
           const values = {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -487,19 +541,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataPageMocks.ResponsePendingStale,
+            b: remoteDataPageMocks.SuccessStale,
+            c: remoteDataPageMocks.ErrorStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -518,18 +574,18 @@ describe('BaseDataService', () => {
       it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           }));
           const expected = '--b-c-d-e';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
@@ -538,25 +594,49 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataPageMocks.ResponsePendingStale,
+            b: remoteDataPageMocks.SuccessStale,
+            c: remoteDataPageMocks.ErrorStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           };
 
+
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
+      it('should link all the followLinks of the cached objects by calling addDependency', () => {
+        spyOn(objectCache, 'addDependency').and.callThrough();
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d', {
+            a: remoteDataPageMocks.SuccessStale,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+          }));
+          const expected = '--b-c-d';
+          const values = {
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, false, ...linksToFollow)).toBe(expected, values);
+          flush();
+          expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
+        });
+      });
     });
   });
 
@@ -566,8 +646,8 @@ describe('BaseDataService', () => {
     beforeEach(() => {
       getByHrefSpy = spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
         requestUUIDs: ['request1', 'request2', 'request3'],
-        dependentRequestUUIDs: ['request4', 'request5']
-      }));
+        dependentRequestUUIDs: ['request4', 'request5'],
+      } as ObjectCacheEntry));
 
     });
 
@@ -714,7 +794,7 @@ describe('BaseDataService', () => {
 
       (service as any).addDependency(
         createSuccessfulRemoteDataObject$({ _links: { self: { href: 'object-href' } } }),
-        observableOf('dependsOnHref')
+        observableOf('dependsOnHref'),
       );
       expect(addDependencySpy).toHaveBeenCalled();
     });
@@ -729,7 +809,7 @@ describe('BaseDataService', () => {
 
       (service as any).addDependency(
         createFailedRemoteDataObject$('something went wrong'),
-        observableOf('dependsOnHref')
+        observableOf('dependsOnHref'),
       );
       expect(addDependencySpy).toHaveBeenCalled();
     });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index edd6d9e2a4..d09ee21ee0 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -6,34 +6,53 @@
  * http://www.dspace.org/license/
  */
 
-import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import {
+  AsyncSubject,
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  skipWhile,
+  switchMap,
+  take,
+  tap,
+  toArray,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { HALLink } from '../../shared/hal-link.model';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { GetRequest } from '../request.models';
 import { RequestService } from '../request.service';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { FindListOptions } from '../find-list-options.model';
-import { PaginatedList } from '../paginated-list.model';
-import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
-import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALDataService } from './hal-data-service.interface';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
 
 export const EMBED_SEPARATOR = '%2F';
 /**
  * Common functionality for data services.
  * Specific functionality that not all services would need
- * is implemented in "DataService feature" classes (e.g. {@link CreateData}
+ * is implemented in "UpdateDataServiceImpl feature" classes (e.g. {@link CreateData}
  *
- * All DataService (or DataService feature) classes must
+ * All UpdateDataServiceImpl (or UpdateDataServiceImpl feature) classes must
  *   - extend this class (or {@link IdentifiableDataService})
- *   - implement any DataService features it requires in order to forward calls to it
+ *   - implement any UpdateDataServiceImpl features it requires in order to forward calls to it
  *
  * ```
  * export class SomeDataService extends BaseDataService<Something> implements CreateData<Something>, SearchData<Something> {
@@ -235,7 +254,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
             if (hasValue(remoteData) && remoteData.isStale) {
               requestFn();
             }
-          })
+          }),
         );
       } else {
         return source;
@@ -268,15 +287,34 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
-    return this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
+    const response$: Observable<RemoteData<T>> = this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
       // This skip ensures that if a stale object is present in the cache when you do a
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
+    return response$.pipe(
+      // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
+      tap((remoteDataObject: RemoteData<T>) => {
+        if (hasValue(remoteDataObject?.payload?._links)) {
+          for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
+            // only add the followLinks if they are embedded
+            if (hasValue(remoteDataObject.payload[followLinkName]) && followLinkName !== 'self') {
+              // followLink can be either an individual HALLink or a HALLink[]
+              const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
+              for (const individualFollowLink of followLinksList) {
+                if (hasValue(individualFollowLink?.href)) {
+                  this.addDependency(response$, individualFollowLink.href);
+                }
+              }
+            }
+          }
+        }
+      }),
+    );
   }
 
   /**
@@ -302,15 +340,38 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
-    return this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
+    const response$: Observable<RemoteData<PaginatedList<T>>> = this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
       // This skip ensures that if a stale object is present in the cache when you do a
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
+    return response$.pipe(
+      // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
+      tap((remoteDataObject: RemoteData<PaginatedList<T>>) => {
+        if (hasValue(remoteDataObject?.payload?.page)) {
+          for (const object of remoteDataObject.payload.page) {
+            if (hasValue(object?._links)) {
+              for (const followLinkName of Object.keys(object._links)) {
+                // only add the followLinks if they are embedded
+                if (hasValue(object[followLinkName]) && followLinkName !== 'self') {
+                  // followLink can be either an individual HALLink or a HALLink[]
+                  const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
+                  for (const individualFollowLink of followLinksList) {
+                    if (hasValue(individualFollowLink?.href)) {
+                      this.addDependency(response$, individualFollowLink.href);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }),
+    );
   }
 
   /**
@@ -329,7 +390,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
       href$.pipe(
         isNotEmptyOperator(),
-        take(1)
+        take(1),
       ).subscribe((href: string) => {
         const requestId = this.requestService.generateRequestId();
         const request = new GetRequest(requestId, href);
@@ -373,19 +434,19 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
     return this.hasCachedResponse(href$).pipe(
       switchMap((hasCachedResponse) => {
         if (hasCachedResponse) {
-           return this.rdbService.buildSingle(href$).pipe(
-             getFirstCompletedRemoteData(),
-             map((rd => rd.hasFailed))
-           );
+          return this.rdbService.buildSingle(href$).pipe(
+            getFirstCompletedRemoteData(),
+            map((rd => rd.hasFailed)),
+          );
         }
         return observableOf(false);
-      })
+      }),
     );
   }
 
   /**
    * Return the links to traverse from the root of the api to the
-   * endpoint this DataService represents
+   * endpoint this UpdateDataServiceImpl represents
    *
    * e.g. if the api root links to 'foo', and the endpoint at 'foo'
    * links to 'bar' the linkPath for the BarDataService would be
@@ -420,7 +481,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
           }
         }),
       ),
-      dependsOnHref$
+      dependsOnHref$,
     );
   }
 
@@ -437,7 +498,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       switchMap((oce: ObjectCacheEntry) => {
         return observableFrom([
           ...oce.requestUUIDs,
-          ...oce.dependentRequestUUIDs
+          ...oce.dependentRequestUUIDs,
         ]).pipe(
           mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
           toArray(),
diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index 0b2e0f3930..1248c5ffe4 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -5,23 +5,33 @@
  *
  * http://www.dspace.org/license/
  */
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { CreateData, CreateDataImpl } from './create-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { RequestParam } from '../../cache/models/request-param.model';
 import { RestRequestMethod } from '../rest-request-method';
-import { DSpaceObject } from '../../shared/dspace-object.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './create-data';
 
 /**
  * Tests whether calls to `CreateData` methods are correctly patched through in a concrete data service that implements it
@@ -149,7 +159,7 @@ describe('CreateDataImpl', () => {
   describe('create', () => {
     it('should POST the object to the root endpoint with the given parameters and return the remote data', (done) => {
       const params = [
-        new RequestParam('abc', 123), new RequestParam('def', 456)
+        new RequestParam('abc', 123), new RequestParam('def', 456),
       ];
       buildFromRequestUUIDSpy.and.returnValue(observableOf(remoteDataMocks.Success));
 
diff --git a/src/app/core/data/base/create-data.ts b/src/app/core/data/base/create-data.ts
index 3ffcd9adf2..13216f8796 100644
--- a/src/app/core/data/base/create-data.ts
+++ b/src/app/core/data/base/create-data.ts
@@ -5,22 +5,31 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
-import { RequestParam } from '../../cache/models/request-param.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { hasValue, isNotEmptyOperator } from '../../../shared/empty.util';
-import { distinctUntilChanged, map, take, takeWhile } from 'rxjs/operators';
-import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
-import { getClassForType } from '../../cache/builders/build-decorators';
-import { CreateRequest } from '../request.models';
+import {
+  distinctUntilChanged,
+  map,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../../../shared/empty.util';
 import { NotificationOptions } from '../../../shared/notifications/models/notification-options.model';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getClassForType } from '../../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { CreateRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that can create objects.
@@ -37,7 +46,7 @@ export interface CreateData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to create objects.
+ * A UpdateDataServiceImpl feature to create objects.
  *
  * Concrete data services can use this feature by implementing {@link CreateData}
  * and delegating its method to an inner instance of this class.
@@ -95,7 +104,7 @@ export class CreateDataImpl<T extends CacheableObject> extends BaseDataService<T
     // TODO a dataservice is not the best place to show a notification,
     // this should move up to the components that use this method
     result$.pipe(
-      takeWhile((rd: RemoteData<T>) => rd.isLoading, true)
+      takeWhile((rd: RemoteData<T>) => rd.isLoading, true),
     ).subscribe((rd: RemoteData<T>) => {
       if (rd.hasFailed) {
         this.notificationsService.error('Server Error:', rd.errorMessage, new NotificationOptions(-1));
diff --git a/src/app/core/data/base/data-service.decorator.spec.ts b/src/app/core/data/base/data-service.decorator.spec.ts
index e09c531a56..296371be69 100644
--- a/src/app/core/data/base/data-service.decorator.spec.ts
+++ b/src/app/core/data/base/data-service.decorator.spec.ts
@@ -6,11 +6,15 @@
  *
  * http://www.dspace.org/license/
  */
+import { v4 as uuidv4 } from 'uuid';
+
 import { ResourceType } from '../../shared/resource-type';
 import { BaseDataService } from './base-data.service';
+import {
+  dataService,
+  getDataServiceFor,
+} from './data-service.decorator';
 import { HALDataService } from './hal-data-service.interface';
-import { dataService, getDataServiceFor } from './data-service.decorator';
-import { v4 as uuidv4 } from 'uuid';
 
 class TestService extends BaseDataService<any> {
 }
diff --git a/src/app/core/data/base/data-service.decorator.ts b/src/app/core/data/base/data-service.decorator.ts
index fbde9bd94f..600fb5e3e3 100644
--- a/src/app/core/data/base/data-service.decorator.ts
+++ b/src/app/core/data/base/data-service.decorator.ts
@@ -6,10 +6,14 @@
  * http://www.dspace.org/license/
  */
 import { InjectionToken } from '@angular/core';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { CacheableObject } from '../../cache/cacheable-object.model';
-import { ResourceType } from '../../shared/resource-type';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ResourceType } from '../../shared/resource-type';
 import { HALDataService } from './hal-data-service.interface';
 
 export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<HALDataService<any>>>('getDataServiceFor', {
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index a076473b0f..53d651402f 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -5,24 +5,35 @@
  *
  * http://www.dspace.org/license/
  */
-import { constructIdEndpointDefault } from './identifiable-data.service';
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { DeleteData, DeleteDataImpl } from './delete-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { RestRequestMethod } from '../rest-request-method';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './delete-data';
+import { constructIdEndpointDefault } from './identifiable-data.service';
 
 /**
  * Tests whether calls to `DeleteData` methods are correctly patched through in a concrete data service that implements it
@@ -34,7 +45,7 @@ export function testDeleteDataImplementation(serviceFactory: () => DeleteData<an
     const ID = '2ce78f3a-791b-4d70-b5eb-753d587bbadd';
     const HREF = 'https://rest.api/core/items/' + ID;
     const COPY_VIRTUAL_METADATA = [
-      'a', 'b', 'c'
+      'a', 'b', 'c',
     ];
 
     beforeAll(() => {
@@ -105,13 +116,13 @@ describe('DeleteDataImpl', () => {
       },
       getByHref: () => {
         /* empty */
-      }
+      },
     } as any;
     notificationsService = {} as NotificationsService;
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 807d9d838e..e758ee40fa 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -5,19 +5,26 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { NoContent } from '../../shared/NoContent.model';
 import { switchMap } from 'rxjs/operators';
-import { DeleteRequest } from '../request.models';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NoContent } from '../../shared/NoContent.model';
+import { RemoteData } from '../remote-data';
+import { DeleteRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './identifiable-data.service';
 
 export interface DeleteData<T extends CacheableObject> {
   /**
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
index 6a73e032d0..f2c48feb76 100644
--- a/src/app/core/data/base/find-all-data.spec.ts
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -5,24 +5,33 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindAllData, FindAllDataImpl } from './find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
-import { RequestParam } from '../../cache/models/request-param.model';
-
-import { RequestService } from '../request.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { EMBED_SEPARATOR } from './base-data.service';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './find-all-data';
 
 /**
  * Tests whether calls to `FindAllData` methods are correctly patched through in a concrete data service that implements it
@@ -143,8 +152,8 @@ describe('FindAllDataImpl', () => {
       options = {};
 
       (service as any).getFindAllHref(options).subscribe((value) => {
-          expect(value).toBe(endpoint);
-        },
+        expect(value).toBe(endpoint);
+      },
       );
     });
 
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index 57884e537e..0d68689e61 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -7,18 +7,23 @@
  */
 
 import { Observable } from 'rxjs';
-import { FindListOptions } from '../find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that list all of its objects.
@@ -42,7 +47,7 @@ export interface FindAllData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to list all objects.
+ * A UpdateDataServiceImpl feature to list all objects.
  *
  * Concrete data services can use this feature by implementing {@link FindAllData}
  * and delegating its method to an inner instance of this class.
@@ -87,10 +92,9 @@ export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
   getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let endpoint$: Observable<string>;
     const args = [];
 
-    endpoint$ = this.getBrowseEndpoint(options).pipe(
+    const endpoint$ = this.getBrowseEndpoint(options).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((href: string) => isNotEmpty(linkPath) ? `${href}/${linkPath}` : href),
       distinctUntilChanged(),
diff --git a/src/app/core/data/base/hal-data-service.interface.ts b/src/app/core/data/base/hal-data-service.interface.ts
index 6959399760..1ffdffaa7c 100644
--- a/src/app/core/data/base/hal-data-service.interface.ts
+++ b/src/app/core/data/base/hal-data-service.interface.ts
@@ -6,11 +6,12 @@
  * http://www.dspace.org/license/
  */
 import { Observable } from 'rxjs';
+
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
+import { HALResource } from '../../shared/hal-resource.model';
 import { FindListOptions } from '../find-list-options.model';
 import { PaginatedList } from '../paginated-list.model';
-import { HALResource } from '../../shared/hal-resource.model';
+import { RemoteData } from '../remote-data';
 
 /**
  * An interface defining the minimum functionality needed for a data service to resolve HAL resources.
diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
index 11af83ff9f..528d6c4945 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -5,21 +5,25 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindListOptions } from '../find-list-options.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { IdentifiableDataService } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { EMBED_SEPARATOR } from './base-data.service';
+import { IdentifiableDataService } from './identifiable-data.service';
 
 const endpoint = 'https://rest.api/core';
 
@@ -63,12 +67,12 @@ describe('IdentifiableDataService', () => {
       },
       getByHref: () => {
         /* empty */
-      }
+      },
     } as any;
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -132,7 +136,7 @@ describe('IdentifiableDataService', () => {
         resourceIdMock,
         followLink('bundles', { shouldEmbed: false }),
         followLink('owningCollection', { shouldEmbed: false }),
-        followLink('templateItemOf')
+        followLink('templateItemOf'),
       );
       expect(result).toEqual(expected);
     });
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index 904f925765..da3167903e 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -5,16 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { RemoteData } from '../remote-data';
-import { BaseDataService } from './base-data.service';
-import { RequestService } from '../request.service';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Shorthand type for the method to construct an ID endpoint.
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
index a55b1229b8..03c15199a7 100644
--- a/src/app/core/data/base/patch-data.spec.ts
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -6,28 +6,38 @@
  * http://www.dspace.org/license/
  */
 /* eslint-disable max-classes-per-file */
-import { RequestService } from '../request.service';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { PatchData, PatchDataImpl } from './patch-data';
-import { ChangeAnalyzer } from '../change-analyzer';
-import { Item } from '../../shared/item.model';
-import { compare, Operation } from 'fast-json-patch';
-import { PatchRequest } from '../request.models';
 import { DSpaceObject } from '../../shared/dspace-object.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { constructIdEndpointDefault } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { Item } from '../../shared/item.model';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { PatchRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { RestRequestMethod } from '../rest-request-method';
+import { constructIdEndpointDefault } from './identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './patch-data';
 
 /**
  * Tests whether calls to `PatchData` methods are correctly patched through in a concrete data service that implements it
@@ -182,15 +192,15 @@ describe('PatchDataImpl', () => {
       _links: {
         self: {
           href: 'dso-href',
-        }
-      }
+        },
+      },
     };
     const operations = [
       Object.assign({
         op: 'move',
         from: '/1',
-        path: '/5'
-      }) as Operation
+        path: '/5',
+      }) as Operation,
     ];
 
     it('should send a PatchRequest', () => {
@@ -224,12 +234,12 @@ describe('PatchDataImpl', () => {
 
       dso = Object.assign(new DSpaceObject(), {
         _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name1 }]
+        metadata: [{ key: 'dc.title', value: name1 }],
       });
 
       dso2 = Object.assign(new DSpaceObject(), {
         _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name2 }]
+        metadata: [{ key: 'dc.title', value: name2 }],
       });
 
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(dso));
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
index e30c394a34..adcf98ef94 100644
--- a/src/app/core/data/base/patch-data.ts
+++ b/src/app/core/data/base/patch-data.ts
@@ -5,22 +5,36 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
 import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { find, map, mergeMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { PatchRequest } from '../request.models';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../shared/operators';
-import { ChangeAnalyzer } from '../change-analyzer';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { RestRequestMethod } from '../rest-request-method';
-import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+import {
+  find,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../shared/operators';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { RemoteData } from '../remote-data';
+import { PatchRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { RestRequestMethod } from '../rest-request-method';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './identifiable-data.service';
 
 /**
  * Interface for a data service that can patch and update objects.
@@ -54,7 +68,7 @@ export interface PatchData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to patch and update objects.
+ * A UpdateDataServiceImpl feature to patch and update objects.
  *
  * Concrete data services can use this feature by implementing {@link PatchData}
  * and delegating its method to an inner instance of this class.
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 6287fe91b1..1430bb3106 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -6,20 +6,27 @@
  * http://www.dspace.org/license/
  */
 
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { PutData, PutDataImpl } from './put-data';
-import { RestRequestMethod } from '../rest-request-method';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
+import { RestRequestMethod } from '../rest-request-method';
+import {
+  PutData,
+  PutDataImpl,
+} from './put-data';
 
 /**
  * Tests whether calls to `PutData` methods are correctly patched through in a concrete data service that implements it
@@ -127,7 +134,7 @@ describe('PutDataImpl', () => {
       metadata: {           // recognized properties will be serialized
         ['dc.title']: [
           { language: 'en', value: 'some object' },
-        ]
+        ],
       },
       data: [ 1, 2, 3, 4 ], // unrecognized properties won't be serialized
       _links: { self: { href: selfLink } },
@@ -144,7 +151,7 @@ describe('PutDataImpl', () => {
           method: RestRequestMethod.PUT,
           body: {  // _links are not serialized
             uuid: obj.uuid,
-            metadata: obj.metadata
+            metadata: obj.metadata,
           },
         }));
         done();
diff --git a/src/app/core/data/base/put-data.ts b/src/app/core/data/base/put-data.ts
index bd2a8d2929..e9d2b01eb8 100644
--- a/src/app/core/data/base/put-data.ts
+++ b/src/app/core/data/base/put-data.ts
@@ -5,18 +5,19 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
+
+import { hasValue } from '../../../shared/empty.util';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { PutRequest } from '../request.models';
-import { hasValue } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { PutRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that can send PUT requests.
@@ -31,7 +32,7 @@ export interface PutData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to send PUT requests.
+ * A UpdateDataServiceImpl feature to send PUT requests.
  *
  * Concrete data services can use this feature by implementing {@link PutData}
  * and delegating its method to an inner instance of this class.
@@ -55,7 +56,7 @@ export class PutDataImpl<T extends CacheableObject> extends BaseDataService<T> i
    */
   put(object: T): Observable<RemoteData<T>> {
     const requestId = this.requestService.generateRequestId();
-    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<{}>).serialize(object);
+    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<unknown>).serialize(object);
     const request = new PutRequest(requestId, object._links.self.href, serializedObject);
 
     if (hasValue(this.responseMsToLive)) {
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index 31dddeddfc..af9f87bf2c 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -5,12 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-import { constructSearchEndpointDefault, SearchData, SearchDataImpl } from './search-data';
-import { FindListOptions } from '../find-list-options.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { of as observableOf } from 'rxjs';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../find-list-options.model';
+import {
+  constructSearchEndpointDefault,
+  SearchData,
+  SearchDataImpl,
+} from './search-data';
 
 /**
  * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 536d6d6e25..f758affa28 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -5,19 +5,26 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-import { hasNoValue, isNotEmpty } from '../../../shared/empty.util';
-import { FindListOptions } from '../find-list-options.model';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Shorthand type for method to construct a search endpoint
@@ -51,7 +58,7 @@ export interface SearchData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to search for objects.
+ * A UpdateDataServiceImpl feature to search for objects.
  *
  * Concrete data services can use this feature by implementing {@link SearchData}
  * and delegating its method to an inner instance of this class.
@@ -112,10 +119,9 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
   getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let result$: Observable<string>;
     const args = [];
 
-    result$ = this.getSearchEndpoint(searchMethod);
+    const result$ = this.getSearchEndpoint(searchMethod);
 
     return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
   }
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 89178f8dd2..95fe5f593f 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -1,26 +1,41 @@
 import { TestBed } from '@angular/core/testing';
-import { BitstreamDataService } from './bitstream-data.service';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { ItemMock } from 'src/app/shared/mocks/item.mock';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from 'src/app/shared/remote-data.utils';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RequestService } from './request.service';
 import { Bitstream } from '../shared/bitstream.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { Observable, of as observableOf } from 'rxjs';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../shared/bitstream-format-support-level';
-import { PatchRequest, PutRequest } from './request.models';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
+import { Bundle } from '../shared/bundle.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { BitstreamDataService } from './bitstream-data.service';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { BundleDataService } from './bundle-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import objectContaining = jasmine.objectContaining;
 import { RemoteData } from './remote-data';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import {
+  PatchRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import objectContaining = jasmine.objectContaining;
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -29,39 +44,41 @@ describe('BitstreamDataService', () => {
   let halService: HALEndpointService;
   let bitstreamFormatService: BitstreamFormatDataService;
   let rdbService: RemoteDataBuildService;
+  let bundleDataService: BundleDataService;
   const bitstreamFormatHref = 'rest-api/bitstreamformats';
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'fake-bitstream1',
     uuid: 'fake-bitstream1',
     _links: {
-      self: { href: 'fake-bitstream1-self' }
-    }
+      self: { href: 'fake-bitstream1-self' },
+    },
   });
   const bitstream2 = Object.assign(new Bitstream(), {
     id: 'fake-bitstream2',
     uuid: 'fake-bitstream2',
     _links: {
-      self: { href: 'fake-bitstream2-self' }
-    }
+      self: { href: 'fake-bitstream2-self' },
+    },
   });
   const format = Object.assign(new BitstreamFormat(), {
     id: '2',
     shortDescription: 'PNG',
     description: 'Portable Network Graphics',
-    supportLevel: BitstreamFormatSupportLevel.Known
+    supportLevel: BitstreamFormatSupportLevel.Known,
   });
   const url = 'fake-bitstream-url';
 
   beforeEach(() => {
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     requestService = getMockRequestService();
     halService = Object.assign(new HALEndpointServiceStub(url));
     bitstreamFormatService = jasmine.createSpyObj('bistreamFormatService', {
-      getBrowseEndpoint: observableOf(bitstreamFormatHref)
+      getBrowseEndpoint: observableOf(bitstreamFormatHref),
     });
+
     rdbService = getMockRemoteDataBuildService();
 
     TestBed.configureTestingModule({
@@ -76,6 +93,7 @@ describe('BitstreamDataService', () => {
       ],
     });
     service = TestBed.inject(BitstreamDataService);
+    bundleDataService = TestBed.inject(BundleDataService);
   });
 
   describe('composition', () => {
@@ -118,6 +136,32 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream1-self');
     });
 
+    describe('findPrimaryBitstreamByItemAndName', () => {
+      it('should return primary bitstream', () => {
+        const exprected$ = cold('(a|)', { a: bitstream1 } );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createSuccessfulRemoteDataObject(bitstream1)),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return null if primary bitstream has not be succeeded ', () => {
+        const exprected$ = cold('(a|)', { a: null } );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createFailedRemoteDataObject()),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return EMPTY if nothing where found', () => {
+        const exprected$ = cold('(|)', {} );
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createFailedRemoteDataObject<Bundle>()));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+    });
+
     it('should be able to delete multiple bitstreams', () => {
       service.removeMultiple([bitstream1, bitstream2]);
 
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bb4ec28166..bc89a54649 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,39 +1,71 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { find, map, switchMap, take } from 'rxjs/operators';
+import {
+  Operation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  find,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BITSTREAM } from '../shared/bitstream.resource-type';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { BundleDataService } from './bundle-data.service';
-import { buildPaginatedList, PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { PatchRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PageInfo } from '../shared/page-info.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { sendRequest } from '../shared/request.operators';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RestRequestMethod } from './rest-request-method';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NoContent } from '../shared/NoContent.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
+import { sendRequest } from '../shared/request.operators';
 import { dataService } from './base/data-service.decorator';
-import { Operation, RemoveOperation } from 'fast-json-patch';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { BundleDataService } from './bundle-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  PatchRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -107,7 +139,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
         } else {
           return [bundleRD as any];
         }
-      })
+      }),
     );
   }
 
@@ -120,10 +152,10 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     const requestId = this.requestService.generateRequestId();
     const bitstreamHref$ = this.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${bitstream.id}`),
-      switchMap((href: string) => this.halService.getEndpoint('format', href))
+      switchMap((href: string) => this.halService.getEndpoint('format', href)),
     );
     const formatHref$ = this.bitstreamFormatService.getBrowseEndpoint().pipe(
-      map((href: string) => `${href}/${format.id}`)
+      map((href: string) => `${href}/${format.id}`),
     );
     observableCombineLatest([bitstreamHref$, formatHref$]).pipe(
       map(([bitstreamHref, formatHref]) => {
@@ -134,7 +166,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
         return new PutRequest(requestId, bitstreamHref, formatHref, options);
       }),
       sendRequest(this.requestService),
-      take(1)
+      take(1),
     ).subscribe(() => {
       this.requestService.removeByHrefSubstring(bitstream.self + '/format');
     });
@@ -177,7 +209,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     const hrefObs = this.getSearchByHref(
       'byItemHandle',
       { searchParams },
-      ...linksToFollow
+      ...linksToFollow,
     );
 
     return this.findByHref(
@@ -201,6 +233,37 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }
 
+
+  /**
+   *
+   * Make a request to get primary bitstream
+   * in all current use cases, and having it simplifies this method
+   *
+   * @param item                        the {@link Item} the {@link Bundle} is a part of
+   * @param bundleName                  the name of the {@link Bundle} we want to find
+   *                                    {@link Bitstream}s for
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @return {Observable<Bitstream | null>}
+   *    Return an observable that constains primary bitstream information or null
+   */
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<Bundle>) => {
+        if (!rd.hasSucceeded) {
+          return EMPTY;
+        }
+        return rd.payload.primaryBitstream.pipe(
+          getFirstCompletedRemoteData(),
+          map((rdb: RemoteData<Bitstream>) => rdb.hasSucceeded ? rdb.payload : null),
+        );
+      }),
+    );
+  }
+
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts
index 15efebe8c7..234326d453 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -1,21 +1,36 @@
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { RestResponse } from '../cache/response.models';
-import { Observable, of as observableOf } from 'rxjs';
-import { Action, Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { waitForAsync } from '@angular/core/testing';
-import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import {
+  Action,
+  Store,
+} from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import {
+  BitstreamFormatsRegistryDeselectAction,
+  BitstreamFormatsRegistryDeselectAllAction,
+  BitstreamFormatsRegistrySelectAction,
+} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('BitstreamFormatDataService', () => {
   let service: BitstreamFormatDataService;
@@ -31,19 +46,19 @@ describe('BitstreamFormatDataService', () => {
   const store = {
     dispatch(action: Action) {
       // Do Nothing
-    }
+    },
   } as Store<CoreState>;
 
   const requestUUIDs = ['some', 'uuid'];
 
   const objectCache = jasmine.createSpyObj('objectCache', {
-    getByHref: observableOf({ requestUUIDs })
+    getByHref: observableOf({ requestUUIDs }),
   }) as ObjectCacheService;
 
   const halEndpointService = {
     getEndpoint(linkPath: string): Observable<string> {
       return cold('a', { a: bitstreamFormatsEndpoint });
-    }
+    },
   } as HALEndpointService;
 
   const notificationsService = {} as NotificationsService;
@@ -83,7 +98,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -104,7 +119,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -127,7 +142,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -149,7 +164,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -174,7 +189,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -198,12 +213,12 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       const halService = {
         getEndpoint(linkPath: string): Observable<string> {
           return observableOf(bitstreamFormatsEndpoint);
-        }
+        },
       } as HALEndpointService;
       service = initTestService(halService);
       service.clearBitStreamFormatRequests().subscribe();
@@ -222,7 +237,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -245,7 +260,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -268,7 +283,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -289,12 +304,12 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: hot('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       const halService = {
         getEndpoint(linkPath: string): Observable<string> {
           return observableOf(bitstreamFormatsEndpoint);
-        }
+        },
       } as HALEndpointService;
       service = initTestService(halService);
     }));
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 0104389815..1006e4eae0 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -1,30 +1,52 @@
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, tap } from 'rxjs/operators';
-import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import {
+  distinctUntilChanged,
+  map,
+  tap,
+} from 'rxjs/operators';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+
+import {
+  BitstreamFormatsRegistryDeselectAction,
+  BitstreamFormatsRegistryDeselectAllAction,
+  BitstreamFormatsRegistrySelectAction,
+} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
-import { Bitstream } from '../shared/bitstream.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteData } from './remote-data';
-import { PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
+import { NoContent } from '../shared/NoContent.model';
 import { sendRequest } from '../shared/request.operators';
-import { CoreState } from '../core-state.model';
+import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
 import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
-import { NoContent } from '../shared/NoContent.model';
-import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import {
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 const bitstreamFormatsStateSelector = createSelector(
   coreSelector,
@@ -106,7 +128,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
       map((endpointURL: string) => {
         return new PostRequest(requestId, endpointURL, bitstreamFormat);
       }),
-      sendRequest(this.requestService)
+      sendRequest(this.requestService),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID(requestId);
@@ -117,7 +139,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
    */
   public clearBitStreamFormatRequests(): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+      tap((href: string) => this.requestService.removeByHrefSubstring(href)),
     );
   }
 
diff --git a/src/app/core/data/browse-response-parsing.service.spec.ts b/src/app/core/data/browse-response-parsing.service.spec.ts
index 9fa7239ef7..53d2ec20fc 100644
--- a/src/app/core/data/browse-response-parsing.service.spec.ts
+++ b/src/app/core/data/browse-response-parsing.service.spec.ts
@@ -1,9 +1,9 @@
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
-import { BrowseResponseParsingService } from './browse-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HIERARCHICAL_BROWSE_DEFINITION } from '../shared/hierarchical-browse-definition.resource-type';
 import { FLAT_BROWSE_DEFINITION } from '../shared/flat-browse-definition.resource-type';
+import { HIERARCHICAL_BROWSE_DEFINITION } from '../shared/hierarchical-browse-definition.resource-type';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../shared/value-list-browse-definition.resource-type';
+import { BrowseResponseParsingService } from './browse-response-parsing.service';
 
 class TestService extends BrowseResponseParsingService {
   constructor(protected objectCache: ObjectCacheService) {
@@ -26,22 +26,22 @@ describe('BrowseResponseParsingService', () => {
 
   describe('', () => {
     const mockFlatBrowse = {
-        id: 'title',
-        browseType: 'flatBrowse',
-        type: 'browse',
-      };
+      id: 'title',
+      browseType: 'flatBrowse',
+      type: 'browse',
+    };
 
     const mockValueList = {
-        id: 'author',
-        browseType: 'valueList',
-        type: 'browse',
-      };
+      id: 'author',
+      browseType: 'valueList',
+      type: 'browse',
+    };
 
     const mockHierarchicalBrowse = {
-        id: 'srsc',
-        browseType: 'hierarchicalBrowse',
-        type: 'browse',
-      };
+      id: 'srsc',
+      browseType: 'hierarchicalBrowse',
+      type: 'browse',
+    };
 
     it('should deserialize flatBrowses correctly', () => {
       let deserialized = service.deserialize(mockFlatBrowse);
diff --git a/src/app/core/data/browse-response-parsing.service.ts b/src/app/core/data/browse-response-parsing.service.ts
index a568cdb617..e01fa17f1f 100644
--- a/src/app/core/data/browse-response-parsing.service.ts
+++ b/src/app/core/data/browse-response-parsing.service.ts
@@ -1,18 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ObjectCacheService } from '../cache/object-cache.service';
+
 import { hasValue } from '../../shared/empty.util';
-import {
-  HIERARCHICAL_BROWSE_DEFINITION
-} from '../shared/hierarchical-browse-definition.resource-type';
-import { FLAT_BROWSE_DEFINITION } from '../shared/flat-browse-definition.resource-type';
-import { HierarchicalBrowseDefinition } from '../shared/hierarchical-browse-definition.model';
-import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
-import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { Serializer } from '../serializer';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
+import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
+import { FLAT_BROWSE_DEFINITION } from '../shared/flat-browse-definition.resource-type';
+import { HierarchicalBrowseDefinition } from '../shared/hierarchical-browse-definition.model';
+import { HIERARCHICAL_BROWSE_DEFINITION } from '../shared/hierarchical-browse-definition.resource-type';
 import { ValueListBrowseDefinition } from '../shared/value-list-browse-definition.model';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../shared/value-list-browse-definition.resource-type';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 
 /**
  * A ResponseParsingService used to parse a REST API response to a BrowseDefinition object
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
index e3ba438f9b..b2c8be06af 100644
--- a/src/app/core/data/bundle-data.service.spec.ts
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -1,19 +1,23 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
-import { compare, Operation } from 'fast-json-patch';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Item } from '../shared/item.model';
-import { ChangeAnalyzer } from './change-analyzer';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { BundleDataService } from './bundle-data.service';
-import { HALLink } from '../shared/hal-link.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { Bundle } from '../shared/bundle.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { Bundle } from '../shared/bundle.model';
+import { HALLink } from '../shared/hal-link.model';
+import { Item } from '../shared/item.model';
 import { testPatchDataImplementation } from './base/patch-data.spec';
+import { BundleDataService } from './bundle-data.service';
+import { ChangeAnalyzer } from './change-analyzer';
 
 class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
   diff(object1: Item, object2: Item): Operation[] {
@@ -41,7 +45,7 @@ describe('BundleDataService', () => {
     bundleHALLink.href = bundleLink;
     item = new Item();
     item._links = {
-      bundles: bundleHALLink
+      bundles: bundleHALLink,
     };
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
@@ -56,7 +60,7 @@ describe('BundleDataService', () => {
       },
       getObjectBySelfLink: () => {
         /* empty */
-      }
+      },
     } as any;
     store = {} as Store<CoreState>;
     return new BundleDataService(
@@ -99,30 +103,30 @@ describe('BundleDataService', () => {
           metadata: {
             'dc.title': [
               {
-                value: 'ORIGINAL'
-              }
-            ]
-          }
+                value: 'ORIGINAL',
+              },
+            ],
+          },
         }),
         Object.assign(new Bundle(), {
           id: 'THUMBNAIL_BUNDLE',
           metadata: {
             'dc.title': [
               {
-                value: 'THUMBNAIL'
-              }
-            ]
-          }
+                value: 'THUMBNAIL',
+              },
+            ],
+          },
         }),
         Object.assign(new Bundle(), {
           id: 'EXTRA_BUNDLE',
           metadata: {
             'dc.title': [
               {
-                value: 'EXTRA'
-              }
-            ]
-          }
+                value: 'EXTRA',
+              },
+            ],
+          },
         }),
       ];
       spyOn(service, 'findAllByItem').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(bundles)));
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 19f0e73706..84684c6603 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -1,28 +1,36 @@
 import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { Bitstream } from '../shared/bitstream.model';
 import { Bundle } from '../shared/bundle.model';
 import { BUNDLE } from '../shared/bundle.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Bitstream } from '../shared/bitstream.model';
 import { RequestEntryState } from './request-entry-state.model';
-import { FindListOptions } from './find-list-options.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RestRequestMethod } from './rest-request-method';
-import { Operation } from 'fast-json-patch';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Bundle}s from the REST API
@@ -91,7 +99,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
               RequestEntryState.Success,
               null,
               matchingBundle,
-              200
+              200,
             );
           } else {
             return new RemoteData(
@@ -101,7 +109,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
               RequestEntryState.Error,
               `The bundle with name ${bundleName} was not found.`,
               null,
-              404
+              404,
             );
           }
         } else {
@@ -119,7 +127,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
   getBitstreamsEndpoint(bundleId: string, searchOptions?: PaginatedSearchOptions): Observable<string> {
     return this.getBrowseEndpoint().pipe(
       switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`)),
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
   }
 
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index 65f8b3ab2c..431fe941bb 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -1,29 +1,45 @@
-import { CollectionDataService } from './collection-data.service';
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { hasNoValue } from '../../shared/empty.util';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { ContentSourceRequest, UpdateContentSourceRequest } from './request.models';
-import { ContentSource } from '../shared/content-source.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { Collection } from '../shared/collection.model';
+import { ContentSource } from '../shared/content-source.model';
 import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from './paginated-list.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { hasNoValue } from '../../shared/empty.util';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { CollectionDataService } from './collection-data.service';
+import { buildPaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  ContentSourceRequest,
+  UpdateContentSourceRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 const url = 'fake-url';
 const collectionId = 'fake-collection-id';
@@ -35,7 +51,7 @@ describe('CollectionDataService', () => {
   let translate: TranslateService;
   let notificationsService: any;
   let rdbService: RemoteDataBuildService;
-  let objectCache: ObjectCacheService;
+  let objectCache: ObjectCacheServiceStub;
   let halService: any;
 
   const mockCollection1: Collection = Object.assign(new Collection(), {
@@ -43,9 +59,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-1',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-1-1'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-1-1',
+      },
+    },
   });
 
   const mockCollection2: Collection = Object.assign(new Collection(), {
@@ -53,9 +69,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-2',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-2-2'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-2-2',
+      },
+    },
   });
 
   const mockCollection3: Collection = Object.assign(new Collection(), {
@@ -63,9 +79,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-3',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-3-3'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-3-3',
+      },
+    },
   });
 
   const queryString = 'test-string';
@@ -138,7 +154,7 @@ describe('CollectionDataService', () => {
       it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollection', () => {
         const result = service.getAuthorizedCollection(queryString);
         const expected = cold('a|', {
-          a: paginatedListRD
+          a: paginatedListRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -153,7 +169,7 @@ describe('CollectionDataService', () => {
       it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollectionByCommunity', () => {
         const result = service.getAuthorizedCollectionByCommunity(communityId, queryString);
         const expected = cold('a|', {
-          a: paginatedListRD
+          a: paginatedListRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -200,19 +216,17 @@ describe('CollectionDataService', () => {
     }
     rdbService = jasmine.createSpyObj('rdbService', {
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: buildResponse$,
-      buildSingle: buildResponse$
-    });
-    objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      buildSingle: buildResponse$,
     });
+    objectCache = new ObjectCacheServiceStub();
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
     translate = getMockTranslateService();
 
-    service = new CollectionDataService(requestService, rdbService, objectCache, halService, null, notificationsService, null, null, translate);
+    service = new CollectionDataService(requestService, rdbService, objectCache as ObjectCacheService, halService, null, notificationsService, null, null, translate);
   }
 
 });
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 405b35c1f9..a85d7c0798 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -2,38 +2,48 @@ import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { INotification } from '../../shared/notifications/models/notification.model';
+import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Collection } from '../shared/collection.model';
 import { COLLECTION } from '../shared/collection.resource-type';
+import { Community } from '../shared/community.model';
 import { ContentSource } from '../shared/content-source.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
+import { dataService } from './base/data-service.decorator';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import {
   ContentSourceRequest,
-  UpdateContentSourceRequest
+  UpdateContentSourceRequest,
 } from './request.models';
 import { RequestService } from './request.service';
-import { BitstreamDataService } from './bitstream-data.service';
 import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { Community } from '../shared/community.model';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COLLECTION)
@@ -73,7 +83,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
   getAuthorizedCollection(query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findSubmitAuthorized';
     options = Object.assign({}, options, {
-      searchParams: [new RequestParam('query', query)]
+      searchParams: [new RequestParam('query', query)],
     });
 
     return this.searchBy(searchHref, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
@@ -102,8 +112,8 @@ export class CollectionDataService extends ComColDataService<Collection> {
     options = Object.assign({}, options, {
       searchParams: [
         new RequestParam('query', query),
-        new RequestParam('entityType', entityType)
-      ]
+        new RequestParam('entityType', entityType),
+      ],
     });
 
     return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe(
@@ -121,13 +131,13 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true,): Observable<RemoteData<PaginatedList<Collection>>> {
+  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findSubmitAuthorizedByCommunity';
     options = Object.assign({}, options, {
       searchParams: [
         new RequestParam('uuid', communityId),
-        new RequestParam('query', query)
-      ]
+        new RequestParam('query', query),
+      ],
     });
 
     return this.searchBy(searchHref, options, reRequestOnStale).pipe(
@@ -154,11 +164,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
     const searchHref = 'findSubmitAuthorizedByCommunityAndEntityType';
     const searchParams = [
       new RequestParam('uuid', communityId),
-      new RequestParam('entityType', entityType)
+      new RequestParam('entityType', entityType),
     ];
 
     options = Object.assign({}, options, {
-      searchParams: searchParams
+      searchParams: searchParams,
     });
 
     return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe(
@@ -179,7 +189,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
     return this.searchBy(searchHref, options).pipe(
       filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending),
       take(1),
-      map((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.totalElements > 0)
+      map((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.totalElements > 0),
     );
   }
 
@@ -189,7 +199,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    */
   getHarvesterEndpoint(collectionId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((href: string) => this.halService.getEndpoint('harvester', `${href}/${collectionId}`))
+      switchMap((href: string) => this.halService.getEndpoint('harvester', `${href}/${collectionId}`)),
     );
   }
 
@@ -200,7 +210,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
   getContentSource(collectionId: string, useCachedVersionIfAvailable = true): Observable<RemoteData<ContentSource>> {
     const href$ = this.getHarvesterEndpoint(collectionId).pipe(
       isNotEmptyOperator(),
-      take(1)
+      take(1),
     );
 
     href$.subscribe((href: string) => {
@@ -227,7 +237,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
         headers = headers.append('Content-Type', 'application/json');
         options.headers = headers;
         return new UpdateContentSourceRequest(requestId, href, JSON.stringify(serializedContentSource), options);
-      })
+      }),
     );
 
     // Execute the post/put request
@@ -255,7 +265,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
           return (response as RemoteData<ContentSource>).payload;
         }
         return response as INotification;
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 0f9f0fa740..e1fe48c076 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -1,28 +1,37 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { cold } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
+import { Bitstream } from '../shared/bitstream.model';
 import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RequestService } from './request.service';
-import { createFailedRemoteDataObject, createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { BitstreamDataService } from './bitstream-data.service';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { testCreateDataImplementation } from './base/create-data.spec';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
-import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { RequestService } from './request.service';
 
 const LINK_NAME = 'test';
 
@@ -45,7 +54,7 @@ class TestService extends ComColDataService<any> {
     protected http: HttpClient,
     protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Community>,
-    protected linkPath: string
+    protected linkPath: string,
   ) {
     super('something', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
@@ -79,30 +88,30 @@ describe('ComColDataService', () => {
   const comparator = {} as any;
 
   const options = Object.assign(new FindListOptions(), {
-    scopeID: scopeID
+    scopeID: scopeID,
   });
   const scopedEndpoint = `${communityEndpoint}/${LINK_NAME}`;
 
   const mockHalService = {
-    getEndpoint: (linkPath) => observableOf(communitiesEndpoint)
+    getEndpoint: (linkPath) => observableOf(communitiesEndpoint),
   };
 
   function initRdbService(): RemoteDataBuildService {
     return jasmine.createSpyObj('rdbService', {
-      buildSingle : createFailedRemoteDataObject$('Error', 500)
+      buildSingle : createFailedRemoteDataObject$('Error', 500),
     });
   }
 
   function initBitstreamDataService(): BitstreamDataService {
     return jasmine.createSpyObj('bitstreamDataService', {
-      deleteByHref: createSuccessfulRemoteDataObject$({})
+      deleteByHref: createSuccessfulRemoteDataObject$({}),
     });
   }
 
   function initMockCommunityDataService(): CommunityDataService {
     return jasmine.createSpyObj('cds', {
       getEndpoint: cold('--a-', { a: communitiesEndpoint }),
-      getIDHref: communityEndpoint
+      getIDHref: communityEndpoint,
     });
   }
 
@@ -112,11 +121,11 @@ describe('ComColDataService', () => {
         d: {
           _links: {
             [LINK_NAME]: {
-              href: scopedEndpoint
-            }
-          }
-        }
-      })
+              href: scopedEndpoint,
+            },
+          },
+        },
+      }),
     });
   }
 
@@ -132,7 +141,7 @@ describe('ComColDataService', () => {
       http,
       bitstreamDataService,
       comparator,
-      LINK_NAME
+      LINK_NAME,
     );
   }
 
@@ -200,12 +209,12 @@ describe('ComColDataService', () => {
       communityWithParentHref = {
         _links: {
           parentCommunity: {
-            href: 'topLevel/parentCommunity'
-          }
-        }
+            href: 'topLevel/parentCommunity',
+          },
+        },
       } as Community;
       communityWithoutParentHref = {
-        _links: {}
+        _links: {},
       } as Community;
     });
 
@@ -238,9 +247,9 @@ describe('ComColDataService', () => {
           id: 'a20da287-e174-466a-9926-f66as300d399',
           metadata: [{
             key: 'dc.title',
-            value: 'parent community'
+            value: 'parent community',
           }],
-          _links: {}
+          _links: {},
         });
       });
       it('should refresh a specific cached community when the parent link can be resolved', () => {
@@ -262,9 +271,9 @@ describe('ComColDataService', () => {
       dso = {
         _links: {
           logo: {
-            href: 'logo-href'
-          }
-        }
+            href: 'logo-href',
+          },
+        },
       };
     });
 
@@ -291,8 +300,8 @@ describe('ComColDataService', () => {
           _links: {
             self: {
               href: 'logo-href',
-            }
-          }
+            },
+          },
         });
       });
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index abc9046cd0..de0d1a3157 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -1,34 +1,63 @@
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { Community } from '../shared/community.model';
-import { HALLink } from '../shared/hal-link.model';
-import { PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
 import { Bitstream } from '../shared/bitstream.model';
 import { Collection } from '../shared/collection.model';
-import { BitstreamDataService } from './bitstream-data.service';
+import { Community } from '../shared/community.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { HALLink } from '../shared/hal-link.model';
 import { NoContent } from '../shared/NoContent.model';
-import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { RestRequestMethod } from './rest-request-method';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { BitstreamDataService } from './bitstream-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { Operation } from 'fast-json-patch';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 export abstract class ComColDataService<T extends Community | Collection> extends IdentifiableDataService<T> implements CreateData<T>, FindAllData<T>, SearchData<T>, PatchData<T>, DeleteData<T> {
   private createData: CreateData<T>;
@@ -86,7 +115,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
         }),
         filter((halLink: HALLink) => isNotEmpty(halLink)),
         map((halLink: HALLink) => halLink.href),
-        distinctUntilChanged()
+        distinctUntilChanged(),
       );
     }
   }
@@ -97,7 +126,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
 
   public findByParent(parentUUID: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
     const href$ = this.getFindByParentHref(parentUUID).pipe(
-      map((href: string) => this.buildHrefFromFindOptions(href, options))
+      map((href: string) => this.buildHrefFromFindOptions(href, options)),
     );
     return this.findListByHref(href$, options, true, true, ...linksToFollow);
   }
@@ -110,7 +139,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     return this.halService.getEndpoint(this.linkPath).pipe(
       // We can't use HalLinkService to discover the logo link itself, as objects without a logo
       // don't have the link, and this method is also used in the createLogo method.
-      map((href: string) => new URLCombiner(href, id, 'logo').toString())
+      map((href: string) => new URLCombiner(href, id, 'logo').toString()),
     );
   }
 
@@ -132,7 +161,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
           } else {
             return this.bitstreamDataService.deleteByHref(logoRd.payload._links.self.href);
           }
-        })
+        }),
       );
     } else {
       return createFailedRemoteDataObject$(`The given object doesn't have a logo`, 400);
@@ -148,7 +177,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
       this.findByHref(parentCommunityUrl).pipe(
         getFirstCompletedRemoteData(),
       ),
-      this.halService.getEndpoint('communities/search/top').pipe(take(1))
+      this.halService.getEndpoint('communities/search/top').pipe(take(1)),
     ]).subscribe(([rd, topHref]: [RemoteData<any>, string]) => {
       if (rd.hasSucceeded && isNotEmpty(rd.payload) && isNotEmpty(rd.payload.id)) {
         this.requestService.setStaleByHrefSubstring(rd.payload.id);
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index efb6d50e84..ad06e9ee91 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -1,23 +1,28 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
 import { COMMUNITY } from '../shared/community.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BitstreamDataService } from './bitstream-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { isNotEmpty } from '../../shared/empty.util';
-import { FindListOptions } from './find-list-options.model';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COMMUNITY)
@@ -44,14 +49,14 @@ export class CommunityDataService extends ComColDataService<Community> {
   findTop(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Community>[]): Observable<RemoteData<PaginatedList<Community>>> {
     return this.getEndpoint().pipe(
       map(href => `${href}/search/top`),
-      switchMap(href => this.findListByHref(href, options, true, true, ...linksToFollow))
+      switchMap(href => this.findListByHref(href, options, true, true, ...linksToFollow)),
     );
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       switchMap((communityEndpointHref: string) =>
-        this.halService.getEndpoint('subcommunities', `${communityEndpointHref}/${parentUUID}`))
+        this.halService.getEndpoint('subcommunities', `${communityEndpointHref}/${parentUUID}`)),
     );
   }
 
@@ -59,7 +64,7 @@ export class CommunityDataService extends ComColDataService<Community> {
     return this.getEndpoint().pipe(
       map((endpoint: string) => this.getIDHref(endpoint, options.scopeID)),
       filter((href: string) => isNotEmpty(href)),
-      take(1)
+      take(1),
     );
   }
 }
diff --git a/src/app/core/data/configuration-data.service.spec.ts b/src/app/core/data/configuration-data.service.spec.ts
index 7fe69c16e5..bccfe45da4 100644
--- a/src/app/core/data/configuration-data.service.spec.ts
+++ b/src/app/core/data/configuration-data.service.spec.ts
@@ -1,12 +1,16 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigurationDataService } from './configuration-data.service';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigurationDataService } from './configuration-data.service';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
 
 describe('ConfigurationDataService', () => {
   let scheduler: TestScheduler;
@@ -18,7 +22,7 @@ describe('ConfigurationDataService', () => {
   const testObject = {
     uuid: 'test-property',
     name: 'test-property',
-    values: ['value-1', 'value-2']
+    values: ['value-1', 'value-2'],
   } as ConfigurationProperty;
   const configLink = 'https://rest.api/rest/api/config/properties';
   const requestURL = `https://rest.api/rest/api/config/properties/${testObject.name}`;
@@ -28,18 +32,18 @@ describe('ConfigurationDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: configLink })
+      getEndpoint: cold('a', { a: configLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
         a: {
-          payload: testObject
-        }
-      })
+          payload: testObject,
+        },
+      }),
     });
     objectCache = {} as ObjectCacheService;
 
@@ -70,8 +74,8 @@ describe('ConfigurationDataService', () => {
       const result = service.findByPropertyName(testObject.name);
       const expected = cold('a', {
         a: {
-          payload: testObject
-        }
+          payload: testObject,
+        },
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index de044e25e3..8293173c14 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,15 +1,15 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(CONFIG_PROPERTY)
diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts
index 066ccf28c9..c4eaa8418d 100644
--- a/src/app/core/data/content-source-response-parsing.service.ts
+++ b/src/app/core/data/content-source-response-parsing.service.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
+
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ContentSource } from '../shared/content-source.model';
 import { MetadataConfig } from '../shared/metadata-config.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
diff --git a/src/app/core/data/debug-response-parsing.service.ts b/src/app/core/data/debug-response-parsing.service.ts
index 992a29e4b8..067afcee87 100644
--- a/src/app/core/data/debug-response-parsing.service.ts
+++ b/src/app/core/data/debug-response-parsing.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+
 import { RestResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
diff --git a/src/app/core/data/default-change-analyzer.service.ts b/src/app/core/data/default-change-analyzer.service.ts
index 70c45bbc2d..94e1856543 100644
--- a/src/app/core/data/default-change-analyzer.service.ts
+++ b/src/app/core/data/default-change-analyzer.service.ts
@@ -1,10 +1,13 @@
 import { Injectable } from '@angular/core';
-import { compare } from 'fast-json-patch';
-import { Operation } from 'fast-json-patch';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+
 import { getClassForType } from '../cache/builders/build-decorators';
+import { TypedObject } from '../cache/typed-object.model';
 import { DSpaceNotNullSerializer } from '../dspace-rest/dspace-not-null.serializer';
 import { ChangeAnalyzer } from './change-analyzer';
-import { TypedObject } from '../cache/typed-object.model';
 
 /**
  * A class to determine what differs between two
diff --git a/src/app/core/data/dso-change-analyzer.service.ts b/src/app/core/data/dso-change-analyzer.service.ts
index a621895633..4f0ade27b1 100644
--- a/src/app/core/data/dso-change-analyzer.service.ts
+++ b/src/app/core/data/dso-change-analyzer.service.ts
@@ -1,9 +1,13 @@
-import { compare, Operation } from 'fast-json-patch';
-import { ChangeAnalyzer } from './change-analyzer';
 import { Injectable } from '@angular/core';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import cloneDeep from 'lodash/cloneDeep';
+
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { MetadataMap } from '../shared/metadata.models';
-import cloneDeep from 'lodash/cloneDeep';
+import { ChangeAnalyzer } from './change-analyzer';
 
 /**
  * A class to determine what differs between two
diff --git a/src/app/core/data/dso-redirect.service.spec.ts b/src/app/core/data/dso-redirect.service.spec.ts
index 2122dc663a..b6b72583ea 100644
--- a/src/app/core/data/dso-redirect.service.spec.ts
+++ b/src/app/core/data/dso-redirect.service.spec.ts
@@ -1,16 +1,25 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
+import { AppConfig } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment.test';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DsoRedirectService } from './dso-redirect.service';
-import { GetRequest, IdentifierType } from './request.models';
-import { RequestService } from './request.service';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Item } from '../shared/item.model';
 import { EMBED_SEPARATOR } from './base/base-data.service';
-import { HardRedirectService } from '../services/hard-redirect.service';
+import { DsoRedirectService } from './dso-redirect.service';
+import {
+  GetRequest,
+  IdentifierType,
+} from './request.models';
+import { RequestService } from './request.service';
 
 describe('DsoRedirectService', () => {
   let scheduler: TestScheduler;
@@ -33,34 +42,35 @@ describe('DsoRedirectService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: pidLink })
+      getEndpoint: cold('a', { a: pidLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
 
     remoteData = createSuccessfulRemoteDataObject(Object.assign(new Item(), {
       type: 'item',
-      uuid: '123456789'
+      uuid: '123456789',
     }));
 
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
-        a: remoteData
-      })
+        a: remoteData,
+      }),
     });
 
     redirectService = jasmine.createSpyObj('redirectService', {
-      redirect: {}
+      redirect: {},
     });
 
     service = new DsoRedirectService(
+      environment as AppConfig,
       requestService,
       rdbService,
       objectCache,
       halService,
-      redirectService
+      redirectService,
     );
   });
 
@@ -107,7 +117,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/items/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/items/${remoteData.payload.uuid}`, 301);
     });
     it('should navigate to entities route with the corresponding entity type', () => {
       remoteData.payload.type = 'item';
@@ -115,8 +125,8 @@ describe('DsoRedirectService', () => {
         'dspace.entity.type': [
           {
             language: 'en_US',
-            value: 'Publication'
-          }
+            value: 'Publication',
+          },
         ],
       };
       const redir = service.findByIdAndIDType(dsoHandle, IdentifierType.HANDLE);
@@ -124,7 +134,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/entities/publication/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/entities/publication/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to collections route', () => {
@@ -133,7 +143,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/collections/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/collections/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to communities route', () => {
@@ -142,7 +152,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/communities/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/communities/${remoteData.payload.uuid}`, 301);
     });
   });
 
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index a27d1fb11f..da8fe7082d 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -6,21 +6,29 @@
  * http://www.dspace.org/license/
  */
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { getDSORoute } from '../../app-routing-paths';
 import { hasValue } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 import { RemoteData } from './remote-data';
 import { IdentifierType } from './request.models';
 import { RequestService } from './request.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { getDSORoute } from '../../app-routing-paths';
-import { HardRedirectService } from '../services/hard-redirect.service';
 
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
@@ -42,7 +50,7 @@ class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
       // interpolate id/uuid as query parameter
       (endpoint: string, resourceID: string): string => {
         return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
-                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+          .replace(/{\?uuid}/, `?uuid=${resourceID}`);
       },
     );
   }
@@ -70,11 +78,12 @@ export class DsoRedirectService {
   private dataService: DsoByIdOrUUIDDataService;
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    private hardRedirectService: HardRedirectService
+    private hardRedirectService: HardRedirectService,
   ) {
     this.dataService = new DsoByIdOrUUIDDataService(requestService, rdbService, objectCache, halService);
   }
@@ -95,14 +104,14 @@ export class DsoRedirectService {
         if (response.hasSucceeded) {
           const dso = response.payload;
           if (hasValue(dso.uuid)) {
-            let newRoute = getDSORoute(dso);
+            const newRoute = getDSORoute(dso);
             if (hasValue(newRoute)) {
               // Use a "301 Moved Permanently" redirect for SEO purposes
-              this.hardRedirectService.redirect(newRoute, 301);
+              this.hardRedirectService.redirect(this.appConfig.ui.nameSpace.replace(/\/$/, '') + newRoute, 301);
             }
           }
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index 74117e79d3..6c9028bf6b 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -1,13 +1,18 @@
 import { Injectable } from '@angular/core';
 
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  DSOSuccessResponse,
+  RestResponse,
+} from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { RestResponse, DSOSuccessResponse } from '../cache/response.models';
-
-import { ResponseParsingService } from './parsing.service';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { BaseResponseParsingService } from './base-response-parsing.service';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
 /**
diff --git a/src/app/core/data/dspace-object-data.service.spec.ts b/src/app/core/data/dspace-object-data.service.spec.ts
index 0f167ea47e..1e4809ac4b 100644
--- a/src/app/core/data/dspace-object-data.service.spec.ts
+++ b/src/app/core/data/dspace-object-data.service.spec.ts
@@ -1,12 +1,16 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DSpaceObjectDataService } from './dspace-object-data.service';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { DSpaceObjectDataService } from './dspace-object-data.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 
 describe('DSpaceObjectDataService', () => {
   let scheduler: TestScheduler;
@@ -16,7 +20,7 @@ describe('DSpaceObjectDataService', () => {
   let rdbService: RemoteDataBuildService;
   let objectCache: ObjectCacheService;
   const testObject = {
-    uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746'
+    uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746',
   } as DSpaceObject;
   const dsoLink = 'https://rest.api/rest/api/dso/find{?uuid}';
   const requestURL = `https://rest.api/rest/api/dso/find?uuid=${testObject.uuid}`;
@@ -26,18 +30,18 @@ describe('DSpaceObjectDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: dsoLink })
+      getEndpoint: cold('a', { a: dsoLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
         a: {
-          payload: testObject
-        }
-      })
+          payload: testObject,
+        },
+      }),
     });
     objectCache = {} as ObjectCacheService;
 
@@ -68,8 +72,8 @@ describe('DSpaceObjectDataService', () => {
       const result = service.findById(testObject.uuid);
       const expected = cold('a', {
         a: {
-          payload: testObject
-        }
+          payload: testObject,
+        },
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index 2ad024133c..15e405a132 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@angular/core';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { DSPACE_OBJECT } from '../shared/dspace-object.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RequestService } from './request.service';
 
 @Injectable()
 @dataService(DSPACE_OBJECT)
diff --git a/src/app/core/data/dspace-rest-response-parsing.service.ts b/src/app/core/data/dspace-rest-response-parsing.service.ts
index 500afc4aff..0177a9813a 100644
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -1,23 +1,34 @@
 /* eslint-disable max-classes-per-file */
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { Serializer } from '../serializer';
-import { PageInfo } from '../shared/page-info.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { PaginatedList, buildPaginatedList } from './paginated-list.model';
-import { getClassForType } from '../cache/builders/build-decorators';
-import { environment } from '../../../environments/environment';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { Injectable } from '@angular/core';
-import { ResponseParsingService } from './parsing.service';
-import { ParsedResponse } from '../cache/response.models';
-import { RestRequestMethod } from './rest-request-method';
-import { getUrlWithoutEmbedParams, getEmbedSizeParams } from '../index/index.selectors';
-import { URLCombiner } from '../url-combiner/url-combiner';
+
+import { environment } from '../../../environments/environment';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { getClassForType } from '../cache/builders/build-decorators';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  getEmbedSizeParams,
+  getUrlWithoutEmbedParams,
+} from '../index/index.selectors';
+import { Serializer } from '../serializer';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { PageInfo } from '../shared/page-info.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 
 
 /**
@@ -144,8 +155,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
         console.warn(`The response for '${request.href}' doesn't have a self link. This could mean there's an issue with the REST endpoint`);
         response.payload._links = Object.assign({}, response.payload._links, {
           self: {
-            href: urlWithoutEmbedParams
-          }
+            href: urlWithoutEmbedParams,
+          },
         });
 
       } else {
@@ -155,8 +166,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
           console.warn(`The response for '${urlWithoutEmbedParams}' has the self link '${response.payload._links.self.href}'. These don't match. This could mean there's an issue with the REST endpoint`);
           response.payload._links = Object.assign({}, response.payload._links, {
             self: {
-              href: urlWithoutEmbedParams
-            }
+              href: urlWithoutEmbedParams,
+            },
           });
         }
       }
@@ -184,8 +195,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
   protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
     let array: ObjectDomain[] = [];
     data.forEach((datum) => {
-        array = [...array, this.process(datum, request)];
-      }
+      array = [...array, this.process(datum, request)];
+    },
     );
     return array;
   }
@@ -231,7 +242,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
diff --git a/src/app/core/data/endpoint-map-response-parsing.service.ts b/src/app/core/data/endpoint-map-response-parsing.service.ts
index 728714876c..69e9ec2de6 100644
--- a/src/app/core/data/endpoint-map-response-parsing.service.ts
+++ b/src/app/core/data/endpoint-map-response-parsing.service.ts
@@ -1,17 +1,17 @@
 import { Injectable } from '@angular/core';
 
-import {
-  DspaceRestResponseParsingService,
-  isCacheableObject
-} from './dspace-rest-response-parsing.service';
+import { environment } from '../../../environments/environment';
 import { hasValue } from '../../shared/empty.util';
 import { getClassForType } from '../cache/builders/build-decorators';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { ParsedResponse } from '../cache/response.models';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { environment } from '../../../environments/environment';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import {
+  DspaceRestResponseParsingService,
+  isCacheableObject,
+} from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
 /**
@@ -56,7 +56,7 @@ export class EndpointMapResponseParsingService extends DspaceRestResponseParsing
     } catch (e) {
       console.warn(`Couldn't parse endpoint request at ${request.href}`);
       return new ParsedResponse(response.statusCode, undefined, {
-        _links: response.payload._links
+        _links: response.payload._links,
       });
     }
   }
@@ -101,7 +101,7 @@ export class EndpointMapResponseParsingService extends DspaceRestResponseParsing
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
diff --git a/src/app/core/data/entity-type-data.service.ts b/src/app/core/data/entity-type-data.service.ts
index 4020ff638d..22cf1a1706 100644
--- a/src/app/core/data/entity-type-data.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -1,21 +1,36 @@
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { RemoteData } from './remote-data';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { PaginatedList } from './paginated-list.model';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { RelationshipTypeDataService } from './relationship-type-data.service';
-import { FindListOptions } from './find-list-options.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
 import { BaseDataService } from './base/base-data.service';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Service handling all ItemType requests
@@ -48,7 +63,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
    */
   getRelationshipTypesEndpoint(entityTypeId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((href) => this.halService.getEndpoint('relationshiptypes', `${href}/${entityTypeId}`))
+      switchMap((href) => this.halService.getEndpoint('relationshiptypes', `${href}/${entityTypeId}`)),
     );
   }
 
@@ -84,7 +99,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
   hasMoreThanOneAuthorized(): Observable<boolean> {
     const findListOptions: FindListOptions = {
       elementsPerPage: 2,
-      currentPage: 1
+      currentPage: 1,
     };
     return this.getAllAuthorizedRelationshipType(findListOptions).pipe(
       map((result: RemoteData<PaginatedList<ItemType>>) => {
@@ -95,7 +110,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
           output = false;
         }
         return output;
-      })
+      }),
     );
   }
 
@@ -118,7 +133,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
   hasMoreThanOneAuthorizedImport(): Observable<boolean> {
     const findListOptions: FindListOptions = {
       elementsPerPage: 2,
-      currentPage: 1
+      currentPage: 1,
     };
     return this.getAllAuthorizedRelationshipTypeImport(findListOptions).pipe(
       map((result: RemoteData<PaginatedList<ItemType>>) => {
@@ -129,7 +144,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
           output = false;
         }
         return output;
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts
index afd4927103..a60cef121a 100644
--- a/src/app/core/data/eperson-registration.service.spec.ts
+++ b/src/app/core/data/eperson-registration.service.spec.ts
@@ -1,16 +1,17 @@
-import { RequestService } from './request.service';
-import { EpersonRegistrationService } from './eperson-registration.service';
-import { RestResponse } from '../cache/response.models';
+import { HttpHeaders } from '@angular/common/http';
 import { cold } from 'jasmine-marbles';
-import { PostRequest } from './request.models';
-import { Registration } from '../shared/registration.model';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { RequestEntry } from './request-entry.model';
-import { HttpHeaders } from '@angular/common/http';
+
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RestResponse } from '../cache/response.models';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Registration } from '../shared/registration.model';
+import { EpersonRegistrationService } from './eperson-registration.service';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('EpersonRegistrationService', () => {
   let testScheduler;
@@ -44,7 +45,7 @@ describe('EpersonRegistrationService', () => {
       generateRequestId: 'request-id',
       send: {},
       getByUUID: cold('a',
-        { a: Object.assign(new RequestEntry(), { response: new RestResponse(true, 200, 'Success') }) })
+        { a: Object.assign(new RequestEntry(), { response: new RestResponse(true, 200, 'Success') }) }),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: observableOf(rd),
@@ -53,7 +54,7 @@ describe('EpersonRegistrationService', () => {
     service = new EpersonRegistrationService(
       requestService,
       rdbService,
-      halService
+      halService,
     );
   });
 
@@ -111,9 +112,9 @@ describe('EpersonRegistrationService', () => {
           payload: Object.assign(new Registration(), {
             email: registrationWithUser.email,
             token: 'test-token',
-            user: registrationWithUser.user
-          })
-        })
+            user: registrationWithUser.user,
+          }),
+        }),
       }));
     });
 
@@ -128,10 +129,10 @@ describe('EpersonRegistrationService', () => {
           jasmine.objectContaining({
             uuid: 'request-id', method: 'GET',
             href: 'rest-url/registrations/search/findByToken?token=test-token',
-          }), true
+          }), true,
         );
         expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', {
-          a: 'rest-url/registrations/search/findByToken?token=test-token'
+          a: 'rest-url/registrations/search/findByToken?token=test-token',
         });
       });
     });
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index 499d05af38..90a3fab83a 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -1,20 +1,33 @@
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { GetRequest, PostRequest } from './request.models';
 import { Observable } from 'rxjs';
-import { filter, find, map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { Registration } from '../shared/registration.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { ResponseParsingService } from './parsing.service';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { RegistrationResponseParsingService } from './registration-response-parsing.service';
-import { RemoteData } from './remote-data';
+import {
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { HttpHeaders } from '@angular/common/http';
-import { HttpParams } from '@angular/common/http';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { Registration } from '../shared/registration.model';
+import { ResponseParsingService } from './parsing.service';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { RemoteData } from './remote-data';
+import {
+  GetRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 @Injectable({
   providedIn: 'root',
@@ -81,11 +94,11 @@ export class EpersonRegistrationService {
       map((href: string) => {
         const request = new PostRequest(requestId, href, registration, options);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID<Registration>(requestId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
@@ -105,7 +118,7 @@ export class EpersonRegistrationService {
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return RegistrationResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request, true);
     });
@@ -117,7 +130,7 @@ export class EpersonRegistrationService {
         } else {
           return rd;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/external-source-data.service.spec.ts b/src/app/core/data/external-source-data.service.spec.ts
index 723d7f9bed..5e643cc549 100644
--- a/src/app/core/data/external-source-data.service.spec.ts
+++ b/src/app/core/data/external-source-data.service.spec.ts
@@ -1,11 +1,12 @@
-import { ExternalSourceDataService } from './external-source-data.service';
+import { of as observableOf } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { of as observableOf } from 'rxjs';
-import { GetRequest } from './request.models';
 import { testSearchDataImplementation } from './base/search-data.spec';
-import { take } from 'rxjs/operators';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { GetRequest } from './request.models';
 
 describe('ExternalSourceService', () => {
   let service: ExternalSourceDataService;
@@ -22,10 +23,10 @@ describe('ExternalSourceService', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0001'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0001',
+          },
+        ],
+      },
     }),
     Object.assign(new ExternalSourceEntry(), {
       id: '0001-0001-0001-0002',
@@ -34,20 +35,20 @@ describe('ExternalSourceService', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0002'
-          }
-        ]
-      }
-    })
+            value: 'https://orcid.org/0001-0001-0001-0002',
+          },
+        ],
+      },
+    }),
   ];
 
   function init() {
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: 'request-uuid',
-      send: {}
+      send: {},
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries))
+      buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries)),
     });
     halService = jasmine.createSpyObj('halService', {
       getEndpoint: observableOf('external-sources-REST-endpoint'),
@@ -96,12 +97,6 @@ describe('ExternalSourceService', () => {
         result.pipe(take(1)).subscribe();
         expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), false);
       });
-
-      it('should return the entries', () => {
-        result.subscribe((resultRD) => {
-          expect(resultRD.payload.page).toBe(entries);
-        });
-      });
     });
   });
 });
diff --git a/src/app/core/data/external-source-data.service.ts b/src/app/core/data/external-source-data.service.ts
index 02c5e4a53c..16eaeb9321 100644
--- a/src/app/core/data/external-source-data.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -1,20 +1,32 @@
 import { Injectable } from '@angular/core';
-import { ExternalSource } from '../shared/external-source.model';
-import { RequestService } from './request.service';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
-import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list.model';
+import { ExternalSource } from '../shared/external-source.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from './base/search-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * A service handling all external source requests
@@ -50,7 +62,7 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
   getEntriesEndpoint(externalSourceId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
       map((href) => this.getIDHref(href, externalSourceId)),
-      switchMap((href) => this.halService.getEndpoint('entries', href))
+      switchMap((href) => this.halService.getEndpoint('entries', href)),
     );
   }
 
@@ -78,7 +90,7 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
     return this.hasCachedErrorResponse(href$).pipe(
       switchMap((hasCachedErrorResponse) => {
         return this.findListByHref(href$, undefined, !hasCachedErrorResponse, reRequestOnStale, ...linksToFollow as any);
-      })
+      }),
     ) as any;
   }
 
diff --git a/src/app/core/data/facet-config-response-parsing.service.ts b/src/app/core/data/facet-config-response-parsing.service.ts
index 3e4493c32b..b4086428ea 100644
--- a/src/app/core/data/facet-config-response-parsing.service.ts
+++ b/src/app/core/data/facet-config-response-parsing.service.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
+
+import { FacetConfigResponse } from '../../shared/search/models/facet-config-response.model';
 import { SearchFilterConfig } from '../../shared/search/models/search-filter-config.model';
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
-import { FacetConfigResponse } from '../../shared/search/models/facet-config-response.model';
 import { RestRequest } from './rest-request.model';
 
 @Injectable()
@@ -16,19 +17,19 @@ export class FacetConfigResponseParsingService extends DspaceRestResponseParsing
     const filters = serializer.deserializeArray(config);
 
     const _links = {
-      self: data.payload._links.self
+      self: data.payload._links.self,
     };
 
     // fill in the missing links section
     filters.forEach((filterConfig: SearchFilterConfig) => {
       _links[filterConfig.name] = {
-        href: filterConfig._links.self.href
+        href: filterConfig._links.self.href,
       };
     });
 
     const facetConfigResponse = Object.assign(new FacetConfigResponse(), {
       filters,
-      _links
+      _links,
     });
 
     this.addToObjectCache(facetConfigResponse, request, data);
diff --git a/src/app/core/data/facet-value-response-parsing.service.ts b/src/app/core/data/facet-value-response-parsing.service.ts
index 0911ed5073..871f2a4965 100644
--- a/src/app/core/data/facet-value-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-response-parsing.service.ts
@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core';
+
 import { FacetValue } from '../../shared/search/models/facet-value.model';
-import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { FacetValues } from '../../shared/search/models/facet-values.model';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
index ae44d590a4..4048efe4ff 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -1,18 +1,26 @@
-import { AuthorizationDataService } from './authorization-data.service';
-import { SiteDataService } from '../site-data.service';
-import { Site } from '../../shared/site.model';
-import { EPerson } from '../../eperson/models/eperson.model';
-import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { FeatureID } from './feature-id';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { hasValue } from '../../../shared/empty.util';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { Authorization } from '../../shared/authorization.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { Feature } from '../../shared/feature.model';
-import { FindListOptions } from '../find-list-options.model';
-import { testSearchDataImplementation } from '../base/search-data.spec';
 import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { Authorization } from '../../shared/authorization.model';
+import { Feature } from '../../shared/feature.model';
+import { Site } from '../../shared/site.model';
+import { testSearchDataImplementation } from '../base/search-data.spec';
+import { FindListOptions } from '../find-list-options.model';
+import { SiteDataService } from '../site-data.service';
+import { AuthorizationDataService } from './authorization-data.service';
+import { FeatureID } from './feature-id';
 
 describe('AuthorizationDataService', () => {
   let service: AuthorizationDataService;
@@ -23,19 +31,19 @@ describe('AuthorizationDataService', () => {
   let ePerson: EPerson;
 
   const requestService = jasmine.createSpyObj('requestService', {
-    setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
+    setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring'),
   });
 
   function init() {
     site = Object.assign(new Site(), {
       id: 'test-site',
       _links: {
-        self: { href: 'test-site-href' }
-      }
+        self: { href: 'test-site-href' },
+      },
     });
     ePerson = Object.assign(new EPerson(), {
       id: 'test-eperson',
-      uuid: 'test-eperson'
+      uuid: 'test-eperson',
     });
     siteService = jasmine.createSpyObj('siteService', {
       find: observableOf(site),
@@ -157,26 +165,26 @@ describe('AuthorizationDataService', () => {
     const validPayload = [
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'invalid-feature'
-        }))
+          id: 'invalid-feature',
+        })),
       }),
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: featureID
-        }))
-      })
+          id: featureID,
+        })),
+      }),
     ];
     const invalidPayload = [
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'invalid-feature'
-        }))
+          id: 'invalid-feature',
+        })),
       }),
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'another-invalid-feature'
-        }))
-      })
+          id: 'another-invalid-feature',
+        })),
+      }),
     ];
     const emptyPayload = [];
 
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index c43d335234..cd8705d2fb 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -1,26 +1,44 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { AUTHORIZATION } from '../../shared/authorization.resource-type';
-import { Authorization } from '../../shared/authorization.model';
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { SiteDataService } from '../site-data.service';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { catchError, map, switchMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Authorization } from '../../shared/authorization.model';
+import { AUTHORIZATION } from '../../shared/authorization.resource-type';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
+import { BaseDataService } from '../base/base-data.service';
+import { dataService } from '../base/data-service.decorator';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../base/search-data';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { SiteDataService } from '../site-data.service';
 import { AuthorizationSearchParams } from './authorization-search-params';
 import { oneAuthorizationMatchesFeature } from './authorization-utils';
 import { FeatureID } from './feature-id';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
-import { FindListOptions } from '../find-list-options.model';
-import { BaseDataService } from '../base/base-data.service';
-import { SearchData, SearchDataImpl } from '../base/search-data';
-import { dataService } from '../base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Authorization}s from the REST API
@@ -74,8 +92,8 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
           return [];
         }
       }),
-      catchError(() => observableOf(false)),
-      oneAuthorizationMatchesFeature(featureId)
+      catchError(() => observableOf([])),
+      oneAuthorizationMatchesFeature(featureId),
     );
   }
 
@@ -100,7 +118,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
       switchMap((url) => {
         if (hasNoValue(url)) {
           return this.siteService.find().pipe(
-            map((site) => site.self)
+            map((site) => site.self),
           );
         } else {
           return observableOf(url);
@@ -112,7 +130,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
       map((url: string) => new AuthorizationSearchParams(url, ePersonUuid, featureId)),
       switchMap((params: AuthorizationSearchParams) => {
         return this.searchBy(this.searchByObjectPath, this.createSearchOptions(params.objectUrl, options, params.ePersonUuid, params.featureId), useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-      })
+      }),
     );
 
     this.addDependency(out$, objectUrl$);
diff --git a/src/app/core/data/feature-authorization/authorization-utils.ts b/src/app/core/data/feature-authorization/authorization-utils.ts
index d1b65f6123..f763b1a38d 100644
--- a/src/app/core/data/feature-authorization/authorization-utils.ts
+++ b/src/app/core/data/feature-authorization/authorization-utils.ts
@@ -1,13 +1,25 @@
-import { map, switchMap } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { AuthorizationSearchParams } from './authorization-search-params';
-import { SiteDataService } from '../site-data.service';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { AuthService } from '../../auth/auth.service';
 import { Authorization } from '../../shared/authorization.model';
 import { Feature } from '../../shared/feature.model';
-import { FeatureID } from './feature-id';
 import { getFirstSucceededRemoteDataPayload } from '../../shared/operators';
+import { SiteDataService } from '../site-data.service';
+import { AuthorizationSearchParams } from './authorization-search-params';
+import { FeatureID } from './feature-id';
 
 /**
  * Operator accepting {@link AuthorizationSearchParams} and adding the current {@link Site}'s selflink to the parameter's
@@ -20,12 +32,12 @@ export const addSiteObjectUrlIfEmpty = (siteService: SiteDataService) =>
       switchMap((params: AuthorizationSearchParams) => {
         if (hasNoValue(params.objectUrl)) {
           return siteService.find().pipe(
-            map((site) => Object.assign({}, params, { objectUrl: site.self }))
+            map((site) => Object.assign({}, params, { objectUrl: site.self })),
           );
         } else {
           return observableOf(params);
         }
-      })
+      }),
     );
 
 /**
@@ -42,17 +54,17 @@ export const addAuthenticatedUserUuidIfEmpty = (authService: AuthService) =>
             switchMap((authenticated) => {
               if (authenticated) {
                 return authService.getAuthenticatedUserFromStore().pipe(
-                  map((ePerson) => Object.assign({}, params, { ePersonUuid: ePerson.uuid }))
+                  map((ePerson) => Object.assign({}, params, { ePersonUuid: ePerson.uuid })),
                 );
               } else {
                 return observableOf(params);
               }
-            })
+            }),
           );
         } else {
           return observableOf(params);
         }
-      })
+      }),
     );
 
 /**
@@ -68,16 +80,16 @@ export const oneAuthorizationMatchesFeature = (featureID: FeatureID) =>
     source.pipe(
       switchMap((authorizations: Authorization[]) => {
         if (isNotEmpty(authorizations)) {
-          return observableCombineLatest(
+          return observableCombineLatest([
             ...authorizations
               .filter((authorization: Authorization) => hasValue(authorization.feature))
               .map((authorization: Authorization) => authorization.feature.pipe(
-                getFirstSucceededRemoteDataPayload()
-              ))
-          );
+                getFirstSucceededRemoteDataPayload(),
+              )),
+          ]);
         } else {
           return observableOf([]);
         }
       }),
-      map((features: Feature[]) => features.filter((feature: Feature) => feature.id === featureID).length > 0)
+      map((features: Feature[]) => features.filter((feature: Feature) => feature.id === featureID).length > 0),
     );
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
index b41a322cb6..5af9f18b33 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user
  * isn't a Collection administrator
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CollectionAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
index 2ab77a00cc..2092fce110 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user
  * isn't a Community administrator
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CommunityAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
index 6c1f330c69..234c2e1628 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
@@ -1,12 +1,21 @@
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../../remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard';
-import { FeatureID } from '../feature-id';
 import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { RemoteData } from '../../remote-data';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard';
 
 /**
  * Test implementation of abstract class DsoPageSingleFeatureGuard
@@ -37,30 +46,30 @@ describe('DsoPageSingleFeatureGuard', () => {
 
   function init() {
     object = {
-      self: 'test-selflink'
+      self: 'test-selflink',
     } as DSpaceObject;
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     resolver = jasmine.createSpyObj('resolver', {
-      resolve: createSuccessfulRemoteDataObject$(object)
+      resolve: createSuccessfulRemoteDataObject$(object),
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     parentRoute = {
       params: {
-        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0'
-      }
+        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0',
+      },
     };
     route = {
       params: {
       },
-      parent: parentRoute
+      parent: parentRoute,
     };
     guard = new DsoPageSingleFeatureGuardImpl(resolver, authorizationService, router, authService, undefined);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
index 3fc90f9069..1f75df846b 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
@@ -1,9 +1,13 @@
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { FeatureID } from '../feature-id';
-import { map } from 'rxjs/operators';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { FeatureID } from '../feature-id';
+import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
 
 /**
  * Abstract Guard for preventing unauthorized access to {@link DSpaceObject} pages that require rights for a specific feature
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
index 071b1b0731..61e236188d 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
@@ -1,11 +1,20 @@
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../../remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { FeatureID } from '../feature-id';
 import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { RemoteData } from '../../remote-data';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
 import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
 
 /**
@@ -37,30 +46,30 @@ describe('DsoPageSomeFeatureGuard', () => {
 
   function init() {
     object = {
-      self: 'test-selflink'
+      self: 'test-selflink',
     } as DSpaceObject;
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     resolver = jasmine.createSpyObj('resolver', {
-      resolve: createSuccessfulRemoteDataObject$(object)
+      resolve: createSuccessfulRemoteDataObject$(object),
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     parentRoute = {
       params: {
-        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0'
-      }
+        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0',
+      },
     };
     route = {
       params: {
       },
-      parent: parentRoute
+      parent: parentRoute,
     };
     guard = new DsoPageSomeFeatureGuardImpl(resolver, authorizationService, router, authService, []);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
index 8683709345..eff2da2102 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
@@ -1,12 +1,21 @@
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../../shared/empty.util';
+import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
 import { RemoteData } from '../../remote-data';
 import { AuthorizationDataService } from '../authorization-data.service';
-import { Observable } from 'rxjs';
-import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
-import { map } from 'rxjs/operators';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { AuthService } from '../../../auth/auth.service';
-import { hasNoValue, hasValue } from '../../../../shared/empty.util';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
@@ -28,7 +37,7 @@ export abstract class DsoPageSomeFeatureGuard<T extends DSpaceObject> extends So
     const routeWithObjectID = this.getRouteWithDSOId(route);
     return (this.resolver.resolve(routeWithObjectID, state) as Observable<RemoteData<T>>).pipe(
       getAllSucceededRemoteDataPayload(),
-      map((dso) => dso.self)
+      map((dso) => dso.self),
     );
   }
 
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
index 5afd572326..5f32e26851 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have group
  * management rights
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class GroupAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
index 635aa3530b..e789f8c473 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
@@ -1,9 +1,17 @@
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../auth/auth.service';
 import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
-import { Observable, of as observableOf } from 'rxjs';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthService } from '../../../auth/auth.service';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Test implementation of abstract class SingleFeatureAuthorizationGuard
@@ -48,13 +56,13 @@ describe('SingleFeatureAuthorizationGuard', () => {
     ePersonUuid = 'fake-eperson-uuid';
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     guard = new SingleFeatureAuthorizationGuardImpl(authorizationService, router, authService, featureId, objectUrl, ePersonUuid);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
index cb71d2f418..cd9f615aa7 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
@@ -1,7 +1,11 @@
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { FeatureID } from '../feature-id';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { map} from 'rxjs/operators';
+import { map } from 'rxjs/operators';
+
+import { FeatureID } from '../feature-id';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
index cc6f50c161..9a7c9de5c4 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { FeatureID } from '../feature-id';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have administrator
  * rights to the {@link Site}
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SiteAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
index bdbb8250e2..bde2d1c14e 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
@@ -1,17 +1,25 @@
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 import { Injectable } from '@angular/core';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have registration
  * rights to the {@link Site}
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SiteRegisterGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
index 90153d2d14..53d77cadad 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
@@ -1,8 +1,16 @@
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../auth/auth.service';
 import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
-import { Observable, of as observableOf } from 'rxjs';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthService } from '../../../auth/auth.service';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
@@ -52,13 +60,13 @@ describe('SomeFeatureAuthorizationGuard', () => {
     authorizationService = Object.assign({
       isAuthorized(featureId?: FeatureID): Observable<boolean> {
         return observableOf(authorizedFeatureIds.indexOf(featureId) > -1);
-      }
+      },
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     guard = new SomeFeatureAuthorizationGuardImpl(authorizationService, router, authService, featureIds, objectUrl, ePersonUuid);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
index b909640ea6..0849c5a96a 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
@@ -1,10 +1,21 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { FeatureID } from '../feature-id';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+
 import { AuthService } from '../../../auth/auth.service';
 import { returnForbiddenUrlTreeOrLoginOnAllFalse } from '../../../shared/authorized.operators';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
 
 /**
  * Abstract Guard for preventing unauthorized activating and loading of routes when a user
@@ -24,9 +35,9 @@ export abstract class SomeFeatureAuthorizationGuard implements CanActivate {
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
     return observableCombineLatest(this.getFeatureIDs(route, state), this.getObjectUrl(route, state), this.getEPersonUuid(route, state)).pipe(
       switchMap(([featureIDs, objectUrl, ePersonUuid]) =>
-        observableCombineLatest(...featureIDs.map((featureID) => this.authorizationService.isAuthorized(featureID, objectUrl, ePersonUuid)))
+        observableCombineLatest(...featureIDs.map((featureID) => this.authorizationService.isAuthorized(featureID, objectUrl, ePersonUuid))),
       ),
-      returnForbiddenUrlTreeOrLoginOnAllFalse(this.router, this.authService, state.url)
+      returnForbiddenUrlTreeOrLoginOnAllFalse(this.router, this.authService, state.url),
     );
   }
 
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
index 680495686e..b301d550a1 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
@@ -1,27 +1,35 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have group
  * management rights
  */
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class StatisticsAdministratorGuard extends SingleFeatureAuthorizationGuard {
-    constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
-        super(authorizationService, router, authService);
-    }
+  constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
 
-    /**
+  /**
      * Check group management rights
      */
-    getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
-        return observableOf(FeatureID.CanViewUsageStatistics);
-    }
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.CanViewUsageStatistics);
+  }
 }
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index eda8791153..184e8c0be9 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@angular/core';
-import { FEATURE } from '../../shared/feature.resource-type';
-import { Feature } from '../../shared/feature.model';
-import { RequestService } from '../request.service';
+
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Feature } from '../../shared/feature.model';
+import { FEATURE } from '../../shared/feature.resource-type';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { BaseDataService } from '../base/base-data.service';
 import { dataService } from '../base/data-service.decorator';
+import { RequestService } from '../request.service';
 
 /**
  * A service to retrieve {@link Feature}s from the REST API
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
index 8fef45a953..3d5803b018 100644
--- a/src/app/core/data/feature-authorization/feature-id.ts
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -34,4 +34,7 @@ export enum FeatureID {
   CanEditItem = 'canEditItem',
   CanRegisterDOI = 'canRegisterDOI',
   CanSubscribe = 'canSubscribeDso',
+  CoarNotifyEnabled = 'coarNotifyEnabled',
+  CanSeeQA = 'canSeeQA',
+  EPersonForgotPassword = 'epersonForgotPassword'
 }
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
index ac0e96a2e6..6966e6a631 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
@@ -1,10 +1,10 @@
-import { FilteredDiscoveryPageResponseParsingService } from './filtered-discovery-page-response-parsing.service';
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { FilteredDiscoveryQueryResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { GenericConstructor } from '../shared/generic-constructor';
+import { FilteredDiscoveryPageResponseParsingService } from './filtered-discovery-page-response-parsing.service';
 import { ResponseParsingService } from './parsing.service';
 import { GetRequest } from './request.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { FilteredDiscoveryQueryResponse } from '../cache/response.models';
 
 describe('FilteredDiscoveryPageResponseParsingService', () => {
   let service: FilteredDiscoveryPageResponseParsingService;
@@ -17,15 +17,15 @@ describe('FilteredDiscoveryPageResponseParsingService', () => {
     const request = Object.assign(new GetRequest('client/f5b4ccb8-fbb0-4548-b558-f234d9fdfad6', 'https://rest.api/path'), {
       getResponseParser(): GenericConstructor<ResponseParsingService> {
         return FilteredDiscoveryPageResponseParsingService;
-      }
+      },
     });
 
     const mockResponse = {
       payload: {
-        'discovery-query': 'query'
+        'discovery-query': 'query',
       },
       statusCode: 200,
-      statusText: 'OK'
+      statusText: 'OK',
     } as RawRestResponse;
 
     it('should return a FilteredDiscoveryQueryResponse containing the correct query', () => {
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
index da7a21c488..fed0d70c58 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
@@ -1,9 +1,13 @@
 import { Injectable } from '@angular/core';
-import { ResponseParsingService } from './parsing.service';
+
+import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  FilteredDiscoveryQueryResponse,
+  RestResponse,
+} from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FilteredDiscoveryQueryResponse, RestResponse } from '../cache/response.models';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
 /**
diff --git a/src/app/core/data/find-list-options.model.ts b/src/app/core/data/find-list-options.model.ts
index dc567d4b53..78fe26fcab 100644
--- a/src/app/core/data/find-list-options.model.ts
+++ b/src/app/core/data/find-list-options.model.ts
@@ -1,15 +1,15 @@
-import { SortOptions } from '../cache/models/sort-options.model';
 import { RequestParam } from '../cache/models/request-param.model';
+import { SortOptions } from '../cache/models/sort-options.model';
 
 /**
  * The options for a find list request
  */
 export class FindListOptions {
-    scopeID?: string;
-    elementsPerPage?: number;
-    currentPage?: number;
-    sort?: SortOptions;
-    searchParams?: RequestParam[];
-    startsWith?: string;
-    fetchThumbnail?: boolean;
+  scopeID?: string;
+  elementsPerPage?: number;
+  currentPage?: number;
+  sort?: SortOptions;
+  searchParams?: RequestParam[];
+  startsWith?: string;
+  fetchThumbnail?: boolean;
 }
diff --git a/src/app/core/data/href-only-data.service.spec.ts b/src/app/core/data/href-only-data.service.spec.ts
index bf7d2890ea..cba85d5de6 100644
--- a/src/app/core/data/href-only-data.service.spec.ts
+++ b/src/app/core/data/href-only-data.service.spec.ts
@@ -1,8 +1,11 @@
-import { HrefOnlyDataService } from './href-only-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from './find-list-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { BaseDataService } from './base/base-data.service';
+import { FindListOptions } from './find-list-options.model';
+import { HrefOnlyDataService } from './href-only-data.service';
 
 describe(`HrefOnlyDataService`, () => {
   let service: HrefOnlyDataService;
@@ -23,60 +26,60 @@ describe(`HrefOnlyDataService`, () => {
     expect((service as any).dataService).toBeInstanceOf(BaseDataService);
   });
 
-    describe(`findByHref`, () => {
-      beforeEach(() => {
-        spy = spyOn((service as any).dataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
-      });
+  describe(`findByHref`, () => {
+    beforeEach(() => {
+      spy = spyOn((service as any).dataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
 
-      it(`should forward to findByHref on the internal DataService`, () => {
-        service.findByHref(href, false, false, ...followLinks);
-        expect(spy).toHaveBeenCalledWith(href, false, false, ...followLinks);
-      });
+    it(`should forward to findByHref on the internal DataService`, () => {
+      service.findByHref(href, false, false, ...followLinks);
+      expect(spy).toHaveBeenCalledWith(href, false, false, ...followLinks);
+    });
 
-      describe(`when useCachedVersionIfAvailable is omitted`, () => {
-        it(`should call findByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
-            service.findByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), true, jasmine.anything());
-        });
-      });
-
-      describe(`when reRequestOnStale is omitted`, () => {
-        it(`should call findByHref on the internal DataService with reRequestOnStale = true`, () => {
-            service.findByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true);
-        });
+    describe(`when useCachedVersionIfAvailable is omitted`, () => {
+      it(`should call findByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
+        service.findByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), true, jasmine.anything());
       });
     });
 
-    describe(`findListByHref`, () => {
-      beforeEach(() => {
-        spy = spyOn((service as any).dataService, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
-      });
-
-      it(`should delegate to findListByHref on the internal DataService`, () => {
-        service.findListByHref(href, findListOptions, false, false, ...followLinks);
-        expect(spy).toHaveBeenCalledWith(href, findListOptions, false, false, ...followLinks);
-      });
-
-      describe(`when findListOptions is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with findListOptions = {}`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), {}, jasmine.anything(), jasmine.anything());
-        });
-      });
-
-      describe(`when useCachedVersionIfAvailable is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true, jasmine.anything());
-        });
-      });
-
-      describe(`when reRequestOnStale is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with reRequestOnStale = true`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), jasmine.anything(), true);
-        });
+    describe(`when reRequestOnStale is omitted`, () => {
+      it(`should call findByHref on the internal DataService with reRequestOnStale = true`, () => {
+        service.findByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true);
       });
     });
+  });
+
+  describe(`findListByHref`, () => {
+    beforeEach(() => {
+      spy = spyOn((service as any).dataService, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it(`should delegate to findListByHref on the internal DataService`, () => {
+      service.findListByHref(href, findListOptions, false, false, ...followLinks);
+      expect(spy).toHaveBeenCalledWith(href, findListOptions, false, false, ...followLinks);
+    });
+
+    describe(`when findListOptions is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with findListOptions = {}`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), {}, jasmine.anything(), jasmine.anything());
+      });
+    });
+
+    describe(`when useCachedVersionIfAvailable is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true, jasmine.anything());
+      });
+    });
+
+    describe(`when reRequestOnStale is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with reRequestOnStale = true`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), jasmine.anything(), true);
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 0a765de101..83fb431e9b 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -1,24 +1,25 @@
-import { RequestService } from './request.service';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Injectable } from '@angular/core';
-import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RemoteData } from './remote-data';
-import { Observable } from 'rxjs';
-import { PaginatedList } from './paginated-list.model';
 import { ITEM_TYPE } from '../shared/item-relationships/item-type.resource-type';
 import { LICENSE } from '../shared/license.resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { FindListOptions } from './find-list-options.model';
+import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
 import { BaseDataService } from './base/base-data.service';
-import { HALDataService } from './base/hal-data-service.interface';
 import { dataService } from './base/data-service.decorator';
+import { HALDataService } from './base/hal-data-service.interface';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
- * A DataService with only findByHref methods. Its purpose is to be used for resources that don't
- * need to be retrieved by ID, or have any way to update them, but require a DataService in order
+ * A UpdateDataServiceImpl with only findByHref methods. Its purpose is to be used for resources that don't
+ * need to be retrieved by ID, or have any way to update them, but require a UpdateDataServiceImpl in order
  * for their links to be resolved by the LinkService.
  *
  * an @dataService annotation can be added for any number of these resource types
diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts
index 03422dadfb..bf6172fd47 100644
--- a/src/app/core/data/identifier-data.service.ts
+++ b/src/app/core/data/identifier-data.service.ts
@@ -1,27 +1,35 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { dataService } from './base/data-service.decorator';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { BaseDataService } from './base/base-data.service';
-import { RequestService } from './request.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { CoreState } from '../core-state.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { Item } from '../shared/item.model';
-import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
-import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import {ConfigurationProperty} from '../shared/configuration-property.model';
-import {ConfigurationDataService} from './configuration-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PostRequest } from './request.models';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { sendRequest } from '../shared/request.operators';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import { ConfigurationDataService } from './configuration-data.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { RemoteData } from './remote-data';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
 import { RestRequest } from './rest-request.model';
 
 /**
@@ -61,7 +69,7 @@ export class IdentifierDataService extends BaseDataService<IdentifierData> {
   public getIdentifierRegistrationConfiguration(): Observable<string[]> {
     return this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
       getFirstCompletedRemoteData(),
-      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : []),
     );
   }
 
@@ -79,7 +87,7 @@ export class IdentifierDataService extends BaseDataService<IdentifierData> {
         return new PostRequest(requestId, endpointURL, item._links.self.href, options);
       }),
       sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable<RemoteData<any>>)
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable<RemoteData<any>>),
     );
   }
 }
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 2c20ed0fb6..915c065a9e 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -1,25 +1,32 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowseService } from '../browse/browse.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { ItemDataService } from './item-data.service';
-import { DeleteRequest, PostRequest } from './request.models';
-import { RequestService } from './request.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
-import { FindListOptions } from './find-list-options.model';
-import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
+import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { ItemDataService } from './item-data.service';
+import {
+  DeleteRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -46,7 +53,7 @@ describe('ItemDataService', () => {
   const objectCache = {} as ObjectCacheService;
   const halEndpointService: any = new HALEndpointServiceStub(itemEndpoint);
   const bundleService = jasmine.createSpyObj('bundleService', {
-    findByHref: {}
+    findByHref: {},
   });
 
   const scopeID = '4af28e99-6a9c-4036-a199-e1b587046d39';
@@ -54,8 +61,8 @@ describe('ItemDataService', () => {
     scopeID: scopeID,
     sort: {
       field: '',
-      direction: undefined
-    }
+      direction: undefined,
+    },
   });
 
   const browsesEndpoint = 'https://rest.api/discover/browses';
@@ -73,7 +80,7 @@ describe('ItemDataService', () => {
       cold('--a-', { a: itemBrowseEndpoint }) :
       cold('--#-', undefined, browseError);
     return jasmine.createSpyObj('bs', {
-      getBrowseURLFor: obs
+      getBrowseURLFor: obs,
     });
   }
 
@@ -158,7 +165,7 @@ describe('ItemDataService', () => {
     const externalSourceEntry = Object.assign(new ExternalSourceEntry(), {
       display: 'John, Doe',
       value: 'John, Doe',
-      _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } }
+      _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } },
     });
 
     beforeEach(() => {
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index c3fa84dd6c..f071f6e1b8 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -8,44 +8,73 @@
 /* eslint-disable max-classes-per-file */
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, switchMap, take } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Bundle } from '../shared/bundle.model';
 import { Collection } from '../shared/collection.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { GenericConstructor } from '../shared/generic-constructor';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { ITEM } from '../shared/item.resource-type';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { DeleteRequest, GetRequest, PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Bundle } from '../shared/bundle.model';
 import { MetadataMap } from '../shared/metadata.models';
-import { BundleDataService } from './bundle-data.service';
-import { Operation } from 'fast-json-patch';
 import { NoContent } from '../shared/NoContent.model';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from './parsing.service';
-import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { ConstructIdEndpoint, IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { RestRequestMethod } from './rest-request-method';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { RequestParam } from '../cache/models/request-param.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
 import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { BundleDataService } from './bundle-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { ResponseParsingService } from './parsing.service';
+import { RemoteData } from './remote-data';
+import {
+  DeleteRequest,
+  GetRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
+import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 
 /**
  * An abstract service for CRUD operations on Items
@@ -140,7 +169,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
         return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionHref, options);
       }),
       sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid))
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)),
     );
   }
 
@@ -152,7 +181,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
   public setWithDrawn(item: Item, withdrawn: boolean): Observable<RemoteData<Item>> {
 
     const patchOperation = {
-      op: 'replace', path: '/withdrawn', value: withdrawn
+      op: 'replace', path: '/withdrawn', value: withdrawn,
     } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
@@ -166,7 +195,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public setDiscoverable(item: Item, discoverable: boolean): Observable<RemoteData<Item>> {
     const patchOperation = {
-      op: 'replace', path: '/discoverable', value: discoverable
+      op: 'replace', path: '/discoverable', value: discoverable,
     } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
@@ -180,7 +209,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBundlesEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('bundles', `${url}/${itemId}`))
+      switchMap((url: string) => this.halService.getEndpoint('bundles', `${url}/${itemId}`)),
     );
   }
 
@@ -191,10 +220,10 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBundles(itemId: string, searchOptions?: PaginatedSearchOptions): Observable<RemoteData<PaginatedList<Bundle>>> {
     const hrefObs = this.getBundlesEndpoint(itemId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
     hrefObs.pipe(
-      take(1)
+      take(1),
     ).subscribe((href) => {
       const request = new GetRequest(this.requestService.generateRequestId(), href);
       this.requestService.send(request);
@@ -215,11 +244,11 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
 
     const bundleJson = {
       name: bundleName,
-      metadata: metadata ? metadata : {}
+      metadata: metadata ? metadata : {},
     };
 
     hrefObs.pipe(
-      take(1)
+      take(1),
     ).subscribe((href) => {
       const options: HttpOptions = Object.create({});
       let headers = new HttpHeaders();
@@ -238,7 +267,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getIdentifiersEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('identifiers', `${url}/${itemId}`))
+      switchMap((url: string) => this.halService.getEndpoint('identifiers', `${url}/${itemId}`)),
     );
   }
 
@@ -249,7 +278,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
   public getMoveItemEndpoint(itemId: string, inheritPolicies: boolean): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       map((endpoint: string) => this.getIDHref(endpoint, itemId)),
-      map((endpoint: string) => `${endpoint}/owningCollection?inheritPolicies=${inheritPolicies}`)
+      map((endpoint: string) => `${endpoint}/owningCollection?inheritPolicies=${inheritPolicies}`),
     );
   }
 
@@ -275,10 +304,10 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
           // TODO: for now, the move Item endpoint returns a malformed collection -- only look at the status code
           getResponseParser(): GenericConstructor<ResponseParsingService> {
             return StatusCodeOnlyResponseParsingService;
-          }
+          },
         });
         return request;
-      })
+      }),
     ).subscribe((request) => {
       this.requestService.send(request);
     });
@@ -305,7 +334,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
       map((href: string) => {
         const request = new PostRequest(requestId, href, externalSourceEntry._links.self.href, options);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID(requestId);
@@ -317,7 +346,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBitstreamsEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`))
+      switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`)),
     );
   }
 
diff --git a/src/app/core/data/item-request-data.service.spec.ts b/src/app/core/data/item-request-data.service.spec.ts
index a5d1872510..68577ae6e2 100644
--- a/src/app/core/data/item-request-data.service.spec.ts
+++ b/src/app/core/data/item-request-data.service.spec.ts
@@ -1,12 +1,13 @@
-import { ItemRequestDataService } from './item-request-data.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../shared/item-request.model';
-import { PostRequest } from './request.models';
+
 import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ItemRequest } from '../shared/item-request.model';
+import { ItemRequestDataService } from './item-request-data.service';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
 import { RestRequestMethod } from './rest-request-method';
 
 describe('ItemRequestDataService', () => {
diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts
index ff6025f7ac..5c85ed1471 100644
--- a/src/app/core/data/item-request-data.service.ts
+++ b/src/app/core/data/item-request-data.service.ts
@@ -1,20 +1,32 @@
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map } from 'rxjs/operators';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteData } from './remote-data';
-import { PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { ItemRequest } from '../shared/item-request.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpHeaders } from '@angular/common/http';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ItemRequest } from '../shared/item-request.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { sendRequest } from '../shared/request.operators';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RemoteData } from './remote-data';
+import {
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the itemrequests endpoint
@@ -60,11 +72,11 @@ export class ItemRequestDataService extends IdentifiableDataService<ItemRequest>
       map((href: string) => {
         const request = new PostRequest(requestId, href, itemRequest);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID<ItemRequest>(requestId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
diff --git a/src/app/core/data/item-template-data.service.spec.ts b/src/app/core/data/item-template-data.service.spec.ts
index 16cf0dbd99..27db819861 100644
--- a/src/app/core/data/item-template-data.service.spec.ts
+++ b/src/app/core/data/item-template-data.service.spec.ts
@@ -1,22 +1,26 @@
-import { ItemTemplateDataService } from './item-template-data.service';
-import { RestResponse } from '../cache/response.models';
-import { RequestService } from './request.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { BrowseService } from '../browse/browse.service';
 import { cold } from 'jasmine-marbles';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CollectionDataService } from './collection-data.service';
-import { RestRequestMethod } from './rest-request-method';
-import { Item } from '../shared/item.model';
-import { RestRequest } from './rest-request.model';
+import { BrowseService } from '../browse/browse.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { CollectionDataService } from './collection-data.service';
+import { ItemTemplateDataService } from './item-template-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 import createSpyObj = jasmine.createSpyObj;
 
 describe('ItemTemplateDataService', () => {
@@ -46,7 +50,7 @@ describe('ItemTemplateDataService', () => {
     },
     commit(method?: RestRequestMethod) {
       // Do nothing
-    }
+    },
   } as RequestService;
   const rdbService = {} as RemoteDataBuildService;
   const store = {} as Store<CoreState>;
@@ -62,18 +66,18 @@ describe('ItemTemplateDataService', () => {
   const halEndpointService = {
     getEndpoint(linkPath: string): Observable<string> {
       return cold('a', { a: itemEndpoint });
-    }
+    },
   } as HALEndpointService;
   const notificationsService = {} as NotificationsService;
   const comparator = {
     diff(first, second) {
       return [{}];
-    }
+    },
   } as any;
   const collectionService = {
     getIDHrefObs(id): Observable<string> {
       return observableOf(collectionEndpoint);
-    }
+    },
   } as CollectionDataService;
 
   function initTestService() {
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
index 634c966dba..0ee362c71a 100644
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -1,22 +1,23 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
-import { BaseItemDataService } from './item-data.service';
-import { Item } from '../shared/item.model';
-import { RemoteData } from './remote-data';
 import { Observable } from 'rxjs';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RequestService } from './request.service';
+import { switchMap } from 'rxjs/operators';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { BrowseService } from '../browse/browse.service';
-import { CollectionDataService } from './collection-data.service';
-import { switchMap } from 'rxjs/operators';
-import { BundleDataService } from './bundle-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { Item } from '../shared/item.model';
 import { CreateDataImpl } from './base/create-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { BundleDataService } from './bundle-data.service';
+import { CollectionDataService } from './collection-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { BaseItemDataService } from './item-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Data service for interacting with Item templates via their Collection
diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts
index 58598b9870..93b4ed6696 100644
--- a/src/app/core/data/lookup-relation.service.spec.ts
+++ b/src/app/core/data/lookup-relation.service.spec.ts
@@ -1,18 +1,22 @@
-import { LookupRelationService } from './lookup-relation.service';
-import { ExternalSourceDataService } from './external-source-data.service';
-import { SearchService } from '../shared/search/search.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { buildPaginatedList } from './paginated-list.model';
-import { PageInfo } from '../shared/page-info.model';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
-import { SearchResult } from '../../shared/search/models/search-result.model';
-import { Item } from '../shared/item.model';
-import { skip, take } from 'rxjs/operators';
-import { ExternalSource } from '../shared/external-source.model';
-import { RequestService } from './request.service';
 import { of as observableOf } from 'rxjs';
+import {
+  skip,
+  take,
+} from 'rxjs/operators';
+
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchResult } from '../../shared/search/models/search-result.model';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ExternalSource } from '../shared/external-source.model';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { SearchService } from '../shared/search/search.service';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { LookupRelationService } from './lookup-relation.service';
+import { buildPaginatedList } from './paginated-list.model';
+import { RequestService } from './request.service';
 
 describe('LookupRelationService', () => {
   let service: LookupRelationService;
@@ -24,20 +28,20 @@ describe('LookupRelationService', () => {
   const optionsWithQuery = new PaginatedSearchOptions({ query: 'test-query' });
   const relationship = Object.assign(new RelationshipOptions(), {
     filter: 'test-filter',
-    configuration: 'test-configuration'
+    configuration: 'test-configuration',
   });
   const localResults = [
     Object.assign(new SearchResult(), {
       indexableObject: Object.assign(new Item(), {
         uuid: 'test-item-uuid',
-        handle: 'test-item-handle'
-      })
-    })
+        handle: 'test-item-handle',
+      }),
+    }),
   ];
   const externalSource = Object.assign(new ExternalSource(), {
     id: 'orcidV2',
     name: 'orcidV2',
-    hierarchical: false
+    hierarchical: false,
   });
   const searchServiceEndpoint = 'http://test-rest.com/server/api/core/search';
 
@@ -47,12 +51,12 @@ describe('LookupRelationService', () => {
         elementsPerPage: 1,
         totalElements: totalExternal,
         totalPages: totalExternal,
-        currentPage: 1
-      }), [{}]))
+        currentPage: 1,
+      }), [{}])),
     });
     searchService = jasmine.createSpyObj('searchService', {
       search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults)),
-      getEndpoint: observableOf(searchServiceEndpoint)
+      getEndpoint: observableOf(searchServiceEndpoint),
     });
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']);
     service = new LookupRelationService(externalSourceService, searchService, requestService);
@@ -77,7 +81,7 @@ describe('LookupRelationService', () => {
 
     it('should set the searchConfig to contain a fixedFilter and configuration', () => {
       expect(service.searchConfig).toEqual(Object.assign(new PaginatedSearchOptions({}), optionsWithQuery,
-        { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration }
+        { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration },
       ));
     });
   });
diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
index 7a6bc2358b..31b9ed845c 100644
--- a/src/app/core/data/lookup-relation.service.ts
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -1,19 +1,34 @@
-import { ExternalSourceDataService } from './external-source-data.service';
-import { SearchService } from '../shared/search/search.service';
-import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  ReplaySubject,
+} from 'rxjs';
+import {
+  concat,
+  distinctUntilChanged,
+  map,
+  multicast,
+  startWith,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Observable, ReplaySubject } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list.model';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
-import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
-import { Item } from '../shared/item.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { Injectable } from '@angular/core';
 import { ExternalSource } from '../shared/external-source.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { Item } from '../shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { SearchService } from '../shared/search/search.service';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
 
 /**
@@ -31,7 +46,7 @@ export class LookupRelationService {
    */
   private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'single-result-options',
-    pageSize: 1
+    pageSize: 1,
   });
 
   constructor(protected externalSourceService: ExternalSourceDataService,
@@ -47,7 +62,7 @@ export class LookupRelationService {
    */
   getLocalResults(relationship: RelationshipOptions, searchOptions: PaginatedSearchOptions, setSearchConfig = true): Observable<RemoteData<PaginatedList<SearchResult<Item>>>> {
     const newConfig = Object.assign(new PaginatedSearchOptions({}), searchOptions,
-      { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration }
+      { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration },
     );
     if (setSearchConfig) {
       this.searchConfig = newConfig;
@@ -59,8 +74,8 @@ export class LookupRelationService {
         () => new ReplaySubject(1),
         (subject) => subject.pipe(
           takeWhile((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => rd.isLoading),
-          concat(subject.pipe(take(1)))
-        )
+          concat(subject.pipe(take(1))),
+        ),
       ) as any
       ,
     ) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
@@ -76,7 +91,7 @@ export class LookupRelationService {
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
       map((results: PaginatedList<SearchResult<Item>>) => results.totalElements),
-      startWith(0)
+      startWith(0),
     );
   }
 
@@ -91,7 +106,7 @@ export class LookupRelationService {
       getRemoteDataPayload(),
       map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements),
       startWith(0),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
index 1ce078f5d5..8d65038060 100644
--- a/src/app/core/data/metadata-field-data.service.spec.ts
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -1,20 +1,21 @@
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../cache/response.models';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { MetadataFieldDataService } from './metadata-field-data.service';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from './find-list-options.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { RestResponse } from '../cache/response.models';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPutDataImplementation } from './base/put-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { MetadataFieldDataService } from './metadata-field-data.service';
+import { RequestService } from './request.service';
 
 describe('MetadataFieldDataService', () => {
   let metadataFieldService: MetadataFieldDataService;
@@ -31,8 +32,8 @@ describe('MetadataFieldDataService', () => {
       prefix: 'dc',
       namespace: 'namespace',
       _links: {
-        self: { href: 'selflink' }
-      }
+        self: { href: 'selflink' },
+      },
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
@@ -73,7 +74,7 @@ describe('MetadataFieldDataService', () => {
     it('should call searchBy with the correct arguments', () => {
       metadataFieldService.findBySchema(schema);
       const expectedOptions = Object.assign(new FindListOptions(), {
-        searchParams: [new RequestParam('schema', schema.prefix)]
+        searchParams: [new RequestParam('schema', schema.prefix)],
       });
       expect(metadataFieldService.searchBy).toHaveBeenCalledWith('bySchema', expectedOptions, true, true);
     });
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index d05e3533d3..c6a08fa82b 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -1,27 +1,40 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { NoContent } from '../shared/NoContent.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
index 1bcf4e1104..02fbc016e7 100644
--- a/src/app/core/data/metadata-schema-data.service.spec.ts
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -1,16 +1,20 @@
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { MetadataSchemaDataService } from './metadata-schema-data.service';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../cache/response.models';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { CreateRequest, PutRequest } from './request.models';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RestResponse } from '../cache/response.models';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { MetadataSchemaDataService } from './metadata-schema-data.service';
+import {
+  CreateRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 describe('MetadataSchemaDataService', () => {
   let metadataSchemaService: MetadataSchemaDataService;
@@ -61,8 +65,8 @@ describe('MetadataSchemaDataService', () => {
         prefix: 'dc',
         namespace: 'namespace',
         _links: {
-          self: { href: 'selflink' }
-        }
+          self: { href: 'selflink' },
+        },
       });
     });
 
@@ -78,7 +82,7 @@ describe('MetadataSchemaDataService', () => {
     describe('called with an existing metadata schema', () => {
       beforeEach(() => {
         schema = Object.assign(schema, {
-          id: 'id-of-existing-schema'
+          id: 'id-of-existing-schema',
         });
       });
 
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 6bd633b8c6..8054dcf657 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -1,25 +1,38 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { METADATA_SCHEMA } from '../metadata/metadata-schema.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { Observable } from 'rxjs';
-import { hasValue } from '../../shared/empty.util';
-import { tap } from 'rxjs/operators';
-import { RemoteData } from './remote-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { CreateData, CreateDataImpl } from './base/create-data';
 import { NoContent } from '../shared/NoContent.model';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FindListOptions } from './find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { PaginatedList } from './paginated-list.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
 import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
diff --git a/src/app/core/data/mydspace-response-parsing.service.ts b/src/app/core/data/mydspace-response-parsing.service.ts
index e46e319149..8e7532a58e 100644
--- a/src/app/core/data/mydspace-response-parsing.service.ts
+++ b/src/app/core/data/mydspace-response-parsing.service.ts
@@ -1,10 +1,14 @@
 import { Injectable } from '@angular/core';
+
+import { hasValue } from '../../shared/empty.util';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { ParsedResponse } from '../cache/response.models';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { hasValue } from '../../shared/empty.util';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { MetadataMap, MetadataValue } from '../shared/metadata.models';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../shared/metadata.models';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
@@ -14,8 +18,8 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded: {
-        objects: []
-      }
+        objects: [],
+      },
     };
     const payload = data.payload._embedded.searchResult || emptyPayload;
     const hitHighlights: MetadataMap[] = payload._embedded.objects
@@ -26,7 +30,7 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
           for (const key of Object.keys(hhObject)) {
             const value: MetadataValue = Object.assign(new MetadataValue(), {
               value: hhObject[key].join('...'),
-              language: null
+              language: null,
             });
             mdMap[key] = [value];
           }
@@ -46,7 +50,7 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
       .map((object, index) => Object.assign({}, object, {
         indexableObject: dsoSelfLinks[index],
         hitHighlights: hitHighlights[index],
-        _embedded: this.filterEmbeddedObjects(object)
+        _embedded: this.filterEmbeddedObjects(object),
       }));
     payload.objects = objects;
     const deserialized: any = new DSpaceSerializer(SearchObjects).deserialize(payload);
@@ -65,8 +69,8 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
             .reduce((obj, key) => {
               obj[key] = object._embedded.indexableObject._embedded[key];
               return obj;
-            }, {})
-        })
+            }, {}),
+        }),
       });
     } else {
       return object;
diff --git a/src/app/core/data/notify-services-status-data.service.spec.ts b/src/app/core/data/notify-services-status-data.service.spec.ts
new file mode 100644
index 0000000000..e336843505
--- /dev/null
+++ b/src/app/core/data/notify-services-status-data.service.spec.ts
@@ -0,0 +1,88 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotifyRequestsStatus } from '../../item-page/simple/notify-requests-status/notify-requests-status.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotifyRequestsStatusDataService } from './notify-services-status-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { RequestEntryState } from './request-entry-state.model';
+
+describe('NotifyRequestsStatusDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: NotifyRequestsStatusDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/suggestiontargets`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new NotifyRequestsStatusDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+      buildFromHref: createSuccessfulRemoteDataObject$({ test: 'test' }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('getNotifyRequestsStatus', () => {
+    it('should get notify status', (done) => {
+      service.getNotifyRequestsStatus(requestUUID).subscribe((status) => {
+        expect(halService.getEndpoint).toHaveBeenCalled();
+        expect(requestService.generateRequestId).toHaveBeenCalled();
+        expect(status).toEqual(createSuccessfulRemoteDataObject({ test: 'test' } as unknown as NotifyRequestsStatus));
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/notify-services-status-data.service.ts b/src/app/core/data/notify-services-status-data.service.ts
new file mode 100644
index 0000000000..ad0c32fadd
--- /dev/null
+++ b/src/app/core/data/notify-services-status-data.service.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+  take,
+} from 'rxjs';
+
+import { NotifyRequestsStatus } from '../../item-page/simple/notify-requests-status/notify-requests-status.model';
+import { NOTIFYREQUEST } from '../../item-page/simple/notify-requests-status/notify-requests-status.resource-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RemoteData } from './remote-data';
+import { GetRequest } from './request.models';
+import { RequestService } from './request.service';
+
+@Injectable()
+@dataService(NOTIFYREQUEST)
+export class NotifyRequestsStatusDataService extends IdentifiableDataService<NotifyRequestsStatus> {
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('notifyrequests', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * Retrieves the status of notify requests for a specific item.
+   * @param itemUuid The UUID of the item.
+   * @returns An Observable that emits the remote data containing the notify requests status.
+   */
+  getNotifyRequestsStatus(itemUuid: string): Observable<RemoteData<NotifyRequestsStatus>> {
+    const href$ = this.getEndpoint().pipe(
+      map((url: string) => url + '/' + itemUuid ),
+    );
+
+    href$.pipe(take(1)).subscribe((url: string) => {
+      const request = new GetRequest(this.requestService.generateRequestId(), url);
+      this.requestService.send(request, true);
+    });
+
+    return this.rdbService.buildFromHref(href$);
+  }
+}
diff --git a/src/app/core/data/object-updates/field-update.model.ts b/src/app/core/data/object-updates/field-update.model.ts
index 47b6782471..71ae3bb68f 100644
--- a/src/app/core/data/object-updates/field-update.model.ts
+++ b/src/app/core/data/object-updates/field-update.model.ts
@@ -1,5 +1,5 @@
-import { Identifiable } from './identifiable.model';
 import { FieldChangeType } from './field-change-type.model';
+import { Identifiable } from './identifiable.model';
 
 /**
  * The state of a single field update
diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts
index 615dedbaf9..8a95a7827c 100644
--- a/src/app/core/data/object-updates/object-updates.actions.ts
+++ b/src/app/core/data/object-updates/object-updates.actions.ts
@@ -1,11 +1,12 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
+import { type } from '../../../shared/ngrx/type';
 import { INotification } from '../../../shared/notifications/models/notification.model';
-import { PatchOperationService } from './patch-operation-service/patch-operation.service';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
 import { FieldChangeType } from './field-change-type.model';
+import { Identifiable } from './identifiable.model';
+import { PatchOperationService } from './patch-operation-service/patch-operation.service';
 
 /**
  * The list of ObjectUpdatesAction type definitions
@@ -20,7 +21,7 @@ export const ObjectUpdatesActionTypes = {
   REINSTATE: type('dspace/core/cache/object-updates/REINSTATE'),
   REMOVE: type('dspace/core/cache/object-updates/REMOVE'),
   REMOVE_ALL: type('dspace/core/cache/object-updates/REMOVE_ALL'),
-  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
+  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD'),
 };
 
 
@@ -49,7 +50,7 @@ export class InitializeFieldsAction implements Action {
     url: string,
     fields: Identifiable[],
     lastModified: Date,
-    patchOperationService?: GenericConstructor<PatchOperationService>
+    patchOperationService?: GenericConstructor<PatchOperationService>,
   ) {
     this.payload = { url, fields, lastModified, patchOperationService };
   }
@@ -113,7 +114,7 @@ export class SelectVirtualMetadataAction implements Action {
     uuid: string,
     select: boolean,
   ) {
-    this.payload = { url, source, uuid, select: select};
+    this.payload = { url, source, uuid, select: select };
   }
 }
 
@@ -193,7 +194,7 @@ export class DiscardObjectUpdatesAction implements Action {
   constructor(
     url: string,
     notification: INotification,
-    discardAll = false
+    discardAll = false,
   ) {
     this.payload = { url, notification, discardAll };
   }
@@ -215,7 +216,7 @@ export class ReinstateObjectUpdatesAction implements Action {
    *    the unique url of the page for which the changes should be reinstated
    */
   constructor(
-    url: string
+    url: string,
   ) {
     this.payload = { url };
   }
@@ -237,7 +238,7 @@ export class RemoveObjectUpdatesAction implements Action {
    *    the unique url of the page for which the changes should be removed
    */
   constructor(
-    url: string
+    url: string,
   ) {
     this.payload = { url };
   }
@@ -269,7 +270,7 @@ export class RemoveFieldUpdateAction implements Action {
    */
   constructor(
     url: string,
-    uuid: string
+    uuid: string,
   ) {
     this.payload = { url, uuid };
   }
diff --git a/src/app/core/data/object-updates/object-updates.effects.spec.ts b/src/app/core/data/object-updates/object-updates.effects.spec.ts
index ffd20a7300..10f37d78cb 100644
--- a/src/app/core/data/object-updates/object-updates.effects.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.effects.spec.ts
@@ -1,24 +1,35 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Observable, Subject } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
+import { Action } from '@ngrx/store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  Subject,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ObjectUpdatesEffects } from './object-updates.effects';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import {
   DiscardObjectUpdatesAction,
   ObjectUpdatesAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
-  RemoveObjectUpdatesAction
+  RemoveObjectUpdatesAction,
 } from './object-updates.actions';
-import {
-  INotification,
-  Notification
-} from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { filter } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import { ObjectUpdatesEffects } from './object-updates.effects';
 
 describe('ObjectUpdatesEffects', () => {
   let updatesEffects: ObjectUpdatesEffects;
@@ -31,13 +42,7 @@ describe('ObjectUpdatesEffects', () => {
       providers: [
         ObjectUpdatesEffects,
         provideMockActions(() => actions),
-        {
-          provide: NotificationsService,
-          useValue: {
-            remove: (notification) => { /* empty */
-            }
-          }
-        },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
     });
   }));
@@ -59,7 +64,6 @@ describe('ObjectUpdatesEffects', () => {
         action = new RemoveObjectUpdatesAction(testURL);
       });
       it('should emit the action from the actionMap\'s value which key matches the action\'s URL', () => {
-        action = new RemoveObjectUpdatesAction(testURL);
         actions = hot('--a-', { a: action });
         (updatesEffects as any).actionMap$[testURL].subscribe((act) => emittedAction = act);
         const expected = cold('--b-', { b: undefined });
@@ -81,14 +85,19 @@ describe('ObjectUpdatesEffects', () => {
           removeAction = new RemoveObjectUpdatesAction(testURL);
         });
         it('should return a RemoveObjectUpdatesAction', () => {
-          actions = hot('a|', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.pipe(
-            filter(((action) => hasValue(action))))
-            .subscribe((t) => {
-                expect(t).toEqual(removeAction);
-              }
-            )
-          ;
+          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
+
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('a', { a: undefined }));
+
+          expect(emittedAction).toEqual(removeAction);
         });
       });
 
@@ -98,12 +107,24 @@ describe('ObjectUpdatesEffects', () => {
           infoNotification.options.timeOut = 10;
         });
         it('should return an action with type NO_ACTION', () => {
-          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          actions = hot('b', { b: new ReinstateObjectUpdatesAction(testURL) });
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((t) => {
-              expect(t).toEqual(new NoOpAction());
-            }
-          );
+          actions = hot('--(ab)', {
+            a: new DiscardObjectUpdatesAction(testURL, infoNotification),
+            b: new ReinstateObjectUpdatesAction(testURL),
+          });
+
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.pipe(
+            take(2),
+          ).subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('--(ab)', { a: undefined, b: undefined }));
+
+          expect(emittedAction).toEqual(new RemoveObjectUpdatesAction(testURL));
         });
       });
 
@@ -113,12 +134,22 @@ describe('ObjectUpdatesEffects', () => {
           infoNotification.options.timeOut = 10;
         });
         it('should return a RemoveObjectUpdatesAction', () => {
-          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          actions = hot('b', { b: new RemoveFieldUpdateAction(testURL, testUUID) });
+          actions = hot('--(ab)', {
+            a: new DiscardObjectUpdatesAction(testURL, infoNotification),
+            b: new RemoveFieldUpdateAction(testURL, testUUID),
+          });
 
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((t) =>
-            expect(t).toEqual(new RemoveObjectUpdatesAction(testURL))
-          );
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('--(ab)', { a: undefined, b: undefined }));
+
+          expect(emittedAction).toEqual(new RemoveObjectUpdatesAction(testURL));
         });
       });
     });
diff --git a/src/app/core/data/object-updates/object-updates.effects.ts b/src/app/core/data/object-updates/object-updates.effects.ts
index 1dfdc95f23..5ef86dbbec 100644
--- a/src/app/core/data/object-updates/object-updates.effects.ts
+++ b/src/app/core/data/object-updates/object-updates.effects.ts
@@ -1,24 +1,43 @@
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Action } from '@ngrx/store';
+import {
+  of as observableOf,
+  race as observableRace,
+  Subject,
+} from 'rxjs';
+import {
+  delay,
+  filter,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import {
+  NotificationsActions,
+  NotificationsActionTypes,
+  RemoveNotificationAction,
+} from '../../../shared/notifications/notifications.actions';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   DiscardObjectUpdatesAction,
   ObjectUpdatesAction,
   ObjectUpdatesActionTypes,
   RemoveAllObjectUpdatesAction,
-  RemoveObjectUpdatesAction
+  RemoveObjectUpdatesAction,
 } from './object-updates.actions';
-import { delay, filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { of as observableOf, race as observableRace, Subject } from 'rxjs';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import {
-  NotificationsActions,
-  NotificationsActionTypes,
-  RemoveNotificationAction
-} from '../../../shared/notifications/notifications.actions';
-import { Action } from '@ngrx/store';
-import { NoOpAction } from '../../../shared/ngrx/no-op.action';
 
 /**
  * NGRX effects for ObjectUpdatesActions
@@ -52,7 +71,7 @@ export class ObjectUpdatesEffects {
   /**
    * Effect that makes sure all last fired ObjectUpdatesActions are stored in the map of this service, with the url as their key
    */
-   mapLastActions$ = createEffect(() => this.actions$
+  mapLastActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(...Object.values(ObjectUpdatesActionTypes)),
       map((action: ObjectUpdatesAction) => {
@@ -63,23 +82,23 @@ export class ObjectUpdatesEffects {
           }
           this.actionMap$[url].next(action);
         }
-      })
+      }),
     ), { dispatch: false });
 
   /**
    * Effect that makes sure all last fired NotificationActions are stored in the notification map of this service, with the id as their key
    */
-   mapLastNotificationActions$ = createEffect(() => this.actions$
+  mapLastNotificationActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(...Object.values(NotificationsActionTypes)),
       map((action: RemoveNotificationAction) => {
-          const id: string = action.payload.id || action.payload || this.allIdentifier;
-          if (hasNoValue(this.notificationActionMap$[id])) {
-            this.notificationActionMap$[id] = new Subject<NotificationsActions>();
-          }
-          this.notificationActionMap$[id].next(action);
+        const id: string = action.payload.id || action.payload || this.allIdentifier;
+        if (hasNoValue(this.notificationActionMap$[id])) {
+          this.notificationActionMap$[id] = new Subject<NotificationsActions>();
         }
-      )
+        this.notificationActionMap$[id].next(action);
+      },
+      ),
     ), { dispatch: false });
 
   /**
@@ -88,52 +107,52 @@ export class ObjectUpdatesEffects {
    * When a REINSTATE action is fired during the timeout, a NO_ACTION action will be returned
    * When any other ObjectUpdatesAction is fired during the timeout, a RemoteObjectUpdatesAction will be returned
    */
-   removeAfterDiscardOrReinstateOnUndo$ = createEffect(() => this.actions$
+  removeAfterDiscardOrReinstateOnUndo$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectUpdatesActionTypes.DISCARD),
       switchMap((action: DiscardObjectUpdatesAction) => {
-          const url: string = action.payload.url;
-          const notification: INotification = action.payload.notification;
-          const timeOut = notification.options.timeOut;
+        const url: string = action.payload.url;
+        const notification: INotification = action.payload.notification;
+        const timeOut = notification.options.timeOut;
 
-          let removeAction: Action = new RemoveObjectUpdatesAction(action.payload.url);
-          if (action.payload.discardAll) {
-            removeAction = new RemoveAllObjectUpdatesAction();
-          }
-
-          return observableRace(
-            // Either wait for the delay and perform a remove action
-            observableOf(removeAction).pipe(delay(timeOut)),
-            // Or wait for a a user action
-            this.actionMap$[url].pipe(
-              take(1),
-              tap(() => {
-                this.notificationsService.remove(notification);
-              }),
-              map((updateAction: ObjectUpdatesAction) => {
-                if (updateAction.type === ObjectUpdatesActionTypes.REINSTATE) {
-                  // If someone reinstated, do nothing, just let the reinstating happen
-                  return new NoOpAction();
-                }
-                // If someone performed another action, assume the user does not want to reinstate and remove all changes
-                return removeAction;
-              })
-            ),
-            this.notificationActionMap$[notification.id].pipe(
-              filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_NOTIFICATION),
-              map(() => {
-                return removeAction;
-              })
-            ),
-            this.notificationActionMap$[this.allIdentifier].pipe(
-              filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_ALL_NOTIFICATIONS),
-              map(() => {
-                return removeAction;
-              })
-            )
-          );
+        let removeAction: Action = new RemoveObjectUpdatesAction(action.payload.url);
+        if (action.payload.discardAll) {
+          removeAction = new RemoveAllObjectUpdatesAction();
         }
-      )
+
+        return observableRace(
+          // Either wait for the delay and perform a remove action
+          observableOf(removeAction).pipe(delay(timeOut)),
+          // Or wait for a a user action
+          this.actionMap$[url].pipe(
+            take(1),
+            tap(() => {
+              this.notificationsService.remove(notification);
+            }),
+            map((updateAction: ObjectUpdatesAction) => {
+              if (updateAction.type === ObjectUpdatesActionTypes.REINSTATE) {
+                // If someone reinstated, do nothing, just let the reinstating happen
+                return new NoOpAction();
+              }
+              // If someone performed another action, assume the user does not want to reinstate and remove all changes
+              return removeAction;
+            }),
+          ),
+          this.notificationActionMap$[notification.id].pipe(
+            filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_NOTIFICATION),
+            map(() => {
+              return removeAction;
+            }),
+          ),
+          this.notificationActionMap$[this.allIdentifier].pipe(
+            filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_ALL_NOTIFICATIONS),
+            map(() => {
+              return removeAction;
+            }),
+          ),
+        );
+      },
+      ),
     ));
 
   constructor(private actions$: Actions,
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index 08944a073f..1f2a15769b 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,5 +1,8 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { FieldChangeType } from './field-change-type.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -10,11 +13,13 @@ import {
   RemoveObjectUpdatesAction,
   SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction,
-  SetValidFieldUpdateAction
+  SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { OBJECT_UPDATES_TRASH_PATH, objectUpdatesReducer } from './object-updates.reducer';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
-import { FieldChangeType } from './field-change-type.model';
+import {
+  OBJECT_UPDATES_TRASH_PATH,
+  objectUpdatesReducer,
+  ObjectUpdatesState,
+} from './object-updates.reducer';
 
 class NullAction extends RemoveFieldUpdateAction {
   type = null;
@@ -29,26 +34,26 @@ const identifiable1 = {
   uuid: '8222b07e-330d-417b-8d7f-3b82aeaf2320',
   key: 'dc.contributor.author',
   language: null,
-  value: 'Smith, John'
+  value: 'Smith, John',
 };
 
 const identifiable1update = {
   uuid: '8222b07e-330d-417b-8d7f-3b82aeaf2320',
   key: 'dc.contributor.author',
   language: null,
-  value: 'Smith, James'
+  value: 'Smith, James',
 };
 const identifiable2 = {
   uuid: '26cbb5ce-5786-4e57-a394-b9fcf8eaf241',
   key: 'dc.title',
   language: null,
-  value: 'New title'
+  value: 'New title',
 };
 const identifiable3 = {
   uuid: 'c5d2c2f7-d757-48bf-84cc-8c9229c8407e',
   key: 'dc.description.abstract',
   language: null,
-  value: 'Unchanged value'
+  value: 'Unchanged value',
 };
 const relationship: Relationship = Object.assign(new Relationship(), { uuid: 'test relationship uuid' });
 
@@ -56,65 +61,62 @@ const modDate = new Date(2010, 2, 11);
 const uuid = identifiable1.uuid;
 const url = 'test-object.url/edit';
 describe('objectUpdatesReducer', () => {
-  const testState = {
+  const testState: ObjectUpdatesState = {
     [url]: {
       fieldStates: {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: false
+          isValid: false,
         },
       },
       fieldUpdates: {
         [identifiable2.uuid]: {
           field: {
             uuid: identifiable2.uuid,
-            key: 'dc.titl',
-            language: null,
-            value: 'New title'
           },
-          changeType: FieldChangeType.ADD
-        }
+          changeType: FieldChangeType.ADD,
+        },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
-    }
+    },
   };
 
-  const discardedTestState = {
+  const discardedTestState: ObjectUpdatesState = {
     [url]: {
       fieldStates: {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
     },
     [url + OBJECT_UPDATES_TRASH_PATH]: {
@@ -122,35 +124,32 @@ describe('objectUpdatesReducer', () => {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: false
+          isValid: false,
         },
       },
       fieldUpdates: {
         [identifiable2.uuid]: {
           field: {
             uuid: identifiable2.uuid,
-            key: 'dc.titl',
-            language: null,
-            value: 'New title'
           },
-          changeType: FieldChangeType.ADD
-        }
+          changeType: FieldChangeType.ADD,
+        },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
-    }
+    },
   };
 
   deepFreeze(testState);
@@ -173,48 +172,80 @@ describe('objectUpdatesReducer', () => {
     const action = new InitializeFieldsAction(url, [identifiable1, identifiable2], modDate);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the SET_EDITABLE_FIELD action without affecting the previous state', () => {
     const action = new SetEditableFieldUpdateAction(url, uuid, false);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the ADD_FIELD action without affecting the previous state', () => {
     const action = new AddFieldUpdateAction(url, identifiable1update, FieldChangeType.UPDATE);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the DISCARD action without affecting the previous state', () => {
     const action = new DiscardObjectUpdatesAction(url, null);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REINSTATE action without affecting the previous state', () => {
     const action = new ReinstateObjectUpdatesAction(url);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REMOVE action without affecting the previous state', () => {
     const action = new RemoveFieldUpdateAction(url, uuid);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REMOVE_FIELD action without affecting the previous state', () => {
     const action = new RemoveFieldUpdateAction(url, uuid);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the SELECT_VIRTUAL_METADATA action without affecting the previous state', () => {
     const action = new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should initialize all fields when the INITIALIZE action is dispatched, based on the payload', () => {
@@ -226,19 +257,19 @@ describe('objectUpdatesReducer', () => {
           [identifiable1.uuid]: {
             editable: false,
             isNew: false,
-            isValid: true
+            isValid: true,
           },
           [identifiable3.uuid]: {
             editable: false,
             isNew: false,
-            isValid: true
+            isValid: true,
           },
         },
         fieldUpdates: {},
         virtualMetadataSources: {},
         lastModified: modDate,
-        patchOperationService: undefined
-      }
+        patchOperationService: undefined,
+      },
     };
     const newState = objectUpdatesReducer(testState, action);
     expect(newState).toEqual(expectedState);
diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts
index 14bacc52db..e014889850 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -1,3 +1,14 @@
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { Item } from '../../shared/item.model';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../shared/item-relationships/relationship-type.model';
+import { FieldChangeType } from './field-change-type.model';
+import { FieldUpdates } from './field-updates.model';
+import { Identifiable } from './identifiable.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -11,15 +22,7 @@ import {
   SetEditableFieldUpdateAction,
   SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
 import { PatchOperationService } from './patch-operation-service/patch-operation.service';
-import { Item } from '../../shared/item.model';
-import { RelationshipType } from '../../shared/item-relationships/relationship-type.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
-import { FieldUpdates } from './field-updates.model';
-import { FieldChangeType } from './field-change-type.model';
 
 /**
  * Path where discarded objects are saved
@@ -77,7 +80,7 @@ export interface DeleteRelationship extends RelationshipIdentifiable {
  */
 export interface ObjectUpdatesEntry {
   fieldStates: FieldStates;
-  fieldUpdates: FieldUpdates;
+  fieldUpdates?: FieldUpdates;
   virtualMetadataSources: VirtualMetadataSources;
   lastModified: Date;
   patchOperationService?: GenericConstructor<PatchOperationService>;
@@ -164,7 +167,7 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) {
     { fieldUpdates: {} },
     { virtualMetadataSources: {} },
     { lastModified: lastModifiedServer },
-    { patchOperationService }
+    { patchOperationService },
   );
   return Object.assign({}, state, { [url]: newPageState });
 }
@@ -178,7 +181,7 @@ function addFieldUpdate(state: any, action: AddFieldUpdateAction) {
   const url: string = action.payload.url;
   const field: Identifiable = action.payload.field;
   const changeType: FieldChangeType = action.payload.changeType;
-  const pageState: ObjectUpdatesEntry = state[url] || {fieldUpdates: {}};
+  const pageState: ObjectUpdatesEntry = state[url] || { fieldUpdates: {} };
 
   let states = pageState.fieldStates;
   if (changeType === FieldChangeType.ADD) {
@@ -231,7 +234,7 @@ function selectVirtualMetadata(state: any, action: SelectVirtualMetadataAction)
   const newPageState = Object.assign(
     {},
     pageState,
-    {virtualMetadataSources: virtualMetadataSources},
+    { virtualMetadataSources: virtualMetadataSources },
   );
 
   return Object.assign(
@@ -239,7 +242,7 @@ function selectVirtualMetadata(state: any, action: SelectVirtualMetadataAction)
     state,
     {
       [url]: newPageState,
-    }
+    },
   );
 }
 
@@ -279,7 +282,7 @@ function discardObjectUpdatesFor(url: string, state: any) {
 
   const discardedPageState = Object.assign({}, pageState, {
     fieldUpdates: {},
-    fieldStates: newFieldStates
+    fieldStates: newFieldStates,
   });
   return Object.assign({}, state, { [url]: discardedPageState }, { [url + OBJECT_UPDATES_TRASH_PATH]: pageState });
 }
@@ -357,7 +360,7 @@ function removeFieldUpdate(state: any, action: RemoveFieldUpdateAction) {
     }
     newPageState = Object.assign({}, state[url], {
       fieldUpdates: newUpdates,
-      fieldStates: newFieldStates
+      fieldStates: newFieldStates,
     });
   }
   return Object.assign({}, state, { [url]: newPageState });
diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts
index 9cf856f03a..21486a581c 100644
--- a/src/app/core/data/object-updates/object-updates.service.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.service.spec.ts
@@ -1,21 +1,22 @@
+import { Injector } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { ObjectUpdatesService } from './object-updates.service';
+import { of as observableOf } from 'rxjs';
+
+import { Notification } from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { CoreState } from '../../core-state.model';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { FieldChangeType } from './field-change-type.model';
 import {
   DiscardObjectUpdatesAction,
   InitializeFieldsAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
-  SetEditableFieldUpdateAction
+  SetEditableFieldUpdateAction,
 } from './object-updates.actions';
-import { of as observableOf } from 'rxjs';
-import { Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
-import { Injector } from '@angular/core';
-import { FieldChangeType } from './field-change-type.model';
-import { CoreState } from '../../core-state.model';
+import { ObjectUpdatesService } from './object-updates.service';
 
 describe('ObjectUpdatesService', () => {
   let service: ObjectUpdatesService;
@@ -31,7 +32,7 @@ describe('ObjectUpdatesService', () => {
 
   const fieldUpdates = {
     [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
-    [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD }
+    [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
   };
 
   const modDate = new Date(2010, 2, 11);
@@ -46,15 +47,15 @@ describe('ObjectUpdatesService', () => {
     };
 
     patchOperationService = jasmine.createSpyObj('patchOperationService', {
-      fieldUpdatesToPatchOperations: []
+      fieldUpdatesToPatchOperations: [],
     });
     const objectEntry = {
-      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, patchOperationService
+      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, patchOperationService,
     };
     store = new Store<CoreState>(undefined, undefined, undefined);
     spyOn(store, 'dispatch');
     injector = jasmine.createSpyObj('injector', {
-      get: patchOperationService
+      get: patchOperationService,
     });
     service = new ObjectUpdatesService(store, injector);
 
@@ -80,7 +81,7 @@ describe('ObjectUpdatesService', () => {
       const expectedResult = {
         [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
         [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
-        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD }
+        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
       };
 
       result$.subscribe((result) => {
@@ -96,7 +97,7 @@ describe('ObjectUpdatesService', () => {
 
       const expectedResult = {
         [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
-        [identifiable2.uuid]: { field: identifiable2, changeType: undefined }
+        [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
       };
 
       result$.subscribe((result) => {
diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index 2fb6d47d31..b526e7e980 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -1,14 +1,36 @@
-import { Injectable, Injector } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { coreSelector } from '../../core.selectors';
 import {
-  FieldState,
-  OBJECT_UPDATES_TRASH_PATH,
-  ObjectUpdatesEntry,
-  ObjectUpdatesState,
-  VirtualMetadataSource
-} from './object-updates.reducer';
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import { coreSelector } from '../../core.selectors';
+import { CoreState } from '../../core-state.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { FieldChangeType } from './field-change-type.model';
+import { FieldUpdates } from './field-updates.model';
+import { Identifiable } from './identifiable.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -17,24 +39,16 @@ import {
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction,
-  SetValidFieldUpdateAction
+  SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 import {
-  hasNoValue,
-  hasValue,
-  isEmpty,
-  isNotEmpty,
-  hasValueOperator
-} from '../../../shared/empty.util';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import { Operation } from 'fast-json-patch';
+  FieldState,
+  OBJECT_UPDATES_TRASH_PATH,
+  ObjectUpdatesEntry,
+  ObjectUpdatesState,
+  VirtualMetadataSource,
+} from './object-updates.reducer';
 import { PatchOperationService } from './patch-operation-service/patch-operation.service';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
-import { FieldUpdates } from './field-updates.model';
-import { FieldChangeType } from './field-change-type.model';
-import { CoreState } from '../../core-state.model';
 
 function objectUpdatesStateSelector(): MemoizedSelector<CoreState, ObjectUpdatesState> {
   return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']);
@@ -122,7 +136,7 @@ export class ObjectUpdatesService {
               fieldUpdates[uuid] = fieldUpdatesExclusive[uuid];
             });
             return fieldUpdates;
-          })
+          }),
         );
       }),
     );
@@ -139,16 +153,16 @@ export class ObjectUpdatesService {
     return objectUpdates.pipe(
       hasValueOperator(),
       map((objectEntry) => {
-      const fieldUpdates: FieldUpdates = {};
-      for (const object of initialFields) {
-        let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
-        if (isEmpty(fieldUpdate)) {
-          fieldUpdate = { field: object, changeType: undefined };
+        const fieldUpdates: FieldUpdates = {};
+        for (const object of initialFields) {
+          let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
+          if (isEmpty(fieldUpdate)) {
+            fieldUpdate = { field: object, changeType: undefined };
+          }
+          fieldUpdates[object.uuid] = fieldUpdate;
         }
-        fieldUpdates[object.uuid] = fieldUpdate;
-      }
-      return fieldUpdates;
-    }));
+        return fieldUpdates;
+      }));
   }
 
   /**
@@ -161,7 +175,7 @@ export class ObjectUpdatesService {
     return fieldState$.pipe(
       filter((fieldState) => hasValue(fieldState)),
       map((fieldState) => fieldState.editable),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -175,7 +189,7 @@ export class ObjectUpdatesService {
     return fieldState$.pipe(
       filter((fieldState) => hasValue(fieldState)),
       map((fieldState) => fieldState.isValid),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -189,7 +203,7 @@ export class ObjectUpdatesService {
       map((entry: ObjectUpdatesEntry) => {
         return Object.values(entry.fieldStates).findIndex((state: FieldState) => !state.isValid) < 0;
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -234,7 +248,7 @@ export class ObjectUpdatesService {
       .pipe(
         select(virtualMetadataSourceSelector(url, relationship)),
         map((virtualMetadataSource) => virtualMetadataSource && virtualMetadataSource[item]),
-    );
+      );
   }
 
   /**
@@ -367,7 +381,7 @@ export class ObjectUpdatesService {
           patch = this.injector.get(entry.patchOperationService).fieldUpdatesToPatchOperations(entry.fieldUpdates);
         }
         return patch;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
index db46426b79..ddf38dd2bb 100644
--- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
@@ -1,8 +1,9 @@
-import { MetadataPatchOperationService } from './metadata-patch-operation.service';
 import { Operation } from 'fast-json-patch';
+
 import { MetadatumViewModel } from '../../../shared/metadata.models';
-import { FieldUpdates } from '../field-updates.model';
 import { FieldChangeType } from '../field-change-type.model';
+import { FieldUpdates } from '../field-updates.model';
+import { MetadataPatchOperationService } from './metadata-patch-operation.service';
 
 describe('MetadataPatchOperationService', () => {
   let service: MetadataPatchOperationService;
@@ -23,13 +24,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -46,13 +47,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Added title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.ADD
-          }
+            changeType: FieldChangeType.ADD,
+          },
         });
         expected = [
-          { op: 'add', path: '/metadata/dc.title/-', value: [{ value: 'Added title', language: undefined }] }
+          { op: 'add', path: '/metadata/dc.title/-', value: [{ value: 'Added title', language: undefined }] },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -69,13 +70,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Changed title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.UPDATE
-          }
+            changeType: FieldChangeType.UPDATE,
+          },
         });
         expected = [
-          { op: 'replace', path: '/metadata/dc.title/0', value: { value: 'Changed title', language: undefined } }
+          { op: 'replace', path: '/metadata/dc.title/0', value: { value: 'Changed title', language: undefined } },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -92,31 +93,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/0' },
           { op: 'remove', path: '/metadata/dc.title/0' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -133,31 +134,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/2' },
           { op: 'remove', path: '/metadata/dc.title/1' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -174,31 +175,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/1' },
           { op: 'remove', path: '/metadata/dc.title/1' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -215,31 +216,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third changed title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.UPDATE
+            changeType: FieldChangeType.UPDATE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/1' },
           { op: 'replace', path: '/metadata/dc.title/1', value: { value: 'Third changed title', language: undefined } },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
index 33e9129a9d..b6dccb759b 100644
--- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
@@ -1,21 +1,22 @@
-import { PatchOperationService } from './patch-operation.service';
-import { MetadatumViewModel } from '../../../shared/metadata.models';
-import { Operation } from 'fast-json-patch';
 import { Injectable } from '@angular/core';
-import { MetadataPatchOperation } from './operations/metadata/metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
 import { hasValue } from '../../../../shared/empty.util';
+import { MetadatumViewModel } from '../../../shared/metadata.models';
+import { FieldChangeType } from '../field-change-type.model';
+import { FieldUpdates } from '../field-updates.model';
 import { MetadataPatchAddOperation } from './operations/metadata/metadata-patch-add-operation.model';
+import { MetadataPatchOperation } from './operations/metadata/metadata-patch-operation.model';
 import { MetadataPatchRemoveOperation } from './operations/metadata/metadata-patch-remove-operation.model';
 import { MetadataPatchReplaceOperation } from './operations/metadata/metadata-patch-replace-operation.model';
-import { FieldUpdates } from '../field-updates.model';
-import { FieldChangeType } from '../field-change-type.model';
+import { PatchOperationService } from './patch-operation.service';
 
 /**
  * Service transforming {@link FieldUpdates} into {@link Operation}s for metadata values
  * This expects the fields within every {@link FieldUpdate} to be {@link MetadatumViewModel}s
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class MetadataPatchOperationService implements PatchOperationService {
 
@@ -75,7 +76,7 @@ export class MetadataPatchOperationService implements PatchOperationService {
       const metadatum = update.field as MetadatumViewModel;
       const val = {
         value: metadatum.value,
-        language: metadatum.language
+        language: metadatum.language,
       };
 
       let operation: MetadataPatchOperation;
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
index 7f9b1d772f..9242290c6b 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch add Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
index 962d53dfee..d80ec16cd1 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch move Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
index 61fbae1980..efaf61f381 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch remove Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
index e889bede0b..c2d9581293 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch replace Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
index 171c1d2a54..7e9c1087ff 100644
--- a/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
@@ -1,4 +1,5 @@
 import { Operation } from 'fast-json-patch';
+
 import { FieldUpdates } from '../field-updates.model';
 
 /**
diff --git a/src/app/core/data/paginated-list.model.ts b/src/app/core/data/paginated-list.model.ts
index 415bfe234e..e412af4986 100644
--- a/src/app/core/data/paginated-list.model.ts
+++ b/src/app/core/data/paginated-list.model.ts
@@ -1,13 +1,22 @@
-import { PageInfo } from '../shared/page-info.model';
-import { hasValue, isEmpty, hasNoValue, isUndefined } from '../../shared/empty.util';
-import { HALResource } from '../shared/hal-resource.model';
-import { HALLink } from '../shared/hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isUndefined,
+} from '../../shared/empty.util';
 import { typedObject } from '../cache/builders/build-decorators';
-import { PAGINATED_LIST } from './paginated-list.resource-type';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { HALLink } from '../shared/hal-link.model';
+import { HALResource } from '../shared/hal-resource.model';
+import { PageInfo } from '../shared/page-info.model';
 import { ResourceType } from '../shared/resource-type';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { CacheableObject } from '../cache/cacheable-object.model';
+import { PAGINATED_LIST } from './paginated-list.resource-type';
 
 /**
  * Factory function for a paginated list
@@ -45,7 +54,7 @@ export const buildPaginatedList = <T>(pageInfo: PageInfo, page: T[], normalized
   }
 
   result._links = Object.assign({}, _links, pageInfo._links, {
-    page: pageLinks
+    page: pageLinks,
   });
 
   if (!normalized || isUndefined(pageLinks)) {
@@ -64,13 +73,13 @@ export class PaginatedList<T> extends CacheableObject {
    * The type of the list
    */
   @excludeFromEquals
-  type = PAGINATED_LIST;
+    type = PAGINATED_LIST;
 
   /**
    * The type of objects in the list
    */
   @autoserialize
-  objectType?: ResourceType;
+    objectType?: ResourceType;
 
   /**
    * The list of objects that represents the current page
@@ -81,13 +90,13 @@ export class PaginatedList<T> extends CacheableObject {
    * the {@link PageInfo} object
    */
   @autoserialize
-  pageInfo?: PageInfo;
+    pageInfo?: PageInfo;
 
   /**
    * The {@link HALLink}s for this PaginatedList
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     page: HALLink[];
     first?: HALLink;
diff --git a/src/app/core/data/parsing.service.ts b/src/app/core/data/parsing.service.ts
index fbebe75b2b..9bf91121cc 100644
--- a/src/app/core/data/parsing.service.ts
+++ b/src/app/core/data/parsing.service.ts
@@ -1,5 +1,5 @@
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { RestRequest } from './rest-request.model';
 
 export interface ResponseParsingService {
diff --git a/src/app/core/data/primary-bitstream.service.spec.ts b/src/app/core/data/primary-bitstream.service.spec.ts
index 00d6d7f03c..6a9c89f796 100644
--- a/src/app/core/data/primary-bitstream.service.spec.ts
+++ b/src/app/core/data/primary-bitstream.service.spec.ts
@@ -1,21 +1,31 @@
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { RequestService } from './request.service';
-import { Bitstream } from '../shared/bitstream.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { PrimaryBitstreamService } from './primary-bitstream.service';
-import { BundleDataService } from './bundle-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { CreateRequest, DeleteRequest, PostRequest, PutRequest } from './request.models';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Bundle } from '../shared/bundle.model';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { BundleDataService } from './bundle-data.service';
+import { PrimaryBitstreamService } from './primary-bitstream.service';
+import {
+  CreateRequest,
+  DeleteRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+
 describe('PrimaryBitstreamService', () => {
   let service: PrimaryBitstreamService;
   let objectCache: ObjectCacheService;
@@ -28,8 +38,8 @@ describe('PrimaryBitstreamService', () => {
   const bitstream = Object.assign(new Bitstream(), {
     uuid: 'fake-bitstream',
     _links: {
-      self: { href: 'fake-bitstream-self' }
-    }
+      self: { href: 'fake-bitstream-self' },
+    },
   });
 
   const bundle = Object.assign(new Bundle(), {
@@ -37,21 +47,21 @@ describe('PrimaryBitstreamService', () => {
     _links: {
       self: { href: 'fake-bundle-self' },
       primaryBitstream: { href: 'fake-primary-bitstream-self' },
-    }
+    },
   });
 
   const url = 'fake-bitstream-url';
 
   beforeEach(() => {
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     requestService = getMockRequestService();
     halService = Object.assign(new HALEndpointServiceStub(url));
 
     rdbService = getMockRemoteDataBuildService();
     notificationService = new NotificationsServiceStub() as any;
-    bundleDataService = jasmine.createSpyObj('bundleDataService', {'findByHref': createSuccessfulRemoteDataObject$(bundle)});
+    bundleDataService = jasmine.createSpyObj('bundleDataService', { 'findByHref': createSuccessfulRemoteDataObject$(bundle) });
     service = new PrimaryBitstreamService(requestService, rdbService, objectCache, halService, notificationService, bundleDataService);
   });
 
@@ -96,7 +106,7 @@ describe('PrimaryBitstreamService', () => {
       expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
         PostRequest,
         bundle._links.primaryBitstream.href,
-        bitstream.self
+        bitstream.self,
       );
     });
   });
@@ -113,7 +123,7 @@ describe('PrimaryBitstreamService', () => {
       expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
         PutRequest,
         bundle._links.primaryBitstream.href,
-        bitstream.self
+        bitstream.self,
       );
     });
   });
@@ -121,12 +131,12 @@ describe('PrimaryBitstreamService', () => {
     const testBundle = Object.assign(new Bundle(), {
       _links: {
         self: {
-          href: 'test-href'
+          href: 'test-href',
         },
         primaryBitstream: {
-          href: 'test-primaryBitstream-href'
-        }
-      }
+          href: 'test-primaryBitstream-href',
+        },
+      },
     });
 
     describe('when the delete request succeeds', () => {
diff --git a/src/app/core/data/primary-bitstream.service.ts b/src/app/core/data/primary-bitstream.service.ts
index 488cb5d22e..a5367e67ed 100644
--- a/src/app/core/data/primary-bitstream.service.ts
+++ b/src/app/core/data/primary-bitstream.service.ts
@@ -1,20 +1,28 @@
-import { Bitstream } from '../shared/bitstream.model';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
+import {
+  Observable,
+  switchMap,
+} from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable, switchMap } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { Bundle } from '../shared/bundle.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { HttpHeaders } from '@angular/common/http';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
 import { GenericConstructor } from '../shared/generic-constructor';
-import { PutRequest, PostRequest, DeleteRequest } from './request.models';
-import { getAllCompletedRemoteData } from '../shared/operators';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
+import { getAllCompletedRemoteData } from '../shared/operators';
 import { BundleDataService } from './bundle-data.service';
+import { RemoteData } from './remote-data';
+import {
+  DeleteRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 @Injectable({
   providedIn: 'root',
@@ -63,8 +71,8 @@ export class PrimaryBitstreamService {
       requestId,
       endpointURL,
       primaryBitstreamSelfLink,
-      this.getHttpOptions()
-  );
+      this.getHttpOptions(),
+    );
 
     this.requestService.send(request);
 
@@ -81,7 +89,7 @@ export class PrimaryBitstreamService {
     return this.createAndSendRequest(
       PostRequest,
       bundle._links.primaryBitstream.href,
-      primaryBitstream.self
+      primaryBitstream.self,
     ) as Observable<RemoteData<Bundle>>;
   }
 
@@ -95,7 +103,7 @@ export class PrimaryBitstreamService {
     return this.createAndSendRequest(
       PutRequest,
       bundle._links.primaryBitstream.href,
-      primaryBitstream.self
+      primaryBitstream.self,
     ) as Observable<RemoteData<Bundle>>;
   }
 
@@ -107,12 +115,12 @@ export class PrimaryBitstreamService {
   delete(bundle: Bundle): Observable<RemoteData<Bundle>> {
     return this.createAndSendRequest(
       DeleteRequest,
-      bundle._links.primaryBitstream.href
+      bundle._links.primaryBitstream.href,
     ).pipe(
       getAllCompletedRemoteData(),
       switchMap((rd: RemoteData<NoContent>) => {
         return this.bundleDataService.findByHref(bundle.self, rd.hasFailed);
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/processes/process-data.service.spec.ts b/src/app/core/data/processes/process-data.service.spec.ts
index 88e5bd5791..217567776c 100644
--- a/src/app/core/data/processes/process-data.service.spec.ts
+++ b/src/app/core/data/processes/process-data.service.spec.ts
@@ -6,14 +6,197 @@
  * http://www.dspace.org/license/
  */
 
-import { testFindAllDataImplementation } from '../base/find-all-data.spec';
-import { ProcessDataService } from './process-data.service';
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReducerManager } from '@ngrx/store';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { Process } from '../../../process-page/processes/process.model';
+import { ProcessStatus } from '../../../process-page/processes/process-status.model';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from '../base/delete-data.spec';
+import { testFindAllDataImplementation } from '../base/find-all-data.spec';
+import { testSearchDataImplementation } from '../base/search-data.spec';
+import { BitstreamFormatDataService } from '../bitstream-format-data.service';
+import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
+import {
+  ProcessDataService,
+  TIMER_FACTORY,
+} from './process-data.service';
 
 describe('ProcessDataService', () => {
+  let testScheduler;
+
+  const mockTimer = (fn: () => any, interval: number) => {
+    fn();
+    return 555;
+  };
+
   describe('composition', () => {
-    const initService = () => new ProcessDataService(null, null, null, null, null, null);
+    const initService = () => new ProcessDataService(null, null, null, null, null, null, null, null);
     testFindAllDataImplementation(initService);
     testDeleteDataImplementation(initService);
+    testSearchDataImplementation(initService);
+  });
+
+  let requestService = getMockRequestService();
+  let processDataService;
+  let remoteDataBuildService;
+
+  describe('autoRefreshUntilCompletion', () => {
+    beforeEach(waitForAsync(() => {
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
+      TestBed.configureTestingModule({
+        imports: [],
+        providers: [
+          ProcessDataService,
+          { provide: RequestService, useValue: null },
+          { provide: RemoteDataBuildService, useValue: null },
+          { provide: ObjectCacheService, useValue: null },
+          { provide: ReducerManager, useValue: null },
+          { provide: HALEndpointService, useValue: null },
+          { provide: DSOChangeAnalyzer, useValue: null },
+          { provide: BitstreamFormatDataService, useValue: null },
+          { provide: NotificationsService, useValue: null },
+          { provide: TIMER_FACTORY, useValue: mockTimer },
+        ],
+      });
+
+      processDataService = TestBed.inject(ProcessDataService);
+      spyOn(processDataService, 'invalidateByHref');
+    }));
+
+    it('should not do any polling when the process is already completed', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        let completedProcess = new Process();
+        completedProcess.processStatus = ProcessStatus.COMPLETED;
+
+        const completedProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, completedProcess);
+
+        spyOn(processDataService, 'findById').and.returnValue(
+          cold('c', {
+            'c': completedProcessRD,
+          }),
+        );
+
+        let process$ = processDataService.autoRefreshUntilCompletion('instantly');
+        expectObservable(process$).toBe('c', {
+          c: completedProcessRD,
+        });
+      });
+
+      expect(processDataService.findById).toHaveBeenCalledTimes(1);
+      expect(processDataService.invalidateByHref).not.toHaveBeenCalled();
+    });
+
+    it('should poll until a process completes', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const runningProcess = Object.assign(new Process(), {
+          _links: {
+            self: {
+              href: 'https://rest.api/processes/123',
+            },
+          },
+        });
+        runningProcess.processStatus = ProcessStatus.RUNNING;
+        const completedProcess = new Process();
+        completedProcess.processStatus = ProcessStatus.COMPLETED;
+        const runningProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, runningProcess);
+        const completedProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, completedProcess);
+
+        spyOn(processDataService, 'findById').and.returnValue(
+          cold('r 150ms c', {
+            'r': runningProcessRD,
+            'c': completedProcessRD,
+          }),
+        );
+
+        let process$ = processDataService.autoRefreshUntilCompletion('foo', 100);
+        expectObservable(process$).toBe('r 150ms c', {
+          'r': runningProcessRD,
+          'c': completedProcessRD,
+        });
+      });
+
+      expect(processDataService.findById).toHaveBeenCalledTimes(1);
+      expect(processDataService.invalidateByHref).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('autoRefreshingSearchBy', () => {
+    beforeEach(waitForAsync(() => {
+
+      TestBed.configureTestingModule({
+        imports: [],
+        providers: [
+          ProcessDataService,
+          { provide: RequestService, useValue: requestService },
+          { provide: RemoteDataBuildService, useValue: null },
+          { provide: ObjectCacheService, useValue: null },
+          { provide: ReducerManager, useValue: null },
+          { provide: HALEndpointService, useValue: null },
+          { provide: DSOChangeAnalyzer, useValue: null },
+          { provide: BitstreamFormatDataService, useValue: null },
+          { provide: NotificationsService, useValue: null },
+          { provide: TIMER_FACTORY, useValue: mockTimer },
+        ],
+      });
+
+      processDataService = TestBed.inject(ProcessDataService);
+    }));
+
+    it('should refresh after the specified interval', fakeAsync(() => {
+      const runningProcess = Object.assign(new Process(), {
+        _links: {
+          self: {
+            href: 'https://rest.api/processes/123',
+          },
+        },
+      });
+      runningProcess.processStatus = ProcessStatus.RUNNING;
+
+      const runningProcessPagination: PaginatedList<Process> = Object.assign(new PaginatedList(), {
+        page: [runningProcess],
+        _links: {
+          self: {
+            href: 'https://rest.api/processesList/456',
+          },
+        },
+      });
+
+      const runningProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, runningProcessPagination);
+
+      spyOn(processDataService, 'searchBy').and.returnValue(
+        of(runningProcessRD),
+      );
+
+      expect(processDataService.searchBy).toHaveBeenCalledTimes(0);
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledTimes(0);
+
+      let sub = processDataService.autoRefreshingSearchBy('id', 'byProperty', new FindListOptions(), 200).subscribe();
+      expect(processDataService.searchBy).toHaveBeenCalledTimes(1);
+
+      tick(250);
+
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledTimes(1);
+
+      sub.unsubscribe();
+    }));
   });
 });
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 3bf34eb650..ae0dfc11fa 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -1,30 +1,70 @@
-import { Injectable } from '@angular/core';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+  NgZone,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  switchMap,
+} from 'rxjs/operators';
+import { ProcessStatus } from 'src/app/process-page/processes/process-status.model';
+
 import { Process } from '../../../process-page/processes/process.model';
 import { PROCESS } from '../../../process-page/processes/process.resource-type';
-import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-import { PaginatedList } from '../paginated-list.model';
-import { Bitstream } from '../../shared/bitstream.model';
-import { RemoteData } from '../remote-data';
-import { BitstreamDataService } from '../bitstream-data.service';
-import { IdentifiableDataService } from '../base/identifiable-data.service';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { dataService } from '../base/data-service.decorator';
-import { DeleteData, DeleteDataImpl } from '../base/delete-data';
+import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Bitstream } from '../../shared/bitstream.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { NoContent } from '../../shared/NoContent.model';
+import { getAllCompletedRemoteData } from '../../shared/operators';
+import { dataService } from '../base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../base/find-all-data';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../base/search-data';
+import { BitstreamDataService } from '../bitstream-data.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+
+/**
+ * Create an InjectionToken for the default JS setTimeout function, purely so we can mock it during
+ * testing. (fakeAsync isn't working for this case)
+ */
+export const TIMER_FACTORY = new InjectionToken<(callback: (...args: any[]) => void, ms?: number, ...args: any[]) => NodeJS.Timeout>('timer', {
+  providedIn: 'root',
+  factory: () => setTimeout,
+});
 
 @Injectable()
 @dataService(PROCESS)
-export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process> {
+export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process>, SearchData<Process> {
+
   private findAllData: FindAllData<Process>;
   private deleteData: DeleteData<Process>;
+  private searchData: SearchData<Process>;
+  protected activelyBeingPolled: Map<string, NodeJS.Timeout> = new Map();
+  protected subs: Map<string, Subscription> = new Map();
 
   constructor(
     protected requestService: RequestService,
@@ -33,11 +73,30 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     protected halService: HALEndpointService,
     protected bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
+    protected zone: NgZone,
+    @Inject(TIMER_FACTORY) protected timer: (callback: (...args: any[]) => void, ms?: number, ...args: any[]) => NodeJS.Timeout,
   ) {
     super('processes', requestService, rdbService, objectCache, halService);
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return true if the given process has the given status
+   * @protected
+   */
+  protected static statusIs(process: Process, status: ProcessStatus): boolean {
+    return hasValue(process) && process.processStatus === status;
+  }
+
+  /**
+   * Return true if the given process has the status COMPLETED or FAILED
+   */
+  public static hasCompletedOrFailed(process: Process): boolean {
+    return ProcessDataService.statusIs(process, ProcessStatus.COMPLETED) ||
+      ProcessDataService.statusIs(process, ProcessStatus.FAILED);
   }
 
   /**
@@ -46,7 +105,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    */
   getFilesEndpoint(processId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`))
+      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`)),
     );
   }
 
@@ -77,6 +136,71 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+   * @param searchMethod                The search method for the Process
+   * @param options                     The FindListOptions object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true.
+   * @param reRequestOnStale            Whether the request should automatically be re-
+   *                                    requested after the response becomes stale.
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should automatically be resolved.
+   * @return {Observable<RemoteData<PaginatedList<Process>>>}
+   *    Return an observable that emits a paginated list of processes
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * @param id                          The id for this auto-refreshing search. Used to stop
+   *                                    auto-refreshing afterwards, and ensure we're not
+   *                                    auto-refreshing the same thing multiple times.
+   * @param searchMethod                The search method for the Process
+   * @param options                     The FindListOptions object
+   * @param pollingIntervalInMs         The interval by which the search will be repeated
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should automatically be resolved.
+   * @return {Observable<RemoteData<PaginatedList<Process>>>}
+   *    Return an observable that emits a paginated list of processes every interval
+   */
+  autoRefreshingSearchBy(id: string, searchMethod: string, options?: FindListOptions, pollingIntervalInMs: number = 5000, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
+
+    const result$ = this.searchBy(searchMethod, options, true, true, ...linksToFollow).pipe(
+      getAllCompletedRemoteData(),
+    );
+
+    const sub = result$.pipe(
+      filter(() =>
+        !this.activelyBeingPolled.has(id),
+      ),
+    ).subscribe((processListRd: RemoteData<PaginatedList<Process>>) => {
+      this.clearCurrentTimeout(id);
+      const nextTimeout = this.timer(() => {
+        this.activelyBeingPolled.delete(id);
+        this.requestService.setStaleByHrefSubstring(processListRd.payload._links.self.href);
+      }, pollingIntervalInMs);
+
+      this.activelyBeingPolled.set(id, nextTimeout);
+    });
+
+    this.subs.set(id, sub);
+
+    return result$;
+  }
+
+  /**
+   * Stop auto-refreshing the request with the given id
+   * @param id the id of the request to stop automatically refreshing
+   */
+  stopAutoRefreshing(id: string) {
+    this.clearCurrentTimeout(id);
+    if (hasValue(this.subs.get(id))) {
+      this.subs.get(id).unsubscribe();
+      this.subs.delete(id);
+    }
+  }
+
   /**
    * Delete an existing object on the server
    * @param   objectId The id of the object to be removed
@@ -101,4 +225,74 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
   public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
+
+  /**
+   * Clear the timeout for the given id, if that timeout exists
+   * @protected
+   */
+  protected clearCurrentTimeout(id: string): void {
+    const timeout = this.activelyBeingPolled.get(id);
+    if (hasValue(timeout)) {
+      clearTimeout(timeout);
+    }
+    this.activelyBeingPolled.delete(id);
+  }
+
+  /**
+   * Poll the process with the given ID, using the given interval, until that process either
+   * completes successfully or fails
+   *
+   * Return an Observable<RemoteData> for the Process. Note that this will also emit while the
+   * process is still running. It will only emit again when the process (not the RemoteData!) changes
+   * status. That makes it more convenient to retrieve that process for a component: you can replace
+   * a findByID call with this method, rather than having to do a separate findById, and then call
+   * this method
+   *
+   * @param processId           The ID of the {@link Process} to poll
+   * @param pollingIntervalInMs The interval for how often the request needs to be polled
+   * @param linksToFollow       List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be
+   *                            automatically resolved
+   */
+  public autoRefreshUntilCompletion(processId: string, pollingIntervalInMs = 5000, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<Process>> {
+    const process$: Observable<RemoteData<Process>> = this.findById(processId, true, true, ...linksToFollow)
+      .pipe(
+        getAllCompletedRemoteData(),
+      );
+
+    // Create a subscription that marks the data as stale if the process hasn't been completed and
+    // the polling interval time has been exceeded.
+    const sub = process$.pipe(
+      filter((processRD: RemoteData<Process>) =>
+        !ProcessDataService.hasCompletedOrFailed(processRD.payload) &&
+        !this.activelyBeingPolled.has(processId),
+      ),
+    ).subscribe((processRD: RemoteData<Process>) => {
+      this.clearCurrentTimeout(processId);
+      if (processRD.hasSucceeded) {
+        const nextTimeout = this.timer(() => {
+          this.activelyBeingPolled.delete(processId);
+          this.invalidateByHref(processRD.payload._links.self.href);
+        }, pollingIntervalInMs);
+
+        this.activelyBeingPolled.set(processId, nextTimeout);
+      }
+    });
+
+    this.subs.set(processId, sub);
+
+    // When the process completes create a one off subscription (the `find` completes the
+    // observable) that unsubscribes the previous one, removes the processId from the list of
+    // processes being polled and clears any running timeouts
+    process$.pipe(
+      find((processRD: RemoteData<Process>) => ProcessDataService.hasCompletedOrFailed(processRD.payload)),
+    ).subscribe(() => {
+      this.stopAutoRefreshing(processId);
+    });
+
+    return process$.pipe(
+      distinctUntilChanged((previous: RemoteData<Process>, current: RemoteData<Process>) =>
+        previous.payload?.processStatus === current.payload?.processStatus,
+      ),
+    );
+  }
 }
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index d9c92cb1d2..901a92e818 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -1,26 +1,33 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { Process } from '../../../process-page/processes/process.model';
+import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
+import { Script } from '../../../process-page/scripts/script.model';
+import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
+import { hasValue } from '../../../shared/empty.util';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { Script } from '../../../process-page/scripts/script.model';
-import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
-import { map, take } from 'rxjs/operators';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
+import { dataService } from '../base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../base/find-all-data';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { MultipartPostRequest } from '../request.models';
 import { RequestService } from '../request.service';
-import { Observable } from 'rxjs';
-import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
-import { Process } from '../../../process-page/processes/process.model';
-import { hasValue } from '../../../shared/empty.util';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { RestRequest } from '../rest-request.model';
-import { IdentifiableDataService } from '../base/identifiable-data.service';
-import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../paginated-list.model';
-import { dataService } from '../base/data-service.decorator';
 
 export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
 export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
@@ -51,7 +58,7 @@ export class ScriptDataService extends IdentifiableDataService<Script> implement
       map((endpoint: string) => {
         const body = this.getInvocationFormData(parameters, files);
         return new MultipartPostRequest(requestId, endpoint, body);
-      })
+      }),
     ).subscribe((request: RestRequest) => this.requestService.send(request));
 
     return this.rdbService.buildFromRequestUUID<Process>(requestId);
diff --git a/src/app/core/data/registration-response-parsing.service.spec.ts b/src/app/core/data/registration-response-parsing.service.spec.ts
index 6cff89ff72..50bf650908 100644
--- a/src/app/core/data/registration-response-parsing.service.spec.ts
+++ b/src/app/core/data/registration-response-parsing.service.spec.ts
@@ -1,6 +1,6 @@
+import { ParsedResponse } from '../cache/response.models';
 import { Registration } from '../shared/registration.model';
 import { RegistrationResponseParsingService } from './registration-response-parsing.service';
-import { ParsedResponse } from '../cache/response.models';
 
 describe('RegistrationResponseParsingService', () => {
   describe('parse', () => {
@@ -10,7 +10,7 @@ describe('RegistrationResponseParsingService', () => {
     const data = {
       payload: { email: 'test@email.org', token: 'test-token' },
       statusCode: 200,
-      statusText: 'Success'
+      statusText: 'Success',
     };
 
     it('should parse a registration response', () => {
diff --git a/src/app/core/data/registration-response-parsing.service.ts b/src/app/core/data/registration-response-parsing.service.ts
index 067deea557..2984550447 100644
--- a/src/app/core/data/registration-response-parsing.service.ts
+++ b/src/app/core/data/registration-response-parsing.service.ts
@@ -1,10 +1,9 @@
 import { Injectable } from '@angular/core';
-import {
-  ParsedResponse
-} from '../cache/response.models';
+
+import { ParsedResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { ResponseParsingService } from './parsing.service';
 import { Registration } from '../shared/registration.model';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
 @Injectable({
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 4432d5213a..21365e52e1 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -1,28 +1,30 @@
 import { of as observableOf } from 'rxjs';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { Relationship } from '../shared/item-relationships/relationship.model';
-import { Item } from '../shared/item.model';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from './paginated-list.model';
-import { DeleteRequest } from './request.models';
-import { RelationshipDataService } from './relationship-data.service';
-import { RequestService } from './request.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { RequestEntry } from './request-entry.model';
-import { FindListOptions } from './find-list-options.model';
-import { testSearchDataImplementation } from './base/search-data.spec';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Item } from '../shared/item.model';
+import { Relationship } from '../shared/item-relationships/relationship.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { MetadataValue } from '../shared/metadata.models';
 import { MetadataRepresentationType } from '../shared/metadata-representation/metadata-representation.model';
+import { PageInfo } from '../shared/page-info.model';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { buildPaginatedList } from './paginated-list.model';
+import { RelationshipDataService } from './relationship-data.service';
+import { DeleteRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('RelationshipDataService', () => {
   let service: RelationshipDataService;
@@ -36,7 +38,7 @@ describe('RelationshipDataService', () => {
     id: '1',
     uuid: '1',
     leftwardType: 'isAuthorOfPublication',
-    rightwardType: 'isPublicationOfAuthor'
+    rightwardType: 'isPublicationOfAuthor',
   });
 
   const ri1SelfLink = restEndpointURL + '/author1';
@@ -46,34 +48,34 @@ describe('RelationshipDataService', () => {
   const relationship1 = Object.assign(new Relationship(), {
     _links: {
       self: {
-        href: relationshipsEndpointURL + '/2'
+        href: relationshipsEndpointURL + '/2',
       },
       leftItem: {
-        href: ri1SelfLink
+        href: ri1SelfLink,
       },
       rightItem: {
-        href: itemSelfLink
-      }
+        href: itemSelfLink,
+      },
     },
     id: '2',
     uuid: '2',
-    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
   });
   const relationship2 = Object.assign(new Relationship(), {
     _links: {
       self: {
-        href: relationshipsEndpointURL + '/3'
+        href: relationshipsEndpointURL + '/3',
       },
       leftItem: {
-        href: ri2SelfLink
+        href: ri2SelfLink,
       },
       rightItem: {
-        href: itemSelfLink
+        href: itemSelfLink,
       },
     },
     id: '3',
     uuid: '3',
-    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
   });
 
   const relationships = [relationship1, relationship2];
@@ -83,23 +85,23 @@ describe('RelationshipDataService', () => {
     relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     _links: {
       relationships: { href: restEndpointURL + '/publication/relationships' },
-      self: { href: itemSelfLink }
-    }
+      self: { href: itemSelfLink },
+    },
   });
 
   const relatedItem1 = Object.assign(new Item(), {
     id: 'author1',
     uuid: 'author1',
     _links: {
-      self: { href: ri1SelfLink }
-    }
+      self: { href: ri1SelfLink },
+    },
   });
   const relatedItem2 = Object.assign(new Item(), {
     id: 'author2',
     uuid: 'author2',
     _links: {
-      self: { href: ri2SelfLink }
-    }
+      self: { href: ri2SelfLink },
+    },
   });
 
   relationship1.leftItem = createSuccessfulRemoteDataObject$(relatedItem1);
@@ -112,20 +114,13 @@ describe('RelationshipDataService', () => {
   const relationships$ = createSuccessfulRemoteDataObject$(createPaginatedList(relationships));
   const rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, {
     'href': buildList$,
-    'https://rest.api/core/publication/relationships': relationships$
+    'https://rest.api/core/publication/relationships': relationships$,
   });
-  const objectCache = Object.assign({
-    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    remove: () => {
-    },
-    hasBySelfLinkObservable: () => observableOf(false),
-    hasByHref$: () => observableOf(false)
-    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-  }) as ObjectCacheService;
+  const objectCache = new ObjectCacheServiceStub();
 
   const itemService = jasmine.createSpyObj('itemService', {
     findById: (uuid) => createSuccessfulRemoteDataObject(relatedItems.find((relatedItem) => relatedItem.id === uuid)),
-    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
+    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0]),
   });
 
   function initTestService() {
@@ -133,7 +128,7 @@ describe('RelationshipDataService', () => {
       requestService,
       rdbService,
       halService,
-      objectCache,
+      objectCache as ObjectCacheService,
       itemService,
       null,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
@@ -142,7 +137,7 @@ describe('RelationshipDataService', () => {
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: relationships } as any
+      response: { isSuccessful: successful, payload: relationships } as any,
     } as RequestEntry);
   };
 
@@ -197,7 +192,7 @@ describe('RelationshipDataService', () => {
         elementsPerPage: relationships.length,
         totalElements: relationships.length,
         currentPage: 1,
-        totalPages: 1
+        totalPages: 1,
       }), relationships);
       mockItem = { uuid: 'someid' } as Item;
       mockLabel = 'label';
@@ -212,7 +207,7 @@ describe('RelationshipDataService', () => {
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
-        mockOptions
+        mockOptions,
       ).subscribe((result) => {
         expect(service.getItemRelationshipsByLabel).toHaveBeenCalledWith(
           mockItem,
@@ -222,7 +217,7 @@ describe('RelationshipDataService', () => {
           true,
           followLink('leftItem',{}, followLink('thumbnail')),
           followLink('rightItem',{}, followLink('thumbnail')),
-          followLink('relationshipType')
+          followLink('relationshipType'),
         );
         done();
       });
@@ -232,7 +227,7 @@ describe('RelationshipDataService', () => {
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
-        mockOptions
+        mockOptions,
       ).subscribe((result) => {
         expect((service as any).paginatedRelationsToItems).toHaveBeenCalledWith(mockItem.uuid);
         done();
@@ -249,12 +244,12 @@ describe('RelationshipDataService', () => {
             language: null,
             value: 'Related Author with authority',
             authority: 'virtual::related-author',
-            place: 2
+            place: 2,
           }),
           Object.assign(new MetadataValue(), {
             language: null,
             value: 'Author without authority',
-            place: 1
+            place: 1,
           }),
         ],
         'dc.creator': [
@@ -264,7 +259,7 @@ describe('RelationshipDataService', () => {
             authority: 'virtual::related-creator',
             place: 3,
           }),
-            Object.assign(new MetadataValue(), {
+          Object.assign(new MetadataValue(), {
             language: null,
             value: 'Related Creator with authority - unauthorized',
             authority: 'virtual::related-creator-unauthorized',
@@ -274,10 +269,10 @@ describe('RelationshipDataService', () => {
         'dc.title': [
           Object.assign(new MetadataValue(), {
             language: null,
-            value: 'Parent Item'
+            value: 'Parent Item',
           }),
-        ]
-      }
+        ],
+      },
     });
     const relatedAuthor: Item = Object.assign(new Item(), {
       id: 'related-author',
@@ -285,10 +280,10 @@ describe('RelationshipDataService', () => {
         'dc.title': [
           Object.assign(new MetadataValue(), {
             language: null,
-            value: 'Related Author'
+            value: 'Related Author',
           }),
-        ]
-      }
+        ],
+      },
     });
     const relatedCreator: Item = Object.assign(new Item(), {
       id: 'related-creator',
@@ -296,15 +291,15 @@ describe('RelationshipDataService', () => {
         'dc.title': [
           Object.assign(new MetadataValue(), {
             language: null,
-            value: 'Related Creator'
+            value: 'Related Creator',
           }),
         ],
         'dspace.entity.type': 'Person',
-      }
+      },
     });
     const authorRelation: Relationship = Object.assign(new Relationship(), {
       leftItem: createSuccessfulRemoteDataObject$(parentItem),
-      rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
+      rightItem: createSuccessfulRemoteDataObject$(relatedAuthor),
     });
     const creatorRelation: Relationship = Object.assign(new Relationship(), {
       leftItem: createSuccessfulRemoteDataObject$(parentItem),
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 46a51a2d01..682c50e076 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -1,56 +1,98 @@
 import { HttpHeaders } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
 import {
-  compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
-  relationsToItems
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import {
+  compareArraysUsingIds,
+  PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
+  relationsToItems,
 } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { AppState, keySelector } from '../../app.reducer';
-import { hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import {
   RemoveNameVariantAction,
-  SetNameVariantAction
+  SetNameVariantAction,
 } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions';
 import { NameVariantListState } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
+import { itemLinksToFollow } from '../../shared/utils/relation-query.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { Item } from '../shared/item.model';
 import { Relationship } from '../shared/item-relationships/relationship.model';
 import { RELATIONSHIP } from '../shared/item-relationships/relationship.resource-type';
-import { Item } from '../shared/item.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../shared/metadata.models';
+import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model';
+import { MetadataRepresentation } from '../shared/metadata-representation/metadata-representation.model';
+import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model';
+import { NoContent } from '../shared/NoContent.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../shared/operators';
+import { sendRequest } from '../shared/request.operators';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
 import { ItemDataService } from './item-data.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { DeleteRequest, PostRequest } from './request.models';
+import {
+  DeleteRequest,
+  PostRequest,
+} from './request.models';
 import { RequestService } from './request.service';
-import { NoContent } from '../shared/NoContent.model';
 import { RequestEntryState } from './request-entry-state.model';
-import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
-import { itemLinksToFollow } from '../../shared/utils/relation-query.utils';
-import { MetadataValue } from '../shared/metadata.models';
-import { MetadataRepresentation } from '../shared/metadata-representation/metadata-representation.model';
-import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model';
-import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model';
-import { DSpaceObject } from '../shared/dspace-object.model';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -72,7 +114,7 @@ const compareItemsByUUID = (itemCheck: Item) =>
   (source: Observable<RemoteData<Item>>): Observable<boolean> =>
     source.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => item.uuid === itemCheck.uuid)
+      map((item: Item) => item.uuid === itemCheck.uuid),
     );
 
 /**
@@ -121,7 +163,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       take(1),
       distinctUntilChanged(),
       map((endpointURL: string) =>
-        new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata)
+        new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata),
       ),
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
@@ -168,10 +210,10 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       getRemoteDataPayload(),
       switchMap((rel: Relationship) => observableCombineLatest(
         rel.leftItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()),
-        rel.rightItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
-        )
+        rel.rightItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()),
       ),
-      take(1)
+      ),
+      take(1),
     ).subscribe(([item1, item2]) => {
       this.refreshRelationshipItemsInCache(item1);
       this.refreshRelationshipItemsInCache(item2);
@@ -187,7 +229,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     this.requestService.removeByHrefSubstring(item.uuid);
     observableCombineLatest([
       this.objectCache.hasByHref$(item._links.self.href),
-      this.requestService.hasByHref$(item.self)
+      this.requestService.hasByHref$(item.self),
     ]).pipe(
       filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
       take(1),
@@ -219,7 +261,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   getRelationshipTypeLabelsByItem(item: Item): Observable<string[]> {
     return this.getItemRelationshipsArray(item, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe(
       switchMap((relationships: Relationship[]) => observableCombineLatest(relationships.map((relationship: Relationship) => this.getRelationshipTypeLabelByRelationshipAndItem(relationship, item)))),
-      map((labels: string[]) => Array.from(new Set(labels)))
+      map((labels: string[]) => Array.from(new Set(labels))),
     );
   }
 
@@ -236,8 +278,8 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
           } else {
             return relationshipType.rightwardType;
           }
-        })
-        )
+        }),
+      ),
       ));
   }
 
@@ -250,9 +292,9 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       item,
       followLink('leftItem'),
       followLink('rightItem'),
-      followLink('relationshipType')
+      followLink('relationshipType'),
     ).pipe(
-      relationsToItems(item.uuid)
+      relationsToItems(item.uuid),
     );
   }
 
@@ -264,7 +306,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
+    const linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
     linksToFollow.push(followLink('relationshipType'));
 
     return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
@@ -313,7 +355,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
           return observableCombineLatest([isLeftItem$, isRightItem$]).pipe(
             filter(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
             map(() => relationship),
-            startWith(undefined)
+            startWith(undefined),
           );
         }));
       }),
@@ -325,7 +367,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     return itemRD$.pipe(
       getFirstSucceededRemoteData(),
       map((itemRD: RemoteData<Item>) => itemRD.payload),
-      map((item: Item) => uuids.includes(item.uuid))
+      map((item: Item) => uuids.includes(item.uuid)),
     );
   }
 
@@ -344,23 +386,23 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       false,
       followLink('relationshipType'),
       followLink('leftItem'),
-      followLink('rightItem')
+      followLink('rightItem'),
     ).pipe(
-        getFirstSucceededRemoteData(),
-        // the mergemap below will emit all elements of the list as separate events
-        mergeMap((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
-        mergeMap((relationship: Relationship) => {
-          return observableCombineLatest([
-            this.itemService.findByHref(relationship._links.leftItem.href).pipe(compareItemsByUUID(item2)),
-            this.itemService.findByHref(relationship._links.rightItem.href).pipe(compareItemsByUUID(item2))
-          ]).pipe(
-            map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
-            map((isMatch) => isMatch ? relationship : undefined)
-          );
-        }),
-        filter((relationship) => hasValue(relationship)),
-        take(1)
-      );
+      getFirstSucceededRemoteData(),
+      // the mergemap below will emit all elements of the list as separate events
+      mergeMap((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
+      mergeMap((relationship: Relationship) => {
+        return observableCombineLatest([
+          this.itemService.findByHref(relationship._links.leftItem.href).pipe(compareItemsByUUID(item2)),
+          this.itemService.findByHref(relationship._links.rightItem.href).pipe(compareItemsByUUID(item2)),
+        ]).pipe(
+          map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
+          map((isMatch) => isMatch ? relationship : undefined),
+        );
+      }),
+      filter((relationship) => hasValue(relationship)),
+      take(1),
+    );
   }
 
   /**
@@ -380,7 +422,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    */
   public getNameVariant(listID: string, itemID: string): Observable<string> {
     return this.appStore.pipe(
-      select(relationshipStateSelector(listID, itemID))
+      select(relationshipStateSelector(listID, itemID)),
     );
   }
 
@@ -417,8 +459,8 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
             getRemoteDataPayload(),
             map((type) => {
               return { relation, type };
-            })
-          )
+            }),
+          ),
         ),
         switchMap((relationshipAndType: { relation: Relationship, type: RelationshipType }) => {
           const { relation, type } = relationshipAndType;
@@ -443,7 +485,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((leftItem: Item) => hasValue(leftItem) && isNotEmpty(leftItem.uuid)),
-      map((leftItem) => leftItem.uuid === item.uuid)
+      map((leftItem) => leftItem.uuid === item.uuid),
     );
   }
 
@@ -494,45 +536,45 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   searchByItemsAndType(typeId: string,itemUuid: string,relationshipLabel: string, arrayOfItemIds: string[] ): Observable<RemoteData<PaginatedList<Relationship>>> {
 
     const searchParams = [
-          {
-            fieldName: 'typeId',
-            fieldValue: typeId
-          },
-          {
-            fieldName: 'focusItem',
-            fieldValue: itemUuid
-          },
-          {
-            fieldName: 'relationshipLabel',
-            fieldValue: relationshipLabel
-          },
-          {
-            fieldName: 'size',
-            fieldValue: arrayOfItemIds.length
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'leftItem'
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'rightItem'
-          },
-        ];
+      {
+        fieldName: 'typeId',
+        fieldValue: typeId,
+      },
+      {
+        fieldName: 'focusItem',
+        fieldValue: itemUuid,
+      },
+      {
+        fieldName: 'relationshipLabel',
+        fieldValue: relationshipLabel,
+      },
+      {
+        fieldName: 'size',
+        fieldValue: arrayOfItemIds.length,
+      },
+      {
+        fieldName: 'embed',
+        fieldValue: 'leftItem',
+      },
+      {
+        fieldName: 'embed',
+        fieldValue: 'rightItem',
+      },
+    ];
 
     arrayOfItemIds.forEach( (itemId) => {
       searchParams.push(
         {
           fieldName: 'relatedItem',
           fieldValue: itemId,
-        }
+        },
       );
     });
 
     return this.searchBy(
       'byItemsAndType',
       {
-        searchParams: searchParams
+        searchParams: searchParams,
       },
     ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
@@ -584,8 +626,8 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
               } else {
                 return Object.assign(new MetadatumRepresentation(itemType), metadatum);
               }
-            })
-          )
+            }),
+          ),
         ));
     } else {
       return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum));
diff --git a/src/app/core/data/relationship-type-data.service.spec.ts b/src/app/core/data/relationship-type-data.service.spec.ts
index 6a788446d8..c82a2789ce 100644
--- a/src/app/core/data/relationship-type-data.service.spec.ts
+++ b/src/app/core/data/relationship-type-data.service.spec.ts
@@ -1,15 +1,20 @@
 import { of as observableOf } from 'rxjs';
+
+import { hasValueOperator } from '../../shared/empty.util';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { RequestService } from './request.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { hasValueOperator } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
 
 describe('RelationshipTypeDataService', () => {
   let service: RelationshipTypeDataService;
@@ -28,7 +33,7 @@ describe('RelationshipTypeDataService', () => {
 
   let buildList;
   let rdbService;
-  let objectCache;
+  let objectCache: ObjectCacheServiceStub;
 
   function init() {
     restEndpointURL = 'https://rest.api/relationshiptypes';
@@ -46,7 +51,7 @@ describe('RelationshipTypeDataService', () => {
       leftwardType: 'isAuthorOfPublication',
       rightwardType: 'isPublicationOfAuthor',
       leftType: createSuccessfulRemoteDataObject$(publicationType),
-      rightType: createSuccessfulRemoteDataObject$(personType)
+      rightType: createSuccessfulRemoteDataObject$(personType),
     });
 
     relationshipType2 = Object.assign(new RelationshipType(), {
@@ -55,26 +60,19 @@ describe('RelationshipTypeDataService', () => {
       leftwardType: 'isOrgUnitOfPublication',
       rightwardType: 'isPublicationOfOrgUnit',
       leftType: createSuccessfulRemoteDataObject$(publicationType),
-      rightType: createSuccessfulRemoteDataObject$(orgUnitType)
+      rightType: createSuccessfulRemoteDataObject$(orgUnitType),
     });
 
     buildList = createSuccessfulRemoteDataObject(createPaginatedList([relationshipType1, relationshipType2]));
     rdbService = getMockRemoteDataBuildService(undefined, observableOf(buildList));
-    objectCache = Object.assign({
-      /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-      remove: () => {
-      },
-      hasBySelfLinkObservable: () => observableOf(false)
-      /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    }) as ObjectCacheService;
-
+    objectCache = new ObjectCacheServiceStub();
   }
 
   function initTestService() {
     return new RelationshipTypeDataService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
     );
   }
@@ -89,7 +87,7 @@ describe('RelationshipTypeDataService', () => {
 
     it('should return the type filtered by label and type strings', (done) => {
       service.getRelationshipTypeByLabelAndTypes(relationshipType1.leftwardType, publicationTypeString, personTypeString).pipe(
-        hasValueOperator()
+        hasValueOperator(),
       ).subscribe((e) => {
         expect(e.id).toEqual(relationshipType1.id);
         done();
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 3020e52d47..556e81dced 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -1,22 +1,38 @@
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RELATIONSHIP_TYPE } from '../shared/item-relationships/relationship-type.resource-type';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import { FindAllDataImpl } from './base/find-all-data';
+import { SearchDataImpl } from './base/search-data';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BaseDataService } from './base/base-data.service';
-import { FindAllDataImpl } from './base/find-all-data';
-import { SearchDataImpl } from './base/search-data';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
@@ -62,33 +78,33 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
   getRelationshipTypeByLabelAndTypes(relationshipTypeLabel: string, firstItemType: string, secondItemType: string): Observable<RelationshipType> {
     // Retrieve all relationship types from the server in a single page
     return this.findAllData.findAll({ currentPage: 1, elementsPerPage: 9999 }, true, true, followLink('leftType'), followLink('rightType'))
-               .pipe(
-                 getFirstSucceededRemoteData(),
-                 // Emit each type in the page array separately
-                 switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
-                 // Check each type individually, to see if it matches the provided types
-                 mergeMap((relationshipType: RelationshipType) => {
-                   if (relationshipType.leftwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, firstItemType, secondItemType);
-                   } else if (relationshipType.rightwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, secondItemType, firstItemType);
-                   } else {
-                     return [null];
-                   }
-                 }),
-                 // Wait for all types to be checked and emit once, with the results combined back into an
-                 // array
-                 toArray(),
-                 // Look for a match in the array and emit it if found, or null if one isn't found
-                 map((types: RelationshipType[]) => {
-                   const match = types.find((type: RelationshipType) => hasValue(type));
-                   if (hasValue(match)) {
-                     return match;
-                   } else {
-                     return null;
-                   }
-                 }),
-               );
+      .pipe(
+        getFirstSucceededRemoteData(),
+        // Emit each type in the page array separately
+        switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
+        // Check each type individually, to see if it matches the provided types
+        mergeMap((relationshipType: RelationshipType) => {
+          if (relationshipType.leftwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, firstItemType, secondItemType);
+          } else if (relationshipType.rightwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, secondItemType, firstItemType);
+          } else {
+            return [null];
+          }
+        }),
+        // Wait for all types to be checked and emit once, with the results combined back into an
+        // array
+        toArray(),
+        // Look for a match in the array and emit it if found, or null if one isn't found
+        map((types: RelationshipType[]) => {
+          const match = types.find((type: RelationshipType) => hasValue(type));
+          if (hasValue(match)) {
+            return match;
+          } else {
+            return null;
+          }
+        }),
+      );
   }
 
   /**
@@ -103,7 +119,7 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
   private checkType(type: RelationshipType, leftItemType: string, rightItemType: string): Observable<RelationshipType> {
     return observableCombineLatest([
       type.leftType.pipe(getFirstCompletedRemoteData()),
-      type.rightType.pipe(getFirstCompletedRemoteData())
+      type.rightType.pipe(getFirstCompletedRemoteData()),
     ]).pipe(
       map(([leftTypeRD, rightTypeRD]: [RemoteData<ItemType>, RemoteData<ItemType>]) => {
         if (checkSide(leftTypeRD, leftItemType) && checkSide(rightTypeRD, rightItemType)
@@ -112,7 +128,7 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts
index 40c8d7f400..935d2a95d2 100644
--- a/src/app/core/data/remote-data.ts
+++ b/src/app/core/data/remote-data.ts
@@ -10,7 +10,7 @@ import {
   isStale,
   isSuccess,
   isSuccessStale,
-  RequestEntryState
+  RequestEntryState,
 } from './request-entry-state.model';
 
 /**
diff --git a/src/app/core/data/request-entry-state.model.spec.ts b/src/app/core/data/request-entry-state.model.spec.ts
new file mode 100644
index 0000000000..f78318149a
--- /dev/null
+++ b/src/app/core/data/request-entry-state.model.spec.ts
@@ -0,0 +1,186 @@
+import {
+  hasCompleted,
+  hasFailed,
+  hasSucceeded,
+  isError,
+  isErrorStale,
+  isLoading,
+  isRequestPending,
+  isResponsePending,
+  isResponsePendingStale,
+  isStale,
+  isSuccess,
+  isSuccessStale,
+  RequestEntryState,
+} from './request-entry-state.model';
+
+describe(`isRequestPending`, () => {
+  it(`should only return true if the given state is RequestPending`, () => {
+    expect(isRequestPending(RequestEntryState.RequestPending)).toBeTrue();
+
+    expect(isRequestPending(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Error)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Success)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isError`, () => {
+  it(`should only return true if the given state is Error`, () => {
+    expect(isError(RequestEntryState.Error)).toBeTrue();
+
+    expect(isError(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isError(RequestEntryState.Success)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isError(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isError(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccess`, () => {
+  it(`should only return true if the given state is Success`, () => {
+    expect(isSuccess(RequestEntryState.Success)).toBeTrue();
+
+    expect(isSuccess(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isErrorStale`, () => {
+  it(`should only return true if the given state is ErrorStale`, () => {
+    expect(isErrorStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isErrorStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Error)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Success)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccessStale`, () => {
+  it(`should only return true if the given state is SuccessStale`, () => {
+    expect(isSuccessStale(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(isSuccessStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Success)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ErrorStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePending`, () => {
+  it(`should only return true if the given state is ResponsePending`, () => {
+    expect(isResponsePending(RequestEntryState.ResponsePending)).toBeTrue();
+
+    expect(isResponsePending(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePendingStale`, () => {
+  it(`should only return true if the given state is requestPending`, () => {
+    expect(isResponsePendingStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isResponsePendingStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isLoading`, () => {
+  it(`should only return true if the given state is RequestPending, ResponsePending or ResponsePendingStale`, () => {
+    expect(isLoading(RequestEntryState.RequestPending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isLoading(RequestEntryState.Error)).toBeFalse();
+    expect(isLoading(RequestEntryState.Success)).toBeFalse();
+    expect(isLoading(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isLoading(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`hasFailed`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasFailed(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasFailed(RequestEntryState.Error)).toBeTrue();
+      expect(hasFailed(RequestEntryState.ErrorStale)).toBeTrue();
+
+      expect(hasFailed(RequestEntryState.Success)).toBeFalse();
+      expect(hasFailed(RequestEntryState.SuccessStale)).toBeFalse();
+    });
+  });
+});
+
+describe(`hasSucceeded`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasSucceeded(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasSucceeded(RequestEntryState.Success)).toBeTrue();
+      expect(hasSucceeded(RequestEntryState.SuccessStale)).toBeTrue();
+
+      expect(hasSucceeded(RequestEntryState.Error)).toBeFalse();
+      expect(hasSucceeded(RequestEntryState.ErrorStale)).toBeFalse();
+    });
+  });
+});
+
+
+describe(`hasCompleted`, () => {
+  it(`should only return true if the given state is Error, Success, ErrorStale or SuccessStale`, () => {
+    expect(hasCompleted(RequestEntryState.Error)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.Success)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.ErrorStale)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(hasCompleted(RequestEntryState.RequestPending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePendingStale)).toBeFalse();
+  });
+});
+
+describe(`isStale`, () => {
+  it(`should only return true if the given state is ResponsePendingStale, SuccessStale or ErrorStale`, () => {
+    expect(isStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+    expect(isStale(RequestEntryState.SuccessStale)).toBeTrue();
+    expect(isStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isStale(RequestEntryState.Error)).toBeFalse();
+    expect(isStale(RequestEntryState.Success)).toBeFalse();
+  });
+});
diff --git a/src/app/core/data/request-entry-state.model.ts b/src/app/core/data/request-entry-state.model.ts
index a813b6e743..3aeace39d2 100644
--- a/src/app/core/data/request-entry-state.model.ts
+++ b/src/app/core/data/request-entry-state.model.ts
@@ -3,8 +3,9 @@ export enum RequestEntryState {
   ResponsePending = 'ResponsePending',
   Error = 'Error',
   Success = 'Success',
+  ResponsePendingStale = 'ResponsePendingStale',
   ErrorStale = 'ErrorStale',
-  SuccessStale = 'SuccessStale'
+  SuccessStale = 'SuccessStale',
 }
 
 /**
@@ -42,12 +43,21 @@ export const isSuccessStale = (state: RequestEntryState) =>
  */
 export const isResponsePending = (state: RequestEntryState) =>
   state === RequestEntryState.ResponsePending;
+
 /**
- * Returns true if the given state is RequestPending or ResponsePending,
- * false otherwise
+ * Returns true if the given state is ResponsePendingStale, false otherwise
+ */
+export const isResponsePendingStale = (state: RequestEntryState) =>
+  state === RequestEntryState.ResponsePendingStale;
+
+/**
+ * Returns true if the given state is RequestPending, RequestPendingStale, ResponsePending, or
+ * ResponsePendingStale, false otherwise
  */
 export const isLoading = (state: RequestEntryState) =>
-  isRequestPending(state) || isResponsePending(state);
+  isRequestPending(state) ||
+  isResponsePending(state) ||
+  isResponsePendingStale(state);
 
 /**
  * If isLoading is true for the given state, this method returns undefined, we can't know yet.
@@ -82,7 +92,10 @@ export const hasCompleted = (state: RequestEntryState) =>
   !isLoading(state);
 
 /**
- * Returns true if the given state is SuccessStale or ErrorStale, false otherwise
+ * Returns true if the given state is isRequestPendingStale, isResponsePendingStale, SuccessStale or
+ * ErrorStale, false otherwise
  */
 export const isStale = (state: RequestEntryState) =>
-  isSuccessStale(state) || isErrorStale(state);
+  isResponsePendingStale(state) ||
+  isSuccessStale(state) ||
+  isErrorStale(state);
diff --git a/src/app/core/data/request-entry.model.ts b/src/app/core/data/request-entry.model.ts
index 1555c99ed4..fbedc3932a 100644
--- a/src/app/core/data/request-entry.model.ts
+++ b/src/app/core/data/request-entry.model.ts
@@ -1,13 +1,13 @@
-import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { RequestEntryState } from './request-entry-state.model';
 import { ResponseState } from './response-state.model';
+import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 
 /**
  * An entry for a request in the NgRx store
  */
 export class RequestEntry {
-    request: RestRequestWithResponseParser;
-    state: RequestEntryState;
-    response: ResponseState;
-    lastUpdated: number;
+  request: RestRequestWithResponseParser;
+  state: RequestEntryState;
+  response: ResponseState;
+  lastUpdated: number;
 }
diff --git a/src/app/core/data/request.actions.ts b/src/app/core/data/request.actions.ts
index 68bae51f25..183c090b75 100644
--- a/src/app/core/data/request.actions.ts
+++ b/src/app/core/data/request.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../shared/ngrx/type';
 import { HALLink } from '../shared/hal-link.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';
@@ -15,7 +16,7 @@ export const RequestActionTypes = {
   ERROR: type('dspace/core/data/request/ERROR'),
   STALE: type('dspace/core/data/request/STALE'),
   RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS'),
-  REMOVE: type('dspace/core/data/request/REMOVE')
+  REMOVE: type('dspace/core/data/request/REMOVE'),
 };
 
 export abstract class RequestUpdateAction implements Action {
@@ -32,7 +33,7 @@ export class RequestConfigureAction extends RequestUpdateAction {
   payload: RestRequest;
 
   constructor(
-    request: RestRequest
+    request: RestRequest,
   ) {
     super();
     this.payload = request;
@@ -88,7 +89,7 @@ export class RequestSuccessAction extends RequestUpdateAction {
       timeCompleted: new Date().getTime(),
       statusCode,
       link,
-      unCacheableObject
+      unCacheableObject,
     };
   }
 }
@@ -121,7 +122,7 @@ export class RequestErrorAction extends RequestUpdateAction {
       uuid,
       timeCompleted: new Date().getTime(),
       statusCode,
-      errorMessage
+      errorMessage,
     };
   }
 }
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 889d909bfa..6501f43133 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,35 +1,50 @@
-import { Injectable, Injector } from '@angular/core';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
-
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
 import { getClassForType } from '../cache/builders/build-decorators';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { ParsedResponse } from '../cache/response.models';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import {
   RequestActionTypes,
   RequestErrorAction,
   RequestExecuteAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
 import { RequestService } from './request.service';
-import { ParsedResponse } from '../cache/response.models';
+import { RequestEntry } from './request-entry.model';
 import { RequestError } from './request-error.model';
 import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
-import { RequestEntry } from './request-entry.model';
 
 @Injectable()
 export class RequestEffects {
 
-   execute = createEffect(() => this.actions$.pipe(
+  execute = createEffect(() => this.actions$.pipe(
     ofType(RequestActionTypes.EXECUTE),
     mergeMap((action: RequestExecuteAction) => {
       return this.requestService.getByUUID(action.payload).pipe(
-        take(1)
+        take(1),
       );
     }),
     filter((entry: RequestEntry) => hasValue(entry)),
@@ -43,17 +58,17 @@ export class RequestEffects {
       return this.restApi.request(request.method, request.href, body, request.options, request.isMultipart).pipe(
         map((data: RawRestResponse) => this.injector.get(request.getResponseParser()).parse(request, data)),
         map((response: ParsedResponse) => new RequestSuccessAction(request.uuid, response.statusCode, response.link, response.unCacheableObject)),
-        catchError((error: RequestError) => {
-          if (hasValue(error.statusCode)) {
+        catchError((error: unknown) => {
+          if (error instanceof RequestError) {
             // if it's an error returned by the server, complete the request
             return [new RequestErrorAction(request.uuid, error.statusCode, error.message)];
           } else {
             // if it's a client side error, throw it
             throw error;
           }
-        })
+        }),
       );
-    })
+    }),
   ));
 
   /**
@@ -64,16 +79,16 @@ export class RequestEffects {
    * This assumes that the server cached everything a negligible
    * time ago, and will likely need to be revisited later
    */
-   fixTimestampsOnRehydrate = createEffect(() => this.actions$
+  fixTimestampsOnRehydrate = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetResponseTimestampsAction(new Date().getTime()))
+      map(() => new ResetResponseTimestampsAction(new Date().getTime())),
     ));
 
   constructor(
     private actions$: Actions,
     private restApi: DspaceRestService,
     private injector: Injector,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) { }
 
 }
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 9809bc0fde..c46d9b8242 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -1,18 +1,16 @@
 /* eslint-disable max-classes-per-file */
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from './parsing.service';
-import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import {
-  SubmissionResponseParsingService
-} from '../submission/submission-response-parsing.service';
-import { RestRequestMethod } from './rest-request-method';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { SubmissionResponseParsingService } from '../submission/submission-response-parsing.service';
 import { TaskResponseParsingService } from '../tasks/task-response-parsing.service';
-import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
-import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
-import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { BrowseResponseParsingService } from './browse-response-parsing.service';
+import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
 import { FindListOptions } from './find-list-options.model';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequestMethod } from './rest-request-method';
+import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 
 
 // uuid and handle requests have separate endpoints
@@ -32,7 +30,7 @@ export class GetRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.GET, body, options);
   }
@@ -43,7 +41,7 @@ export class PostRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.POST, body);
   }
@@ -58,7 +56,7 @@ export class MultipartPostRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   )  {
     super(uuid, href, RestRequestMethod.POST, body);
   }
@@ -69,7 +67,7 @@ export class PutRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.PUT, body);
   }
@@ -80,7 +78,7 @@ export class DeleteRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.DELETE, body);
   }
@@ -91,7 +89,7 @@ export class OptionsRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.OPTIONS, body);
   }
@@ -102,7 +100,7 @@ export class HeadRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.HEAD, body);
   }
@@ -113,7 +111,7 @@ export class PatchRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.PATCH, body);
   }
@@ -235,7 +233,7 @@ export class DeleteByIDRequest extends DeleteRequest {
   constructor(
     uuid: string,
     href: string,
-    public resourceID: string
+    public resourceID: string,
   ) {
     super(uuid, href);
   }
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 05f074a96a..40e17a49dd 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
 import {
   RequestConfigureAction,
   RequestErrorAction,
@@ -7,10 +8,10 @@ import {
   RequestRemoveAction,
   RequestStaleAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
 import { GetRequest } from './request.models';
-import { requestReducer} from './request.reducer';
+import { requestReducer } from './request.reducer';
 import { RequestEntryState } from './request-entry-state.model';
 import { RequestState } from './request-state.model';
 
@@ -33,24 +34,31 @@ describe('requestReducer', () => {
       request: new GetRequest(id1, link1),
       state: RequestEntryState.RequestPending,
       response: undefined,
-      lastUpdated: undefined
-    }
+      lastUpdated: undefined,
+    },
   };
   const testSuccessState = {
     [id1]: {
       state: RequestEntryState.Success,
-      lastUpdated: 0
-    }
+      lastUpdated: 0,
+    },
   };
   const testErrorState = {
     [id1]: {
       state: RequestEntryState.Error,
-      lastUpdated: 0
-    }
+      lastUpdated: 0,
+    },
+  };
+  const testResponsePendingState = {
+    [id1]: {
+      state: RequestEntryState.ResponsePending,
+      lastUpdated: 0,
+    },
   };
   deepFreeze(testInitState);
   deepFreeze(testSuccessState);
   deepFreeze(testErrorState);
+  deepFreeze(testResponsePendingState);
 
   it('should return the current state when no valid actions have been made', () => {
     const action = new NullAction();
@@ -91,37 +99,102 @@ describe('requestReducer', () => {
     expect(newState[id1].response).toEqual(undefined);
   });
 
-  it('should set state to Success for the given RestRequest in the state, in response to a SUCCESS action', () => {
-    const state = testInitState;
+  describe(`in response to a SUCCESS action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending,
+          }),
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Success for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestSuccessAction(id1, 200);
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Success);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
+
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale,
+          }),
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to SuccessStale for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Success);
-    expect(newState[id1].response.statusCode).toEqual(200);
   });
 
-  it('should set state to Error for the given RestRequest in the state, in response to an ERROR action', () => {
-    const state = testInitState;
+  describe(`in response to an ERROR action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending,
+          }),
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Error for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestErrorAction(id1, 404, 'Not Found');
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Error);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Error);
-    expect(newState[id1].response.statusCode).toEqual(404);
-    expect(newState[id1].response.errorMessage).toEqual('Not Found');
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale,
+          }),
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to ErrorStale for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+
+    });
   });
 
   it('should update the response\'s timeCompleted for the given RestRequest in the state, in response to a RESET_TIMESTAMPS action', () => {
     const update = Object.assign({}, testInitState[id1], {
       response: {
         timeCompleted: 10,
-        statusCode: 200
-      }
+        statusCode: 200,
+      },
     });
     const state = Object.assign({}, testInitState, { [id1]: update });
     const timeStamp = 1000;
@@ -145,28 +218,112 @@ describe('requestReducer', () => {
     expect(newState[id1]).toBeNull();
   });
 
-  describe(`for an entry with state: Success`, () => {
-    it(`should set the state to SuccessStale, in response to a STALE action`, () => {
-      const state = testSuccessState;
+  describe(`in response to a STALE action`, () => {
+    describe(`when the entry has been removed`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = {
+          [id1]: null,
+        };
+        deepFreeze(startState);
 
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
 
-      expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+        expect(newState[id1]).toBeNull();
+      });
+    });
+
+    describe(`for stale entries`, () => {
+      it(`shouldn't do anything`, () => {
+        const rpsStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale,
+          }),
+        });
+        deepFreeze(rpsStartState);
+
+        const action = new RequestStaleAction(id1);
+        let newState = requestReducer(rpsStartState, action);
+
+        expect(newState[id1].state).toEqual(rpsStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(rpsStartState[id1].lastUpdated);
+
+        const ssStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.SuccessStale,
+          }),
+        });
+
+        newState = requestReducer(ssStartState, action);
+
+        expect(newState[id1].state).toEqual(ssStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(ssStartState[id1].lastUpdated);
+
+        const esStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ErrorStale,
+          }),
+        });
+
+        newState = requestReducer(esStartState, action);
+
+        expect(newState[id1].state).toEqual(esStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(esStartState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for and entry with state: RequestPending`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.RequestPending,
+          }),
+        });
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].state).toEqual(startState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(startState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for an entry with state: ResponsePending`, () => {
+      it(`should set the state to ResponsePendingStale`, () => {
+        const state = testResponsePendingState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ResponsePendingStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Success`, () => {
+      it(`should set the state to SuccessStale`, () => {
+        const state = testSuccessState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Error`, () => {
+      it(`should set the state to ErrorStale`, () => {
+        const state = testErrorState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
     });
   });
-
-  describe(`for an entry with state: Error`, () => {
-    it(`should set the state to ErrorStale, in response to a STALE action`, () => {
-      const state = testErrorState;
-
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
-
-      expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
-    });
-  });
-
 });
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index 9bf17faf8d..cccb47442f 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -1,4 +1,5 @@
 /* eslint-disable max-classes-per-file */
+import { isNull } from '../../shared/empty.util';
 import {
   RequestAction,
   RequestActionTypes,
@@ -8,10 +9,15 @@ import {
   RequestRemoveAction,
   RequestStaleAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
-import { isNull } from '../../shared/empty.util';
-import { hasSucceeded, isStale, RequestEntryState } from './request-entry-state.model';
+import {
+  hasSucceeded,
+  isRequestPending,
+  isResponsePending,
+  isStale,
+  RequestEntryState,
+} from './request-entry-state.model';
 import { RequestState } from './request-state.model';
 
 // Object.create(null) ensures the object has no default js properties (e.g. `__proto__`)
@@ -60,8 +66,8 @@ function configureRequest(storeState: RequestState, action: RequestConfigureActi
       request: action.payload,
       state: RequestEntryState.RequestPending,
       response: null,
-      lastUpdated: action.lastUpdated
-    }
+      lastUpdated: action.lastUpdated,
+    },
   });
 }
 
@@ -74,8 +80,8 @@ function executeRequest(storeState: RequestState, action: RequestExecuteAction):
     return Object.assign({}, storeState, {
       [action.payload]: Object.assign({}, storeState[action.payload], {
         state: RequestEntryState.ResponsePending,
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -91,24 +97,27 @@ function executeRequest(storeState: RequestState, action: RequestExecuteAction):
  *    the new storeState, with the response added to the request
  */
 function completeSuccessRequest(storeState: RequestState, action: RequestSuccessAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Success,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.Success,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
           statusCode: action.payload.statusCode,
           payloadLink: action.payload.link,
           unCacheableObject: action.payload.unCacheableObject,
-          errorMessage: null
+          errorMessage: null,
         },
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -124,14 +133,17 @@ function completeSuccessRequest(storeState: RequestState, action: RequestSuccess
  *    the new storeState, with the response added to the request
  */
 function completeFailedRequest(storeState: RequestState, action: RequestErrorAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Error,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.ErrorStale : RequestEntryState.Error,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
@@ -139,8 +151,8 @@ function completeFailedRequest(storeState: RequestState, action: RequestErrorAct
           payloadLink: null,
           errorMessage: action.payload.errorMessage,
         },
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -155,22 +167,27 @@ function completeFailedRequest(storeState: RequestState, action: RequestErrorAct
  *    the new storeState, set to stale
  */
 function expireRequest(storeState: RequestState, action: RequestStaleAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
-    // after a request has been removed it's possible pending changes still come in.
-    // Don't store them
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry) || isStale(prevEntry.state) || isRequestPending(prevEntry.state)) {
+    // No need to do anything if the entry doesn't exist, is already stale, or if the request is
+    // still pending, because that means it still needs to be sent to the server. Any response
+    // is guaranteed to have been generated after the request was set to stale.
     return storeState;
   } else {
-    const prevEntry = storeState[action.payload.uuid];
-    if (isStale(prevEntry.state)) {
-      return storeState;
+    let nextRequestEntryState: RequestEntryState;
+    if (isResponsePending(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.ResponsePendingStale;
+    } else if (hasSucceeded(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.SuccessStale;
     } else {
-      return Object.assign({}, storeState, {
-        [action.payload.uuid]: Object.assign({}, prevEntry, {
-          state: hasSucceeded(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.ErrorStale,
-          lastUpdated: action.lastUpdated
-        })
-      });
+      nextRequestEntryState = RequestEntryState.ErrorStale;
     }
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        state: nextRequestEntryState,
+        lastUpdated: action.lastUpdated,
+      }),
+    });
   }
 }
 
@@ -190,10 +207,10 @@ function resetResponseTimestamps(storeState: RequestState, action: ResetResponse
     newState[key] = Object.assign({}, storeState[key],
       {
         response: Object.assign({}, storeState[key].response, {
-          timeCompleted: action.payload
+          timeCompleted: action.payload,
         }),
-        lastUpdated: action.payload
-      }
+        lastUpdated: action.payload,
+      },
     );
   });
   return newState;
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 108a588881..76e70e8a6d 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,14 +1,42 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { EMPTY, of as observableOf } from 'rxjs';
+import {
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { storeModuleConfig } from '../../app.reducer';
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
-import { defaultUUID, getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
+import {
+  defaultUUID,
+  getMockUUIDService,
+} from '../../shared/mocks/uuid.service.mock';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { coreReducers} from '../core.reducers';
+import { coreReducers } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { UUIDService } from '../shared/uuid.service';
-import { RequestConfigureAction, RequestExecuteAction, RequestStaleAction } from './request.actions';
+import {
+  RequestConfigureAction,
+  RequestExecuteAction,
+  RequestStaleAction,
+} from './request.actions';
 import {
   DeleteRequest,
   GetRequest,
@@ -16,16 +44,12 @@ import {
   OptionsRequest,
   PatchRequest,
   PostRequest,
-  PutRequest
+  PutRequest,
 } from './request.models';
 import { RequestService } from './request.service';
-import { fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { storeModuleConfig } from '../../app.reducer';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { RequestEntry } from './request-entry.model';
 import { RequestEntryState } from './request-entry-state.model';
 import { RestRequest } from './rest-request.model';
-import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;
@@ -53,19 +77,19 @@ describe('RequestService', () => {
       'cache/object-updates': {},
       'data/request': {},
       'index': {},
-    }
+    },
   };
 
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(coreReducers, storeModuleConfig)
+        StoreModule.forRoot(coreReducers, storeModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: RequestService, useValue: service }
-      ]
+        { provide: RequestService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
@@ -84,7 +108,7 @@ describe('RequestService', () => {
       objectCache,
       uuidService,
       store,
-      undefined
+      undefined,
     );
     serviceAsAny = service as any;
   });
@@ -129,7 +153,7 @@ describe('RequestService', () => {
     describe('when the request has reached the store, before the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValue(observableOf({
-          state: RequestEntryState.ResponsePending
+          state: RequestEntryState.ResponsePending,
         } as RequestEntry));
       });
 
@@ -144,7 +168,7 @@ describe('RequestService', () => {
     describe('after the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValues(observableOf({
-          state: RequestEntryState.Success
+          state: RequestEntryState.Success,
         } as RequestEntry));
       });
 
@@ -166,22 +190,22 @@ describe('RequestService', () => {
         entry = {
           state: RequestEntryState.Success,
           response: {
-            timeCompleted: new Date().getTime()
+            timeCompleted: new Date().getTime(),
           },
-          request: new GetRequest('request-uuid', 'request-href')
+          request: new GetRequest('request-uuid', 'request-href'),
         };
 
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'data/request': {
-              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry
+              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry,
             },
             'index': {
               'get-request/configured-to-cache-uuid': {
-                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
-              }
-            }
-          })
+                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
+              },
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -189,7 +213,7 @@ describe('RequestService', () => {
       it('should return an Observable of the RequestEntry', () => {
         const result = service.getByUUID(testUUID);
         const expected = cold('b', {
-          b: entry
+          b: entry,
         });
 
         expect(result).toBeObservable(expected);
@@ -220,24 +244,24 @@ describe('RequestService', () => {
         entry = {
           state: RequestEntryState.Success,
           response: {
-            timeCompleted: new Date().getTime()
+            timeCompleted: new Date().getTime(),
           },
-          request: new GetRequest('request-uuid', 'request-href')
+          request: new GetRequest('request-uuid', 'request-href'),
         };
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'data/request': {
-              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry
+              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry,
             },
             'index': {
               'get-request/configured-to-cache-uuid': {
-                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
+                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
               },
               'get-request/href-to-uuid': {
-                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
-              }
-            }
-          })
+                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
+              },
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -245,7 +269,7 @@ describe('RequestService', () => {
       it('should return an Observable of the RequestEntry', () => {
         const result = service.getByHref(testHref);
         const expected = cold('c', {
-          c: entry
+          c: entry,
         });
 
         expect(result).toBeObservable(expected);
@@ -263,7 +287,7 @@ describe('RequestService', () => {
       it('should return an Observable of undefined', () => {
         const result = service.getByHref(testHref);
         const expected = cold('c', {
-          c: undefined
+          c: undefined,
         });
 
         expect(result).toBeObservable(expected);
@@ -527,9 +551,9 @@ describe('RequestService', () => {
       entry = {
         state: RequestEntryState.Success,
         response: {
-          timeCompleted: new Date().getTime()
+          timeCompleted: new Date().getTime(),
         },
-        request: request
+        request: request,
       };
     });
 
@@ -591,7 +615,7 @@ describe('RequestService', () => {
       };
       const queryParams = service.uriEncodeBody(body);
       expect(queryParams).toEqual(
-        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123'
+        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123',
       );
     });
 
@@ -604,7 +628,7 @@ describe('RequestService', () => {
       };
       const queryParams = service.uriEncodeBody(body);
       expect(queryParams).toEqual(
-        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123&arrayParam=arrayValue1&arrayParam=arrayValue2'
+        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123&arrayParam=arrayValue1&arrayParam=arrayValue2',
       );
     });
   });
@@ -638,4 +662,87 @@ describe('RequestService', () => {
       expect(done$).toBeObservable(cold('-----(t|)', { t: true }));
     }));
   });
+
+  describe('setStaleByHref', () => {
+    const uuid = 'c574a42c-4818-47ac-bbe1-6c3cd622c81f';
+    const href = 'https://rest.api/some/object';
+    const freshRE: any = {
+      request: { uuid, href },
+      state: RequestEntryState.Success,
+    };
+    const staleRE: any = {
+      request: { uuid, href },
+      state: RequestEntryState.SuccessStale,
+    };
+
+    it(`should call getByHref to retrieve the RequestEntry matching the href`, () => {
+      spyOn(service, 'getByHref').and.returnValue(observableOf(staleRE));
+      service.setStaleByHref(href);
+      expect(service.getByHref).toHaveBeenCalledWith(href);
+    });
+
+    it(`should dispatch a RequestStaleAction for the RequestEntry returned by getByHref`, (done: DoneFn) => {
+      spyOn(service, 'getByHref').and.returnValue(observableOf(staleRE));
+      spyOn(store, 'dispatch');
+      service.setStaleByHref(href).subscribe(() => {
+        const requestStaleAction = new RequestStaleAction(uuid);
+        requestStaleAction.lastUpdated = jasmine.any(Number) as any;
+        expect(store.dispatch).toHaveBeenCalledWith(requestStaleAction);
+        done();
+      });
+    });
+
+    it(`should emit true when the request in the store is stale`, () => {
+      spyOn(service, 'getByHref').and.returnValue(cold('a-b', {
+        a: freshRE,
+        b: staleRE,
+      }));
+      const result$ = service.setStaleByHref(href);
+      expect(result$).toBeObservable(cold('--(c|)', { c: true }));
+    });
+  });
+
+  describe('setStaleByHrefSubstring', () => {
+    let dispatchSpy: jasmine.Spy;
+    let getByUUIDSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      dispatchSpy = spyOn(store, 'dispatch');
+      getByUUIDSpy = spyOn(service, 'getByUUID').and.callThrough();
+    });
+
+    describe('with an empty/no matching requests in the state', () => {
+      it('should return true', () => {
+        const done$: Observable<boolean> = service.setStaleByHrefSubstring('https://rest.api/endpoint/selfLink');
+        expect(done$).toBeObservable(cold('(a|)', { a: true }));
+      });
+    });
+
+    describe('with a matching request in the state', () => {
+      beforeEach(() => {
+        const state = Object.assign({}, initialState, {
+          core: Object.assign({}, initialState.core, {
+            'index': {
+              'get-request/href-to-uuid': {
+                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
+              },
+            },
+          }),
+        });
+        mockStore.setState(state);
+      });
+
+      it('should return an Observable that emits true as soon as the request is stale', () => {
+        dispatchSpy.and.callFake(() => { /* empty */ });   // don't actually set as stale
+        getByUUIDSpy.and.returnValue(cold('a-b--c--d-', {  // but fake the state in the cache
+          a: { state: RequestEntryState.ResponsePending },
+          b: { state: RequestEntryState.Success },
+          c: { state: RequestEntryState.SuccessStale },
+          d: { state: RequestEntryState.Error },
+        }));
+        const done$: Observable<boolean> = service.setStaleByHrefSubstring('https://rest.api/endpoint/selfLink');
+        expect(done$).toBeObservable(cold('-----(a|)', { a: true }));
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 1f6680203e..9bd262b1ad 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -1,37 +1,68 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
-
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { filter, map, take, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import cloneDeep from 'lodash/cloneDeep';
-import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../../shared/empty.util';
+import {
+  from as observableFrom,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+  toArray,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { IndexState, MetaIndexState } from '../index/index.reducer';
-import { requestIndexSelector, getUrlWithoutEmbedParams } from '../index/index.selectors';
+import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import {
+  IndexState,
+  MetaIndexState,
+} from '../index/index.reducer';
+import {
+  getUrlWithoutEmbedParams,
+  requestIndexSelector,
+} from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
 import {
   RequestConfigureAction,
   RequestExecuteAction,
-  RequestStaleAction
+  RequestStaleAction,
 } from './request.actions';
-import { GetRequest} from './request.models';
-import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
-import { RestRequestMethod } from './rest-request-method';
-import { coreSelector } from '../core.selectors';
-import { isLoading, isStale } from './request-entry-state.model';
-import { RestRequest } from './rest-request.model';
-import { CoreState } from '../core-state.model';
-import { RequestState } from './request-state.model';
+import { GetRequest } from './request.models';
 import { RequestEntry } from './request-entry.model';
+import {
+  isLoading,
+  isStale,
+} from './request-entry-state.model';
+import { RequestState } from './request-state.model';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * The base selector function to select the request state in the store
  */
 const requestCacheSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['data/request']
+  (state: CoreState) => state['data/request'],
 );
 
 /**
@@ -42,7 +73,7 @@ const entryFromUUIDSelector = (uuid: string): MemoizedSelector<CoreState, Reques
   requestCacheSelector,
   (state: RequestState) => {
     return hasValue(state) ? state[uuid] : undefined;
-  }
+  },
 );
 
 /**
@@ -65,7 +96,7 @@ const entryFromHrefSelector = (href: string): MemoizedSelector<CoreState, Reques
     } else {
       return undefined;
     }
-  }
+  },
 );
 
 /**
@@ -77,7 +108,7 @@ const entryFromHrefSelector = (href: string): MemoizedSelector<CoreState, Reques
 const uuidsFromHrefSubstringSelector =
   (selector: MemoizedSelector<CoreState, IndexState>, href: string): MemoizedSelector<CoreState, string[]> => createSelector(
     selector,
-    (state: IndexState) => getUuidsFromHrefSubstring(state, href)
+    (state: IndexState) => getUuidsFromHrefSubstring(state, href),
   );
 
 /**
@@ -129,7 +160,7 @@ const isValid = (entry: RequestEntry): boolean => {
  * A service to interact with the request state in the store
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RequestService {
   private requestsOnTheirWayToTheStore: string[] = [];
@@ -164,7 +195,7 @@ export class RequestService {
     this.getByHref(request.href).pipe(
       take(1))
       .subscribe((re: RequestEntry) => {
-        isPending = (hasValue(re) && isLoading(re.state));
+        isPending = (hasValue(re) && isLoading(re.state) && !isStale(re.state));
       });
     return isPending;
   }
@@ -176,7 +207,7 @@ export class RequestService {
     return this.store.pipe(
       select(entryFromUUIDSelector(uuid)),
       this.fixRequestHeaders(),
-      this.checkStale()
+      this.checkStale(),
     );
   }
 
@@ -188,14 +219,14 @@ export class RequestService {
   private fixRequestHeaders() {
     return (source: Observable<RequestEntry>): Observable<RequestEntry> => {
       return source.pipe(map((entry: RequestEntry) => {
-          // Headers break after being retrieved from the store (because of lazy initialization)
-          // Combining them with a new object fixes this issue
-          if (hasValue(entry) && hasValue(entry.request) && hasValue(entry.request.options) && hasValue(entry.request.options.headers)) {
-            entry = cloneDeep(entry);
-            entry.request.options.headers = Object.assign(new HttpHeaders(), entry.request.options.headers);
-          }
-          return entry;
-        })
+        // Headers break after being retrieved from the store (because of lazy initialization)
+        // Combining them with a new object fixes this issue
+        if (hasValue(entry) && hasValue(entry.request) && hasValue(entry.request.options) && hasValue(entry.request.options.headers)) {
+          entry = cloneDeep(entry);
+          entry.request.options.headers = Object.assign(new HttpHeaders(), entry.request.options.headers);
+        }
+        return entry;
+      }),
       );
     };
   }
@@ -212,7 +243,7 @@ export class RequestService {
           if (hasValue(entry) && hasValue(entry.request) && !isStale(entry.state) && !isValid(entry)) {
             this.store.dispatch(new RequestStaleAction(entry.request.uuid));
           }
-        })
+        }),
       );
     };
   }
@@ -224,7 +255,7 @@ export class RequestService {
     return this.store.pipe(
       select(entryFromHrefSelector(href)),
       this.fixRequestHeaders(),
-      this.checkStale()
+      this.checkStale(),
     );
   }
 
@@ -300,22 +331,42 @@ export class RequestService {
    * Set all requests that match (part of) the href to stale
    *
    * @param href    A substring of the request(s) href
-   * @return        Returns an observable emitting whether or not the cache is removed
+   * @return        Returns an observable emitting when those requests are all stale
    */
   setStaleByHrefSubstring(href: string): Observable<boolean> {
-    this.store.pipe(
+    const requestUUIDs$ = this.store.pipe(
       select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
-      take(1)
-    ).subscribe((uuids: string[]) => {
+      take(1),
+    );
+    requestUUIDs$.subscribe((uuids: string[]) => {
       for (const uuid of uuids) {
         this.store.dispatch(new RequestStaleAction(uuid));
       }
     });
     this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((reqHref: string) => reqHref.indexOf(href) < 0);
 
-    return this.store.pipe(
-      select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
-      map((uuids) => isEmpty(uuids))
+    // emit true after all requests are stale
+    return requestUUIDs$.pipe(
+      switchMap((uuids: string[]) => {
+        if (isEmpty(uuids)) {
+          // if there were no matching requests, emit true immediately
+          return [true];
+        } else {
+          // otherwise emit all request uuids in order
+          return observableFrom(uuids).pipe(
+            // retrieve the RequestEntry for each uuid
+            mergeMap((uuid: string) => this.getByUUID(uuid)),
+            // check whether it is undefined or stale
+            map((request: RequestEntry) => hasNoValue(request) || isStale(request.state)),
+            // if it is, complete
+            find((stale: boolean) => stale === true),
+            // after all observables above are completed, emit them as a single array
+            toArray(),
+            // when the array comes in, emit true
+            map(() => true),
+          );
+        }
+      }),
     );
   }
 
@@ -331,7 +382,29 @@ export class RequestService {
       map((request: RequestEntry) => isStale(request.state)),
       filter((stale: boolean) => stale),
       take(1),
-      );
+    );
+  }
+
+  /**
+   * Mark a request as stale
+   * @param href  the href of the request
+   * @return      an Observable that will emit true once the Request becomes stale
+   */
+  setStaleByHref(href: string): Observable<boolean> {
+    const requestEntry$ = this.getByHref(href);
+
+    requestEntry$.pipe(
+      map((re: RequestEntry) => re.request.uuid),
+      take(1),
+    ).subscribe((uuid: string) => {
+      this.store.dispatch(new RequestStaleAction(uuid));
+    });
+
+    return requestEntry$.pipe(
+      map((request: RequestEntry) => isStale(request.state)),
+      filter((stale: boolean) => stale),
+      take(1),
+    );
   }
 
   /**
@@ -344,10 +417,10 @@ export class RequestService {
     // if it's not a GET request
     if (request.method !== RestRequestMethod.GET) {
       return true;
-    // if it is a GET request, check it isn't pending
+      // if it is a GET request, check it isn't pending
     } else if (this.isPending(request)) {
       return false;
-    // if it is pending, check if we're allowed to use a cached version
+      // if it is pending, check if we're allowed to use a cached version
     } else if (!useCachedVersionIfAvailable) {
       return true;
     } else {
@@ -391,7 +464,7 @@ export class RequestService {
     this.requestsOnTheirWayToTheStore = [...this.requestsOnTheirWayToTheStore, request.href];
     this.getByHref(request.href).pipe(
       filter((re: RequestEntry) => hasValue(re) && hasValue(re.request) && re.request.uuid === request.uuid),
-      take(1)
+      take(1),
     ).subscribe((re: RequestEntry) => {
       this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((pendingHref: string) => pendingHref !== request.href);
     });
@@ -438,7 +511,7 @@ export class RequestService {
    */
   hasByHref$(href: string, checkValidity = true): Observable<boolean> {
     return this.getByHref(href).pipe(
-      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry)),
     );
   }
 
@@ -475,7 +548,7 @@ export class RequestService {
    */
   hasByUUID$(uuid: string, checkValidity = true): Observable<boolean> {
     return this.getByUUID(uuid).pipe(
-      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry)),
     );
   }
 
diff --git a/src/app/core/data/response-state.model.ts b/src/app/core/data/response-state.model.ts
index 97203fcdd5..1f7863e9c8 100644
--- a/src/app/core/data/response-state.model.ts
+++ b/src/app/core/data/response-state.model.ts
@@ -5,9 +5,9 @@ import { UnCacheableObject } from '../shared/uncacheable-object.model';
  * The response substate in the NgRx store
  */
 export class ResponseState {
-    timeCompleted: number;
-    statusCode: number;
-    errorMessage?: string;
-    payloadLink?: HALLink;
-    unCacheableObject?: UnCacheableObject;
+  timeCompleted: number;
+  statusCode: number;
+  errorMessage?: string;
+  payloadLink?: HALLink;
+  unCacheableObject?: UnCacheableObject;
 }
diff --git a/src/app/core/data/rest-request-with-response-parser.model.ts b/src/app/core/data/rest-request-with-response-parser.model.ts
index 1c9677ebb1..d05bcb19cf 100644
--- a/src/app/core/data/rest-request-with-response-parser.model.ts
+++ b/src/app/core/data/rest-request-with-response-parser.model.ts
@@ -1,6 +1,6 @@
-import { RestRequest } from './rest-request.model';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './rest-request.model';
 
 /**
  * A RestRequest with a method to retrieve the ResponseParsingService needed for its response
diff --git a/src/app/core/data/rest-request.model.ts b/src/app/core/data/rest-request.model.ts
index 05b583639b..95e605711b 100644
--- a/src/app/core/data/rest-request.model.ts
+++ b/src/app/core/data/rest-request.model.ts
@@ -1,20 +1,20 @@
 import { environment } from '../../../environments/environment';
-import { RestRequestMethod } from './rest-request-method';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * A request to the DSpace REST API
  */
 export abstract class RestRequest {
-    public responseMsToLive = environment.cache.msToLive.default;
-    public isMultipart = false;
+  public responseMsToLive = environment.cache.msToLive.default;
+  public isMultipart = false;
 
-    constructor(
+  constructor(
         public uuid: string,
         public href: string,
         public method: RestRequestMethod = RestRequestMethod.GET,
         public body?: any,
         public options?: HttpOptions,
-    ) {
-    }
+  ) {
+  }
 }
diff --git a/src/app/core/data/root-data.service.spec.ts b/src/app/core/data/root-data.service.spec.ts
index b65449d007..d629883220 100644
--- a/src/app/core/data/root-data.service.spec.ts
+++ b/src/app/core/data/root-data.service.spec.ts
@@ -1,16 +1,19 @@
-import { RootDataService } from './root-data.service';
+import { cold } from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable, of } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { Root } from './root.model';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { cold } from 'jasmine-marbles';
+import { RootDataService } from './root-data.service';
 
 describe('RootDataService', () => {
   let service: RootDataService;
   let halService: HALEndpointService;
-  let restService;
+  let requestService;
   let rootEndpoint;
   let findByHrefSpy;
 
@@ -19,10 +22,10 @@ describe('RootDataService', () => {
     halService = jasmine.createSpyObj('halService', {
       getRootHref: rootEndpoint,
     });
-    restService = jasmine.createSpyObj('halService', {
-      get: jasmine.createSpy('get'),
-    });
-    service = new RootDataService(null, null, null, halService, restService);
+    requestService = jasmine.createSpyObj('requestService', [
+      'setStaleByHref',
+    ]);
+    service = new RootDataService(requestService, null, null, halService);
 
     findByHrefSpy = spyOn(service as any, 'findByHref');
     findByHrefSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
@@ -47,32 +50,32 @@ describe('RootDataService', () => {
     let result$: Observable<boolean>;
 
     it('should return observable of true when root endpoint is available', () => {
-      const mockResponse = {
-        statusCode: 200,
-        statusText: 'OK'
-      } as RawRestResponse;
+      spyOn(service, 'findRoot').and.returnValue(createSuccessfulRemoteDataObject$<Root>({} as any));
 
-      restService.get.and.returnValue(of(mockResponse));
       result$ = service.checkServerAvailability();
 
       expect(result$).toBeObservable(cold('(a|)', {
-        a: true
+        a: true,
       }));
     });
 
     it('should return observable of false when root endpoint is not available', () => {
-      const mockResponse = {
-        statusCode: 500,
-        statusText: 'Internal Server Error'
-      } as RawRestResponse;
+      spyOn(service, 'findRoot').and.returnValue(createFailedRemoteDataObject$<Root>('500'));
 
-      restService.get.and.returnValue(of(mockResponse));
       result$ = service.checkServerAvailability();
 
       expect(result$).toBeObservable(cold('(a|)', {
-        a: false
+        a: false,
       }));
     });
 
   });
+
+  describe(`invalidateRootCache`, () => {
+    it(`should set the cached root request to stale`, () => {
+      service.invalidateRootCache();
+      expect(halService.getRootHref).toHaveBeenCalled();
+      expect(requestService.setStaleByHref).toHaveBeenCalledWith(rootEndpoint);
+    });
+  });
 });
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index 54fe614d3e..c6d634318c 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -1,18 +1,24 @@
-import { Root } from './root.model';
 import { Injectable } from '@angular/core';
-import { ROOT } from './root.resource-type';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteData } from './remote-data';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { catchError, map } from 'rxjs/operators';
-import { BaseDataService } from './base/base-data.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { Root } from './root.model';
+import { ROOT } from './root.resource-type';
 
 /**
  * A service to retrieve the {@link Root} object from the REST API.
@@ -25,7 +31,6 @@ export class RootDataService extends BaseDataService<Root> {
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected restService: DspaceRestService,
   ) {
     super('', requestService, rdbService, objectCache, halService, 6 * 60 * 60 * 1000);
   }
@@ -34,12 +39,13 @@ export class RootDataService extends BaseDataService<Root> {
    * Check if root endpoint is available
    */
   checkServerAvailability(): Observable<boolean> {
-    return this.restService.get(this.halService.getRootHref()).pipe(
-      catchError((err ) => {
+    return this.findRoot().pipe(
+      catchError((err: unknown) => {
         console.error(err);
         return observableOf(false);
       }),
-      map((res: RawRestResponse) => res.statusCode === 200)
+      getFirstCompletedRemoteData(),
+      map((rootRd: RemoteData<Root>) => rootRd.statusCode === 200),
     );
   }
 
@@ -60,6 +66,6 @@ export class RootDataService extends BaseDataService<Root> {
    * Set to sale the root endpoint cache hit
    */
   invalidateRootCache() {
-    this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
+    this.requestService.setStaleByHref(this.halService.getRootHref());
   }
 }
diff --git a/src/app/core/data/root.model.ts b/src/app/core/data/root.model.ts
index a2d2518dde..46a276fa1f 100644
--- a/src/app/core/data/root.model.ts
+++ b/src/app/core/data/root.model.ts
@@ -1,10 +1,14 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { ROOT } from './root.resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { ResourceType } from '../shared/resource-type';
-import { HALLink } from '../shared/hal-link.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { HALLink } from '../shared/hal-link.model';
+import { ResourceType } from '../shared/resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { ROOT } from './root.resource-type';
 
 /**
  * The root rest api resource
@@ -18,37 +22,37 @@ export class Root implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The url for the dspace UI
    */
   @autoserialize
-  dspaceUI: string;
+    dspaceUI: string;
 
   /**
    * The repository Name
    */
   @autoserialize
-  dspaceName: string;
+    dspaceName: string;
 
   /**
    * The url for the rest api
    */
   @autoserialize
-  dspaceServer: string;
+    dspaceServer: string;
 
   /**
    * The current DSpace version
    */
   @autoserialize
-  dspaceVersion: string;
+    dspaceVersion: string;
 
   /**
    * The {@link HALLink}s for the root object
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     [k: string]: HALLink | HALLink[];
   };
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index 8ba9a747fe..1dac4ab183 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -1,10 +1,14 @@
 import { Injectable } from '@angular/core';
+
 import { hasValue } from '../../shared/empty.util';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { MetadataMap, MetadataValue } from '../shared/metadata.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../shared/metadata.models';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
@@ -14,8 +18,8 @@ export class SearchResponseParsingService extends DspaceRestResponseParsingServi
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded : {
-        objects: []
-      }
+        objects: [],
+      },
     };
     const payload = data.payload._embedded.searchResult || emptyPayload;
     payload.appliedFilters = data.payload.appliedFilters;
diff --git a/src/app/core/data/signposting-data.service.spec.ts b/src/app/core/data/signposting-data.service.spec.ts
index f34ce6538f..2b10bba89b 100644
--- a/src/app/core/data/signposting-data.service.spec.ts
+++ b/src/app/core/data/signposting-data.service.spec.ts
@@ -1,11 +1,14 @@
-import { fakeAsync, TestBed, tick } from '@angular/core/testing';
-
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { of } from 'rxjs';
 
-import { SignpostingDataService } from './signposting-data.service';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { SignpostingLink } from './signposting-links.model';
 import { APP_CONFIG } from '../../../config/app-config.interface';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { SignpostingDataService } from './signposting-data.service';
+import { SignpostingLink } from './signposting-links.model';
 
 describe('SignpostingDataService', () => {
   let service: SignpostingDataService;
@@ -14,28 +17,28 @@ describe('SignpostingDataService', () => {
   const mocklink = {
     href: 'http://test.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   const mocklink2 = {
     href: 'http://test2.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   const mockResponse: any = {
     statusCode: 200,
-    payload: [mocklink, mocklink2]
+    payload: [mocklink, mocklink2],
   };
 
   const mockErrResponse: any = {
-    statusCode: 500
+    statusCode: 500,
   };
 
   const environmentRest = {
     rest: {
-      baseUrl: 'http://localhost:8080'
-    }
+      baseUrl: 'http://localhost:8080',
+    },
   };
 
   beforeEach(() => {
@@ -45,8 +48,8 @@ describe('SignpostingDataService', () => {
       providers: [
         SignpostingDataService,
         { provide: APP_CONFIG, useValue: environmentRest },
-        { provide: DspaceRestService, useValue: restSpy }
-      ]
+        { provide: DspaceRestService, useValue: restSpy },
+      ],
     });
 
     service = TestBed.inject(SignpostingDataService);
diff --git a/src/app/core/data/signposting-data.service.ts b/src/app/core/data/signposting-data.service.ts
index 638b04dfdd..d78f75bd11 100644
--- a/src/app/core/data/signposting-data.service.ts
+++ b/src/app/core/data/signposting-data.service.ts
@@ -1,18 +1,29 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { catchError, map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { SignpostingLink } from './signposting-links.model';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 /**
  * Service responsible for handling requests related to the Signposting endpoint
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SignpostingDataService {
 
@@ -28,10 +39,10 @@ export class SignpostingDataService {
     const baseUrl = `${this.appConfig.rest.baseUrl}`;
 
     return this.restService.get(`${baseUrl}/signposting/links/${uuid}`).pipe(
-      catchError((err) => {
+      catchError((err: unknown) => {
         return observableOf([]);
       }),
-      map((res: RawRestResponse) => res.statusCode === 200 ? res.payload as SignpostingLink[] : [])
+      map((res: RawRestResponse) => res.statusCode === 200 ? res.payload as SignpostingLink[] : []),
     );
   }
 
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
index 42bdfedb8a..253d1a6f15 100644
--- a/src/app/core/data/site-data.service.spec.ts
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -1,15 +1,19 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { SiteDataService } from './site-data.service';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { Site } from '../shared/site.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { FindListOptions } from './find-list-options.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Site } from '../shared/site.model';
 import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { RequestService } from './request.service';
+import { SiteDataService } from './site-data.service';
 
 describe('SiteDataService', () => {
   let scheduler: TestScheduler;
@@ -32,7 +36,7 @@ describe('SiteDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: siteLink })
+      getEndpoint: cold('a', { a: siteLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
@@ -40,8 +44,8 @@ describe('SiteDataService', () => {
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildList: cold('a', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
-      })
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject])),
+      }),
     });
 
     objectCache = {} as ObjectCacheService;
@@ -74,7 +78,7 @@ describe('SiteDataService', () => {
     it('should return the Site object', () => {
 
       spyOn(service, 'findAll').and.returnValue(cold('a', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject])),
       }));
 
       const expected = cold('(b|)', { b: testObject });
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index c2c4ffa466..af91320e3c 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -1,20 +1,24 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
 import { Site } from '../shared/site.model';
 import { SITE } from '../shared/site.resource-type';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BaseDataService } from './base/base-data.service';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * Service responsible for handling requests related to the Site object
diff --git a/src/app/core/data/status-code-only-response-parsing.service.spec.ts b/src/app/core/data/status-code-only-response-parsing.service.spec.ts
index cbf2a49c48..aef01777d3 100644
--- a/src/app/core/data/status-code-only-response-parsing.service.spec.ts
+++ b/src/app/core/data/status-code-only-response-parsing.service.spec.ts
@@ -16,7 +16,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       const result = service.parse(undefined, {
         payload,
         statusCode: 201,
-        statusText: '201'
+        statusText: '201',
       });
 
       expect(JSON.stringify(result).indexOf(payload)).toBe(-1);
@@ -31,7 +31,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a success RestResponse', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.isSuccessful).toBe(true);
@@ -40,7 +40,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status code', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusCode).toBe(statusCode);
@@ -49,7 +49,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status text', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusText).toBe(statusText);
@@ -65,7 +65,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return an error RestResponse', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.isSuccessful).toBe(false);
@@ -74,7 +74,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status code', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusCode).toBe(statusCode);
@@ -83,7 +83,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status text', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusText).toBe(statusText);
diff --git a/src/app/core/data/status-code-only-response-parsing.service.ts b/src/app/core/data/status-code-only-response-parsing.service.ts
index ad6a01429d..919891dedc 100644
--- a/src/app/core/data/status-code-only-response-parsing.service.ts
+++ b/src/app/core/data/status-code-only-response-parsing.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+
 import { RestResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
@@ -9,7 +10,7 @@ import { RestRequest } from './rest-request.model';
  * text of the response, and ignore anything else that might be there
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class StatusCodeOnlyResponseParsingService implements ResponseParsingService {
 
diff --git a/src/app/core/data/system-wide-alert-data.service.spec.ts b/src/app/core/data/system-wide-alert-data.service.spec.ts
index 9ba88ce6dd..6561b90785 100644
--- a/src/app/core/data/system-wide-alert-data.service.spec.ts
+++ b/src/app/core/data/system-wide-alert-data.service.spec.ts
@@ -1,7 +1,7 @@
-import { SystemWideAlertDataService } from './system-wide-alert-data.service';
+import { testCreateDataImplementation } from './base/create-data.spec';
 import { testFindAllDataImplementation } from './base/find-all-data.spec';
 import { testPutDataImplementation } from './base/put-data.spec';
-import { testCreateDataImplementation } from './base/create-data.spec';
+import { SystemWideAlertDataService } from './system-wide-alert-data.service';
 
 describe('SystemWideAlertDataService', () => {
   describe('composition', () => {
diff --git a/src/app/core/data/system-wide-alert-data.service.ts b/src/app/core/data/system-wide-alert-data.service.ts
index 51a88b907a..8ea8358ad2 100644
--- a/src/app/core/data/system-wide-alert-data.service.ts
+++ b/src/app/core/data/system-wide-alert-data.service.ts
@@ -1,23 +1,36 @@
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { SystemWideAlert } from '../../system-wide-alert/system-wide-alert.model';
+import { SYSTEMWIDEALERT } from '../../system-wide-alert/system-wide-alert.resource-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable } from 'rxjs';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import { dataService } from './base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FindListOptions } from './find-list-options.model';
-import { dataService } from './base/data-service.decorator';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { SYSTEMWIDEALERT } from '../../system-wide-alert/system-wide-alert.resource-type';
-import { SystemWideAlert } from '../../system-wide-alert/system-wide-alert.model';
-import { PutData, PutDataImpl } from './base/put-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
+import { RequestService } from './request.service';
 
 /**
  * Dataservice representing a system-wide alert
diff --git a/src/app/core/data/update-data.service.spec.ts b/src/app/core/data/update-data.service.spec.ts
new file mode 100644
index 0000000000..73ea07b84d
--- /dev/null
+++ b/src/app/core/data/update-data.service.spec.ts
@@ -0,0 +1,152 @@
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { HrefOnlyDataService } from './href-only-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { UpdateDataServiceImpl } from './update-data.service';
+
+describe('VersionDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: UpdateDataServiceImpl<any>;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let hrefOnlyDataService: HrefOnlyDataService;
+  let responseCacheEntry: RequestEntry;
+
+  const notificationsService = {} as NotificationsService;
+
+  const item = Object.assign(new Item(), {
+    id: '1234-1234',
+    uuid: '1234-1234',
+    bundles: observableOf({}),
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'This is just another title',
+        },
+      ],
+      'dc.type': [
+        {
+          language: null,
+          value: 'Article',
+        },
+      ],
+      'dc.contributor.author': [
+        {
+          language: 'en_US',
+          value: 'Smith, Donald',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '2015-06-26',
+        },
+      ],
+    },
+  });
+
+  const versionHistory = Object.assign(new VersionHistory(), {
+    id: '1',
+    draftVersion: true,
+  });
+
+  const mockVersion: Version = Object.assign(new Version(), {
+    item: createSuccessfulRemoteDataObject$(item),
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
+    version: 1,
+  });
+  const mockVersionRD = createSuccessfulRemoteDataObject(mockVersion);
+
+  const endpointURL = `https://rest.api/rest/api/versioning/versions`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  objectCache = {} as ObjectCacheService;
+  const comparatorEntry = {} as any;
+  function initTestService() {
+    hrefOnlyDataService = getMockHrefOnlyDataService();
+    return new UpdateDataServiceImpl(
+      'testLinkPath',
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      comparatorEntry,
+      10 * 1000,
+    );
+  }
+
+  beforeEach(() => {
+
+    scheduler = getTestScheduler();
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: endpointURL }),
+    });
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: hot('(a|)', {
+        a: mockVersionRD,
+      }),
+    });
+
+    service = initTestService();
+
+    spyOn((service as any), 'findById').and.callThrough();
+  });
+
+  afterEach(() => {
+    service = null;
+  });
+
+  describe('composition', () => {
+    const initService = () => new UpdateDataServiceImpl(null, null, null, null, null, null, null, null);
+
+    testPatchDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+    testCreateDataImplementation(initService);
+    testFindAllDataImplementation(initService);
+    testPutDataImplementation(initService);
+  });
+
+});
diff --git a/src/app/core/data/update-data.service.ts b/src/app/core/data/update-data.service.ts
index 9f707a82da..6a8a0c63e8 100644
--- a/src/app/core/data/update-data.service.ts
+++ b/src/app/core/data/update-data.service.ts
@@ -1,13 +1,337 @@
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { RestRequestMethod } from './rest-request-method';
 import { Operation } from 'fast-json-patch';
+import {
+  AsyncSubject,
+  from as observableFrom,
+  Observable,
+} from 'rxjs';
+import {
+  find,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../cache/object-cache.reducer';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { ChangeAnalyzer } from './change-analyzer';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  DeleteByIDRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
- * Represents a data service to update a given object
+ * Interface to list the methods used by the injected service in components
  */
 export interface UpdateDataService<T> {
   patch(dso: T, operations: Operation[]): Observable<RemoteData<T>>;
   update(object: T): Observable<RemoteData<T>>;
-  commitUpdates(method?: RestRequestMethod);
+  commitUpdates(method?: RestRequestMethod): void;
+}
+
+
+/**
+ * Specific functionalities that not all services would need.
+ * Goal of the class is to update remote objects, handling custom methods that don't belong to BaseDataService
+ * The class implements also the following common interfaces
+ *
+ * findAllData: FindAllData<T>;
+ * searchData: SearchData<T>;
+ * createData: CreateData<T>;
+ * patchData: PatchData<T>;
+ * putData: PutData<T>;
+ * deleteData: DeleteData<T>;
+ *
+ * Custom methods are:
+ *
+ * deleteOnRelated - delete all related objects to the given one
+ * postOnRelated - post all the related objects to the given one
+ * invalidate - invalidate the DSpaceObject making all requests as stale
+ * invalidateByHref - invalidate the href making all requests as stale
+ */
+
+export class UpdateDataServiceImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements FindAllData<T>, SearchData<T>, CreateData<T>, PatchData<T>, PutData<T>, DeleteData<T> {
+  private findAllData: FindAllDataImpl<T>;
+  private searchData: SearchDataImpl<T>;
+  private createData: CreateDataImpl<T>;
+  private patchData: PatchDataImpl<T>;
+  private putData: PutDataImpl<T>;
+  private deleteData: DeleteDataImpl<T>;
+
+
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: ChangeAnalyzer<T>,
+    protected responseMsToLive: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService ,this.responseMsToLive);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator ,this.responseMsToLive, this.constructIdEndpoint);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService ,this.responseMsToLive, this.constructIdEndpoint);
+  }
+
+
+  /**
+   * Create the HREF with given options object
+   *
+   * @param options The [[FindListOptions]] object
+   * @param linkPath The link path for the object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
+    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
+  }
+
+  /**
+   * Create the HREF for a specific object's search method with given options object
+   *
+   * @param searchMethod The search method for the object
+   * @param options The [[FindListOptions]] object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return  this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Send a patch request for a specified object
+   * @param {T} object The object to send a patch request for
+   * @param {Operation[]} operations The patch operations to be performed
+   */
+  patch(object: T, operations: Operation[]): Observable<RemoteData<T>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  createPatchFromCache(object: T): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: T): Observable<RemoteData<T>> {
+    return this.putData.put(object);
+  }
+
+  /**
+   * Add a new patch to the object cache
+   * The patch is derived from the differences between the given object and its version in the object cache
+   * @param {DSpaceObject} object The given object
+   */
+  update(object: T): Observable<RemoteData<T>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Create a new DSpaceObject on the server, and store the response
+   * in the object cache
+   *
+   * @param {CacheableObject} object
+   *    The object to create
+   * @param {RequestParam[]} params
+   *    Array with additional params to combine with query string
+   */
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
+    return this.createData.create(object, ...params);
+  }
+  /**
+   * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
+   * @param itemId The item id
+   * @param relatedItemId The related item Id
+   * @param body The optional POST body
+   * @return the RestResponse as an Observable
+   */
+  public postOnRelated(itemId: string, relatedItemId: string, body?: any) {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(itemId);
+
+    hrefObs.pipe(
+      take(1),
+    ).subscribe((href: string) => {
+      const request = new PostRequest(requestId, href + '/related?item=' + relatedItemId, body);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<T>(requestId);
+  }
+
+  /**
+   * Perform a delete on an endpoint related item. Ex.: endpoint/<itemId>/related
+   * @param itemId The item id
+   * @return the RestResponse as an Observable
+   */
+  public deleteOnRelated(itemId: string): Observable<RemoteData<NoContent>> {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(itemId);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new DeleteByIDRequest(requestId, href + '/related', itemId);
+        if (hasValue(this.responseMsToLive)) {
+          request.responseMsToLive = this.responseMsToLive;
+        }
+        this.requestService.send(request);
+      }),
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
+  /*
+   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
+   * @param   objectId The id of the object to be invalidated
+   * @return  An Observable that will emit `true` once all requests are stale
+   */
+  invalidate(objectId: string): Observable<boolean> {
+    return this.getIDHrefObs(objectId).pipe(
+      switchMap((href: string) => this.invalidateByHref(href)),
+    );
+  }
+
+  /**
+   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
+   * @param   href The self link of the object to be invalidated
+   * @return  An Observable that will emit `true` once all requests are stale
+   */
+  invalidateByHref(href: string): Observable<boolean> {
+    const done$ = new AsyncSubject<boolean>();
+
+    this.objectCache.getByHref(href).pipe(
+      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
+        mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
+        toArray(),
+      )),
+    ).subscribe(() => {
+      done$.next(true);
+      done$.complete();
+    });
+
+    return done$;
+  }
+
+  /**
+   * Delete an existing DSpace Object on the server
+   * @param   objectId The id of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   *                            metadata should be saved as real metadata
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
+   */
+  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing DSpace Object on the server
+   * @param   href The self link of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   *                            metadata should be saved as real metadata
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
+   *          Only emits once all request related to the DSO has been invalidated.
+   */
+  deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  commitUpdates(method?: RestRequestMethod) {
+    this.patchData.commitUpdates(method);
+  }
 }
diff --git a/src/app/core/data/version-data.service.spec.ts b/src/app/core/data/version-data.service.spec.ts
index dd3f9eec94..54af9b8895 100644
--- a/src/app/core/data/version-data.service.spec.ts
+++ b/src/app/core/data/version-data.service.spec.ts
@@ -1,21 +1,29 @@
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from './href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { VersionDataService } from './version-data.service';
 import { Version } from '../shared/version.model';
 import { VersionHistory } from '../shared/version-history.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { RequestEntry } from './request-entry.model';
 import { testPatchDataImplementation } from './base/patch-data.spec';
+import { HrefOnlyDataService } from './href-only-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { VersionDataService } from './version-data.service';
 
 describe('VersionDataService test', () => {
   let scheduler: TestScheduler;
@@ -35,28 +43,28 @@ describe('VersionDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
 
@@ -84,7 +92,7 @@ describe('VersionDataService test', () => {
       rdbService,
       objectCache,
       halService,
-      comparatorEntry
+      comparatorEntry,
     );
   }
 
@@ -99,7 +107,7 @@ describe('VersionDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: cold('a', { a: endpointURL }),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -114,8 +122,8 @@ describe('VersionDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('(a|)', {
-          a: mockVersionRD
-        })
+          a: mockVersionRD,
+        }),
       });
 
       service = initTestService();
@@ -128,7 +136,7 @@ describe('VersionDataService test', () => {
     });
 
     describe('getHistoryFromVersion', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.getHistoryFromVersion(mockVersion, true, true));
         scheduler.flush();
 
@@ -138,7 +146,7 @@ describe('VersionDataService test', () => {
       it('should return a VersionHistory', () => {
         const result = service.getHistoryFromVersion(mockVersion, true, true);
         const expected = cold('(a|)', {
-          a: versionHistory
+          a: versionHistory,
         });
         expect(result).toBeObservable(expected);
       });
@@ -156,7 +164,7 @@ describe('VersionDataService test', () => {
 
         const result = service.getHistoryIdFromVersion(mockVersion);
         const expected = cold('(a|)', {
-          a: versionHistory.id
+          a: versionHistory.id,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index 67c249fe0a..7bc8e47d1e 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -1,23 +1,33 @@
 import { Injectable } from '@angular/core';
-import { Version } from '../shared/version.model';
-import { RequestService } from './request.service';
+import { Operation } from 'fast-json-patch';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { EMPTY, Observable } from 'rxjs';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
+import { Version } from '../shared/version.model';
 import { VERSION } from '../shared/version.resource-type';
 import { VersionHistory } from '../shared/version-history.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import { isNotEmpty } from '../../shared/empty.util';
-import { RemoteData } from './remote-data';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { RestRequestMethod } from './rest-request-method';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
-import { Operation } from 'fast-json-patch';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * Service responsible for handling requests related to the Version object
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 03bf6c8bcb..a4e2a2c436 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -1,18 +1,22 @@
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  waitForAsync,
+} from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { VersionHistoryDataService } from './version-history-data.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { VersionDataService } from './version-data.service';
-import { fakeAsync, waitForAsync } from '@angular/core/testing';
-import { VersionHistory } from '../shared/version-history.model';
-import { Version } from '../shared/version.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../shared/item.model';
-import { of } from 'rxjs';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { RequestService } from './request.service';
+import { VersionDataService } from './version-data.service';
+import { VersionHistoryDataService } from './version-history-data.service';
 import SpyObj = jasmine.SpyObj;
 
 const url = 'fake-url';
@@ -74,8 +78,8 @@ describe('VersionHistoryDataService', () => {
     _links: {
       self: {
         href: '/items/' + item2Uuid,
-      }
-    }
+      },
+    },
   });
   const item2 = Object.assign(new Item(), {
     uuid: item2Uuid,
@@ -84,8 +88,8 @@ describe('VersionHistoryDataService', () => {
     _links: {
       self: {
         href: '/items/' + item2Uuid,
-      }
-    }
+      },
+    },
   });
   const items = [item1, item2];
   version1.item = createSuccessfulRemoteDataObject$(item1);
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b331c4f2e4..e39e12ea29 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -1,30 +1,47 @@
-import { VersionHistory } from '../shared/version-history.model';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { hasValueOperator } from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { HttpHeaders } from '@angular/common/http';
-import { PostRequest } from './request.models';
-import { Observable, of } from 'rxjs';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list.model';
-import { Version } from '../shared/version.model';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { VERSION_HISTORY } from '../shared/version-history.resource-type';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { VersionDataService } from './version-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { hasValueOperator } from '../../shared/empty.util';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { FindListOptions } from './find-list-options.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+} from '../shared/operators';
 import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RestRequest } from './rest-request.model';
+import { VersionDataService } from './version-data.service';
 
 /**
  * Service responsible for handling requests related to the VersionHistory object
@@ -57,7 +74,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    */
   getVersionsEndpoint(versionHistoryId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href: string) => this.halService.getEndpoint(this.versionsEndpoint, `${href}/${versionHistoryId}`))
+      switchMap((href: string) => this.halService.getEndpoint(this.versionsEndpoint, `${href}/${versionHistoryId}`)),
     );
   }
 
@@ -74,7 +91,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    */
   getVersions(versionHistoryId: string, searchOptions?: PaginatedSearchOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Version>[]): Observable<RemoteData<PaginatedList<Version>>> {
     const hrefObs = this.getVersionsEndpoint(versionHistoryId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
 
     return this.versionDataService.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
@@ -97,7 +114,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)),
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ) as Observable<RemoteData<Version>>;
   }
 
@@ -111,17 +128,17 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     const latestVersionOptions = Object.assign(new PaginationComponentOptions(), {
       id: 'item-newest-version-options',
       currentPage: 1,
-      pageSize: 1
+      pageSize: 1,
     });
 
-    const latestVersionSearch = new PaginatedSearchOptions({pagination: latestVersionOptions});
+    const latestVersionSearch = new PaginatedSearchOptions({ pagination: latestVersionOptions });
 
     return this.getVersions(versionHistory.id, latestVersionSearch, false, true, followLink('item')).pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
       hasValueOperator(),
       filter((versions) => versions.page.length > 0),
-      map((versions) => versions.page[0])
+      map((versions) => versions.page[0]),
     );
 
   }
@@ -148,7 +165,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
   isLatest$(version: Version): Observable<boolean> {
     return version ? this.getLatestVersion$(version).pipe(
       take(1),
-      switchMap((latestVersion) => of(version.version === latestVersion.version))
+      switchMap((latestVersion) => of(version.version === latestVersion.version)),
     ) : of(null);
   }
 
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index 00cd5e2889..13f4f84b8d 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -1,12 +1,13 @@
-import { WorkflowAction } from '../tasks/models/workflow-action-object.model';
-import { RequestService } from './request.service';
+import { Injectable } from '@angular/core';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Injectable } from '@angular/core';
+import { WorkflowAction } from '../tasks/models/workflow-action-object.model';
 import { WORKFLOW_ACTION } from '../tasks/models/workflow-action-object.resource-type';
 import { dataService } from './base/data-service.decorator';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the workflowactions endpoint
diff --git a/src/app/core/drag.service.ts b/src/app/core/drag.service.ts
index d5f329d362..5320d8c6a7 100644
--- a/src/app/core/drag.service.ts
+++ b/src/app/core/drag.service.ts
@@ -9,7 +9,7 @@
 import { Injectable } from '@angular/core';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DragService {
   private _overrideDragOverPage = false;
diff --git a/src/app/core/dspace-rest/dspace-not-null.serializer.ts b/src/app/core/dspace-rest/dspace-not-null.serializer.ts
index eabae3d983..81f8e2c2bd 100644
--- a/src/app/core/dspace-rest/dspace-not-null.serializer.ts
+++ b/src/app/core/dspace-rest/dspace-not-null.serializer.ts
@@ -1,4 +1,7 @@
-import { Deserialize, Serialize } from 'cerialize';
+import {
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 
 import { Serializer } from '../serializer';
 import { GenericConstructor } from '../shared/generic-constructor';
diff --git a/src/app/core/dspace-rest/dspace-rest.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
index 2188522dc0..4dd856b48e 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,25 +1,40 @@
-import { inject, TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import {
+  HttpErrorResponse,
+  HttpHeaders,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 
-import { DEFAULT_CONTENT_TYPE, DspaceRestService } from './dspace-rest.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { HttpHeaders } from '@angular/common/http';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import {
+  DEFAULT_CONTENT_TYPE,
+  DspaceRestService,
+} from './dspace-rest.service';
 
 describe('DspaceRestService', () => {
   let dspaceRestService: DspaceRestService;
   let httpMock: HttpTestingController;
   const url = 'http://www.dspace.org/';
-  const mockError: any = {
-    statusCode: 0,
+
+  const mockError = new HttpErrorResponse({
+    status: 0,
     statusText: 'Unknown Error',
-    message: 'Http failure response for http://www.dspace.org/: 0 '
-  };
+    error: {
+      message: 'Http failure response for http://www.dspace.org/: 0 ',
+    },
+  });
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
-      providers: [DspaceRestService]
+      providers: [DspaceRestService],
     });
 
     dspaceRestService = TestBed.inject(DspaceRestService);
@@ -35,7 +50,7 @@ describe('DspaceRestService', () => {
   describe('#get', () => {
     it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
-        page: 1
+        page: 1,
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
@@ -52,24 +67,28 @@ describe('DspaceRestService', () => {
       req.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
     });
     it('should throw an error', () => {
-      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
-        expect(err).toEqual(mockError);
+      dspaceRestService.get(url).subscribe(() => undefined, (err: unknown) => {
+        expect(err).toEqual(jasmine.objectContaining({
+          statusCode: 0,
+          statusText: 'Unknown Error',
+          message: 'Http failure response for http://www.dspace.org/: 0 ',
+        }));
       });
       const req = httpMock.expectOne(url);
       expect(req.request.method).toBe('GET');
-      req.error(mockError);
+      req.error({ error: mockError } as ErrorEvent);
     });
 
     it('should log an error', () => {
       spyOn(console, 'log');
 
-      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
+      dspaceRestService.get(url).subscribe(() => undefined, (err: unknown) => {
         expect(console.log).toHaveBeenCalled();
       });
 
       const req = httpMock.expectOne(url);
       expect(req.request.method).toBe('GET');
-      req.error(mockError);
+      req.error({ error: mockError } as ErrorEvent);
     });
 
     it('when no content-type header is provided, it should use application/json', () => {
@@ -83,7 +102,7 @@ describe('DspaceRestService', () => {
   describe('#request', () => {
     it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
-        page: 1
+        page: 1,
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
@@ -121,7 +140,7 @@ describe('DspaceRestService', () => {
     it('should return the correct data', () => {
       const name = 'testname';
       const dso: DSpaceObject = {
-        name: name
+        name: name,
       } as DSpaceObject;
       const formdata = dspaceRestService.buildFormData(dso);
       expect(formdata.get('name')).toBe(name);
diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index ea4e8c2831..67d74e9570 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -1,12 +1,28 @@
-import { Observable, throwError as observableThrowError } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import {
+  HttpClient,
+  HttpErrorResponse,
+  HttpHeaders,
+  HttpParams,
+  HttpResponse,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
+import {
+  Observable,
+  throwError as observableThrowError,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 
-import { RawRestResponse } from './raw-rest-response.model';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RequestError } from '../data/request-error.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { RawRestResponse } from './raw-rest-response.model';
 
 export const DEFAULT_CONTENT_TYPE = 'application/json; charset=utf-8';
 export interface HttpOptions {
@@ -40,22 +56,19 @@ export class DspaceRestService {
   get(absoluteURL: string): Observable<RawRestResponse> {
     const requestOptions = {
       observe: 'response' as any,
-      headers: new HttpHeaders({'Content-Type': DEFAULT_CONTENT_TYPE})
+      headers: new HttpHeaders({ 'Content-Type': DEFAULT_CONTENT_TYPE }),
     };
     return this.http.get(absoluteURL, requestOptions).pipe(
       map((res: HttpResponse<any>) => ({
         payload: res.body,
         statusCode: res.status,
-        statusText: res.statusText
+        statusText: res.statusText,
       })),
-      catchError((err) => {
+      catchError((err: unknown) => observableThrowError(() => {
         console.log('Error: ', err);
-        return observableThrowError({
-          statusCode: err.status,
-          statusText: err.statusText,
-          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-        });
-      }));
+        return this.handleHttpError(err);
+      })),
+    );
   }
 
   /**
@@ -109,19 +122,12 @@ export class DspaceRestService {
         payload: res.body,
         headers: res.headers,
         statusCode: res.status,
-        statusText: res.statusText
+        statusText: res.statusText,
       })),
-      catchError((err) => {
-        if (hasValue(err.status)) {
-          return observableThrowError({
-            statusCode: err.status,
-            statusText: err.statusText,
-            message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-          });
-        } else {
-          return observableThrowError(err);
-        }
-      }));
+      catchError((err: unknown) => observableThrowError(() => {
+        return this.handleHttpError(err);
+      })),
+    );
   }
 
   /**
@@ -145,4 +151,20 @@ export class DspaceRestService {
     return form;
   }
 
+  protected handleHttpError(err: unknown): RequestError | unknown {
+    if (err instanceof HttpErrorResponse) {
+      const error = new RequestError(
+        (isNotEmpty(err?.error?.message)) ? err.error.message : err.message,
+      );
+
+      error.statusCode = err.status;
+      error.statusText = err.statusText;
+
+      return error;
+    } else {
+      console.error('Cannot construct RequestError from', err);
+      return err;
+    }
+  }
+
 }
diff --git a/src/app/core/dspace-rest/dspace.serializer.spec.ts b/src/app/core/dspace-rest/dspace.serializer.spec.ts
index 331254c502..9a6635bc98 100644
--- a/src/app/core/dspace-rest/dspace.serializer.spec.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.spec.ts
@@ -1,17 +1,21 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
 import { DSpaceSerializer } from './dspace.serializer';
 
 class TestModel implements HALResource {
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  name: string;
+    name: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     parents: HALLink;
   };
@@ -23,54 +27,54 @@ const testModels = [
     name: 'Model 1',
     _links: {
       self: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60'
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60',
       },
       parents: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents'
-      }
-    }
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents',
+      },
+    },
   },
   {
     id: '752a1250-949a-46ad-9bea-fbc45f0b656d',
     name: 'Model 2',
     _links: {
       self: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad'
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad',
       },
       parents: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents'
-      }
-    }
-  }
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents',
+      },
+    },
+  },
 ];
 
 const testResponses = [
   {
     _links: {
       self: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60'
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60',
       },
       parents: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents'
-      }
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents',
+      },
     },
     id: '9e32a2e2-6b91-4236-a361-995ccdc14c60',
     type: 'testModels',
-    name: 'A Test Model'
+    name: 'A Test Model',
   },
   {
     _links: {
       self: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad'
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad',
       },
       parents: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents'
-      }
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents',
+      },
     },
     id: '598ce822-c357-46f3-ab70-63724d02d6ad',
     type: 'testModels',
-    name: 'Another Test Model'
-  }
+    name: 'Another Test Model',
+  },
 ];
 
 describe('DSpaceSerializer', () => {
@@ -127,7 +131,7 @@ describe('DSpaceSerializer', () => {
     it('should throw an error when dealing with a document describing a single model', () => {
       const serializer = new DSpaceSerializer(TestModel);
       const doc = {
-        _embedded: testResponses[0]
+        _embedded: testResponses[0],
       };
 
       expect(() => {
diff --git a/src/app/core/dspace-rest/dspace.serializer.ts b/src/app/core/dspace-rest/dspace.serializer.ts
index f77818a8f5..ccf2d9a634 100644
--- a/src/app/core/dspace-rest/dspace.serializer.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.ts
@@ -1,4 +1,7 @@
-import { Deserialize, Serialize } from 'cerialize';
+import {
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 
 import { Serializer } from '../serializer';
 import { GenericConstructor } from '../shared/generic-constructor';
diff --git a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
index 076df8ebc9..7d67872004 100644
--- a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
+++ b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
@@ -1,7 +1,17 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { environment } from '../../../environments/environment';
+import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
 
 /**
  * An abstract guard for redirecting users to the user agreement page if a certain condition is met
@@ -23,7 +33,7 @@ export abstract class AbstractEndUserAgreementGuard implements CanActivate {
       return observableOf(true);
     }
     return this.hasAccepted().pipe(
-      returnEndUserAgreementUrlTreeOnFalse(this.router, state.url)
+      returnEndUserAgreementUrlTreeOnFalse(this.router, state.url),
     );
   }
 
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
index 805c765832..a801fb7a6f 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
@@ -1,5 +1,9 @@
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+
 import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router, UrlTree } from '@angular/router';
 import { EndUserAgreementCookieGuard } from './end-user-agreement-cookie.guard';
 
 describe('EndUserAgreementCookieGuard', () => {
@@ -10,12 +14,12 @@ describe('EndUserAgreementCookieGuard', () => {
 
   beforeEach(() => {
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
-      isCookieAccepted: true
+      isCookieAccepted: true,
     });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: {},
       parseUrl: new UrlTree(),
-      createUrlTree: new UrlTree()
+      createUrlTree: new UrlTree(),
     });
 
     guard = new EndUserAgreementCookieGuard(endUserAgreementService, router);
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
index 2219aa9e50..a6d3e0f0e8 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
@@ -1,8 +1,12 @@
 import { Injectable } from '@angular/core';
-import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router } from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
+import { EndUserAgreementService } from './end-user-agreement.service';
 
 /**
  * A guard redirecting users to the end agreement page when the user agreement cookie hasn't been accepted
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
index 21d7c3908d..88722bd799 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -1,8 +1,12 @@
-import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-user.guard';
-import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router, UrlTree } from '@angular/router';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
 import { environment } from '../../../environments/environment.test';
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-user.guard';
 
 describe('EndUserAgreementGuard', () => {
   let guard: EndUserAgreementCurrentUserGuard;
@@ -12,12 +16,12 @@ describe('EndUserAgreementGuard', () => {
 
   beforeEach(() => {
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
-      hasCurrentUserAcceptedAgreement: observableOf(true)
+      hasCurrentUserAcceptedAgreement: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: {},
       parseUrl: new UrlTree(),
-      createUrlTree: new UrlTree()
+      createUrlTree: new UrlTree(),
     });
 
     guard = new EndUserAgreementCurrentUserGuard(endUserAgreementService, router);
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
index a79e12cc32..f59b9dcab3 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
@@ -1,9 +1,13 @@
 import { Injectable } from '@angular/core';
-import { Observable, of as observableOf } from 'rxjs';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { environment } from '../../../environments/environment';
 import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
 import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router } from '@angular/router';
-import { environment } from '../../../environments/environment';
 
 /**
  * A guard redirecting logged in users to the end agreement page when they haven't accepted the latest user agreement
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
index fadc43c6c8..0511fd8b72 100644
--- a/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
@@ -1,12 +1,13 @@
+import { of as observableOf } from 'rxjs';
+
+import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { EPerson } from '../eperson/models/eperson.model';
 import {
   END_USER_AGREEMENT_COOKIE,
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from './end-user-agreement.service';
-import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
-import { of as observableOf } from 'rxjs';
-import { EPerson } from '../eperson/models/eperson.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('EndUserAgreementService', () => {
   let service: EndUserAgreementService;
@@ -23,21 +24,21 @@ describe('EndUserAgreementService', () => {
       metadata: {
         [END_USER_AGREEMENT_METADATA_FIELD]: [
           {
-            value: 'true'
-          }
-        ]
-      }
+            value: 'true',
+          },
+        ],
+      },
     });
     userWithoutMetadata = Object.assign(new EPerson());
 
     cookie = new CookieServiceMock();
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      getAuthenticatedUserFromStore: observableOf(userWithMetadata)
+      getAuthenticatedUserFromStore: observableOf(userWithMetadata),
     });
     ePersonService = jasmine.createSpyObj('ePersonService', {
       update: createSuccessfulRemoteDataObject$(userWithMetadata),
-      patch: createSuccessfulRemoteDataObject$({})
+      patch: createSuccessfulRemoteDataObject$({}),
     });
 
     service = new EndUserAgreementService(cookie, authService, ePersonService);
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.ts b/src/app/core/end-user-agreement/end-user-agreement.service.ts
index 3841abb5d4..8af701ed8f 100644
--- a/src/app/core/end-user-agreement/end-user-agreement.service.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.ts
@@ -1,10 +1,18 @@
 import { Injectable } from '@angular/core';
-import { AuthService } from '../auth/auth.service';
-import { CookieService } from '../services/cookie.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
+import { CookieService } from '../services/cookie.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 
 export const END_USER_AGREEMENT_COOKIE = 'hasAgreedEndUser';
@@ -44,12 +52,12 @@ export class EndUserAgreementService {
       switchMap((authenticated) => {
         if (authenticated) {
           return this.authService.getAuthenticatedUserFromStore().pipe(
-            map((user) => hasValue(user) && user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD) && user.firstMetadata(END_USER_AGREEMENT_METADATA_FIELD).value === 'true')
+            map((user) => hasValue(user) && user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD) && user.firstMetadata(END_USER_AGREEMENT_METADATA_FIELD).value === 'true'),
           );
         } else {
           return observableOf(acceptedWhenAnonymous);
         }
-      })
+      }),
     );
   }
 
@@ -76,14 +84,14 @@ export class EndUserAgreementService {
               return this.ePersonService.patch(user, [operation]);
             }),
             getFirstCompletedRemoteData(),
-            map((response) => response.hasSucceeded)
+            map((response) => response.hasSucceeded),
           );
         } else {
           this.setCookieAccepted(accepted);
           return observableOf(true);
         }
       }),
-      take(1)
+      take(1),
     );
   }
 
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index b4b939eebf..127f0a1d2c 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -1,39 +1,67 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { compare, Operation } from 'fast-json-patch';
-import { getTestScheduler } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Store } from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
 import {
   EPeopleRegistryCancelEPersonAction,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from '../../access-control/epeople-registry/epeople-registry.actions';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import { GroupMock } from '../../shared/testing/group-mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import {
+  createPaginatedList,
+  createRequestEntry$,
+} from '../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { PatchRequest, PostRequest } from '../data/request.models';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  PatchRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { EPersonDataService } from './eperson-data.service';
+import {
+  editEPersonSelector,
+  EPersonDataService,
+} from './eperson-data.service';
 import { EPerson } from './models/eperson.model';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
 
 describe('EPersonDataService', () => {
   let service: EPersonDataService;
-  let store: Store<CoreState>;
+  let store: MockStore<CoreState>;
   let requestService: RequestService;
-  let scheduler: TestScheduler;
 
   let epeople;
 
@@ -43,50 +71,38 @@ describe('EPersonDataService', () => {
   let epeople$;
   let rdbService;
 
-  function initTestService() {
-    return new EPersonDataService(
-      requestService,
-      rdbService,
-      null,
-      halService,
-      new DummyChangeAnalyzer() as any,
-      null,
-      store,
-    );
-  }
+  const initialState = {
+    epeopleRegistry: {
+      editEPerson: null,
+    },
+  };
 
-  function init() {
+  beforeEach(waitForAsync(() => {
     restEndpointURL = 'https://rest.api/dspace-spring-rest/api/eperson';
     epersonsEndpoint = `${restEndpointURL}/epersons`;
     epeople = [EPersonMock, EPersonMock2];
     epeople$ = createSuccessfulRemoteDataObject$(createPaginatedList([epeople]));
     rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://rest.api/dspace-spring-rest/api/eperson/epersons': epeople$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
+    requestService = getMockRequestService(createRequestEntry$(epeople));
 
     TestBed.configureTestingModule({
-      imports: [
-        CommonModule,
-        StoreModule.forRoot({}),
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+      providers: [
+        EPersonDataService,
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: HALEndpointService, useValue: halService },
+        provideMockStore({ initialState }),
+        { provide: ObjectCacheService, useValue: {} },
+        { provide: DSOChangeAnalyzer, useClass: DummyChangeAnalyzer },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      declarations: [],
-      providers: [],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
-  }
 
-  beforeEach(() => {
-    init();
-    requestService = getMockRequestService(createRequestEntry$(epeople));
-    store = new Store<CoreState>(undefined, undefined, undefined);
-    service = initTestService();
-    spyOn(store, 'dispatch');
-  });
+    service = TestBed.inject(EPersonDataService);
+    store = TestBed.inject(Store) as MockStore<CoreState>;
+    spyOn(store, 'dispatch').and.callThrough();
+  }));
 
   describe('searchByScope', () => {
     beforeEach(() => {
@@ -96,7 +112,7 @@ describe('EPersonDataService', () => {
     it('search by default scope (byMetadata) and no query', () => {
       service.searchByScope(null, '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -104,7 +120,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and no query', () => {
       service.searchByScope('metadata', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -112,7 +128,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and with query', () => {
       service.searchByScope('metadata', 'test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('test')))]
+        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('test')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -122,7 +138,7 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       service.searchByScope('email', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent('')))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
@@ -133,13 +149,37 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
       service.searchByScope('email', EPersonMock.email);
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent(EPersonMock.email)))]
+        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent(EPersonMock.email)))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
     });
   });
 
+  describe('searchNonMembers', () => {
+    beforeEach(() => {
+      spyOn(service, 'searchBy');
+    });
+
+    it('search with empty query and a group ID', () => {
+      service.searchNonMembers('', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', '')),
+          Object.assign(new RequestParam('group', GroupMock.id))],
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+
+    it('search with query and a group ID', () => {
+      service.searchNonMembers('test', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', 'test')),
+          Object.assign(new RequestParam('group', GroupMock.id))],
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+  });
+
   describe('updateEPerson', () => {
     beforeEach(() => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
@@ -213,7 +253,7 @@ describe('EPersonDataService', () => {
             'eperson.firstname': [
               {
                 value: newFirstName,
-              }
+              },
             ],
             'eperson.lastname': [
               {
@@ -239,34 +279,29 @@ describe('EPersonDataService', () => {
   });
 
   describe('clearEPersonRequests', () => {
-    beforeEach(waitForAsync(() => {
-      scheduler = getTestScheduler();
-      halService = {
-        getEndpoint(linkPath: string): Observable<string> {
-          return observableOf(restEndpointURL + '/' + linkPath);
-        }
-      } as HALEndpointService;
-      initTestService();
-      service.clearEPersonRequests();
-    }));
-    it('should remove the eperson hrefs in the request service', () => {
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(epersonsEndpoint);
+    beforeEach(() => {
+      spyOn(halService, 'getEndpoint').and.callFake((linkPath: string) => {
+        return observableOf(`${restEndpointURL}/${linkPath}`);
+      });
     });
+    it('should remove the eperson hrefs in the request service', fakeAsync(() => {
+      service.clearEPersonRequests();
+      tick();
+
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(epersonsEndpoint);
+    }));
   });
 
   describe('getActiveEPerson', () => {
     it('should retrieve the ePerson currently getting edited, if any', () => {
-      service.editEPerson(EPersonMock);
+      // Update the state with the ePerson (the provideMockStore doesn't update itself when dispatch is called)
+      store.overrideSelector(editEPersonSelector, EPersonMock);
 
-      service.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-        expect(activeEPerson).toEqual(EPersonMock);
-      });
+      expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: EPersonMock }));
     });
 
     it('should retrieve the ePerson currently getting edited, null if none being edited', () => {
-      service.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-        expect(activeEPerson).toEqual(null);
-      });
+      expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: null }));
     });
   });
 
@@ -290,7 +325,7 @@ describe('EPersonDataService', () => {
       service.deleteEPerson(EPersonMock).subscribe();
     });
 
-    it('should call DataService.delete with the EPerson\'s UUID', () => {
+    it('should call UpdateDataServiceImpl.delete with the EPerson\'s UUID', () => {
       expect(service.delete).toHaveBeenCalledWith(EPersonMock.id);
     });
   });
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index d30030365c..ef728cccd3 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -1,42 +1,78 @@
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { find, map, take } from 'rxjs/operators';
+import {
+  find,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
 import {
   EPeopleRegistryCancelEPersonAction,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from '../../access-control/epeople-registry/epeople-registry.actions';
 import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers';
 import { AppState } from '../../app.reducer';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { PatchRequest, PostRequest } from '../data/request.models';
+import {
+  PatchRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
 import { EPerson } from './models/eperson.model';
 import { EPERSON } from './models/eperson.resource-type';
-import { NoContent } from '../shared/NoContent.model';
-import { PageInfo } from '../shared/page-info.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PatchData, PatchDataImpl } from '../data/base/patch-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { dataService } from '../data/base/data-service.decorator';
+
+// todo: optimize imports
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
-const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
+export const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
 
 /**
  * A service to retrieve {@link EPerson}s from the REST API & EPerson related CRUD actions
@@ -100,16 +136,16 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
                   elementsPerPage: options.elementsPerPage,
                   totalElements: page.length,
                   totalPages: page.length,
-                  currentPage: 1
+                  currentPage: 1,
                 }), page),
-                rd.statusCode
+                rd.statusCode,
               );
             } else {
               // If it hasn't succeeded, there can be no payload, so we can re-cast the existing
               // RemoteData object
               return rd as RemoteData<PaginatedList<EPerson>>;
             }
-          })
+          }),
         );
       default:
         return this.getEpeopleByMetadata(query.trim(), options, useCachedVersionIfAvailable);
@@ -176,6 +212,34 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return this.searchBy(searchMethod, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+   * Searches for all EPerons which are *not* a member of a given group, via a passed in query
+   * (searches all EPerson metadata and by exact UUID).
+   * Endpoint used: /eperson/epesons/search/isNotMemberOf?query=<:string>&group=<:uuid>
+   * @param query                       search query param
+   * @param group                       UUID of group to exclude results from. Members of this group will never be returned.
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  public searchNonMembers(query: string, group: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
+    const searchParams = [new RequestParam('query', query), new RequestParam('group', group)];
+    let findListOptions = new FindListOptions();
+    if (options) {
+      findListOptions = Object.assign(new FindListOptions(), options);
+    }
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+    } else {
+      findListOptions.searchParams = searchParams;
+    }
+    return this.searchBy('isNotMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
   /**
    * Add a new patch to the object cache
    * The patch is derived from the differences between the given object and its version in the object cache
@@ -187,7 +251,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     oldVersion$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((oldEPerson: EPerson) => {
       const operations = this.generateOperations(oldEPerson, ePerson);
       const patchRequest = new PatchRequest(requestId, ePerson._links.self.href, operations);
@@ -207,17 +271,17 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     let operations = this.comparator.diff(oldEPerson, newEPerson).filter((operation: Operation) => operation.op === 'replace');
     if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
       operations = [...operations, {
-        op: 'replace', path: '/email', value: newEPerson.email
+        op: 'replace', path: '/email', value: newEPerson.email,
       }];
     }
     if (hasValue(oldEPerson.requireCertificate) && oldEPerson.requireCertificate !== newEPerson.requireCertificate) {
       operations = [...operations, {
-        op: 'replace', path: '/certificate', value: newEPerson.requireCertificate
+        op: 'replace', path: '/certificate', value: newEPerson.requireCertificate,
       }];
     }
     if (hasValue(oldEPerson.canLogIn) && oldEPerson.canLogIn !== newEPerson.canLogIn) {
       operations = [...operations, {
-        op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn
+        op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn,
       }];
     }
     return operations;
@@ -281,15 +345,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
         this.editEPerson(ePerson);
       }
     });
-    return '/access-control/epeople';
-  }
-
-  /**
-   * Get EPeople admin page
-   * @param ePerson New EPerson to edit
-   */
-  public getEPeoplePageRouterLink(): string {
-    return '/access-control/epeople';
+    return getEPersonEditRoute(ePerson.id);
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index b424aed1aa..28b8a9dc9a 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -2,33 +2,55 @@ import { CommonModule } from '@angular/common';
 import { HttpHeaders } from '@angular/common/http';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { compare, Operation } from 'fast-json-patch';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import { of as observableOf } from 'rxjs';
+
 import {
   GroupRegistryCancelGroupAction,
-  GroupRegistryEditGroupAction
+  GroupRegistryEditGroupAction,
 } from '../../access-control/group-registry/group-registry.actions';
-import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../shared/testing/group-mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
+import {
+  createPaginatedList,
+  createRequestEntry$,
+} from '../../shared/testing/utils.test';
 import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../cache/object-cache.reducer';
+import { CoreState } from '../core-state.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { DeleteRequest, PostRequest } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  DeleteRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Item } from '../shared/item.model';
 import { GroupDataService } from './group-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { of as observableOf } from 'rxjs';
-import { ObjectCacheEntry } from '../cache/object-cache.reducer';
-import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
 
 describe('GroupDataService', () => {
   let service: GroupDataService;
@@ -43,11 +65,11 @@ describe('GroupDataService', () => {
   let rdbService;
   let objectCache;
   function init() {
-    restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
+    restEndpointURL = 'https://rest.api/server/api/eperson';
     groupsEndpoint = `${restEndpointURL}/groups`;
     groups = [GroupMock, GroupMock2];
     groups$ = createSuccessfulRemoteDataObject$(createPaginatedList(groups));
-    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
+    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://rest.api/server/api/eperson/groups': groups$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
     objectCache = getMockObjectCacheService();
     TestBed.configureTestingModule({
@@ -57,13 +79,13 @@ describe('GroupDataService', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [],
       providers: [],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }
 
@@ -97,7 +119,7 @@ describe('GroupDataService', () => {
     it('search with empty query', () => {
       service.searchGroups('');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', ''))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -105,12 +127,36 @@ describe('GroupDataService', () => {
     it('search with query', () => {
       service.searchGroups('test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', 'test'))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
   });
 
+  describe('searchNonMemberGroups', () => {
+    beforeEach(() => {
+      spyOn(service, 'searchBy');
+    });
+
+    it('search with empty query and a group ID', () => {
+      service.searchNonMemberGroups('', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', '')),
+          Object.assign(new RequestParam('group', GroupMock.id))],
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+
+    it('search with query and a group ID', () => {
+      service.searchNonMemberGroups('test', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', 'test')),
+          Object.assign(new RequestParam('group', GroupMock.id))],
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+  });
+
   describe('addSubGroupToGroup', () => {
     beforeEach(() => {
       objectCache.getByHref.and.returnValue(observableOf({
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index bb38e46758..7758c76dae 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -1,45 +1,68 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  zip as observableZip,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
 
-import { createSelector, select, Store } from '@ngrx/store';
-import { Observable, zip as observableZip } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { getGroupEditRoute } from '../../access-control/access-control-routing-paths';
 import {
   GroupRegistryCancelGroupAction,
-  GroupRegistryEditGroupAction
+  GroupRegistryEditGroupAction,
 } from '../../access-control/group-registry/group-registry.actions';
 import { GroupRegistryState } from '../../access-control/group-registry/group-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { CreateRequest, DeleteRequest, PostRequest } from '../data/request.models';
-
+import {
+  CreateRequest,
+  DeleteRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Collection } from '../shared/collection.model';
+import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { Group } from './models/group.model';
 import { GROUP } from './models/group.resource-type';
-import { DSONameService } from '../breadcrumbs/dso-name.service';
-import { Community } from '../shared/community.model';
-import { Collection } from '../shared/collection.model';
-import { NoContent } from '../shared/NoContent.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PatchData, PatchDataImpl } from '../data/base/patch-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { Operation } from 'fast-json-patch';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { dataService } from '../data/base/data-service.decorator';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -104,23 +127,31 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
   }
 
   /**
-   * Check if the current user is member of to the indicated group
-   *
-   * @param groupName
-   *    the group name
-   * @return boolean
-   *    true if user is member of the indicated group, false otherwise
+   * Searches for all groups which are *not* a member of a given group, via a passed in query
+   * (searches in group name and by exact UUID).
+   * Endpoint used: /eperson/groups/search/isNotMemberOf?query=<:string>&group=<:uuid>
+   * @param query                       search query param
+   * @param group                       UUID of group to exclude results from. Members of this group will never be returned.
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
    */
-  isMemberOf(groupName: string): Observable<boolean> {
-    const searchHref = 'isMemberOf';
-    const options = new FindListOptions();
-    options.searchParams = [new RequestParam('groupName', groupName)];
-
-    return this.searchBy(searchHref, options).pipe(
-      filter((groups: RemoteData<PaginatedList<Group>>) => !groups.isResponsePending),
-      take(1),
-      map((groups: RemoteData<PaginatedList<Group>>) => groups.payload.totalElements > 0)
-    );
+  public searchNonMemberGroups(query: string, group: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<RemoteData<PaginatedList<Group>>> {
+    const searchParams = [new RequestParam('query', query), new RequestParam('group', group)];
+    let findListOptions = new FindListOptions();
+    if (options) {
+      findListOptions = Object.assign(new FindListOptions(), options);
+    }
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+    } else {
+      findListOptions.searchParams = searchParams;
+    }
+    return this.searchBy('isNotMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -264,15 +295,15 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
    * @param group Group we want edit page for
    */
   public getGroupEditPageRouterLink(group: Group): string {
-    return this.getGroupEditPageRouterLinkWithID(group.id);
+    return getGroupEditRoute(group.id);
   }
 
   /**
    * Get Edit page of group
    * @param groupID Group ID we want edit page for
    */
-  public getGroupEditPageRouterLinkWithID(groupId: string): string {
-    return '/access-control/groups/' + groupId;
+  public getGroupEditPageRouterLinkWithID(groupID: string): string {
+    return getGroupEditRoute(groupID);
   }
 
   /**
@@ -303,7 +334,7 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
         'dc.description': [
           {
             value: `${this.nameService.getName(dso)} ${role} group`,
-          }
+          },
         ],
       },
     });
diff --git a/src/app/core/eperson/models/eperson-dto.model.ts b/src/app/core/eperson/models/eperson-dto.model.ts
index 0e79902196..f84e81dab2 100644
--- a/src/app/core/eperson/models/eperson-dto.model.ts
+++ b/src/app/core/eperson/models/eperson-dto.model.ts
@@ -5,17 +5,12 @@ import { EPerson } from './eperson.model';
  */
 export class EpersonDtoModel {
 
-    /**
+  /**
      * The EPerson linked to this object
      */
-    public eperson: EPerson;
-    /**
+  public eperson: EPerson;
+  /**
      * Whether or not the linked EPerson is able to be deleted
      */
-    public ableToDelete: boolean;
-    /**
-     * Whether or not this EPerson is member of group on page it is being used on
-     */
-    public memberOfGroup: boolean;
-
+  public ableToDelete: boolean;
 }
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index 08b36dd78d..ab84d9c113 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -1,16 +1,22 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
-
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALLink } from '../../shared/hal-link.model';
 import { EPERSON } from './eperson.resource-type';
 import { Group } from './group.model';
 import { GROUP } from './group.resource-type';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
diff --git a/src/app/core/eperson/models/group.model.ts b/src/app/core/eperson/models/group.model.ts
index f147cc53a6..bed55af0a2 100644
--- a/src/app/core/eperson/models/group.model.ts
+++ b/src/app/core/eperson/models/group.model.ts
@@ -1,16 +1,24 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
-
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { DSPACE_OBJECT } from '../../shared/dspace-object.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { EPerson } from './eperson.model';
 import { EPERSON } from './eperson.resource-type';
 import { GROUP } from './group.resource-type';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -40,7 +48,7 @@ export class Group extends DSpaceObject {
    * The {@link HALLink}s for this Group
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     subgroups: HALLink;
     epersons: HALLink;
diff --git a/src/app/core/feedback/feedback-data.service.spec.ts b/src/app/core/feedback/feedback-data.service.spec.ts
index 4b76d06cec..9b666e9776 100644
--- a/src/app/core/feedback/feedback-data.service.spec.ts
+++ b/src/app/core/feedback/feedback-data.service.spec.ts
@@ -1,14 +1,15 @@
-import { FeedbackDataService } from './feedback-data.service';
-import { HALLink } from '../shared/hal-link.model';
-import { Item } from '../shared/item.model';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Store } from '@ngrx/store';
-import { Feedback } from './models/feedback.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
 import { testCreateDataImplementation } from '../data/base/create-data.spec';
+import { HALLink } from '../shared/hal-link.model';
+import { Item } from '../shared/item.model';
+import { FeedbackDataService } from './feedback-data.service';
+import { Feedback } from './models/feedback.model';
 
 describe('FeedbackDataService', () => {
   let service: FeedbackDataService;
@@ -25,7 +26,7 @@ describe('FeedbackDataService', () => {
   const feedbackPayload = Object.assign(new Feedback(), {
     email: 'test@email.com',
     message: 'message',
-    page: '/home'
+    page: '/home',
   });
 
 
@@ -35,7 +36,7 @@ describe('FeedbackDataService', () => {
     bundleHALLink.href = bundleLink;
     item = new Item();
     item._links = {
-      bundles: bundleHALLink
+      bundles: bundleHALLink,
     };
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
@@ -48,7 +49,7 @@ describe('FeedbackDataService', () => {
       },
       getObjectBySelfLink: () => {
         /* empty */
-      }
+      },
     } as any;
     store = {} as Store<CoreState>;
     return new FeedbackDataService(
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index 3cc7df7653..a4207ba9fe 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -1,19 +1,26 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Feedback } from './models/feedback.model';
-import { FEEDBACK } from './models/feedback.resource-type';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs';
+
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { dataService } from '../data/base/data-service.decorator';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { Feedback } from './models/feedback.model';
+import { FEEDBACK } from './models/feedback.resource-type';
 
 /**
  * Service for checking and managing the feedback
diff --git a/src/app/core/feedback/feedback.guard.ts b/src/app/core/feedback/feedback.guard.ts
index 63353a60ff..652bb5dfa3 100644
--- a/src/app/core/feedback/feedback.guard.ts
+++ b/src/app/core/feedback/feedback.guard.ts
@@ -1,8 +1,14 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../data/feature-authorization/feature-id';
-import { Injectable } from '@angular/core';
 
 /**
  * An guard for redirecting users to the feedback page if user is authorized
diff --git a/src/app/core/feedback/models/feedback.model.ts b/src/app/core/feedback/models/feedback.model.ts
index fd98affba9..e6718cb265 100644
--- a/src/app/core/feedback/models/feedback.model.ts
+++ b/src/app/core/feedback/models/feedback.model.ts
@@ -1,6 +1,9 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
-import { typedObject } from '../../cache/builders/build-decorators';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
 
+import { typedObject } from '../../cache/builders/build-decorators';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { FEEDBACK } from './feedback.resource-type';
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
index bd9e4f9076..5e2b0670d4 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -1,10 +1,14 @@
-import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';
+
 describe('ForwardClientIpInterceptor', () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
@@ -25,7 +29,7 @@ describe('ForwardClientIpInterceptor', () => {
           useClass: ForwardClientIpInterceptor,
           multi: true,
         },
-        { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } }
+        { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
       ],
     });
 
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 2e2e59fa6b..67427d4ed1 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -1,9 +1,17 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { Observable } from 'rxjs';
 
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 /**
  * Http Interceptor intercepting Http Requests, adding the client's IP to their X-Forwarded-For header
  */
diff --git a/src/app/core/google-recaptcha/google-recaptcha.module.ts b/src/app/core/google-recaptcha/google-recaptcha.module.ts
index 64620a48f4..6451ff3d6a 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.module.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.module.ts
@@ -1,22 +1,22 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { GoogleRecaptchaComponent } from '../../shared/google-recaptcha/google-recaptcha.component';
 
+import { GoogleRecaptchaComponent } from '../../shared/google-recaptcha/google-recaptcha.component';
 import { GoogleRecaptchaService } from './google-recaptcha.service';
 
 const PROVIDERS = [
-  GoogleRecaptchaService
+  GoogleRecaptchaService,
 ];
 
 const COMPONENTS = [
-  GoogleRecaptchaComponent
+  GoogleRecaptchaComponent,
 ];
 
 @NgModule({
   imports: [ CommonModule ],
   providers: [...PROVIDERS],
   declarations: [...COMPONENTS],
-  exports: [...COMPONENTS]
+  exports: [...COMPONENTS],
 })
 
 /**
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
index 545e3b9873..957cc649bf 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
@@ -1,7 +1,8 @@
-import { GoogleRecaptchaService } from './google-recaptcha.service';
 import { of as observableOf } from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { NativeWindowRef } from '../services/window.service';
+import { GoogleRecaptchaService } from './google-recaptcha.service';
 
 describe('GoogleRecaptchaService', () => {
   let service: GoogleRecaptchaService;
@@ -16,23 +17,23 @@ describe('GoogleRecaptchaService', () => {
   const document = { documentElement: { lang: 'en' } } as Document;
   scriptElementMock = {
     set innerHTML(newVal) { /* noop */ },
-    get innerHTML() { return innerHTMLTestValue; }
+    get innerHTML() { return innerHTMLTestValue; },
   };
 
   function init() {
     window = new NativeWindowRef();
     rendererFactory2 = jasmine.createSpyObj('rendererFactory2', {
       createRenderer: observableOf('googleRecaptchaToken'),
-      createElement: scriptElementMock
+      createElement: scriptElementMock,
     });
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: createSuccessfulRemoteDataObject$({ values: ['googleRecaptchaToken'] })
+      findByPropertyName: createSuccessfulRemoteDataObject$({ values: ['googleRecaptchaToken'] }),
     });
     cookieService = jasmine.createSpyObj('cookieService', {
       get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
-      }
+      },
     });
     service = new GoogleRecaptchaService(cookieService, document, window, rendererFactory2, configurationDataService);
   }
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index 72de1bb26c..eb369384fe 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -1,14 +1,32 @@
-import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { isNotEmpty } from '../../shared/empty.util';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  Renderer2,
+  RendererFactory2,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import { ConfigurationDataService } from '../data/configuration-data.service';
 import { RemoteData } from '../data/remote-data';
-import { map, switchMap, take } from 'rxjs/operators';
-import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { CookieService } from '../services/cookie.service';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 export const CAPTCHA_COOKIE = '_GRECAPTCHA';
 export const CAPTCHA_NAME = 'google-recaptcha';
@@ -64,7 +82,7 @@ export class GoogleRecaptchaService {
       getFirstCompletedRemoteData(),
       map((res: RemoteData<ConfigurationProperty>) => {
         return res.hasSucceeded && res.payload && isNotEmpty(res.payload.values) && res.payload.values[0].toLowerCase() === 'true';
-      })
+      }),
     );
     registrationVerification$.subscribe(registrationVerification => {
       if (registrationVerification) {
@@ -125,7 +143,7 @@ export class GoogleRecaptchaService {
    */
   public getRecaptchaToken(action) {
     return this.captchaKey().pipe(
-      switchMap((key) => grecaptcha.execute(key, {action: action}))
+      switchMap((key) => grecaptcha.execute(key, { action: action })),
     );
   }
 
diff --git a/src/app/core/history/history.actions.ts b/src/app/core/history/history.actions.ts
index f49e3984d1..ec67bef02d 100644
--- a/src/app/core/history/history.actions.ts
+++ b/src/app/core/history/history.actions.ts
@@ -5,7 +5,7 @@ import { type } from '../../shared/ngrx/type';
 
 export const HistoryActionTypes = {
   ADD_TO_HISTORY: type('dspace/history/ADD_TO_HISTORY'),
-  GET_HISTORY: type('dspace/history/GET_HISTORY')
+  GET_HISTORY: type('dspace/history/GET_HISTORY'),
 };
 
 
diff --git a/src/app/core/history/history.reducer.ts b/src/app/core/history/history.reducer.ts
index a073a15466..b39bde69bf 100644
--- a/src/app/core/history/history.reducer.ts
+++ b/src/app/core/history/history.reducer.ts
@@ -1,4 +1,8 @@
-import { AddUrlToHistoryAction, HistoryAction, HistoryActionTypes } from './history.actions';
+import {
+  AddUrlToHistoryAction,
+  HistoryAction,
+  HistoryActionTypes,
+} from './history.actions';
 
 /**
  * The auth state.
diff --git a/src/app/core/history/selectors.ts b/src/app/core/history/selectors.ts
index 925b56c795..13c22c5be4 100644
--- a/src/app/core/history/selectors.ts
+++ b/src/app/core/history/selectors.ts
@@ -1,8 +1,9 @@
 import { createSelector } from '@ngrx/store';
+
 import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 
 export const historySelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.history
+  (state: CoreState) => state.history,
 );
diff --git a/src/app/core/index/index.actions.ts b/src/app/core/index/index.actions.ts
index d573174142..fc6bc3494d 100644
--- a/src/app/core/index/index.actions.ts
+++ b/src/app/core/index/index.actions.ts
@@ -10,7 +10,7 @@ import { IndexName } from './index-name.model';
 export const IndexActionTypes = {
   ADD: type('dspace/core/index/ADD'),
   REMOVE_BY_VALUE: type('dspace/core/index/REMOVE_BY_VALUE'),
-  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING')
+  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING'),
 };
 
 /**
diff --git a/src/app/core/index/index.effects.spec.ts b/src/app/core/index/index.effects.spec.ts
index c86860d01c..89b5916f45 100644
--- a/src/app/core/index/index.effects.spec.ts
+++ b/src/app/core/index/index.effects.spec.ts
@@ -1,13 +1,20 @@
-import { Observable } from 'rxjs';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { UUIDIndexEffects } from './index.effects';
-import { cold, hot } from 'jasmine-marbles';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { AddToObjectCacheAction } from '../cache/object-cache.actions';
 import { Item } from '../shared/item.model';
 import { AddToIndexAction } from './index.actions';
-import { provideMockStore } from '@ngrx/store/testing';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
+import { UUIDIndexEffects } from './index.effects';
 import { IndexName } from './index-name.model';
 
 describe('ObjectUpdatesEffects', () => {
@@ -30,8 +37,8 @@ describe('ObjectUpdatesEffects', () => {
       uuid: '3601eaed-8fdb-487f-8b89-4d7647314143',
       _links: {
         self: { href: selfLink },
-        anotherLink: { href: otherLink }
-      }
+        anotherLink: { href: otherLink },
+      },
     };
     timeCompleted = new Date().getDate();
     msToLive = 90000;
@@ -41,10 +48,10 @@ describe('ObjectUpdatesEffects', () => {
       core: {
         index: {
           [IndexName.REQUEST]: {
-            [selfLink]: requestUUID
-          }
-        }
-      }
+            [selfLink]: requestUUID,
+          },
+        },
+      },
     };
   }
 
@@ -70,7 +77,7 @@ describe('ObjectUpdatesEffects', () => {
       const newAction = new AddToIndexAction(
         IndexName.ALTERNATIVE_OBJECT_LINK,
         alternativeLink,
-        objectToCache._links.self.href
+        objectToCache._links.self.href,
       );
       actions = hot('--a-', { a: action });
       const expected = cold('--b-', { b: newAction });
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index 18d639023f..2c3b9ad89b 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -1,30 +1,48 @@
-import { filter, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
+import { hasValue } from '../../shared/empty.util';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import {
   AddToObjectCacheAction,
   ObjectCacheActionTypes,
-  RemoveFromObjectCacheAction
+  RemoveFromObjectCacheAction,
 } from '../cache/object-cache.actions';
+import { CoreState } from '../core-state.model';
 import {
   RequestActionTypes,
   RequestConfigureAction,
-  RequestStaleAction
+  RequestStaleAction,
 } from '../data/request.actions';
-import { AddToIndexAction, RemoveFromIndexByValueAction } from './index.actions';
-import { hasValue } from '../../shared/empty.util';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { getUrlWithoutEmbedParams, uuidFromHrefSelector } from './index.selectors';
-import { Store, select } from '@ngrx/store';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
+import {
+  AddToIndexAction,
+  RemoveFromIndexByValueAction,
+} from './index.actions';
+import {
+  getUrlWithoutEmbedParams,
+  uuidFromHrefSelector,
+} from './index.selectors';
 import { IndexName } from './index-name.model';
-import { CoreState } from '../core-state.model';
 
 @Injectable()
 export class UUIDIndexEffects {
 
-   addObject$ = createEffect(() => this.actions$
+  addObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
       filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache.uuid)),
@@ -32,16 +50,16 @@ export class UUIDIndexEffects {
         return new AddToIndexAction(
           IndexName.OBJECT,
           action.payload.objectToCache.uuid,
-          action.payload.objectToCache._links.self.href
+          action.payload.objectToCache._links.self.href,
         );
-      })
+      }),
     ));
 
   /**
    * Adds an alternative link to an object to the ALTERNATIVE_OBJECT_LINK index
    * When the self link of the objectToCache is not the same as the alternativeLink
    */
-   addAlternativeObjectLink$ = createEffect(() => this.actions$
+  addAlternativeObjectLink$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
       map((action: AddToObjectCacheAction) => {
@@ -51,37 +69,37 @@ export class UUIDIndexEffects {
           return new AddToIndexAction(
             IndexName.ALTERNATIVE_OBJECT_LINK,
             alternativeLink,
-            selfLink
+            selfLink,
           );
         } else {
           return new NoOpAction();
         }
-      })
+      }),
     ));
 
-   removeObject$ = createEffect(() => this.actions$
+  removeObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.REMOVE),
       map((action: RemoveFromObjectCacheAction) => {
         return new RemoveFromIndexByValueAction(
           IndexName.OBJECT,
-          action.payload
+          action.payload,
         );
-      })
+      }),
     ));
 
-   addRequest$ = createEffect(() => this.actions$
+  addRequest$ = createEffect(() => this.actions$
     .pipe(
       ofType(RequestActionTypes.CONFIGURE),
       filter((action: RequestConfigureAction) => action.payload.method === RestRequestMethod.GET),
       switchMap((action: RequestConfigureAction) => {
         const href = getUrlWithoutEmbedParams(action.payload.href);
         return this.store.pipe(
-            select(uuidFromHrefSelector(href)),
-            take(1),
-            map((uuid: string) => [action, uuid])
-          );
-        }
+          select(uuidFromHrefSelector(href)),
+          take(1),
+          map((uuid: string) => [action, uuid]),
+        );
+      },
       ),
       switchMap(([action, uuid]: [RequestConfigureAction, string]) => {
         let actions = [];
@@ -91,10 +109,10 @@ export class UUIDIndexEffects {
         actions = [...actions, new AddToIndexAction(
           IndexName.REQUEST,
           getUrlWithoutEmbedParams(action.payload.href),
-          action.payload.uuid
+          action.payload.uuid,
         )];
         return actions;
-      })
+      }),
     ));
 
   constructor(private actions$: Actions, private store: Store<CoreState>) {
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index 774b9b2742..a5d46a05f6 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -1,12 +1,15 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
-import { indexReducer, MetaIndexState } from './index.reducer';
 import {
   AddToIndexAction,
   RemoveFromIndexBySubstringAction,
-  RemoveFromIndexByValueAction
+  RemoveFromIndexByValueAction,
 } from './index.actions';
+import {
+  indexReducer,
+  MetaIndexState,
+} from './index.reducer';
 import { IndexName } from './index-name.model';
 
 class NullAction extends AddToIndexAction {
@@ -25,12 +28,12 @@ describe('requestReducer', () => {
   const val2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb';
   const testState: MetaIndexState = {
     [IndexName.OBJECT]: {
-      [key1]: val1
+      [key1]: val1,
     }, [IndexName.ALTERNATIVE_OBJECT_LINK]: {
-      [key1]: val1
+      [key1]: val1,
     }, [IndexName.REQUEST]: {
-      [key1]: val1
-    }
+      [key1]: val1,
+    },
   };
   deepFreeze(testState);
 
diff --git a/src/app/core/index/index.reducer.ts b/src/app/core/index/index.reducer.ts
index 21819d67ba..c1f91caf2b 100644
--- a/src/app/core/index/index.reducer.ts
+++ b/src/app/core/index/index.reducer.ts
@@ -1,4 +1,10 @@
-import { AddToIndexAction, IndexAction, IndexActionTypes, RemoveFromIndexBySubstringAction, RemoveFromIndexByValueAction } from './index.actions';
+import {
+  AddToIndexAction,
+  IndexAction,
+  IndexActionTypes,
+  RemoveFromIndexBySubstringAction,
+  RemoveFromIndexByValueAction,
+} from './index.actions';
 import { IndexName } from './index-name.model';
 
 /**
@@ -62,10 +68,10 @@ export function indexReducer(state = initialState, action: IndexAction): MetaInd
 function addToIndex(state: MetaIndexState, action: AddToIndexAction): MetaIndexState {
   const subState = state[action.payload.name];
   const newSubState = Object.assign({}, subState, {
-    [action.payload.key]: action.payload.value
+    [action.payload.key]: action.payload.value,
   });
   const obs = Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
   return obs;
 }
@@ -89,7 +95,7 @@ function removeFromIndexByValue(state: MetaIndexState, action: RemoveFromIndexBy
     }
   }
   return Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
 }
 
@@ -112,6 +118,6 @@ function removeFromIndexBySubstring(state: MetaIndexState, action: RemoveFromInd
     }
   }
   return Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
 }
diff --git a/src/app/core/index/index.selectors.spec.ts b/src/app/core/index/index.selectors.spec.ts
index 91119a283c..bea6290e5a 100644
--- a/src/app/core/index/index.selectors.spec.ts
+++ b/src/app/core/index/index.selectors.spec.ts
@@ -1,4 +1,7 @@
-import { getEmbedSizeParams, getUrlWithoutEmbedParams } from './index.selectors';
+import {
+  getEmbedSizeParams,
+  getUrlWithoutEmbedParams,
+} from './index.selectors';
 
 
 describe(`index selectors`, () => {
@@ -36,15 +39,15 @@ describe(`index selectors`, () => {
       const source = 'https://rest.api/core/communities/search/top?page=0&size=50&sort=dc.title,ASC&embed.size=subcommunities=5&embed=subcommunities';
       const result = getEmbedSizeParams(source);
       expect(result).toHaveSize(1);
-      expect(result[0]).toEqual({name: 'subcommunities', size: 5});
+      expect(result[0]).toEqual({ name: 'subcommunities', size: 5 });
     });
 
     it(`url with multiple embed size param => should return list with {name, size}`, () => {
       const source = 'https://rest.api/core/communities/search/top?page=0&size=50&sort=dc.title,ASC&embed.size=subcommunities=5&embed=subcommunities&embed.size=collections=1&embed=collections';
       const result = getEmbedSizeParams(source);
       expect(result).toHaveSize(2);
-      expect(result[0]).toEqual({name: 'subcommunities', size: 5});
-      expect(result[1]).toEqual({name: 'collections', size: 1});
+      expect(result[0]).toEqual({ name: 'subcommunities', size: 5 });
+      expect(result[1]).toEqual({ name: 'collections', size: 1 });
     });
 
     it(`url without params => should return empty list`, () => {
diff --git a/src/app/core/index/index.selectors.ts b/src/app/core/index/index.selectors.ts
index e6ca04f79b..a9d42baa47 100644
--- a/src/app/core/index/index.selectors.ts
+++ b/src/app/core/index/index.selectors.ts
@@ -1,10 +1,20 @@
-import { createSelector, MemoizedSelector } from '@ngrx/store';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { coreSelector } from '../core.selectors';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { IndexState, MetaIndexState } from './index.reducer';
-import { IndexName } from './index-name.model';
 import { CoreState } from '../core-state.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  IndexState,
+  MetaIndexState,
+} from './index.reducer';
+import { IndexName } from './index-name.model';
 
 /**
  * Return the given url without `embed` params.
@@ -74,7 +84,7 @@ export const getEmbedSizeParams = (url: string): { name: string, size: number }[
  */
 export const metaIndexSelector: MemoizedSelector<CoreState, MetaIndexState> = createSelector(
   coreSelector,
-  (state: CoreState) => state.index
+  (state: CoreState) => state.index,
 );
 
 /**
@@ -86,7 +96,7 @@ export const metaIndexSelector: MemoizedSelector<CoreState, MetaIndexState> = cr
  */
 export const objectIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.OBJECT]
+  (state: MetaIndexState) => state[IndexName.OBJECT],
 );
 
 /**
@@ -97,7 +107,7 @@ export const objectIndexSelector: MemoizedSelector<CoreState, IndexState> = crea
  */
 export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.REQUEST]
+  (state: MetaIndexState) => state[IndexName.REQUEST],
 );
 
 /**
@@ -108,7 +118,7 @@ export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = cre
  */
 export const alternativeLinkIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.ALTERNATIVE_OBJECT_LINK]
+  (state: MetaIndexState) => state[IndexName.ALTERNATIVE_OBJECT_LINK],
 );
 
 /**
@@ -122,7 +132,7 @@ export const alternativeLinkIndexSelector: MemoizedSelector<CoreState, IndexStat
 export const selfLinkFromUuidSelector =
   (uuid: string): MemoizedSelector<CoreState, string> => createSelector(
     objectIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[uuid] : undefined
+    (state: IndexState) => hasValue(state) ? state[uuid] : undefined,
   );
 
 /**
@@ -136,7 +146,7 @@ export const selfLinkFromUuidSelector =
 export const uuidFromHrefSelector =
   (href: string): MemoizedSelector<CoreState, string> => createSelector(
     requestIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[getUrlWithoutEmbedParams(href)] : undefined
+    (state: IndexState) => hasValue(state) ? state[getUrlWithoutEmbedParams(href)] : undefined,
   );
 
 /**
@@ -150,5 +160,5 @@ export const uuidFromHrefSelector =
 export const selfLinkFromAlternativeLinkSelector =
   (altLink: string): MemoizedSelector<CoreState, string> => createSelector(
     alternativeLinkIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[altLink] : undefined
+    (state: IndexState) => hasValue(state) ? state[altLink] : undefined,
   );
diff --git a/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts b/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
index d29bf993cc..73677a3384 100644
--- a/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
+++ b/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
@@ -52,6 +52,6 @@ export class JsonPatchOperationPathCombiner extends URLCombiner {
       path += '/' + fragment;
     }
 
-    return {rootElement: this._rootElement, subRootElement: this._subRootElement, path: path};
+    return { rootElement: this._rootElement, subRootElement: this._subRootElement, path: path };
   }
 }
diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
index f5a584fd3d..b7db765b3b 100644
--- a/src/app/core/json-patch/builder/json-patch-operations-builder.ts
+++ b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -1,18 +1,29 @@
+import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+
 import {
+  dateToISOFormat,
+  dateToString,
+  isNgbDateStruct,
+} from '../../../shared/date.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { CoreState } from '../../core-state.model';
+import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
+import {
+  FlushPatchOperationAction,
   NewPatchAddOperationAction,
   NewPatchMoveOperationAction,
   NewPatchRemoveOperationAction,
-  NewPatchReplaceOperationAction
+  NewPatchReplaceOperationAction,
 } from '../json-patch-operations.actions';
 import { JsonPatchOperationPathObject } from './json-patch-operation-path-combiner';
-import { Injectable } from '@angular/core';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { dateToISOFormat, dateToString, isNgbDateStruct } from '../../../shared/date.util';
-import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
-import { CoreState } from '../../core-state.model';
 
 /**
  * Provides methods to dispatch JsonPatch Operations Actions
@@ -80,8 +91,8 @@ export class JsonPatchOperationsBuilder {
         path.rootElement,
         path.subRootElement,
         prevPath,
-        path.path
-      )
+        path.path,
+      ),
     );
   }
 
@@ -99,6 +110,20 @@ export class JsonPatchOperationsBuilder {
         path.path));
   }
 
+  /**
+   * Dispatches a new FlushPatchOperationAction
+   *
+   * @param path
+   *    a JsonPatchOperationPathObject representing path
+   */
+  flushOperation(path: JsonPatchOperationPathObject) {
+    this.store.dispatch(
+      new FlushPatchOperationAction(
+        path.rootElement,
+        path.subRootElement,
+        path.path));
+  }
+
   protected prepareValue(value: any, plain: boolean, first: boolean) {
     let operationValue: any = null;
     if (hasValue(value)) {
diff --git a/src/app/core/json-patch/json-patch-operations.actions.ts b/src/app/core/json-patch/json-patch-operations.actions.ts
index 6fea7a58fb..81cce174ec 100644
--- a/src/app/core/json-patch/json-patch-operations.actions.ts
+++ b/src/app/core/json-patch/json-patch-operations.actions.ts
@@ -20,6 +20,7 @@ export const JsonPatchOperationsActionTypes = {
   COMMIT_JSON_PATCH_OPERATIONS: type('dspace/core/patch/COMMIT_JSON_PATCH_OPERATIONS'),
   ROLLBACK_JSON_PATCH_OPERATIONS: type('dspace/core/patch/ROLLBACK_JSON_PATCH_OPERATIONS'),
   FLUSH_JSON_PATCH_OPERATIONS: type('dspace/core/patch/FLUSH_JSON_PATCH_OPERATIONS'),
+  FLUSH_JSON_PATCH_OPERATION: type('dspace/core/patch/FLUSH_JSON_PATCH_OPERATION'),
   START_TRANSACTION_JSON_PATCH_OPERATIONS: type('dspace/core/patch/START_TRANSACTION_JSON_PATCH_OPERATIONS'),
   DELETE_PENDING_JSON_PATCH_OPERATIONS: type('dspace/core/patch/DELETE_PENDING_JSON_PATCH_OPERATIONS'),
 };
@@ -120,6 +121,32 @@ export class FlushPatchOperationsAction implements Action {
   }
 }
 
+
+/**
+ * An ngrx action to flush a single operation of the JSON Patch operations
+ */
+export class FlushPatchOperationAction implements Action {
+  type = JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATION;
+  payload: {
+    resourceType: string;
+    resourceId: string;
+    path: string
+  };
+
+  /**
+   * Create a new FlushPatchOperationsAction
+   *
+   * @param resourceType
+   *    the resource's type
+   * @param resourceId
+   *    the resource's ID
+   * @param path
+   *    the path of the operation
+   */
+  constructor(resourceType: string, resourceId: string, path: string) {
+    this.payload = { resourceType, resourceId, path };
+  }
+}
 /**
  * An ngrx action to Add new HTTP/PATCH ADD operations to state
  */
@@ -284,4 +311,5 @@ export type PatchOperationsActions
   | NewPatchReplaceOperationAction
   | RollbacktPatchOperationsAction
   | StartTransactionPatchOperationsAction
-  | DeletePendingJsonPatchOperationsAction;
+  | DeletePendingJsonPatchOperationsAction
+  | FlushPatchOperationAction;
diff --git a/src/app/core/json-patch/json-patch-operations.effects.spec.ts b/src/app/core/json-patch/json-patch-operations.effects.spec.ts
index 8ad238b21d..d43fb0edd1 100644
--- a/src/app/core/json-patch/json-patch-operations.effects.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.spec.ts
@@ -1,15 +1,22 @@
 import { TestBed } from '@angular/core/testing';
-
-import { cold, hot } from 'jasmine-marbles';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Store } from '@ngrx/store';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
+import {
+  FlushPatchOperationsAction,
+  JsonPatchOperationsActionTypes,
+} from './json-patch-operations.actions';
 import { JsonPatchOperationsEffects } from './json-patch-operations.effects';
 import { JsonPatchOperationsState } from './json-patch-operations.reducer';
 
-import { FlushPatchOperationsAction, JsonPatchOperationsActionTypes } from './json-patch-operations.actions';
-
 describe('JsonPatchOperationsEffects test suite', () => {
   let jsonPatchOperationsEffects: JsonPatchOperationsEffects;
   let actions: Observable<any>;
@@ -17,7 +24,7 @@ describe('JsonPatchOperationsEffects test suite', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
   const testJsonPatchResourceType = 'testResourceType';
   const testJsonPatchResourceId = 'testResourceId';
@@ -40,12 +47,12 @@ describe('JsonPatchOperationsEffects test suite', () => {
       actions = hot('--a-', {
         a: {
           type: JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS,
-          payload: { resourceType: testJsonPatchResourceType, resourceId: testJsonPatchResourceId }
-        }
+          payload: { resourceType: testJsonPatchResourceType, resourceId: testJsonPatchResourceId },
+        },
       });
 
       const expected = cold('--b-', {
-        b: new FlushPatchOperationsAction(testJsonPatchResourceType, testJsonPatchResourceId)
+        b: new FlushPatchOperationsAction(testJsonPatchResourceType, testJsonPatchResourceId),
       });
 
       expect(jsonPatchOperationsEffects.commit$).toBeObservable(expected);
diff --git a/src/app/core/json-patch/json-patch-operations.effects.ts b/src/app/core/json-patch/json-patch-operations.effects.ts
index 3acfcba910..49bfabc0c5 100644
--- a/src/app/core/json-patch/json-patch-operations.effects.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.ts
@@ -1,11 +1,15 @@
 import { Injectable } from '@angular/core';
-
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { map } from 'rxjs/operators';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
 
 import {
-  CommitPatchOperationsAction, FlushPatchOperationsAction,
-  JsonPatchOperationsActionTypes
+  CommitPatchOperationsAction,
+  FlushPatchOperationsAction,
+  JsonPatchOperationsActionTypes,
 } from './json-patch-operations.actions';
 
 /**
@@ -17,7 +21,7 @@ export class JsonPatchOperationsEffects {
   /**
    * Dispatches a FlushPatchOperationsAction for every dispatched CommitPatchOperationsAction
    */
-   commit$ = createEffect(() => this.actions$.pipe(
+  commit$ = createEffect(() => this.actions$.pipe(
     ofType(JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
     map((action: CommitPatchOperationsAction) => {
       return new FlushPatchOperationsAction(action.payload.resourceType, action.payload.resourceId);
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 34a68a8801..dba5794ffc 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -2,18 +2,19 @@
 import * as deepFreeze from 'deep-freeze';
 
 import {
-  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
   FlushPatchOperationsAction,
   NewPatchAddOperationAction,
   NewPatchRemoveOperationAction,
   RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
 import {
   JsonPatchOperationsEntry,
   jsonPatchOperationsReducer,
   JsonPatchOperationsResourceEntry,
-  JsonPatchOperationsState
+  JsonPatchOperationsState,
 } from './json-patch-operations.reducer';
 
 class NullAction extends NewPatchAddOperationAction {
@@ -37,7 +38,7 @@ describe('jsonPatchOperationsReducer test suite', () => {
   const patchOpBody = [{
     op: 'add',
     path: '/testResourceType/testResourceId/testField',
-    value: ['test']
+    value: ['test'],
   }];
   const timestampBeforeStart = 1545994811991;
   const timestampAfterStart = 1545994837492;
@@ -51,16 +52,16 @@ describe('jsonPatchOperationsReducer test suite', () => {
               operation: {
                 op: 'add',
                 path: '/testResourceType/testResourceId/testField',
-                value: ['test']
+                value: ['test'],
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
-          ]
-        } as JsonPatchOperationsEntry
+          ],
+        } as JsonPatchOperationsEntry,
       },
       transactionStartTime: null,
-      commitPending: false
-    } as JsonPatchOperationsResourceEntry
+      commitPending: false,
+    } as JsonPatchOperationsResourceEntry,
   };
 
   let initState: JsonPatchOperationsState;
@@ -74,23 +75,23 @@ describe('jsonPatchOperationsReducer test suite', () => {
               operation: {
                 op: 'add',
                 path: '/testResourceType/testResourceId/testField',
-                value: ['test']
+                value: ['test'],
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
             {
               operation: {
                 op: 'remove',
-                path: '/testResourceType/testResourceId/testField'
+                path: '/testResourceType/testResourceId/testField',
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
-          ]
-        } as JsonPatchOperationsEntry
+          ],
+        } as JsonPatchOperationsEntry,
       },
       transactionStartTime: null,
-      commitPending: false
-    } as JsonPatchOperationsResourceEntry
+      commitPending: false,
+    } as JsonPatchOperationsResourceEntry,
   };
   deepFreeze(testState);
 
@@ -159,8 +160,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
@@ -177,8 +178,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
@@ -202,32 +203,32 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceId/testField'
+                    path: '/testResourceType/testResourceId/testField',
                   },
-                  timeCompleted: timestampAfterStart
+                  timeCompleted: timestampAfterStart,
                 },
-              ]
-            } as JsonPatchOperationsEntry
+              ],
+            } as JsonPatchOperationsEntry,
           },
           transactionStartTime: startTimestamp,
-          commitPending: false
-        })
+          commitPending: false,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
       const expectedBody: any = [
         {
           operation: {
             op: 'remove',
-            path: '/testResourceType/testResourceId/testField'
+            path: '/testResourceType/testResourceId/testField',
           },
-          timeCompleted: timestampAfterStart
+          timeCompleted: timestampAfterStart,
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
@@ -245,18 +246,18 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceId/testField'
+                    path: '/testResourceType/testResourceId/testField',
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
-              ]
+              ],
             } as JsonPatchOperationsEntry,
             testResourceAnotherId: {
               body: [
@@ -264,23 +265,23 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceAnotherId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceAnotherId/testField'
+                    path: '/testResourceType/testResourceAnotherId/testField',
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
-              ]
-            } as JsonPatchOperationsEntry
+              ],
+            } as JsonPatchOperationsEntry,
           },
           transactionStartTime: startTimestamp,
-          commitPending: false
-        })
+          commitPending: false,
+        }),
       });
     });
 
@@ -294,16 +295,16 @@ describe('jsonPatchOperationsReducer test suite', () => {
           operation: {
             op: 'add',
             path: '/testResourceType/testResourceAnotherId/testField',
-            value: ['test']
+            value: ['test'],
           },
-          timeCompleted: timestampBeforeStart
+          timeCompleted: timestampBeforeStart,
         },
         {
           operation: {
             op: 'remove',
-            path: '/testResourceType/testResourceAnotherId/testField'
+            path: '/testResourceType/testResourceAnotherId/testField',
           },
-          timeCompleted: timestampBeforeStart
+          timeCompleted: timestampBeforeStart,
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
@@ -330,8 +331,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 5e00027edb..53466d284d 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -1,20 +1,28 @@
-import { hasValue, isNotEmpty, isNotUndefined, isNull } from '../../shared/empty.util';
-
 import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+  isNull,
+} from '../../shared/empty.util';
+import {
+  JsonPatchOperationModel,
+  JsonPatchOperationType,
+} from './json-patch.model';
+import {
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
+  FlushPatchOperationAction,
   FlushPatchOperationsAction,
-  PatchOperationsActions,
   JsonPatchOperationsActionTypes,
   NewPatchAddOperationAction,
   NewPatchCopyOperationAction,
   NewPatchMoveOperationAction,
   NewPatchRemoveOperationAction,
   NewPatchReplaceOperationAction,
-  CommitPatchOperationsAction,
-  StartTransactionPatchOperationsAction,
+  PatchOperationsActions,
   RollbacktPatchOperationsAction,
-  DeletePendingJsonPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
-import { JsonPatchOperationModel, JsonPatchOperationType } from './json-patch.model';
 
 /**
  * An interface to represent JSON-PATCH Operation objects to execute
@@ -71,7 +79,7 @@ export function jsonPatchOperationsReducer(state = initialState, action: PatchOp
     }
 
     case JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATIONS: {
-      return flushOperation(state, action as FlushPatchOperationsAction);
+      return flushOperations(state, action as FlushPatchOperationsAction);
     }
 
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_ADD_OPERATION: {
@@ -106,6 +114,10 @@ export function jsonPatchOperationsReducer(state = initialState, action: PatchOp
       return deletePendingOperations(state, action as DeletePendingJsonPatchOperationsAction);
     }
 
+    case JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATION: {
+      return flushOperation(state, action as FlushPatchOperationAction);
+    }
+
     default: {
       return state;
     }
@@ -128,8 +140,8 @@ function startTransactionPatchOperations(state: JsonPatchOperationsState, action
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         transactionStartTime: action.payload.startTime,
-        commitPending: true
-      })
+        commitPending: true,
+      }),
     });
   } else {
     return state;
@@ -151,8 +163,8 @@ function commitOperations(state: JsonPatchOperationsState, action: CommitPatchOp
     && state[ action.payload.resourceType ].commitPending) {
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   } else {
     return state;
@@ -175,8 +187,8 @@ function rollbackOperations(state: JsonPatchOperationsState, action: RollbacktPa
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         transactionStartTime: null,
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   } else {
     return state;
@@ -197,6 +209,39 @@ function deletePendingOperations(state: JsonPatchOperationsState, action: Delete
   return null;
 }
 
+/**
+ * Flush one operation from JsonPatchOperationsState.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an FlushPatchOperationsAction
+ * @return JsonPatchOperationsState
+ *    the new state.
+ */
+function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOperationAction): JsonPatchOperationsState {
+  const payload = action.payload;
+  if (state[payload.resourceType] && state[payload.resourceType].children) {
+    const body = state[payload.resourceType].children[payload.resourceId].body;
+    const operation = body.filter(operations => operations.operation.path === payload.path)[0];
+    const operationIndex = body.indexOf(operation);
+    const newBody = [...body];
+    newBody.splice(operationIndex, 1);
+
+    return Object.assign({}, state, {
+      [action.payload.resourceType]: Object.assign({}, {
+        children: {
+          [action.payload.resourceId]: {
+            body: newBody,
+          },
+        },
+      }),
+    });
+  } else {
+    return state;
+  }
+}
+
 /**
  * Add new JSON patch operation list.
  *
@@ -225,10 +270,10 @@ function newOperation(state: JsonPatchOperationsState, action): JsonPatchOperati
         children: Object.assign({}, state[ action.payload.resourceType ].children, {
           [action.payload.resourceId]: {
             body: newBody,
-          }
+          },
         }),
-        commitPending: isNotUndefined(state[ action.payload.resourceType ].commitPending) ? state[ action.payload.resourceType ].commitPending : false
-      })
+        commitPending: isNotUndefined(state[ action.payload.resourceType ].commitPending) ? state[ action.payload.resourceType ].commitPending : false,
+      }),
     });
   } else {
     return Object.assign({}, state, {
@@ -236,11 +281,11 @@ function newOperation(state: JsonPatchOperationsState, action): JsonPatchOperati
         children: {
           [action.payload.resourceId]: {
             body: newBody,
-          }
+          },
         },
         transactionStartTime: null,
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   }
 }
@@ -273,7 +318,7 @@ function hasValidBody(state: JsonPatchOperationsState, resourceType: any, resour
  * @return SubmissionObjectState
  *    the new state, with the section new validity status.
  */
-function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOperationsAction): JsonPatchOperationsState {
+function flushOperations(state: JsonPatchOperationsState, action: FlushPatchOperationsAction): JsonPatchOperationsState {
   if (hasValue(state[ action.payload.resourceType ])) {
     let newChildren;
     if (isNotUndefined(action.payload.resourceId)) {
@@ -283,8 +328,8 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
         newChildren = Object.assign({}, state[ action.payload.resourceType ].children, {
           [action.payload.resourceId]: {
             body: state[ action.payload.resourceType ].children[ action.payload.resourceId ].body
-              .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
-          }
+              .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime),
+          },
         });
       } else {
         newChildren = state[ action.payload.resourceType ].children;
@@ -297,8 +342,8 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
           newChildren = Object.assign({}, newChildren, {
             [resourceId]: {
               body: newChildren[ resourceId ].body
-                .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
-            }
+                .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime),
+            },
           });
         });
     }
@@ -306,7 +351,7 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         children: newChildren,
         transactionStartTime: null,
-      })
+      }),
     });
   } else {
     return state;
@@ -334,14 +379,14 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
       newBody.push(makeOperationEntry({
         op: JsonPatchOperationType.add,
         path: targetPath,
-        value: value
+        value: value,
       }));
       break;
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_REPLACE_OPERATION:
       newBody.push(makeOperationEntry({
         op: JsonPatchOperationType.replace,
         path: targetPath,
-        value: value
+        value: value,
       }));
       break;
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_REMOVE_OPERATION:
@@ -351,7 +396,28 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
       newBody.push(makeOperationEntry({ op: JsonPatchOperationType.move, from: fromPath, path: targetPath }));
       break;
   }
-  return newBody;
+  return dedupeOperationEntries(newBody);
+}
+
+/**
+ * Dedupe operation entries by op and path. This prevents processing unnecessary patches in a single PATCH request.
+ *
+ * @param body JSON patch operation object entries
+ * @returns deduped JSON patch operation object entries
+ */
+function dedupeOperationEntries(body: JsonPatchOperationObject[]): JsonPatchOperationObject[] {
+  const ops = new Map<string, any>();
+  for (let i = body.length - 1; i >= 0; i--) {
+    const patch = body[i].operation;
+    const key = `${patch.op}-${patch.path}`;
+    if (!ops.has(key)) {
+      ops.set(key, patch);
+    } else {
+      body.splice(i, 1);
+    }
+  }
+
+  return body;
 }
 
 function makeOperationEntry(operation) {
diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 10fc2f2ed8..e1c6e79d10 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -1,29 +1,38 @@
-import { getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import { Store } from '@ngrx/store';
+import { deepClone } from 'fast-json-patch';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
+import { TestScheduler } from 'rxjs/testing';
 
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { RequestService } from '../data/request.service';
-import { SubmissionPatchRequest } from '../data/request.models';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { JsonPatchOperationsService } from './json-patch-operations.service';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
+import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { JsonPatchOperationsEntry, JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 import {
   CommitPatchOperationsAction,
   DeletePendingJsonPatchOperationsAction,
   RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { deepClone } from 'fast-json-patch';
-import { CoreState } from '../core-state.model';
-import { RequestEntry } from '../data/request-entry.model';
+import {
+  JsonPatchOperationsEntry,
+  JsonPatchOperationsResourceEntry,
+} from './json-patch-operations.reducer';
+import { JsonPatchOperationsService } from './json-patch-operations.service';
 
 
 class TestService extends JsonPatchOperationsService<SubmitDataResponseDefinitionObject, SubmissionPatchRequest> {
@@ -60,17 +69,17 @@ describe('JsonPatchOperationsService test suite', () => {
                 operation: {
                   op: 'add',
                   path: '/testResourceType/testResourceId/testField',
-                  value: ['test']
+                  value: ['test'],
                 },
-                timeCompleted: timestamp
+                timeCompleted: timestamp,
               },
-            ]
-          } as JsonPatchOperationsEntry
+            ],
+          } as JsonPatchOperationsEntry,
         },
         transactionStartTime: null,
-        commitPending: false
-      } as JsonPatchOperationsResourceEntry
-    }
+        commitPending: false,
+      } as JsonPatchOperationsResourceEntry,
+    },
   };
   const resourceEndpointURL = 'https://rest.api/endpoint';
   const resourceEndpoint = 'resource';
@@ -82,12 +91,12 @@ describe('JsonPatchOperationsService test suite', () => {
   const patchOpBody = [{
     op: 'add',
     path: '/testResourceType/testResourceId/testField',
-    value: ['test']
+    value: ['test'],
   }];
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, timeCompleted: timestampResponse } as any
+      response: { isSuccessful: successful, timeCompleted: timestampResponse } as any,
     } as RequestEntry);
   };
 
@@ -96,7 +105,7 @@ describe('JsonPatchOperationsService test suite', () => {
       requestService,
       store,
       halService,
-      rdbService
+      rdbService,
     );
 
   }
@@ -105,19 +114,19 @@ describe('JsonPatchOperationsService test suite', () => {
     return jasmine.createSpyObj('store', {
       dispatch: {},
       select: observableOf(mockState['json/patch'][testJsonPatchResourceType]),
-      pipe: observableOf(true)
+      pipe: observableOf(true),
     });
   }
 
   function spyOnRdbServiceAndReturnSuccessfulRemoteData() {
     spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
-      observableOf(Object.assign(createSuccessfulRemoteDataObject({ dataDefinition: 'test' }), { timeCompleted: new Date().getTime() + 10000 }))
+      observableOf(Object.assign(createSuccessfulRemoteDataObject({ dataDefinition: 'test' }), { timeCompleted: new Date().getTime() + 10000 })),
     );
   }
 
   function spyOnRdbServiceAndReturnFailedRemoteData() {
     spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
-      observableOf(Object.assign(createFailedRemoteDataObject('Error', 500), { timeCompleted: new Date().getTime() + 10000 }))
+      observableOf(Object.assign(createFailedRemoteDataObject('Error', 500), { timeCompleted: new Date().getTime() + 10000 })),
     );
   }
 
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index 1dfbd404cc..552a4354fd 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -1,23 +1,42 @@
-import { merge as observableMerge, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, partition, take, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import {
+  merge as observableMerge,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  partition,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core-state.model';
+import { RemoteData } from '../data/remote-data';
 import { PatchRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { jsonPatchOperationsByResourceType } from './selectors';
-import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
-import {
-  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
-  RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
-} from './json-patch-operations.actions';
-import { JsonPatchOperationModel } from './json-patch.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RemoteData } from '../data/remote-data';
-import { CoreState } from '../core-state.model';
+import { JsonPatchOperationModel } from './json-patch.model';
+import {
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
+  RollbacktPatchOperationsAction,
+  StartTransactionPatchOperationsAction,
+} from './json-patch-operations.actions';
+import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
+import { jsonPatchOperationsByResourceType } from './selectors';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -99,9 +118,9 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
                 return rd.payload.dataDefinition;
               }
             }),
-            distinctUntilChanged()
-        );
-        }))
+            distinctUntilChanged(),
+          );
+        })),
     );
   }
 
diff --git a/src/app/core/json-patch/selectors.ts b/src/app/core/json-patch/selectors.ts
index 20eb853891..7f6aaa3d98 100644
--- a/src/app/core/json-patch/selectors.ts
+++ b/src/app/core/json-patch/selectors.ts
@@ -1,8 +1,15 @@
 import { MemoizedSelector } from '@ngrx/store';
+
+import {
+  keySelector,
+  subStateSelector,
+} from '../../submission/selectors';
 import { coreSelector } from '../core.selectors';
-import { JsonPatchOperationsEntry, JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
-import { keySelector, subStateSelector } from '../../submission/selectors';
 import { CoreState } from '../core-state.model';
+import {
+  JsonPatchOperationsEntry,
+  JsonPatchOperationsResourceEntry,
+} from './json-patch-operations.reducer';
 
 /**
  * Return MemoizedSelector to select all jsonPatchOperations for a specified resource type, stored in the state
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
index e96126d19c..4725820a6b 100644
--- a/src/app/core/locale/locale.interceptor.spec.ts
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -1,13 +1,16 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
-
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { LocaleService } from './locale.service';
-import { LocaleInterceptor } from './locale.interceptor';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { LocaleInterceptor } from './locale.interceptor';
+import { LocaleService } from './locale.service';
+
 describe(`LocaleInterceptor`, () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
@@ -17,7 +20,7 @@ describe(`LocaleInterceptor`, () => {
 
   const mockLocaleService = jasmine.createSpyObj('LocaleService', {
     getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
-    getLanguageCodeList: of(languageList)
+    getLanguageCodeList: of(languageList),
   });
 
   beforeEach(() => {
diff --git a/src/app/core/locale/locale.interceptor.ts b/src/app/core/locale/locale.interceptor.ts
index 035dad35c9..6dfa19485d 100644
--- a/src/app/core/locale/locale.interceptor.ts
+++ b/src/app/core/locale/locale.interceptor.ts
@@ -1,10 +1,17 @@
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-
 import { Observable } from 'rxjs';
+import {
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
 import { LocaleService } from './locale.service';
-import { mergeMap, scan } from 'rxjs/operators';
 
 @Injectable()
 export class LocaleInterceptor implements HttpInterceptor {
@@ -26,7 +33,7 @@ export class LocaleInterceptor implements HttpInterceptor {
           // Clone the request to add the new header.
           newReq = req.clone({
             headers: req.headers
-              .set('Accept-Language', languages.toString())
+              .set('Accept-Language', languages.toString()),
           });
           // Pass on the new request instead of the original request.
           return next.handle(newReq);
diff --git a/src/app/core/locale/locale.service.spec.ts b/src/app/core/locale/locale.service.spec.ts
index 39356fdf97..d7f681056c 100644
--- a/src/app/core/locale/locale.service.spec.ts
+++ b/src/app/core/locale/locale.service.spec.ts
@@ -1,15 +1,25 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-
-import { CookieService } from '../services/cookie.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { LANG_COOKIE, LANG_ORIGIN, LocaleService } from './locale.service';
-import { AuthService } from '../auth/auth.service';
-import { NativeWindowRef } from '../services/window.service';
-import { RouteService } from '../services/route.service';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import { NativeWindowRef } from '../services/window.service';
+import {
+  LANG_COOKIE,
+  LANG_ORIGIN,
+  LocaleService,
+} from './locale.service';
 
 describe('LocaleService test suite', () => {
   let service: LocaleService;
@@ -25,7 +35,7 @@ describe('LocaleService test suite', () => {
 
   authService = jasmine.createSpyObj('AuthService', {
     isAuthenticated: jasmine.createSpy('isAuthenticated'),
-    isAuthenticationLoaded: jasmine.createSpy('isAuthenticationLoaded')
+    isAuthenticationLoaded: jasmine.createSpy('isAuthenticationLoaded'),
   });
 
   const langList = ['en', 'xx', 'de'];
@@ -36,8 +46,8 @@ describe('LocaleService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       providers: [
@@ -45,7 +55,7 @@ describe('LocaleService test suite', () => {
         { provide: AuthService, userValue: authService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Document, useValue: document },
-      ]
+      ],
     });
   }));
 
diff --git a/src/app/core/locale/locale.service.ts b/src/app/core/locale/locale.service.ts
index 5c080d8c16..0c54ce8412 100644
--- a/src/app/core/locale/locale.service.ts
+++ b/src/app/core/locale/locale.service.ts
@@ -1,17 +1,33 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { TranslateService } from '@ngx-translate/core';
-
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { CookieService } from '../services/cookie.service';
-import { environment } from '../../../environments/environment';
-import { AuthService } from '../auth/auth.service';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { RouteService } from '../services/route.service';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
 import { LangConfig } from '../../../config/lang-config.interface';
+import { environment } from '../../../environments/environment';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
 
 export const LANG_COOKIE = 'dsLanguage';
 
@@ -41,7 +57,7 @@ export class LocaleService {
     protected translate: TranslateService,
     protected authService: AuthService,
     protected routeService: RouteService,
-    @Inject(DOCUMENT) protected document: any
+    @Inject(DOCUMENT) protected document: any,
   ) {
   }
 
@@ -72,7 +88,7 @@ export class LocaleService {
   getLanguageCodeList(): Observable<string[]> {
     const obs$ = combineLatest([
       this.authService.isAuthenticated(),
-      this.authService.isAuthenticationLoaded()
+      this.authService.isAuthenticationLoaded(),
     ]);
 
     return obs$.pipe(
@@ -80,7 +96,7 @@ export class LocaleService {
       mergeMap(([isAuthenticated, isLoaded]) => {
         // TODO to enabled again when https://github.com/DSpace/dspace-angular/issues/739 will be resolved
         const epersonLang$: Observable<string[]> = observableOf([]);
-/*        if (isAuthenticated && isLoaded) {
+        /*        if (isAuthenticated && isLoaded) {
           epersonLang$ = this.authService.getAuthenticatedUserFromStore().pipe(
             take(1),
             map((eperson) => {
@@ -112,13 +128,13 @@ export class LocaleService {
               languages.push(...this.setQuality(
                 Object.assign([], navigator.languages),
                 LANG_ORIGIN.BROWSER,
-                !isEmpty(this.translate.currentLang))
+                !isEmpty(this.translate.currentLang)),
               );
             }
             return languages;
-          })
+          }),
         );
-      })
+      }),
     );
   }
 
@@ -176,11 +192,11 @@ export class LocaleService {
         divisor = 1;
     }
     languages.forEach( (lang) => {
-        let value = lang + ';q=';
-        let quality = (v - idx++) / v;
-        quality = ((languages.length > 10) ? quality.toFixed(2) : quality) as number;
-        value += quality / divisor;
-        langWithPrior.push(value);
+      let value = lang + ';q=';
+      let quality = (v - idx++) / v;
+      quality = ((languages.length > 10) ? quality.toFixed(2) : quality) as number;
+      value += quality / divisor;
+      langWithPrior.push(value);
     });
     return langWithPrior;
   }
diff --git a/src/app/core/locale/server-locale.service.ts b/src/app/core/locale/server-locale.service.ts
index 556619b946..1c636a92e4 100644
--- a/src/app/core/locale/server-locale.service.ts
+++ b/src/app/core/locale/server-locale.service.ts
@@ -1,15 +1,37 @@
-import { LANG_ORIGIN, LocaleService } from './locale.service';
-import { Inject, Injectable } from '@angular/core';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { REQUEST } from '@nguniversal/express-engine/tokens';
-import { CookieService } from '../services/cookie.service';
-import { TranslateService } from '@ngx-translate/core';
-import { AuthService } from '../auth/auth.service';
-import { RouteService } from '../services/route.service';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  LANG_ORIGIN,
+  LocaleService,
+} from './locale.service';
 
 @Injectable()
 export class ServerLocaleService extends LocaleService {
@@ -21,7 +43,7 @@ export class ServerLocaleService extends LocaleService {
     protected translate: TranslateService,
     protected authService: AuthService,
     protected routeService: RouteService,
-    @Inject(DOCUMENT) protected document: any
+    @Inject(DOCUMENT) protected document: any,
   ) {
     super(_window, cookie, translate, authService, routeService, document);
   }
@@ -34,7 +56,7 @@ export class ServerLocaleService extends LocaleService {
   getLanguageCodeList(): Observable<string[]> {
     const obs$ = combineLatest([
       this.authService.isAuthenticated(),
-      this.authService.isAuthenticationLoaded()
+      this.authService.isAuthenticationLoaded(),
     ]);
 
     return obs$.pipe(
@@ -54,7 +76,7 @@ export class ServerLocaleService extends LocaleService {
                   !isEmpty(this.translate.currentLang)));
               }
               return languages;
-            })
+            }),
           );
         }
         return epersonLang$.pipe(
@@ -70,13 +92,13 @@ export class ServerLocaleService extends LocaleService {
               languages.push(...epersonLang);
             }
             if (hasValue(this.req.headers['accept-language'])) {
-              languages.push(...this.req.headers['accept-language'].split(',')
+              languages.push(...this.req.headers['accept-language'].split(','),
               );
             }
             return languages;
-          })
+          }),
         );
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
index cae9c32202..7a3c11fccc 100644
--- a/src/app/core/log/log.interceptor.spec.ts
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -1,18 +1,24 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
+import { StoreModule } from '@ngrx/store';
 
-import { LogInterceptor } from './log.interceptor';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { CookieService } from '../services/cookie.service';
+import {
+  appReducers,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { RouterStub } from '../../shared/testing/router.stub';
-import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { CookieService } from '../services/cookie.service';
 import { UUIDService } from '../shared/uuid.service';
-import { StoreModule } from '@ngrx/store';
-import { appReducers, storeModuleConfig } from '../../app.reducer';
+import { LogInterceptor } from './log.interceptor';
 
 
 describe('LogInterceptor', () => {
@@ -20,12 +26,12 @@ describe('LogInterceptor', () => {
   let httpMock: HttpTestingController;
   let cookieService: CookieService;
   let correlationIdService: CorrelationIdService;
-  const router = Object.assign(new RouterStub(),{url : '/statistics'});
+  const router = Object.assign(new RouterStub(),{ url : '/statistics' });
 
   // Mock payload/statuses are dummy content as we are not testing the results
   // of any below requests. We are only testing for X-XSRF-TOKEN header.
   const mockPayload = {
-    id: 1
+    id: 1,
   };
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index aff1a24963..bda408278f 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -1,10 +1,15 @@
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Router } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { hasValue } from '../../shared/empty.util';
+
 import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Log Interceptor intercepting Http Requests & Responses to
diff --git a/src/app/core/metadata/meta-tag.actions.ts b/src/app/core/metadata/meta-tag.actions.ts
index 5a1ff8fd3d..74f5c9932a 100644
--- a/src/app/core/metadata/meta-tag.actions.ts
+++ b/src/app/core/metadata/meta-tag.actions.ts
@@ -1,10 +1,11 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../../shared/ngrx/type';
+
 export const MetaTagTypes = {
   ADD: type('dspace/meta-tag/ADD'),
-  CLEAR: type('dspace/meta-tag/CLEAR')
+  CLEAR: type('dspace/meta-tag/CLEAR'),
 };
 
 export class AddMetaTagAction implements Action {
diff --git a/src/app/core/metadata/meta-tag.reducer.spec.ts b/src/app/core/metadata/meta-tag.reducer.spec.ts
index 1fcd7d83e3..16880751ce 100644
--- a/src/app/core/metadata/meta-tag.reducer.spec.ts
+++ b/src/app/core/metadata/meta-tag.reducer.spec.ts
@@ -6,8 +6,11 @@
  * http://www.dspace.org/license/
  */
 
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
 import { metaTagReducer } from './meta-tag.reducer';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 
 const nullAction = { type: null };
 
diff --git a/src/app/core/metadata/meta-tag.reducer.ts b/src/app/core/metadata/meta-tag.reducer.ts
index 0af6fb0aab..5b541cabca 100644
--- a/src/app/core/metadata/meta-tag.reducer.ts
+++ b/src/app/core/metadata/meta-tag.reducer.ts
@@ -1,8 +1,8 @@
 import {
-  MetaTagAction,
-  MetaTagTypes,
   AddMetaTagAction,
   ClearMetaTagAction,
+  MetaTagAction,
+  MetaTagTypes,
 } from './meta-tag.actions';
 
 export interface MetaTagState {
@@ -10,7 +10,7 @@ export interface MetaTagState {
 }
 
 const initialstate: MetaTagState = {
-  tagsInUse: []
+  tagsInUse: [],
 };
 
 export const metaTagReducer = (state: MetaTagState = initialstate, action: MetaTagAction): MetaTagState => {
@@ -29,7 +29,7 @@ export const metaTagReducer = (state: MetaTagState = initialstate, action: MetaT
 
 const addMetaTag = (state: MetaTagState, action: AddMetaTagAction): MetaTagState => {
   return {
-    tagsInUse: [...state.tagsInUse, action.payload]
+    tagsInUse: [...state.tagsInUse, action.payload],
   };
 };
 
diff --git a/src/app/core/metadata/metadata-field.model.ts b/src/app/core/metadata/metadata-field.model.ts
index e9fd0fd1cf..1084b4009f 100644
--- a/src/app/core/metadata/metadata-field.model.ts
+++ b/src/app/core/metadata/metadata-field.model.ts
@@ -1,7 +1,16 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
 import { isNotEmpty } from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
@@ -9,8 +18,6 @@ import { ResourceType } from '../shared/resource-type';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { METADATA_FIELD } from './metadata-field.resource-type';
 import { MetadataSchema } from './metadata-schema.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
 import { METADATA_SCHEMA } from './metadata-schema.resource-type';
 
 /**
@@ -25,37 +32,37 @@ export class MetadataField extends ListableObject implements HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this metadata field
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The element of this metadata field
    */
   @autoserialize
-  element: string;
+    element: string;
 
   /**
    * The qualifier of this metadata field
    */
   @autoserialize
-  qualifier: string;
+    qualifier: string;
 
   /**
    * The scope note of this metadata field
    */
   @autoserialize
-  scopeNote: string;
+    scopeNote: string;
 
   /**
    * The {@link HALLink}s for this MetadataField
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     schema: HALLink
   };
@@ -65,7 +72,7 @@ export class MetadataField extends ListableObject implements HALResource {
    * Will be undefined unless the schema {@link HALLink} has been resolved.
    */
   @link(METADATA_SCHEMA)
-  schema?: Observable<RemoteData<MetadataSchema>>;
+    schema?: Observable<RemoteData<MetadataSchema>>;
 
   /**
    * Method to print this metadata field as a string without the schema
diff --git a/src/app/core/metadata/metadata-schema.model.ts b/src/app/core/metadata/metadata-schema.model.ts
index 252113b3e4..85faf5d2ce 100644
--- a/src/app/core/metadata/metadata-schema.model.ts
+++ b/src/app/core/metadata/metadata-schema.model.ts
@@ -1,4 +1,8 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
 import { GenericConstructor } from '../shared/generic-constructor';
@@ -19,29 +23,29 @@ export class MetadataSchema extends ListableObject implements HALResource {
    * The unique identifier for this metadata schema
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * A unique prefix that defines this schema
    */
   @autoserialize
-  prefix: string;
+    prefix: string;
 
   /**
    * The namespace of this metadata schema
    */
   @autoserialize
-  namespace: string;
+    namespace: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 553b437d71..b48da35a8e 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -1,35 +1,51 @@
-import { fakeAsync, tick } from '@angular/core/testing';
-import { Meta, Title } from '@angular/platform-browser';
-import { NavigationEnd, Router } from '@angular/router';
-
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import {
+  Meta,
+  Title,
+} from '@angular/platform-browser';
+import {
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import { getMockStore } from '@ngrx/store/testing';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, of } from 'rxjs';
-
-import { RemoteData } from '../data/remote-data';
-import { Item } from '../shared/item.model';
+import {
+  Observable,
+  of as observableOf,
+  of,
+} from 'rxjs';
 
+import { AppConfig } from '../../../config/app-config.interface';
 import {
   ItemMock,
   MockBitstream1,
+  MockBitstream2,
   MockBitstream3,
-  MockBitstream2
 } from '../../shared/mocks/item.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginatedList } from '../data/paginated-list.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { MetadataValue } from '../shared/metadata.models';
-
-import { MetadataService } from './metadata.service';
-import { RootDataService } from '../data/root-data.service';
-import { Bundle } from '../shared/bundle.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
-import { HardRedirectService } from '../services/hard-redirect.service';
-import { getMockStore } from '@ngrx/store/testing';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
-import { AppConfig } from '../../../config/app-config.interface';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RootDataService } from '../data/root-data.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { Item } from '../shared/item.model';
+import { MetadataValue } from '../shared/metadata.models';
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
+import { MetadataService } from './metadata.service';
 
 describe('MetadataService', () => {
   let metadataService: MetadataService;
@@ -52,42 +68,42 @@ describe('MetadataService', () => {
 
   let appConfig: AppConfig;
 
-  const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] }}};
+  const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] } } };
 
 
   beforeEach(() => {
     rootService = jasmine.createSpyObj({
-      findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' })
+      findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' }),
     });
     bitstreamDataService = jasmine.createSpyObj({
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([MockBitstream3])),
     });
     bundleDataService = jasmine.createSpyObj({
-      findByItemAndName: mockBundleRD$([MockBitstream3])
+      findByItemAndName: mockBundleRD$([MockBitstream3]),
     });
     translateService = getMockTranslateService();
     meta = jasmine.createSpyObj('meta', {
       addTag: {},
-      removeTag: {}
+      removeTag: {},
     });
     title = jasmine.createSpyObj({
-      setTitle: {}
+      setTitle: {},
     });
     dsoNameService = jasmine.createSpyObj({
-      getName: ItemMock.firstMetadataValue('dc.title')
+      getName: ItemMock.firstMetadataValue('dc.title'),
     });
     router = {
       url: '/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
       events: of(new NavigationEnd(1, '', '')),
       routerState: {
-        root: {}
-      }
+        root: {},
+      },
     } as any as Router;
     hardRedirectService = jasmine.createSpyObj( {
       getCurrentOrigin: 'https://request.org',
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     // @ts-ignore
@@ -97,9 +113,9 @@ describe('MetadataService', () => {
     appConfig = {
       item: {
         bitstream: {
-          pageSize: 5
-        }
-      }
+          pageSize: 5,
+        },
+      },
     } as any;
 
     metadataService = new MetadataService(
@@ -115,7 +131,7 @@ describe('MetadataService', () => {
       store,
       hardRedirectService,
       appConfig,
-      authorizationService
+      authorizationService,
     );
   });
 
@@ -124,25 +140,25 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(ItemMock),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('Test PowerPoint Document');
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_title',
-      content: 'Test PowerPoint Document'
+      content: 'Test PowerPoint Document',
     });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, Jane' });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_publication_date',
-      content: '1650-06-26'
+      content: '1650-06-26',
     });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_issn', content: '123456789' });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_language', content: 'en' });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_keywords',
-      content: 'keyword1; keyword2; keyword3'
+      content: 'keyword1; keyword2; keyword3',
     });
   }));
 
@@ -151,17 +167,17 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_dissertation_name',
-      content: 'Test PowerPoint Document'
+      content: 'Test PowerPoint Document',
     });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_pdf_url',
-      content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+      content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
     });
   }));
 
@@ -170,13 +186,13 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_technical_report_institution',
-      content: 'Mock Publisher'
+      content: 'Mock Publisher',
     });
   }));
 
@@ -187,8 +203,8 @@ describe('MetadataService', () => {
         value: {
           dso: createSuccessfulRemoteDataObject(ItemMock),
           title: 'route.title.key',
-        }
-      }
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledTimes(2);
@@ -202,19 +218,19 @@ describe('MetadataService', () => {
       data: {
         value: {
           title: 'Dummy Title',
-          description: 'This is a dummy item component for testing!'
-        }
-      }
+          description: 'This is a dummy item component for testing!',
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('DSpace :: Dummy Title');
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'title',
-      content: 'DSpace :: Dummy Title'
+      content: 'DSpace :: Dummy Title',
     });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'description',
-      content: 'This is a dummy item component for testing!'
+      content: 'This is a dummy item component for testing!',
     });
   }));
 
@@ -231,7 +247,7 @@ describe('MetadataService', () => {
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'Generator',
-        content: 'mock-dspace-version'
+        content: 'mock-dspace-version',
       });
     }));
   });
@@ -242,13 +258,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockUri(ItemMock, 'https://ddg.gg')),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_abstract_html_url',
-        content: 'https://ddg.gg'
+        content: 'https://ddg.gg',
       });
     }));
 
@@ -257,13 +273,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockUri(ItemMock)),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_abstract_html_url',
-        content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
+        content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
       });
     }));
   });
@@ -274,13 +290,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_dissertation_institution',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_technical_report_institution' }));
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
@@ -291,14 +307,14 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_dissertation_institution' }));
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_technical_report_institution',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
     }));
@@ -308,15 +324,15 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Some Other Type'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_dissertation_institution' }));
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_technical_report_institution' }));
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_publisher',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
     }));
   });
@@ -329,13 +345,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(ItemMock),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_pdf_url',
-        content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+        content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
       });
     }));
 
@@ -348,8 +364,8 @@ describe('MetadataService', () => {
           data: {
             value: {
               dso: createSuccessfulRemoteDataObject(ItemMock),
-            }
-          }
+            },
+          },
         });
         tick();
         expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_pdf_url' }));
@@ -365,13 +381,13 @@ describe('MetadataService', () => {
           data: {
             value: {
               dso: createSuccessfulRemoteDataObject(ItemMock),
-            }
-          }
+            },
+          },
         });
         tick();
         expect(meta.addTag).toHaveBeenCalledWith({
           name: 'citation_pdf_url',
-          content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+          content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
         });
       }));
 
@@ -391,13 +407,13 @@ describe('MetadataService', () => {
             data: {
               value: {
                 dso: createSuccessfulRemoteDataObject(ItemMock),
-              }
-            }
+              },
+            },
           });
           tick();
           expect(meta.addTag).toHaveBeenCalledWith({
             name: 'citation_pdf_url',
-            content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'
+            content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download',
           });
         }));
 
@@ -422,13 +438,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(ItemMock),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).not.toHaveBeenCalledWith({
         name: 'citation_pdf_url',
-        content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'
+        content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download',
       });
     }));
 
@@ -441,8 +457,8 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(ItemMock),
-          }
-        }
+          },
+        },
       });
       tick();
     }));
@@ -470,8 +486,8 @@ describe('MetadataService', () => {
     publishedMockItem.metadata['dc.publisher'] = [
       {
         language: 'en_US',
-        value: 'Mock Publisher'
-      }
+        value: 'Mock Publisher',
+      },
     ] as MetadataValue[];
     return publishedMockItem;
   };
@@ -488,7 +504,7 @@ describe('MetadataService', () => {
         name: 'ORIGINAL',
         bitstreams: createSuccessfulRemoteDataObject$(mockBitstreamPages$(bitstreams)[0]),
         primaryBitstream: createSuccessfulRemoteDataObject$(primary),
-      })
+      }),
     );
   };
 
@@ -498,8 +514,8 @@ describe('MetadataService', () => {
         totalElements: bitstreams.length,       // announce multiple elements/pages
       },
       _links: index < bitstreams.length - 1
-        ? { next: { href: 'not empty' }}        // fake link to the next bitstream page
-        : { next: { href: undefined }},         // last page has no link
+        ? { next: { href: 'not empty' } }        // fake link to the next bitstream page
+        : { next: { href: undefined } },         // last page has no link
     }));
   };
 });
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 204c925e6b..7c99d917f0 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -1,57 +1,84 @@
-import { Injectable, Inject } from '@angular/core';
-
-import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Meta,
+  MetaDefinition,
+  Title,
+} from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-
 import {
   BehaviorSubject,
   combineLatest,
+  concat as observableConcat,
+  EMPTY,
   Observable,
   of as observableOf,
-  concat as observableConcat,
-  EMPTY
 } from 'rxjs';
-import { filter, map, switchMap, take, mergeMap } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { getBitstreamDownloadRoute } from '../../app-routing-paths';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
-
+import { BundleDataService } from '../data/bundle-data.service';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { RootDataService } from '../data/root-data.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
 import { Bitstream } from '../shared/bitstream.model';
+import { getDownloadableBitstream } from '../shared/bitstream.operators';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { Bundle } from '../shared/bundle.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteDataPayload,
 } from '../shared/operators';
-import { RootDataService } from '../data/root-data.service';
-import { getBitstreamDownloadRoute } from '../../app-routing-paths';
-import { BundleDataService } from '../data/bundle-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { Bundle } from '../shared/bundle.model';
-import { PaginatedList } from '../data/paginated-list.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { HardRedirectService } from '../services/hard-redirect.service';
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
 import { MetaTagState } from './meta-tag.reducer';
-import { createSelector, select, Store } from '@ngrx/store';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
-import { coreSelector } from '../core.selectors';
-import { CoreState } from '../core-state.model';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
-import { getDownloadableBitstream } from '../shared/bitstream.operators';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 /**
  * The base selector function to select the metaTag section in the store
  */
 const metaTagSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.metaTag
+  (state: CoreState) => state.metaTag,
 );
 
 /**
@@ -96,7 +123,7 @@ export class MetadataService {
     private store: Store<CoreState>,
     private hardRedirectService: HardRedirectService,
     @Inject(APP_CONFIG) private appConfig: AppConfig,
-    private authorizationService: AuthorizationDataService
+    private authorizationService: AuthorizationDataService,
   ) {
   }
 
@@ -308,11 +335,11 @@ export class MetadataService {
         true,
         followLink('primaryBitstream'),
         followLink('bitstreams', {
-            findListOptions: {
-              // limit the number of bitstreams used to find the citation pdf url to the number
-              // shown by default on an item page
-              elementsPerPage: this.appConfig.item.bitstream.pageSize
-            }
+          findListOptions: {
+            // limit the number of bitstreams used to find the citation pdf url to the number
+            // shown by default on an item page
+            elementsPerPage: this.appConfig.item.bitstream.pageSize,
+          },
         }, followLink('format')),
       ).pipe(
         getFirstSucceededRemoteDataPayload(),
@@ -329,8 +356,8 @@ export class MetadataService {
             }),
             getDownloadableBitstream(this.authorizationService),
             // return the bundle as well so we can use it again if there's no primary bitstream
-            map((bitstream: Bitstream) => [bundle, bitstream])
-          )
+            map((bitstream: Bitstream) => [bundle, bitstream]),
+          ),
         ),
         switchMap(([bundle, primaryBitstream]: [Bundle, Bitstream]) => {
           if (hasValue(primaryBitstream)) {
@@ -348,16 +375,16 @@ export class MetadataService {
                   // Otherwise check all bitstreams to see if one matches the format whitelist
                   return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
                 }
-              })
+              }),
             );
           }
         }),
-        take(1)
+        take(1),
       ).subscribe((link: string) => {
         // Use the found link to set the <meta> tag
         this.addMetaTag(
           'citation_pdf_url',
-          new URLCombiner(this.hardRedirectService.getCurrentOrigin(), link).toString()
+          new URLCombiner(this.hardRedirectService.getCurrentOrigin(), link).toString(),
         );
       });
     }
@@ -373,7 +400,7 @@ export class MetadataService {
           // Otherwise check all bitstreams to see if one matches the format whitelist
           return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
         }
-      })
+      }),
     );
   }
 
@@ -397,13 +424,13 @@ export class MetadataService {
           getFirstSucceededRemoteDataPayload(),
           // Keep the original bitstream, because it, not the format, is what we'll need
           // for the link at the end
-          map((format: BitstreamFormat) => [bitstream, format])
-        ))
+          map((format: BitstreamFormat) => [bitstream, format]),
+        )),
       ).pipe(
         // Verify that the bitstream is downloadable
         mergeMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
           getDownloadableBitstream(this.authorizationService),
-          map((bit: Bitstream) => [bit, format])
+          map((bit: Bitstream) => [bit, format]),
         )),
         // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
         filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
@@ -412,7 +439,7 @@ export class MetadataService {
         take(1),
         // Emit the link of the match
         // tap((v) => console.log('result', v)),
-        map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
+        map(([bitstream ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream)),
       );
     } else {
       return EMPTY;
@@ -489,7 +516,7 @@ export class MetadataService {
   public clearMetaTags() {
     this.store.pipe(
       select(tagsInUseSelector),
-      take(1)
+      take(1),
     ).subscribe((tagsInUse: string[]) => {
       for (const name of tagsInUse) {
         this.meta.removeTag('name=\'' + name + '\'');
diff --git a/src/app/core/notifications/models/suggestion-objects.resource-type.ts b/src/app/core/notifications/models/suggestion-objects.resource-type.ts
new file mode 100644
index 0000000000..8f83d86376
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-objects.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION = new ResourceType('suggestion');
diff --git a/src/app/core/notifications/models/suggestion-source-object.resource-type.ts b/src/app/core/notifications/models/suggestion-source-object.resource-type.ts
new file mode 100644
index 0000000000..e319ed5109
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-source-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion Source object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION_SOURCE = new ResourceType('suggestionsource');
diff --git a/src/app/core/notifications/models/suggestion-source.model.ts b/src/app/core/notifications/models/suggestion-source.model.ts
new file mode 100644
index 0000000000..f8e7c70cf5
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-source.model.ts
@@ -0,0 +1,50 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION_SOURCE } from './suggestion-source-object.resource-type';
+
+/**
+ * The interface representing the Suggestion Source model
+ */
+@typedObject
+export class SuggestionSource implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION_SOURCE;
+
+  /**
+   * The Suggestion Target id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    total: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    suggestiontargets: HALLink
+  };
+}
diff --git a/src/app/core/notifications/models/suggestion-target-object.resource-type.ts b/src/app/core/notifications/models/suggestion-target-object.resource-type.ts
new file mode 100644
index 0000000000..81b1b5c261
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-target-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion Target object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION_TARGET = new ResourceType('suggestiontarget');
diff --git a/src/app/core/notifications/models/suggestion-target.model.ts b/src/app/core/notifications/models/suggestion-target.model.ts
new file mode 100644
index 0000000000..1cbd78ae6b
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-target.model.ts
@@ -0,0 +1,63 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION_TARGET } from './suggestion-target-object.resource-type';
+
+/**
+ * The interface representing the Suggestion Target model
+ */
+@typedObject
+export class SuggestionTarget implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION_TARGET;
+
+  /**
+   * The Suggestion Target id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Suggestion Target name to display
+   */
+  @autoserialize
+    display: string;
+
+  /**
+   * The Suggestion Target source to display
+   */
+  @autoserialize
+    source: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    total: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    suggestions: HALLink,
+    target: HALLink
+  };
+}
diff --git a/src/app/core/notifications/models/suggestion.model.ts b/src/app/core/notifications/models/suggestion.model.ts
new file mode 100644
index 0000000000..a84fe9ffe2
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion.model.ts
@@ -0,0 +1,95 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import {
+  MetadataMap,
+  MetadataMapSerializer,
+} from '../../shared/metadata.models';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION } from './suggestion-objects.resource-type';
+
+/**
+ * The interface representing Suggestion Evidences such as scores (authorScore, datescore)
+ */
+export interface SuggestionEvidences {
+  [sectionId: string]: {
+    score: string;
+    notes: string
+  };
+}
+/**
+ * The interface representing the Suggestion Source model
+ */
+@typedObject
+export class Suggestion implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION;
+
+  /**
+   * The Suggestion id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Suggestion name to display
+   */
+  @autoserialize
+    display: string;
+
+  /**
+   * The Suggestion source to display
+   */
+  @autoserialize
+    source: string;
+
+  /**
+   * The Suggestion external source uri
+   */
+  @autoserialize
+    externalSourceUri: string;
+
+  /**
+   * The Total Score of the suggestion
+   */
+  @autoserialize
+    score: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    evidences: SuggestionEvidences;
+
+  /**
+   * All metadata of this suggestion object
+   */
+  @excludeFromEquals
+  @autoserializeAs(MetadataMapSerializer)
+    metadata: MetadataMap;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    target: HALLink
+  };
+}
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
new file mode 100644
index 0000000000..847eea7c7e
--- /dev/null
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
@@ -0,0 +1,250 @@
+import { HttpClient } from '@angular/common/http';
+import { ReplaceOperation } from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceEventObjectMissingPid,
+  qualityAssuranceEventObjectMissingPid2,
+  qualityAssuranceEventObjectMissingProjectFound,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceEventDataService } from './quality-assurance-event-data.service';
+
+describe('QualityAssuranceEventDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceEventDataService;
+  let serviceASAny: any;
+  let responseCacheEntry: RequestEntry;
+  let responseCacheEntryB: RequestEntry;
+  let responseCacheEntryC: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancetopics';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+  const topic = 'ENRICH!MORE!PID';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceEventObjectMissingPid, qualityAssuranceEventObjectMissingPid2];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaEventObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingPid);
+  const qaEventObjectMissingProjectRD = createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingProjectFound);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  const status = 'ACCEPTED';
+  const operation: ReplaceOperation<string>[] = [
+    {
+      path: '/status',
+      op: 'replace',
+      value: status,
+    },
+  ];
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: jasmine.createSpy('getByHref'),
+      getByUUID: jasmine.createSpy('getByUUID'),
+    });
+
+    responseCacheEntryB = new RequestEntry();
+    responseCacheEntryB.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntryB.response = new RestResponse(true, 201, 'Created');
+
+    responseCacheEntryC = new RequestEntry();
+    responseCacheEntryC.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntryC.response = new RestResponse(true, 204, 'No Content');
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaEventObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+      buildFromRequestUUID: jasmine.createSpy('buildFromRequestUUID'),
+      buildFromRequestUUIDAndAwait: jasmine.createSpy('buildFromRequestUUIDAndAwait'),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceEventDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+      comparator,
+    );
+
+    serviceASAny = service;
+
+    spyOn(serviceASAny.searchData, 'searchBy').and.callThrough();
+    spyOn(serviceASAny, 'findById').and.callThrough();
+    spyOn(serviceASAny.patchData, 'patch').and.callThrough();
+    spyOn(serviceASAny, 'postOnRelated').and.callThrough();
+    spyOn(serviceASAny, 'deleteOnRelated').and.callThrough();
+  });
+
+  describe('getEventsByTopic', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should proxy the call to searchData.searchBy', () => {
+      const options: FindListOptions = {
+        searchParams: [
+          {
+            fieldName: 'topic',
+            fieldValue: topic,
+          },
+        ],
+      };
+      service.getEventsByTopic(topic);
+      expect(serviceASAny.searchData.searchBy).toHaveBeenCalledWith('findByTopic', options, true, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceEventObject>> for the object with the given Topic', () => {
+      const result = service.getEventsByTopic(topic);
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getEvent', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should call findById', () => {
+      service.getEvent(qualityAssuranceEventObjectMissingPid.id).subscribe(
+        (res) => {
+          expect(serviceASAny.findById).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingPid.id, true, true);
+        },
+      );
+    });
+
+    it('should return a RemoteData for the object with the given URL', () => {
+      const result = service.getEvent(qualityAssuranceEventObjectMissingPid.id);
+      const expected = cold('(a)', {
+        a: qaEventObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('patchEvent', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+      serviceASAny.rdbService.buildFromRequestUUIDAndAwait.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should proxy the call to patchData.patch', () => {
+      service.patchEvent(status, qualityAssuranceEventObjectMissingPid).subscribe(
+        (res) => {
+          expect(serviceASAny.patchData.patch).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingPid, operation);
+        },
+      );
+    });
+
+    it('should return a RemoteData with HTTP 200', () => {
+      const result = service.patchEvent(status, qualityAssuranceEventObjectMissingPid);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingPid),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('boundProject', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntryB));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntryB));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectMissingProjectRD));
+    });
+
+    it('should call postOnRelated', () => {
+      service.boundProject(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID).subscribe(
+        (res) => {
+          expect(serviceASAny.postOnRelated).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID);
+        },
+      );
+    });
+
+    it('should return a RestResponse with HTTP 201', () => {
+      const result = service.boundProject(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingProjectFound),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('removeProject', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntryC));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntryC));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(createSuccessfulRemoteDataObject({})));
+    });
+
+    it('should call deleteOnRelated', () => {
+      service.removeProject(qualityAssuranceEventObjectMissingProjectFound.id).subscribe(
+        (res) => {
+          expect(serviceASAny.deleteOnRelated).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingProjectFound.id);
+        },
+      );
+    });
+
+    it('should return a RestResponse with HTTP 204', () => {
+      const result = service.removeProject(qualityAssuranceEventObjectMissingProjectFound.id);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject({}),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
new file mode 100644
index 0000000000..8c299b83ce
--- /dev/null
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
@@ -0,0 +1,271 @@
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { ReplaceOperation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  find,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { QualityAssuranceEventData } from '../../../../notifications/qa/project-entry-import-modal/project-entry-import-modal.component';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../data/base/create-data';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../data/base/delete-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import {
+  DeleteByIDRequest,
+  PostRequest,
+} from '../../../data/request.models';
+import { RequestService } from '../../../data/request.service';
+import { HttpOptions } from '../../../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { NoContent } from '../../../shared/NoContent.model';
+import { QualityAssuranceEventObject } from '../models/quality-assurance-event.model';
+import { QUALITY_ASSURANCE_EVENT_OBJECT } from '../models/quality-assurance-event-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance topic REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_EVENT_OBJECT)
+export class QualityAssuranceEventDataService extends IdentifiableDataService<QualityAssuranceEventObject> {
+
+  private createData: CreateData<QualityAssuranceEventObject>;
+  private searchData: SearchData<QualityAssuranceEventObject>;
+  private patchData: PatchData<QualityAssuranceEventObject>;
+  private deleteData: DeleteData<QualityAssuranceEventObject>;
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {DefaultChangeAnalyzer<QualityAssuranceEventObject>} comparator
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: DefaultChangeAnalyzer<QualityAssuranceEventObject>,
+  ) {
+    super('qualityassuranceevents', requestService, rdbService, objectCache, halService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl<QualityAssuranceEventObject>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return the list of Quality Assurance events by topic.
+   *
+   * @param topic
+   *    The Quality Assurance topic
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>>
+   *    The list of Quality Assurance events.
+   */
+  public getEventsByTopic(topic: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>> {
+    options.searchParams = [
+      {
+        fieldName: 'topic',
+        fieldValue: topic,
+      },
+    ];
+    return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Service for retrieving Quality Assurance events by topic and target.
+   * @param options (Optional) The search options to use when retrieving the events.
+   * @param linksToFollow (Optional) The links to follow when retrieving the events.
+   * @returns An observable of the remote data containing the paginated list of Quality Assurance events.
+   */
+  public searchEventsByTopic(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>> {
+    return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Clear findByTopic requests from cache
+   */
+  public clearFindByTopicRequests() {
+    this.requestService.setStaleByHrefSubstring('findByTopic');
+  }
+
+  /**
+   * Return a single Quality Assurance event.
+   *
+   * @param id
+   *    The Quality Assurance event id
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return Observable<RemoteData<QualityAssuranceEventObject>>
+   *    The Quality Assurance event.
+   */
+  public getEvent(id: string, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<QualityAssuranceEventObject>> {
+    return this.findById(id, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Save the new status of a Quality Assurance event.
+   *
+   * @param status
+   *    The new status
+   * @param dso QualityAssuranceEventObject
+   *    The event item
+   * @param reason
+   *    The optional reason (not used for now; for future implementation)
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public patchEvent(status, dso, reason?: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    const operation: ReplaceOperation<string>[] = [
+      {
+        path: '/status',
+        op: 'replace',
+        value: status,
+      },
+    ];
+    return this.patchData.patch(dso, operation);
+  }
+
+  /**
+   * Bound a project to a Quality Assurance event publication.
+   *
+   * @param itemId
+   *    The Id of the Quality Assurance event
+   * @param projectId
+   *    The project Id to bound
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public boundProject(itemId: string, projectId: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    return this.postOnRelated(itemId, projectId);
+  }
+
+  /**
+   * Remove a project from a Quality Assurance event publication.
+   *
+   * @param itemId
+   *    The Id of the Quality Assurance event
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public removeProject(itemId: string): Observable<RemoteData<NoContent>> {
+    return this.deleteOnRelated(itemId);
+  }
+
+  /**
+   * Perform a delete operation on an endpoint related item. Ex.: endpoint/<itemId>/related
+   * @param objectId The item id
+   * @return the RestResponse as an Observable
+   */
+  private deleteOnRelated(objectId: string): Observable<RemoteData<NoContent>> {
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getIDHrefObs(objectId);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+    ).subscribe((href: string) => {
+      const request = new DeleteByIDRequest(requestId, href + '/related', objectId);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+  }
+
+  /**
+   * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
+   * @param objectId The item id
+   * @param relatedItemId The related item Id
+   * @param body The optional POST body
+   * @return the RestResponse as an Observable
+   */
+  private postOnRelated(objectId: string, relatedItemId: string, body?: any) {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(objectId);
+
+    hrefObs.pipe(
+      take(1),
+    ).subscribe((href: string) => {
+      const request = new PostRequest(requestId, href + '/related?item=' + relatedItemId, body);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+  }
+
+  /**
+   * Perform a post on an endpoint related to correction type
+   * @param data the data to post
+   * @returns the RestResponse as an Observable
+   */
+  postData(target: string, correctionType: string, related: string, reason: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    const requestId = this.requestService.generateRequestId();
+    const href$ = this.getBrowseEndpoint();
+
+    return href$.pipe(
+      switchMap((href: string) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'application/json');
+        options.headers = headers;
+        let params = new HttpParams();
+        params = params.append('target', target)
+          .append('correctionType', correctionType);
+        options.params = params;
+        const request = new PostRequest(requestId, href, { 'reason': reason } , options);
+        if (hasValue(this.responseMsToLive)) {
+          request.responseMsToLive = this.responseMsToLive;
+        }
+        this.requestService.send(request);
+        return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+      }),
+    );
+  }
+
+  public deleteQAEvent(qaEvent: QualityAssuranceEventData): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(qaEvent.id);
+  }
+
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
new file mode 100644
index 0000000000..84aff6ba2c
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance event
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_EVENT_OBJECT = new ResourceType('qualityassuranceevent');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
new file mode 100644
index 0000000000..9210d8f6f9
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
@@ -0,0 +1,181 @@
+/* eslint-disable max-classes-per-file */
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { RemoteData } from '../../../data/remote-data';
+import { HALLink } from '../../../shared/hal-link.model';
+import { Item } from '../../../shared/item.model';
+import { ITEM } from '../../../shared/item.resource-type';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_EVENT_OBJECT } from './quality-assurance-event-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance event message
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface QualityAssuranceEventMessageObject {
+
+}
+
+/**
+ * The interface representing the Quality Assurance event message
+ */
+export interface SourceQualityAssuranceEventMessageObject {
+  /**
+   * The type of 'value'
+   */
+  type: string;
+
+  reason: string;
+
+  /**
+   * The value suggested by Notifications
+   */
+  value: string;
+
+  /**
+   * The abstract suggested by Notifications
+   */
+  abstract: string;
+
+  /**
+   * The project acronym suggested by Notifications
+   */
+  acronym: string;
+
+  /**
+   * The project code suggested by Notifications
+   */
+  code: string;
+
+  /**
+   * The project funder suggested by Notifications
+   */
+  funder: string;
+
+  /**
+   * The project program suggested by Notifications
+   */
+  fundingProgram?: string;
+
+  /**
+   * The project jurisdiction suggested by Notifications
+   */
+  jurisdiction: string;
+
+  /**
+   * The project title suggested by Notifications
+   */
+  title: string;
+
+  /**
+   * The Source ID.
+   */
+  sourceId: string;
+
+  /**
+   * The PID href.
+   */
+  pidHref: string;
+
+}
+
+/**
+ * The interface representing the Quality Assurance event model
+ */
+@typedObject
+export class QualityAssuranceEventObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_EVENT_OBJECT;
+
+  /**
+   * The Quality Assurance event uuid inside DSpace
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The universally unique identifier of this Quality Assurance event
+   */
+  @autoserializeAs(String, 'id')
+    uuid: string;
+
+  /**
+   * The Quality Assurance event original id (ex.: the source archive OAI-PMH identifier)
+   */
+  @autoserialize
+    originalId: string;
+
+  /**
+   * The title of the article to which the suggestion refers
+   */
+  @autoserialize
+    title: string;
+
+  /**
+   * Reliability of the suggestion (of the data inside 'message')
+   */
+  @autoserialize
+    trust: number;
+
+  /**
+   * The timestamp Quality Assurance event was saved in DSpace
+   */
+  @autoserialize
+    eventDate: string;
+
+  /**
+   * The Quality Assurance event status (ACCEPTED, REJECTED, DISCARDED, PENDING)
+   */
+  @autoserialize
+    status: string;
+
+  /**
+   * The suggestion data. Data may vary depending on the source
+   */
+  @autoserialize
+    message: SourceQualityAssuranceEventMessageObject;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    target: HALLink,
+    related: HALLink
+  };
+
+  /**
+   * The related publication DSpace item
+   * Will be undefined unless the {@item HALLink} has been resolved.
+   */
+  @link(ITEM)
+    target?: Observable<RemoteData<Item>>;
+
+  /**
+   * The related project for this Event
+   * Will be undefined unless the {@related HALLink} has been resolved.
+   */
+  @link(ITEM)
+    related?: Observable<RemoteData<Item>>;
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
new file mode 100644
index 0000000000..b4f64b24d1
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance source
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_SOURCE_OBJECT = new ResourceType('qualityassurancesource');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source.model.ts b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts
new file mode 100644
index 0000000000..cc5f874119
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts
@@ -0,0 +1,55 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { HALLink } from '../../../shared/hal-link.model';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_SOURCE_OBJECT } from './quality-assurance-source-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance source model
+ */
+@typedObject
+export class QualityAssuranceSourceObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_SOURCE_OBJECT;
+
+  /**
+   * The Quality Assurance source id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The date of the last udate from Notifications
+   */
+  @autoserialize
+    lastEvent: string;
+
+  /**
+   * The total number of suggestions provided by Notifications for this source
+   */
+  @autoserialize
+    totalEvents: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
new file mode 100644
index 0000000000..e9fc57a307
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance topic
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_TOPIC_OBJECT = new ResourceType('qualityassurancetopic');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
new file mode 100644
index 0000000000..ddc027d194
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
@@ -0,0 +1,61 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { HALLink } from '../../../shared/hal-link.model';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_TOPIC_OBJECT } from './quality-assurance-topic-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance topic model
+ */
+@typedObject
+export class QualityAssuranceTopicObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_TOPIC_OBJECT;
+
+  /**
+   * The Quality Assurance topic id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Quality Assurance topic name to display
+   */
+  @autoserialize
+    name: string;
+
+  /**
+   * The date of the last udate from Notifications
+   */
+  @autoserialize
+    lastEvent: string;
+
+  /**
+   * The total number of suggestions provided by Notifications for this topic
+   */
+  @autoserialize
+    totalEvents: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
new file mode 100644
index 0000000000..0fca119e8b
--- /dev/null
+++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
@@ -0,0 +1,128 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceSourceDataService } from './quality-assurance-source-data.service';
+
+describe('QualityAssuranceSourceDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceSourceDataService;
+  let responseCacheEntry: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancesources';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaSourceObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceSourceObjectMorePid);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaSourceObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceSourceDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+    );
+
+    spyOn((service as any).findAllData, 'findAll').and.callThrough();
+    spyOn((service as any), 'findById').and.callThrough();
+  });
+
+  describe('getSources', () => {
+    it('should call findAll', (done) => {
+      service.getSources().subscribe(
+        (res) => {
+          expect((service as any).findAllData.findAll).toHaveBeenCalledWith({}, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceSourceObject>> for the object with the given URL', () => {
+      const result = service.getSources();
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getSource', () => {
+    it('should call findById', (done) => {
+      service.getSource(qualityAssuranceSourceObjectMorePid.id).subscribe(
+        (res) => {
+          expect((service as any).findById).toHaveBeenCalledWith(qualityAssuranceSourceObjectMorePid.id, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<QualityAssuranceSourceObject> for the object with the given URL', () => {
+      const result = service.getSource(qualityAssuranceSourceObjectMorePid.id);
+      const expected = cold('(a)', {
+        a: qaSourceObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
new file mode 100644
index 0000000000..aad9ebc28b
--- /dev/null
+++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
@@ -0,0 +1,109 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { RequestService } from '../../../data/request.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { QualityAssuranceSourceObject } from '../models/quality-assurance-source.model';
+import { QUALITY_ASSURANCE_SOURCE_OBJECT } from '../models/quality-assurance-source-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance source REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_SOURCE_OBJECT)
+export class QualityAssuranceSourceDataService extends IdentifiableDataService<QualityAssuranceSourceObject> {
+
+  private findAllData: FindAllData<QualityAssuranceSourceObject>;
+  private searchAllData: SearchData<QualityAssuranceSourceObject>;
+
+  private searchByTargetMethod = 'byTarget';
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('qualityassurancesources', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchAllData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return the list of Quality Assurance source.
+   *
+   * @param options                     Find list options object.
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   *
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Clear FindAll source requests from cache
+   */
+  public clearFindAllSourceRequests() {
+    this.requestService.setStaleByHrefSubstring('qualityassurancesources');
+  }
+
+  /**
+   * Return a single Quality Assurance source.
+   *
+   * @param id                          The Quality Assurance source id
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   *
+   * @return Observable<RemoteData<QualityAssuranceSourceObject>>    The Quality Assurance source.
+   */
+  public getSource(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<QualityAssuranceSourceObject>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Retrieves a paginated list of QualityAssuranceSourceObject objects that are associated with a given target object.
+   * @param options The options for the search query.
+   * @param useCachedVersionIfAvailable Whether to use a cached version of the data if available.
+   * @param reRequestOnStale Whether to re-request the data if the cached version is stale.
+   * @param linksToFollow The links to follow to retrieve the data.
+   * @returns An observable that emits a RemoteData object containing the paginated list of QualityAssuranceSourceObject objects.
+   */
+  public getSourcesByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>> {
+    return this.searchAllData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
new file mode 100644
index 0000000000..ede1563c30
--- /dev/null
+++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
@@ -0,0 +1,135 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceTopicDataService } from './quality-assurance-topic-data.service';
+
+describe('QualityAssuranceTopicDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceTopicDataService;
+  let responseCacheEntry: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancetopics';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaTopicObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceTopicObjectMorePid);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaTopicObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceTopicDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+    );
+
+    spyOn((service as any).findAllData, 'findAll').and.callThrough();
+    spyOn((service as any), 'findById').and.callThrough();
+    spyOn((service as any).searchData, 'searchBy').and.callThrough();
+  });
+
+  describe('searchTopicsByTarget', () => {
+    it('should call searchData.searchBy with the correct parameters', () => {
+      const options = { elementsPerPage: 10 };
+      const useCachedVersionIfAvailable = true;
+      const reRequestOnStale = true;
+
+      service.searchTopicsByTarget(options, useCachedVersionIfAvailable, reRequestOnStale);
+
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith(
+        'byTarget',
+        options,
+        useCachedVersionIfAvailable,
+        reRequestOnStale,
+      );
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceTopicObject>> for the object with the given URL', () => {
+      const result = service.searchTopicsByTarget();
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getTopic', () => {
+    it('should call findByHref', (done) => {
+      service.getTopic(qualityAssuranceTopicObjectMorePid.id).subscribe(
+        (res) => {
+          expect((service as any).findById).toHaveBeenCalledWith(qualityAssuranceTopicObjectMorePid.id, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<QualityAssuranceTopicObject> for the object with the given URL', () => {
+      const result = service.getTopic(qualityAssuranceTopicObjectMorePid.id);
+      const expected = cold('(a)', {
+        a: qaTopicObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
new file mode 100644
index 0000000000..7b0a8b4d14
--- /dev/null
+++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
@@ -0,0 +1,106 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { RequestService } from '../../../data/request.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { QualityAssuranceTopicObject } from '../models/quality-assurance-topic.model';
+import { QUALITY_ASSURANCE_TOPIC_OBJECT } from '../models/quality-assurance-topic-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance topic REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_TOPIC_OBJECT)
+export class QualityAssuranceTopicDataService extends IdentifiableDataService<QualityAssuranceTopicObject> {
+
+  private findAllData: FindAllData<QualityAssuranceTopicObject>;
+  private searchData: SearchData<QualityAssuranceTopicObject>;
+
+  private searchByTargetMethod = 'byTarget';
+  private searchBySourceMethod = 'bySource';
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('qualityassurancetopics', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Search for Quality Assurance topics.
+   * @param options The search options.
+   * @param useCachedVersionIfAvailable Whether to use cached version if available.
+   * @param reRequestOnStale Whether to re-request on stale.
+   * @param linksToFollow The links to follow.
+   * @returns An observable of remote data containing a paginated list of Quality Assurance topics.
+   */
+  public searchTopicsByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>> {
+    return this.searchData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Searches for quality assurance topics by source.
+   * @param options The search options.
+   * @param useCachedVersionIfAvailable Whether to use a cached version if available.
+   * @param reRequestOnStale Whether to re-request the data if it's stale.
+   * @param linksToFollow The links to follow.
+   * @returns An observable of the remote data containing the paginated list of quality assurance topics.
+   */
+  public searchTopicsBySource(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>> {
+    return this.searchData.searchBy(this.searchBySourceMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Clear FindAll topics requests from cache
+   */
+  public clearFindAllTopicsRequests() {
+    this.requestService.setStaleByHrefSubstring('qualityassurancetopics');
+  }
+
+  /**
+   * Return a single Quality Assurance topic.
+   *
+   * @param id                          The Quality Assurance topic id
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   *
+   * @return Observable<RemoteData<QualityAssuranceTopicObject>>
+   *    The Quality Assurance topic.
+   */
+  public getTopic(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<QualityAssuranceTopicObject>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/source/suggestion-source-data.service.ts b/src/app/core/notifications/source/suggestion-source-data.service.ts
new file mode 100644
index 0000000000..e897a8b1fe
--- /dev/null
+++ b/src/app/core/notifications/source/suggestion-source-data.service.ts
@@ -0,0 +1,100 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { CoreState } from '../../core-state.model';
+import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionSource } from '../models/suggestion-source.model';
+import { SUGGESTION_SOURCE } from '../models/suggestion-source-object.resource-type';
+
+/**
+ * Service that retrieves Suggestion Source data
+ */
+@Injectable()
+@dataService(SUGGESTION_SOURCE)
+export class SuggestionSourceDataService extends IdentifiableDataService<SuggestionSource> {
+
+  protected linkPath = 'suggestionsources';
+
+  private findAllData: FindAllData<SuggestionSource>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SuggestionSource>) {
+    super('suggestionsources', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+  /**
+   * Return the list of Suggestion source.
+   *
+   * @param options                     Find list options object.
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   *
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Return a single Suggestoin source.
+   *
+   * @param id                          The Quality Assurance source id
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   *
+   * @return Observable<RemoteData<QualityAssuranceSourceObject>>    The Quality Assurance source.
+   */
+  public getSource(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<SuggestionSource>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/source/suggestions-source-data.service.spec.ts b/src/app/core/notifications/source/suggestions-source-data.service.spec.ts
new file mode 100644
index 0000000000..3026c2d8b4
--- /dev/null
+++ b/src/app/core/notifications/source/suggestions-source-data.service.spec.ts
@@ -0,0 +1,117 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { CoreState } from '../../core-state.model';
+import { FindAllData } from '../../data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionSource } from '../models/suggestion-source.model';
+import { SuggestionSourceDataService } from './suggestion-source-data.service';
+
+describe('SuggestionSourceDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionSourceDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: DefaultChangeAnalyzer<SuggestionSource>;
+  let responseCacheEntry: RequestEntry;
+
+  const store = {} as Store<CoreState>;
+  const endpointURL = `https://rest.api/rest/api/suggestionsources`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionSourceDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparator = {} as DefaultChangeAnalyzer<SuggestionSource>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new SuggestionSourceDataService(null, null, null, null, null, null, null, null) as unknown as FindAllData<any>;
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('getSources', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}`);
+      scheduler.schedule(() => service.getSources().subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getSource', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/testId`);
+      scheduler.schedule(() => service.getSource('testId').subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+});
diff --git a/src/app/core/notifications/suggestion-data.service.spec.ts b/src/app/core/notifications/suggestion-data.service.spec.ts
new file mode 100644
index 0000000000..050f81914f
--- /dev/null
+++ b/src/app/core/notifications/suggestion-data.service.spec.ts
@@ -0,0 +1,180 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Suggestion } from './models/suggestion.model';
+import { SuggestionSource } from './models/suggestion-source.model';
+import { SuggestionTarget } from './models/suggestion-target.model';
+import { SuggestionSourceDataService } from './source/suggestion-source-data.service';
+import {
+  SuggestionDataServiceImpl,
+  SuggestionsDataService,
+} from './suggestions-data.service';
+import { SuggestionTargetDataService } from './target/suggestion-target-data.service';
+
+describe('SuggestionDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionsDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparatorSuggestion: DefaultChangeAnalyzer<Suggestion>;
+  let comparatorSuggestionSource: DefaultChangeAnalyzer<SuggestionSource>;
+  let comparatorSuggestionTarget: DefaultChangeAnalyzer<SuggestionTarget>;
+  let suggestionSourcesDataService: SuggestionSourceDataService;
+  let suggestionTargetsDataService: SuggestionTargetDataService;
+  let suggestionsDataService: SuggestionDataServiceImpl;
+  let responseCacheEntry: RequestEntry;
+
+
+  const testSource = 'test-source';
+  const testUserId = '1234-4321';
+  const endpointURL = `https://rest.api/rest/api/`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionsDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparatorSuggestion,
+      comparatorSuggestionSource,
+      comparatorSuggestionTarget,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparatorSuggestion = {} as DefaultChangeAnalyzer<Suggestion>;
+    comparatorSuggestionTarget = {} as DefaultChangeAnalyzer<SuggestionTarget>;
+    comparatorSuggestionSource = {} as DefaultChangeAnalyzer<SuggestionSource>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+      setStaleByHrefSubstring: observableOf(true),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    suggestionSourcesDataService = jasmine.createSpyObj('suggestionSourcesDataService', {
+      getSources: observableOf(null),
+    });
+
+    suggestionTargetsDataService = jasmine.createSpyObj('suggestionTargetsDataService', {
+      getTargets: observableOf(null),
+      getTargetsByUser: observableOf(null),
+      findById: observableOf(null),
+    });
+
+    suggestionsDataService = jasmine.createSpyObj('suggestionsDataService', {
+      searchBy: observableOf(null),
+      delete: observableOf(null),
+    });
+
+
+    service = initTestService();
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionSourcesDataService'] = suggestionSourcesDataService;
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionTargetsDataService'] = suggestionTargetsDataService;
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionsDataService'] = suggestionsDataService;
+  });
+
+  describe('Suggestion targets service', () => {
+    it('should call suggestionSourcesDataService.getTargets', () => {
+      const options = {
+        searchParams: [new RequestParam('source', testSource)],
+      };
+      service.getTargets(testSource);
+      expect(suggestionTargetsDataService.getTargets).toHaveBeenCalledWith('findBySource', options);
+    });
+
+    it('should call suggestionSourcesDataService.getTargetsByUser', () => {
+      const options = {
+        searchParams: [new RequestParam('target', testUserId)],
+      };
+      service.getTargetsByUser(testUserId);
+      expect(suggestionTargetsDataService.getTargetsByUser).toHaveBeenCalledWith(testUserId, options);
+    });
+
+    it('should call suggestionSourcesDataService.getTargetById', () => {
+      service.getTargetById('1');
+      expect(suggestionTargetsDataService.findById).toHaveBeenCalledWith('1');
+    });
+  });
+
+
+  describe('Suggestion sources service', () => {
+    it('should call suggestionSourcesDataService.getSources', () => {
+      service.getSources();
+      expect(suggestionSourcesDataService.getSources).toHaveBeenCalled();
+    });
+  });
+
+  describe('Suggestion service', () => {
+    it('should call suggestionsDataService.searchBy', () => {
+      const options = {
+        searchParams: [new RequestParam('target', testUserId), new RequestParam('source', testSource)],
+      };
+      service.getSuggestionsByTargetAndSource(testUserId, testSource);
+      expect(suggestionsDataService.searchBy).toHaveBeenCalledWith('findByTargetAndSource', options, false, true);
+    });
+
+    it('should call suggestionsDataService.delete', () => {
+      service.deleteSuggestion('1');
+      expect(suggestionsDataService.delete).toHaveBeenCalledWith('1');
+    });
+  });
+
+  describe('Request service', () => {
+    it('should call requestService.setStaleByHrefSubstring', () => {
+      service.clearSuggestionRequests();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/core/notifications/suggestions-data.service.ts b/src/app/core/notifications/suggestions-data.service.ts
new file mode 100644
index 0000000000..372ea65e33
--- /dev/null
+++ b/src/app/core/notifications/suggestions-data.service.ts
@@ -0,0 +1,228 @@
+/* eslint-disable max-classes-per-file */
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
+import { ChangeAnalyzer } from '../data/change-analyzer';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { UpdateDataServiceImpl } from '../data/update-data.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { Suggestion } from './models/suggestion.model';
+import { SUGGESTION } from './models/suggestion-objects.resource-type';
+import { SuggestionSource } from './models/suggestion-source.model';
+import { SuggestionTarget } from './models/suggestion-target.model';
+import { SuggestionSourceDataService } from './source/suggestion-source-data.service';
+import { SuggestionTargetDataService } from './target/suggestion-target-data.service';
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+ */
+export class SuggestionDataServiceImpl extends UpdateDataServiceImpl<Suggestion> {
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {Store<CoreState>} store
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {HttpClient} http
+   * @param {ChangeAnalyzer<Suggestion>} comparator
+   * @param responseMsToLive
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: ChangeAnalyzer<Suggestion>,
+    protected responseMsToLive: number,
+  ) {
+    super('suggestions', requestService, rdbService, objectCache, halService, notificationsService, comparator ,responseMsToLive);
+  }
+}
+
+/**
+ * The service handling all Suggestion Target REST requests.
+ */
+@Injectable()
+@dataService(SUGGESTION)
+export class SuggestionsDataService {
+  protected searchFindBySourceMethod = 'findBySource';
+  protected searchFindByTargetAndSourceMethod = 'findByTargetAndSource';
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionsDataService: SuggestionDataServiceImpl;
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionSourcesDataService: SuggestionSourceDataService;
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionTargetsDataService: SuggestionTargetDataService;
+
+  private responseMsToLive = 10 * 1000;
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {HttpClient} http
+   * @param {DefaultChangeAnalyzer<Suggestion>} comparatorSuggestions
+   * @param {DefaultChangeAnalyzer<SuggestionSource>} comparatorSources
+   * @param {DefaultChangeAnalyzer<SuggestionTarget>} comparatorTargets
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparatorSuggestions: DefaultChangeAnalyzer<Suggestion>,
+    protected comparatorSources: DefaultChangeAnalyzer<SuggestionSource>,
+    protected comparatorTargets: DefaultChangeAnalyzer<SuggestionTarget>,
+  ) {
+    this.suggestionsDataService = new SuggestionDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSuggestions, this.responseMsToLive);
+    this.suggestionSourcesDataService = new SuggestionSourceDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSources);
+    this.suggestionTargetsDataService = new SuggestionTargetDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorTargets);
+  }
+
+  /**
+   * Return the list of Suggestion Sources
+   *
+   * @param options
+   *    Find list options object.
+   * @return Observable<RemoteData<PaginatedList<SuggestionSource>>>
+   *    The list of Suggestion Sources.
+   */
+  public getSources(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.suggestionSourcesDataService.getSources(options);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given source
+   *
+   * @param source
+   *    The source for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargets(
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('source', source)];
+
+    return this.suggestionTargetsDataService.getTargets(this.searchFindBySourceMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given user
+   *
+   * @param userId
+   *    The user Id for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetsByUser(
+    userId: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('target', userId)];
+    return this.suggestionTargetsDataService.getTargetsByUser(userId, options, ...linksToFollow);
+  }
+
+  /**
+   * Return a Suggestion Target for a given id
+   *
+   * @param targetId
+   *    The target id to retrieve.
+   *
+   * @return Observable<RemoteData<SuggestionTarget>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetById(targetId: string): Observable<RemoteData<SuggestionTarget>> {
+    return this.suggestionTargetsDataService.findById(targetId);
+  }
+
+  /**
+   * Used to delete Suggestion
+   * @suggestionId
+   */
+  public deleteSuggestion(suggestionId: string): Observable<RemoteData<NoContent>> {
+    return this.suggestionsDataService.delete(suggestionId);
+  }
+
+  /**
+   * Return the list of Suggestion for a given target and source
+   *
+   * @param target
+   *    The target for which to find suggestions.
+   * @param source
+   *    The source for which to find suggestions.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<Suggestion>>>
+   *    The list of Suggestion.
+   */
+  public getSuggestionsByTargetAndSource(
+    target: string,
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<Suggestion>[]
+  ): Observable<RemoteData<PaginatedList<Suggestion>>> {
+    options.searchParams = [
+      new RequestParam('target', target),
+      new RequestParam('source', source),
+    ];
+
+    return this.suggestionsDataService.searchBy(this.searchFindByTargetAndSourceMethod, options, false, true, ...linksToFollow);
+  }
+
+  /**
+   * Clear findByTargetAndSource suggestions requests from cache
+   */
+  public clearSuggestionRequests() {
+    this.requestService.setStaleByHrefSubstring(this.searchFindByTargetAndSourceMethod);
+  }
+}
diff --git a/src/app/core/notifications/target/suggestion-target-data.service.ts b/src/app/core/notifications/target/suggestion-target-data.service.ts
new file mode 100644
index 0000000000..dddeb4fdf9
--- /dev/null
+++ b/src/app/core/notifications/target/suggestion-target-data.service.ts
@@ -0,0 +1,147 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { CoreState } from '../../core-state.model';
+import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionTarget } from '../models/suggestion-target.model';
+import { SUGGESTION_TARGET } from '../models/suggestion-target-object.resource-type';
+
+@Injectable()
+@dataService(SUGGESTION_TARGET)
+export class SuggestionTargetDataService extends IdentifiableDataService<SuggestionTarget> {
+
+  protected linkPath = 'suggestiontargets';
+  private findAllData: FindAllData<SuggestionTarget>;
+  private searchData: SearchData<SuggestionTarget>;
+  protected searchFindBySourceMethod = 'findBySource';
+  protected searchFindByTargetMethod = 'findByTarget';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SuggestionTarget>) {
+    super('suggestiontargets', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+  /**
+   * Return the list of Suggestion Target for a given source
+   *
+   * @param source
+   *    The source for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargets(
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('source', source)];
+
+    return this.searchBy(this.searchFindBySourceMethod, options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given user
+   *
+   * @param userId
+   *    The user Id for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetsByUser(
+    userId: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('target', userId)];
+
+    return this.searchBy(this.searchFindByTargetMethod, options, true, true, ...linksToFollow);
+  }
+  /**
+   * Return a Suggestion Target for a given id
+   *
+   * @param targetId
+   *    The target id to retrieve.
+   *
+   * @return Observable<RemoteData<SuggestionTarget>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetById(targetId: string): Observable<RemoteData<SuggestionTarget>> {
+    return this.findById(targetId);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+}
diff --git a/src/app/core/notifications/target/suggestions-target-data.service.spec.ts b/src/app/core/notifications/target/suggestions-target-data.service.spec.ts
new file mode 100644
index 0000000000..7b4ed3e82a
--- /dev/null
+++ b/src/app/core/notifications/target/suggestions-target-data.service.spec.ts
@@ -0,0 +1,140 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { CoreState } from '../../core-state.model';
+import { FindAllData } from '../../data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { SearchData } from '../../data/base/search-data';
+import { testSearchDataImplementation } from '../../data/base/search-data.spec';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionTarget } from '../models/suggestion-target.model';
+import { SuggestionTargetDataService } from './suggestion-target-data.service';
+
+describe('SuggestionTargetDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionTargetDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: DefaultChangeAnalyzer<SuggestionTarget>;
+  let responseCacheEntry: RequestEntry;
+
+  const store = {} as Store<CoreState>;
+  const endpointURL = `https://rest.api/rest/api/suggestiontargets`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionTargetDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparator = {} as DefaultChangeAnalyzer<SuggestionTarget>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initSearchService = () => new SuggestionTargetDataService(null, null, null, null, null, null, null, null) as unknown as SearchData<any>;
+    const initFindAllService = () => new SuggestionTargetDataService(null, null, null, null, null, null, null, null) as unknown as FindAllData<any>;
+    testSearchDataImplementation(initSearchService);
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('getTargetById', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(), endpointURL + '/testId');
+      scheduler.schedule(() => service.getTargetById('testId').subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getTargetsByUser', () => {
+    it('should send a new GetRequest', () => {
+      const options = {
+        searchParams: [new RequestParam('target', 'testId')],
+      };
+      const searchFindByTargetMethod = 'findByTarget';
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/search/${searchFindByTargetMethod}?target=testId`);
+      scheduler.schedule(() => service.getTargetsByUser('testId', options).subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getTargets', () => {
+    it('should send a new GetRequest', () => {
+      const options = {
+        searchParams: [new RequestParam('source', 'testId')],
+      };
+      const searchFindBySourceMethod = 'findBySource';
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/search/${searchFindBySourceMethod}?source=testId`);
+      scheduler.schedule(() => service.getTargets('testId', options).subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+});
diff --git a/src/app/core/orcid/model/orcid-history.model.ts b/src/app/core/orcid/model/orcid-history.model.ts
index ef8f30e0a3..62f5353ed2 100644
--- a/src/app/core/orcid/model/orcid-history.model.ts
+++ b/src/app/core/orcid/model/orcid-history.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_HISTORY } from './orcid-history.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid History.
@@ -19,49 +23,49 @@ export class OrcidHistory extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Orcid History record
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The name of the related entity
    */
   @autoserialize
-  entityName: string;
+    entityName: string;
 
   /**
    * The identifier of the profileItem of this Orcid History record.
    */
   @autoserialize
-  profileItemId: string;
+    profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid History record.
    */
   @autoserialize
-  entityId: string;
+    entityId: string;
 
   /**
    * The type of the entity related to this Orcid History record.
    */
   @autoserialize
-  entityType: string;
+    entityType: string;
 
   /**
    * The response status coming from ORCID api.
    */
   @autoserialize
-  status: number;
+    status: number;
 
   /**
    * The putCode assigned by ORCID to the entity.
    */
   @autoserialize
-  putCode: string;
+    putCode: string;
 
   /**
    * The last send attempt timestamp.
@@ -82,7 +86,7 @@ export class OrcidHistory extends CacheableObject {
    * The {@link HALLink}s for this Orcid History record
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/orcid/model/orcid-queue.model.ts b/src/app/core/orcid/model/orcid-queue.model.ts
index 2a1c3f1d82..fedb078cc5 100644
--- a/src/app/core/orcid/model/orcid-queue.model.ts
+++ b/src/app/core/orcid/model/orcid-queue.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_QUEUE } from './orcid-queue.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid Queue.
@@ -19,49 +23,49 @@ export class OrcidQueue extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Orcid Queue record
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The record description.
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The identifier of the profileItem of this Orcid Queue record.
    */
   @autoserialize
-  profileItemId: string;
+    profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid Queue record.
    */
   @autoserialize
-  entityId: string;
+    entityId: string;
 
   /**
    * The type of this Orcid Queue record.
    */
   @autoserialize
-  recordType: string;
+    recordType: string;
 
   /**
    * The operation related to this Orcid Queue record.
    */
   @autoserialize
-  operation: string;
+    operation: string;
 
   /**
    * The {@link HALLink}s for this Orcid Queue record
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/orcid/orcid-auth.service.spec.ts b/src/app/core/orcid/orcid-auth.service.spec.ts
index ad703d135e..a3dc628029 100644
--- a/src/app/core/orcid/orcid-auth.service.spec.ts
+++ b/src/app/core/orcid/orcid-auth.service.spec.ts
@@ -1,17 +1,27 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  AddOperation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { ResearcherProfile } from '../profile/model/researcher-profile.model';
-import { Item } from '../shared/item.model';
-import { AddOperation, RemoveOperation } from 'fast-json-patch';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { ConfigurationDataService } from '../data/configuration-data.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+
 import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ConfigurationDataService } from '../data/configuration-data.service';
+import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { Item } from '../shared/item.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { OrcidAuthService } from './orcid-auth.service';
-import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 
 describe('OrcidAuthService', () => {
   let scheduler: TestScheduler;
@@ -32,12 +42,12 @@ describe('OrcidAuthService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -46,12 +56,12 @@ describe('OrcidAuthService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
@@ -59,105 +69,105 @@ describe('OrcidAuthService', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   const disconnectionAllowAdmin = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['only_admin']
+    values: ['only_admin'],
   } as ConfigurationProperty;
 
   const disconnectionAllowAdminOwner = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['admin_and_owner']
+    values: ['admin_and_owner'],
   } as ConfigurationProperty;
 
   const authorizeUrl = {
     uuid: 'orcid.authorize-url',
     name: 'orcid.authorize-url',
-    values: ['orcid.authorize-url']
+    values: ['orcid.authorize-url'],
   } as ConfigurationProperty;
   const appClientId = {
     uuid: 'orcid.application-client-id',
     name: 'orcid.application-client-id',
-    values: ['orcid.application-client-id']
+    values: ['orcid.application-client-id'],
   } as ConfigurationProperty;
   const orcidScope = {
     uuid: 'orcid.scope',
     name: 'orcid.scope',
-    values: ['/authenticate', '/read-limited']
+    values: ['/authenticate', '/read-limited'],
   } as ConfigurationProperty;
 
   beforeEach(() => {
@@ -169,7 +179,7 @@ describe('OrcidAuthService', () => {
       updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations'),
     });
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: jasmine.createSpy('findByPropertyName')
+      findByPropertyName: jasmine.createSpy('findByPropertyName'),
     });
     nativeWindowService = new NativeWindowRefMock();
 
@@ -200,7 +210,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdmin));
       const result = service.onlyAdminCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: true
+        a: true,
       });
       expect(result).toBeObservable(expected);
     });
@@ -209,7 +219,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
       const result = service.onlyAdminCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: false
+        a: false,
       });
       expect(result).toBeObservable(expected);
     });
@@ -220,7 +230,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdminOwner));
       const result = service.ownerCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: true
+        a: true,
       });
       expect(result).toBeObservable(expected);
     });
@@ -229,7 +239,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
       const result = service.ownerCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: false
+        a: false,
       });
       expect(result).toBeObservable(expected);
     });
@@ -246,7 +256,7 @@ describe('OrcidAuthService', () => {
       const operations: AddOperation<string>[] = [{
         path: '/orcid',
         op: 'add',
-        value: 'test-code'
+        value: 'test-code',
       }];
 
       scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
@@ -266,7 +276,7 @@ describe('OrcidAuthService', () => {
     it('should call updateByOrcidOperations method properly', () => {
       const operations: RemoveOperation[] = [{
         path: '/orcid',
-        op: 'remove'
+        op: 'remove',
       }];
 
       scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
@@ -282,7 +292,7 @@ describe('OrcidAuthService', () => {
       (service as any).configurationService.findByPropertyName.and.returnValues(
         createSuccessfulRemoteDataObject$(authorizeUrl),
         createSuccessfulRemoteDataObject$(appClientId),
-        createSuccessfulRemoteDataObject$(orcidScope)
+        createSuccessfulRemoteDataObject$(orcidScope),
       );
     });
 
@@ -292,7 +302,7 @@ describe('OrcidAuthService', () => {
       const url = 'orcid.authorize-url?client_id=orcid.application-client-id&redirect_uri=' + redirectUri + '&response_type=code&scope=/authenticate /read-limited';
 
       const expected = cold('(a|)', {
-        a: url
+        a: url,
       });
       expect(result).toBeObservable(expected);
     });
@@ -304,7 +314,7 @@ describe('OrcidAuthService', () => {
         '/authenticate',
         '/read-limited',
         '/activities/update',
-        '/person/update'
+        '/person/update',
       ];
       const result = service.getOrcidAuthorizationScopesByItem(mockItemLinkedToOrcid);
       expect(result).toEqual(orcidScopes);
@@ -314,14 +324,14 @@ describe('OrcidAuthService', () => {
   describe('getOrcidAuthorizationScopes', () => {
     it('should return list of scopes by configuration', () => {
       (service as any).configurationService.findByPropertyName.and.returnValue(
-        createSuccessfulRemoteDataObject$(orcidScope)
+        createSuccessfulRemoteDataObject$(orcidScope),
       );
       const orcidScopes = [
         '/authenticate',
-        '/read-limited'
+        '/read-limited',
       ];
       const expected = cold('(a|)', {
-        a: orcidScopes
+        a: orcidScopes,
       });
       const result = service.getOrcidAuthorizationScopes();
       expect(result).toBeObservable(expected);
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
index a930a8f614..4ac04eabb6 100644
--- a/src/app/core/orcid/orcid-auth.service.ts
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -1,20 +1,37 @@
-import { Inject, Injectable } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  AddOperation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { AddOperation, RemoveOperation } from 'fast-json-patch';
-
-import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
-import { Item } from '../shared/item.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { RemoteData } from '../data/remote-data';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { ConfigurationDataService } from '../data/configuration-data.service';
+import { RemoteData } from '../data/remote-data';
 import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { Item } from '../shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 
 @Injectable()
 export class OrcidAuthService {
@@ -45,7 +62,7 @@ export class OrcidAuthService {
     return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
       map((propertyRD: RemoteData<ConfigurationProperty>) => {
         return propertyRD.hasSucceeded && propertyRD.payload.values.map((value) => value.toLowerCase()).includes('only_admin');
-      })
+      }),
     );
   }
 
@@ -58,7 +75,7 @@ export class OrcidAuthService {
     return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
       map((propertyRD: RemoteData<ConfigurationProperty>) => {
         return propertyRD.hasSucceeded && propertyRD.payload.values.map( (value) => value.toLowerCase()).includes('admin_and_owner');
-      })
+      }),
     );
   }
 
@@ -72,7 +89,7 @@ export class OrcidAuthService {
     const operations: AddOperation<string>[] = [{
       path: '/orcid',
       op: 'add',
-      value: code
+      value: code,
     }];
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
@@ -89,7 +106,7 @@ export class OrcidAuthService {
   public unlinkOrcidByItem(person: Item): Observable<RemoteData<ResearcherProfile>> {
     const operations: RemoveOperation[] = [{
       path:'/orcid',
-      op:'remove'
+      op:'remove',
     }];
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
@@ -107,7 +124,7 @@ export class OrcidAuthService {
     return combineLatest([
       this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
       this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
+      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())],
     ).pipe(
       map(([authorizeUrl, clientId, scopes]) => {
         const redirectUri = new URLCombiner(this._window.nativeWindow.origin, encodeURIComponent(this.router.url.split('?')[0]));
@@ -131,13 +148,13 @@ export class OrcidAuthService {
   public getOrcidAuthorizationScopes(): Observable<string[]> {
     return this.configurationService.findByPropertyName('orcid.scope').pipe(
       getFirstCompletedRemoteData(),
-      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : []),
     );
   }
 
   private getOrcidDisconnectionAllowedUsersConfiguration(): Observable<RemoteData<ConfigurationProperty>> {
     return this.configurationService.findByPropertyName('orcid.disconnection.allowed-users').pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index f06a270a44..5e9a3ab1e9 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -1,21 +1,25 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
 import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { sendRequest } from '../shared/request.operators';
 import { OrcidHistory } from './model/orcid-history.model';
 import { ORCID_HISTORY } from './model/orcid-history.resource-type';
 import { OrcidQueue } from './model/orcid-queue.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { RestRequest } from '../data/rest-request.model';
-import { sendRequest } from '../shared/request.operators';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with Orcid History endpoint.
@@ -44,7 +48,7 @@ export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistor
         return new PostRequest(requestId, endpointURL, orcidQueue._links.self.href, options);
       }),
       sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>)
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>),
     );
   }
 }
diff --git a/src/app/core/orcid/orcid-queue-data.service.ts b/src/app/core/orcid/orcid-queue-data.service.ts
index 77149c4bf8..d869110f97 100644
--- a/src/app/core/orcid/orcid-queue-data.service.ts
+++ b/src/app/core/orcid/orcid-queue-data.service.ts
@@ -1,21 +1,28 @@
-import { OrcidQueue } from './model/orcid-queue.model';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { Injectable } from '@angular/core';
-import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { RequestParam } from '../cache/models/request-param.model';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../shared/NoContent.model';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { OrcidQueue } from './model/orcid-queue.model';
+import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 
 /**
  * A service that provides methods to make REST requests with Orcid Queue endpoint.
@@ -50,12 +57,12 @@ export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
    */
   searchByProfileItemId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
     return this.searchData.searchBy('findByProfileItem', {
-        searchParams: [new RequestParam('profileItemId', itemId)],
-        elementsPerPage: paginationOptions.pageSize,
-        currentPage: paginationOptions.currentPage,
-      },
-      useCachedVersionIfAvailable,
-      reRequestOnStale,
+      searchParams: [new RequestParam('profileItemId', itemId)],
+      elementsPerPage: paginationOptions.pageSize,
+      currentPage: paginationOptions.currentPage,
+    },
+    useCachedVersionIfAvailable,
+    reRequestOnStale,
     );
   }
 
diff --git a/src/app/core/pagination/pagination-route-params.interface.ts b/src/app/core/pagination/pagination-route-params.interface.ts
new file mode 100644
index 0000000000..029b27f255
--- /dev/null
+++ b/src/app/core/pagination/pagination-route-params.interface.ts
@@ -0,0 +1,15 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { SortDirection } from '../cache/models/sort-options.model';
+
+export interface PaginationRouteParams {
+  page?: number
+  pageSize?: number
+  sortField?: string
+  sortDirection?: SortDirection
+}
diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index da508d45cd..e9c75703b1 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -1,9 +1,13 @@
-import { PaginationService } from './pagination.service';
-import { RouterStub } from '../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
+
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  SortDirection,
+  SortOptions,
+} from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { PaginationService } from './pagination.service';
 
 
 describe('PaginationService', () => {
@@ -33,7 +37,7 @@ describe('PaginationService', () => {
           value = 'score';
         }
         return observableOf(value);
-      }
+      },
     };
 
     service = new PaginationService(routeService, router);
@@ -44,7 +48,7 @@ describe('PaginationService', () => {
       service.getCurrentPagination('test-id', defaultPagination).subscribe((currentPagination) => {
         expect(currentPagination).toEqual(Object.assign(new PaginationComponentOptions(), {
           currentPage: 5,
-          pageSize: 10
+          pageSize: 10,
         }));
       });
     });
@@ -67,7 +71,7 @@ describe('PaginationService', () => {
             value = 10;
           }
           return observableOf(value);
-        }
+        },
       };
       service = new PaginationService(routeService, router);
 
@@ -83,7 +87,7 @@ describe('PaginationService', () => {
           {
             sort: new SortOptions('score', SortDirection.ASC ),
             currentPage: 5,
-            elementsPerPage: 10
+            elementsPerPage: 10,
           }));
       });
     });
@@ -93,13 +97,13 @@ describe('PaginationService', () => {
       spyOn(service, 'updateRoute');
       service.resetPage('test');
 
-      expect(service.updateRoute).toHaveBeenCalledWith('test', {page: 1});
+      expect(service.updateRoute).toHaveBeenCalledWith('test', { page: 1 });
     });
   });
 
   describe('updateRoute', () => {
     it('should update the route with the provided page params', () => {
-      service.updateRoute('test', {page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC});
+      service.updateRoute('test', { page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -107,10 +111,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `title`;
       navigateParams[`test.sd`] = `DESC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should update the route with the provided page params while keeping the existing non provided ones', () => {
-      service.updateRoute('test', {page: 2});
+      service.updateRoute('test', { page: 2 });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -118,10 +122,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should pass on navigationExtras to router.navigate', () => {
-      service.updateRoute('test', {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      service.updateRoute('test', { page: 2 }, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -129,12 +133,12 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
     });
   });
   describe('updateRouteWithUrl', () => {
     it('should update the route with the provided page params and url', () => {
-      service.updateRouteWithUrl('test', ['someUrl'], {page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC});
+      service.updateRouteWithUrl('test', ['someUrl'], { page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -142,10 +146,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `title`;
       navigateParams[`test.sd`] = `DESC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should update the route with the provided page params and url while keeping the existing non provided ones', () => {
-      service.updateRouteWithUrl('test',['someUrl'], {page: 2});
+      service.updateRouteWithUrl('test',['someUrl'], { page: 2 });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -153,10 +157,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should pass on navigationExtras to router.navigate', () => {
-      service.updateRouteWithUrl('test',['someUrl'], {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      service.updateRouteWithUrl('test',['someUrl'], { page: 2 }, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -164,7 +168,7 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
     });
   });
   describe('clearPagination', () => {
@@ -186,7 +190,7 @@ describe('PaginationService', () => {
 
       service.updateRoute('another-id', {});
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: Object.assign({}, resetParams, navigateParams), queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: Object.assign({}, resetParams, navigateParams), queryParamsHandling: 'merge' });
     });
   });
   describe('getPageParam', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index ce4c3adc3c..0597daa363 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -1,14 +1,33 @@
 import { Injectable } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
-import { RouteService } from '../services/route.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { difference } from '../../shared/object.util';
-import { FindListOptions } from '../data/find-list-options.model';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { isNumeric } from '../../shared/numeric.util';
+import { difference } from '../../shared/object.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../cache/models/sort-options.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RouteService } from '../services/route.service';
+import { PaginationRouteParams } from './pagination-route-params.interface';
 
 @Injectable({
   providedIn: 'root',
@@ -33,7 +52,7 @@ export class PaginationService {
   private clearParams = {};
 
   constructor(protected routeService: RouteService,
-              protected router: Router
+              protected router: Router,
   ) {
   }
 
@@ -50,9 +69,9 @@ export class PaginationService {
       map(([page, size]) => {
         return Object.assign(new PaginationComponentOptions(), defaultPagination, {
           currentPage: this.convertToNumeric(page, defaultPagination.currentPage),
-          pageSize: this.getBestMatchPageSize(size, defaultPagination)
+          pageSize: this.getBestMatchPageSize(size, defaultPagination),
         });
-      })
+      }),
     );
   }
 
@@ -70,10 +89,10 @@ export class PaginationService {
     const sortDirection$ = this.routeService.getQueryParameterValue(`${paginationId}.sd`);
     const sortField$ = this.routeService.getQueryParameterValue(`${paginationId}.sf`);
     return observableCombineLatest([sortDirection$, sortField$]).pipe(map(([sortDirection, sortField]) => {
-        const field = sortField || defaultSort?.field;
-        const direction = SortDirection[sortDirection] || defaultSort?.direction;
-        return new SortOptions(field, direction);
-      })
+      const field = sortField || defaultSort?.field;
+      const direction = SortDirection[sortDirection] || defaultSort?.direction;
+      return new SortOptions(field, direction);
+    }),
     );
   }
 
@@ -97,7 +116,7 @@ export class PaginationService {
         return Object.assign(new FindListOptions(), defaultFindList, {
           sort: currentSortOptions,
           currentPage: currentPagination.currentPage,
-          elementsPerPage: currentPagination.pageSize
+          elementsPerPage: currentPagination.pageSize,
         });
       }));
   }
@@ -107,7 +126,7 @@ export class PaginationService {
    * @param paginationId - The pagination id for which to reset the page
    */
   resetPage(paginationId: string) {
-    this.updateRoute(paginationId, {page: 1});
+    this.updateRoute(paginationId, { page: 1 });
   }
 
 
@@ -121,13 +140,8 @@ export class PaginationService {
    */
   updateRoute(
     paginationId: string,
-    params: {
-      page?: number
-      pageSize?: number
-      sortField?: string
-      sortDirection?: SortDirection
-    },
-    extraParams?,
+    params: PaginationRouteParams,
+    extraParams?: Record<string, unknown>,
     retainScrollPosition?: boolean,
     navigationExtras?: NavigationExtras,
   ) {
@@ -147,13 +161,8 @@ export class PaginationService {
   updateRouteWithUrl(
     paginationId: string,
     url: string[],
-    params: {
-      page?: number
-      pageSize?: number
-      sortField?: string
-      sortDirection?: SortDirection
-    },
-    extraParams?,
+    params: PaginationRouteParams,
+    extraParams?: Record<string, unknown>,
     retainScrollPosition?: boolean,
     navigationExtras?: NavigationExtras,
   ) {
@@ -215,16 +224,11 @@ export class PaginationService {
           sortField: findListoptions.sort.field,
           sortDirection: findListoptions.sort.direction,
         };
-      })
+      }),
     );
   }
 
-  private getParametersWithIdName(paginationId: string, params: {
-    page?: number
-    pageSize?: number
-    sortField?: string
-    sortDirection?: SortDirection
-  }) {
+  private getParametersWithIdName(paginationId: string, params: PaginationRouteParams) {
     const paramsWithIdName = {};
     if (hasValue(params.page)) {
       paramsWithIdName[`${paginationId}.page`] = `${params.page}`;
diff --git a/src/app/core/profile/model/researcher-profile.model.ts b/src/app/core/profile/model/researcher-profile.model.ts
index 6c8b19db40..d26156123c 100644
--- a/src/app/core/profile/model/researcher-profile.model.ts
+++ b/src/app/core/profile/model/researcher-profile.model.ts
@@ -1,15 +1,22 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
 
-import { link, typedObject } from '../../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { RemoteData } from '../../data/remote-data';
 import { HALLink } from '../../shared/hal-link.model';
+import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { RESEARCHER_PROFILE } from './researcher-profile.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { RemoteData } from '../../data/remote-data';
-import { ITEM } from '../../shared/item.resource-type';
-import { Item } from '../../shared/item.model';
 
 /**
  * Class the represents a Researcher Profile.
@@ -24,28 +31,28 @@ export class ResearcherProfile extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Researcher Profile
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @deserializeAs('id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The visibility of this Researcher Profile
    */
   @autoserialize
-  visible: boolean;
+    visible: boolean;
 
   /**
    * The {@link HALLink}s for this Researcher Profile
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     item: HALLink,
     eperson: HALLink
@@ -56,6 +63,6 @@ export class ResearcherProfile extends CacheableObject {
    * Will be undefined unless the item {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  item?: Observable<RemoteData<Item>>;
+    item?: Observable<RemoteData<Item>>;
 
 }
diff --git a/src/app/core/profile/researcher-profile-data.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
index b93e33e2c5..ccaa7063dd 100644
--- a/src/app/core/profile/researcher-profile-data.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -1,33 +1,43 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import { ReplaceOperation } from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from '../data/paginated-list.model';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from '../data/request-entry.model';
-import { ResearcherProfileDataService } from './researcher-profile-data.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { ResearcherProfile } from './model/researcher-profile.model';
-import { Item } from '../shared/item.model';
-import { ReplaceOperation } from 'fast-json-patch';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PostRequest } from '../data/request.models';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { testCreateDataImplementation } from '../data/base/create-data.spec';
-import { testSearchDataImplementation } from '../data/base/search-data.spec';
-import { testPatchDataImplementation } from '../data/base/patch-data.spec';
 import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
+import { testPatchDataImplementation } from '../data/base/patch-data.spec';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { ResearcherProfile } from './model/researcher-profile.model';
+import { ResearcherProfileDataService } from './researcher-profile-data.service';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
@@ -46,9 +56,9 @@ describe('ResearcherProfileService', () => {
     id: itemId,
     _links: {
       self: {
-        href: `https://rest.api/rest/api/items/${itemId}`
+        href: `https://rest.api/rest/api/items/${itemId}`,
       },
-    }
+    },
   });
   const researcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
     id: researcherProfileId,
@@ -56,12 +66,12 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -70,12 +80,12 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfileId2 = 'agbf9946-f4ce-479e-8f11-b90cbe9f7241';
@@ -85,9 +95,9 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId2}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId2}`,
       },
-    }
+    },
   });
 
   const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
@@ -95,105 +105,105 @@ describe('ResearcherProfileService', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   const disconnectionAllowAdmin = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['only_admin']
+    values: ['only_admin'],
   } as ConfigurationProperty;
 
   const disconnectionAllowAdminOwner = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['admin_and_owner']
+    values: ['admin_and_owner'],
   } as ConfigurationProperty;
 
   const authorizeUrl = {
     uuid: 'orcid.authorize-url',
     name: 'orcid.authorize-url',
-    values: ['orcid.authorize-url']
+    values: ['orcid.authorize-url'],
   } as ConfigurationProperty;
   const appClientId = {
     uuid: 'orcid.application-client-id',
     name: 'orcid.application-client-id',
-    values: ['orcid.application-client-id']
+    values: ['orcid.application-client-id'],
   } as ConfigurationProperty;
   const orcidScope = {
     uuid: 'orcid.scope',
     name: 'orcid.scope',
-    values: ['/authenticate', '/read-limited']
+    values: ['/authenticate', '/read-limited'],
   } as ConfigurationProperty;
 
   const endpointURL = `https://rest.api/rest/api/profiles`;
@@ -212,7 +222,7 @@ describe('ResearcherProfileService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: endpointURL })
+      getEndpoint: cold('a', { a: endpointURL }),
     });
 
     responseCacheEntry = new RequestEntry();
@@ -225,18 +235,18 @@ describe('ResearcherProfileService', () => {
       removeByHrefSubstring: {},
       getByHref: observableOf(responseCacheEntry),
       getByUUID: observableOf(responseCacheEntry),
-      setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
+      setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring'),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
-        a: researcherProfileRD
+        a: researcherProfileRD,
       }),
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: hot('a|', {
-        a: researcherProfileRD
-      })
+        a: researcherProfileRD,
+      }),
     });
     objectCache = {} as ObjectCacheService;
     const notificationsService = {} as NotificationsService;
@@ -244,7 +254,7 @@ describe('ResearcherProfileService', () => {
     const comparator = {} as any;
     routerStub = new RouterMock();
     const itemService = jasmine.createSpyObj('ItemService', {
-      findByHref: jasmine.createSpy('findByHref')
+      findByHref: jasmine.createSpy('findByHref'),
     });
 
     service = new ResearcherProfileDataService(
@@ -287,7 +297,7 @@ describe('ResearcherProfileService', () => {
     it('should return the RemoteData<ResearcherProfile> created', () => {
       const result = service.create();
       const expected = cold('a|', {
-        a: researcherProfileRD
+        a: researcherProfileRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -319,7 +329,7 @@ describe('ResearcherProfileService', () => {
       it('should return a ResearcherProfile object with the given id', () => {
         const result = service.findRelatedItemId(researcherProfile);
         const expected = cold('(a|)', {
-          a: itemId
+          a: itemId,
         });
         expect(result).toBeObservable(expected);
       });
@@ -341,7 +351,7 @@ describe('ResearcherProfileService', () => {
       it('should not return a ResearcherProfile object with the given id', () => {
         const result = service.findRelatedItemId(researcherProfile);
         const expected = cold('(a|)', {
-          a: null
+          a: null,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
index c43bf696f8..3f287ab967 100644
--- a/src/app/core/profile/researcher-profile-data.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -1,38 +1,66 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  Operation,
+  ReplaceOperation,
+} from 'fast-json-patch';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { Operation, ReplaceOperation } from 'fast-json-patch';
-import { Observable, of as observableOf } from 'rxjs';
-import { find, map, mergeMap } from 'rxjs/operators';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { ItemDataService } from '../data/item-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { RESEARCHER_PROFILE } from './model/researcher-profile.resource-type';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PostRequest } from '../data/request.models';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Item } from '../shared/item.model';
-import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PatchData, PatchDataImpl } from '../data/base/patch-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with researcher profile endpoint.
@@ -86,7 +114,7 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     const relatedItem$ = researcherProfile.item ? researcherProfile.item : this.itemService.findByHref(researcherProfile._links.item.href, false);
     return relatedItem$.pipe(
       getFirstCompletedRemoteData(),
-      map((itemRD: RemoteData<Item>) => (itemRD.hasSucceeded && itemRD.payload) ? itemRD.payload.id : null)
+      map((itemRD: RemoteData<Item>) => (itemRD.hasSucceeded && itemRD.payload) ? itemRD.payload.id : null),
     );
   }
 
@@ -100,7 +128,7 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     const replaceOperation: ReplaceOperation<boolean> = {
       path: '/visible',
       op: 'replace',
-      value: visible
+      value: visible,
     };
 
     return this.patch(researcherProfile, [replaceOperation]);
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index e9dfbe7e2c..4f4be0fb27 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -1,9 +1,16 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -14,22 +21,25 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
+import { storeModuleConfig } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { StoreMock } from '../../shared/testing/store.mock';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { StoreMock } from '../../shared/testing/store.mock';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FindListOptions } from '../data/find-list-options.model';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { RemoteData } from '../data/remote-data';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { RegistryService } from './registry.service';
-import { storeModuleConfig } from '../../app.reducer';
-import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
-import { MetadataFieldDataService } from '../data/metadata-field-data.service';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { RemoteData } from '../data/remote-data';
 import { NoContent } from '../shared/NoContent.model';
-import { FindListOptions } from '../data/find-list-options.model';
+import { RegistryService } from './registry.service';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -48,28 +58,28 @@ describe('RegistryService', () => {
   function init() {
     options = Object.assign(new FindListOptions(), {
       currentPage: 1,
-      elementsPerPage: 20
+      elementsPerPage: 20,
     });
 
     mockSchemasList = [
       Object.assign(new MetadataSchema(), {
         id: 1,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' },
         },
         prefix: 'dc',
         namespace: 'http://dublincore.org/documents/dcmi-terms/',
-        type: MetadataSchema.type
+        type: MetadataSchema.type,
       }),
       Object.assign(new MetadataSchema(), {
         id: 2,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' },
         },
         prefix: 'mock',
         namespace: 'http://dspace.org/mockschema',
-        type: MetadataSchema.type
-      })
+        type: MetadataSchema.type,
+      }),
     ];
 
     mockFieldsList = [
@@ -77,50 +87,50 @@ describe('RegistryService', () => {
         {
           id: 1,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' },
           },
           element: 'contributor',
           qualifier: 'advisor',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 2,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' },
           },
           element: 'contributor',
           qualifier: 'author',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 3,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' },
           },
           element: 'contributor',
           qualifier: 'editor',
           scopeNote: 'test scope note',
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 4,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' },
           },
           element: 'contributor',
           qualifier: 'illustrator',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
-          type: MetadataField.type
-        })
+          type: MetadataField.type,
+        }),
     ];
 
     metadataSchemaService = jasmine.createSpyObj('metadataSchemaService', {
@@ -128,7 +138,7 @@ describe('RegistryService', () => {
       findById: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
       createOrUpdateMetadataSchema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
       delete: createNoContentRemoteDataObject$(),
-      clearRequests: observableOf('href')
+      clearRequests: observableOf('href'),
     });
 
     metadataFieldService = jasmine.createSpyObj('metadataFieldService', {
@@ -137,7 +147,7 @@ describe('RegistryService', () => {
       create: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
       put: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
       delete: createNoContentRemoteDataObject$(),
-      clearRequests: observableOf('href')
+      clearRequests: observableOf('href'),
     });
   }
 
@@ -146,15 +156,15 @@ describe('RegistryService', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot()],
       declarations: [
-        DummyComponent
+        DummyComponent,
       ],
       providers: [
         { provide: Store, useClass: StoreMock },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: MetadataSchemaDataService, useValue: metadataSchemaService },
         { provide: MetadataFieldDataService, useValue: metadataFieldService },
-        RegistryService
-      ]
+        RegistryService,
+      ],
     });
     registryService = TestBed.inject(RegistryService);
     mockStore = TestBed.inject(Store);
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 7a377405bd..dfa87d8d2a 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -1,12 +1,20 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util';
-import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { createSelector, select, Store } from '@ngrx/store';
-import { AppState } from '../../app.reducer';
-import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -17,19 +25,27 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { map, mergeMap, tap } from 'rxjs/operators';
+import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
+import { AppState } from '../../app.reducer';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
-import { MetadataFieldDataService } from '../data/metadata-field-data.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RequestParam } from '../cache/models/request-param.model';
-import { NoContent } from '../shared/NoContent.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -78,14 +94,14 @@ export class RegistryService {
   public getMetadataSchemaByPrefix(prefix: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<MetadataSchema>> {
     // Temporary options to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
     const options: FindListOptions = Object.assign(new FindListOptions(), {
-      elementsPerPage: 10000
+      elementsPerPage: 10000,
     });
     return this.getMetadataSchemas(options).pipe(
       getFirstSucceededRemoteDataPayload(),
       map((schemas: PaginatedList<MetadataSchema>) => schemas.page),
       isNotEmptyOperator(),
       map((schemas: MetadataSchema[]) => schemas.filter((schema) => schema.prefix === prefix)[0]),
-      mergeMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      mergeMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -219,7 +235,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, isUpdate, false, { prefix: schema.prefix });
-      })
+      }),
     );
   }
 
@@ -253,7 +269,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, false, true, { field: field.toString() });
-      })
+      }),
     );
   }
 
@@ -271,7 +287,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, true, true, { field: field.toString() });
-      })
+      }),
     );
   }
 
@@ -296,7 +312,7 @@ export class RegistryService {
     const editedString = edited ? 'edited' : 'created';
     const messages = observableCombineLatest(
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}${isField ? '.field' : ''}.${editedString}`, options)
+      this.translateService.get(`${prefix}${isField ? '.field' : ''}.${editedString}`, options),
     );
     messages.subscribe(([head, content]) => {
       if (success) {
diff --git a/src/app/core/reload/reload.guard.spec.ts b/src/app/core/reload/reload.guard.spec.ts
index 6146f51572..d7b92146af 100644
--- a/src/app/core/reload/reload.guard.spec.ts
+++ b/src/app/core/reload/reload.guard.spec.ts
@@ -1,4 +1,5 @@
 import { Router } from '@angular/router';
+
 import { AppConfig } from '../../../config/app-config.interface';
 import { DefaultAppConfig } from '../../../config/default-app-config';
 import { ReloadGuard } from './reload.guard';
@@ -24,8 +25,8 @@ describe('ReloadGuard', () => {
         redirectUrl = '/redirect/url?param=extra';
         route = {
           queryParams: {
-            redirect: redirectUrl
-          }
+            redirect: redirectUrl,
+          },
         };
       });
 
@@ -38,7 +39,7 @@ describe('ReloadGuard', () => {
     describe('when the route\'s query params doesn\'t contain a redirect url', () => {
       beforeEach(() => {
         route = {
-          queryParams: {}
+          queryParams: {},
         };
       });
 
diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts
index 1e99a5687a..0608293e33 100644
--- a/src/app/core/reload/reload.guard.ts
+++ b/src/app/core/reload/reload.guard.ts
@@ -1,6 +1,19 @@
-import { Inject, Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { isNotEmpty } from '../../shared/empty.util';
 
 /**
diff --git a/src/app/core/resolving/resolver.actions.ts b/src/app/core/resolving/resolver.actions.ts
index db41d20b6e..66f075be7c 100644
--- a/src/app/core/resolving/resolver.actions.ts
+++ b/src/app/core/resolving/resolver.actions.ts
@@ -1,9 +1,10 @@
-import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
+import { type } from '../../shared/ngrx/type';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
 export const ResolverActionTypes = {
-  RESOLVED: type('dspace/resolver/RESOLVED')
+  RESOLVED: type('dspace/resolver/RESOLVED'),
 };
 
 /**
diff --git a/src/app/core/resource-policy/models/resource-policy.model.ts b/src/app/core/resource-policy/models/resource-policy.model.ts
index b0608dfbca..d4558cfe3a 100644
--- a/src/app/core/resource-policy/models/resource-policy.model.ts
+++ b/src/app/core/resource-policy/models/resource-policy.model.ts
@@ -1,19 +1,27 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
-import { link, typedObject } from '../../cache/builders/build-decorators';
-import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
-import { ActionType } from './action-type.model';
-import { HALLink } from '../../shared/hal-link.model';
-import { RESOURCE_POLICY } from './resource-policy.resource-type';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
-import { PolicyType } from './policy-type.model';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { GROUP } from '../../eperson/models/group.resource-type';
-import { Group } from '../../eperson/models/group.model';
-import { EPERSON } from '../../eperson/models/eperson.resource-type';
-import { EPerson } from '../../eperson/models/eperson.model';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { CacheableObject } from '../../cache/cacheable-object.model';
+import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { RemoteData } from '../../data/remote-data';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { EPERSON } from '../../eperson/models/eperson.resource-type';
+import { Group } from '../../eperson/models/group.model';
+import { GROUP } from '../../eperson/models/group.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ActionType } from './action-type.model';
+import { PolicyType } from './policy-type.model';
+import { RESOURCE_POLICY } from './resource-policy.resource-type';
 
 /**
  * Model class for a Resource Policy
@@ -26,50 +34,50 @@ export class ResourcePolicy implements CacheableObject {
    * The identifier for this Resource Policy
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name for this Resource Policy
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The description for this Resource Policy
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The classification or this Resource Policy
    */
   @autoserialize
-  policyType: PolicyType;
+    policyType: PolicyType;
 
   /**
    * The action that is allowed by this Resource Policy
    */
   @autoserialize
-  action: ActionType;
+    action: ActionType;
 
   /**
    * The first day of validity of the policy (format YYYY-MM-DD)
    */
   @autoserialize
-  startDate: string;
+    startDate: string;
 
   /**
    * The last day of validity of the policy (format YYYY-MM-DD)
    */
   @autoserialize
-  endDate: string;
+    endDate: string;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The universally unique identifier for this Resource Policy
@@ -77,13 +85,13 @@ export class ResourcePolicy implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The {@link HALLink}s for this ResourcePolicy
    */
   @deserialize
-  _links: {
+    _links: {
     eperson: HALLink,
     group: HALLink,
     self: HALLink,
@@ -94,12 +102,12 @@ export class ResourcePolicy implements CacheableObject {
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The group linked by this resource policy
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(GROUP)
-  group?: Observable<RemoteData<Group>>;
+    group?: Observable<RemoteData<Group>>;
 }
diff --git a/src/app/core/resource-policy/resource-policy-data.service.spec.ts b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
index 7cfcaabb5d..1af36c1254 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
@@ -1,32 +1,37 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { ResourcePolicyDataService } from './resource-policy-data.service';
-import { PolicyType } from './models/policy-type.model';
-import { ActionType } from './models/action-type.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from '../data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from '../data/request-entry.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
-import { RestRequestMethod } from '../data/rest-request-method';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PageInfo } from '../shared/page-info.model';
+import { ActionType } from './models/action-type.model';
+import { PolicyType } from './models/policy-type.model';
+import { ResourcePolicyDataService } from './resource-policy-data.service';
 
 describe('ResourcePolicyService', () => {
   let scheduler: TestScheduler;
   let service: ResourcePolicyDataService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
-  let objectCache: ObjectCacheService;
+  let objectCache: ObjectCacheServiceStub;
   let halService: HALEndpointService;
   let responseCacheEntry: RequestEntry;
   let ePersonService: EPersonDataService;
@@ -44,15 +49,15 @@ describe('ResourcePolicyService', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
-    }
+    },
   };
 
   const anotherResourcePolicy: any = {
@@ -67,15 +72,15 @@ describe('ResourcePolicyService', () => {
     uuid: 'resource-policy-2',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
-    }
+    },
   };
   const endpointURL = `https://rest.api/rest/api/resourcepolicies`;
   const requestURL = `https://rest.api/rest/api/resourcepolicies/${resourcePolicy.id}`;
@@ -97,7 +102,7 @@ describe('ResourcePolicyService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: endpointURL })
+      getEndpoint: cold('a', { a: endpointURL }),
     });
 
     responseCacheEntry = new RequestEntry();
@@ -114,39 +119,39 @@ describe('ResourcePolicyService', () => {
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       }),
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: hot('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       }),
       buildFromRequestUUIDAndAwait: hot('a|', {
-        a: resourcePolicyRD
-      })
+        a: resourcePolicyRD,
+      }),
     });
     ePersonService = jasmine.createSpyObj('ePersonService', {
       getBrowseEndpoint: hot('a', {
-        a: ePersonEndpoint
+        a: ePersonEndpoint,
       }),
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID
+        a: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID,
       }),
     });
     groupService = jasmine.createSpyObj('groupService', {
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/eperson/groups/' + groupUUID
+        a: 'https://rest.api/rest/api/eperson/groups/' + groupUUID,
       }),
     });
-    objectCache = {} as ObjectCacheService;
+    objectCache = new ObjectCacheServiceStub();
     const notificationsService = {} as NotificationsService;
     const comparator = {} as any;
 
     service = new ResourcePolicyDataService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
       notificationsService,
       comparator,
@@ -190,7 +195,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
       const result = service.create(resourcePolicy, resourceUUID, epersonUUID);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -218,7 +223,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
       const result = service.findById(resourcePolicyId);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -228,7 +233,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given URL', () => {
       const result = service.findByHref(requestURL);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -259,7 +264,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByEPerson(epersonUUID, resourceUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -291,7 +296,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByGroup(groupUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -324,7 +329,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByResource(resourceUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/resource-policy/resource-policy-data.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
index 9f799fe292..6ec6c22e88 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -1,38 +1,42 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RequestService } from '../data/request.service';
-import { Collection } from '../shared/collection.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ResourcePolicy } from './models/resource-policy.model';
-import { RemoteData } from '../data/remote-data';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { PaginatedList } from '../data/paginated-list.model';
-import { ActionType } from './models/action-type.model';
-import { RequestParam } from '../cache/models/request-param.model';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../shared/empty.util';
-import { first, map } from 'rxjs/operators';
-import { NoContent } from '../shared/NoContent.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CreateDataImpl } from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import { DeleteDataImpl } from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { PatchDataImpl } from '../data/base/patch-data';
+import { SearchDataImpl } from '../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { FindListOptions } from '../data/find-list-options.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PutRequest } from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
+import { PaginatedList } from '../data/paginated-list.model';
 import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { PutRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
 import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { CreateDataImpl } from '../data/base/create-data';
-import { SearchDataImpl } from '../data/base/search-data';
-import { PatchDataImpl } from '../data/base/patch-data';
-import { DeleteDataImpl } from '../data/base/delete-data';
-import { dataService } from '../data/base/data-service.decorator';
+import { Collection } from '../shared/collection.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { ActionType } from './models/action-type.model';
+import { ResourcePolicy } from './models/resource-policy.model';
+import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
@@ -212,7 +216,7 @@ export class ResourcePolicyDataService extends IdentifiableDataService<ResourceP
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return StatusCodeOnlyResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request);
     });
diff --git a/src/app/core/rest-property/forgot-password-check-guard.guard.ts b/src/app/core/rest-property/forgot-password-check-guard.guard.ts
new file mode 100644
index 0000000000..cc74e8039f
--- /dev/null
+++ b/src/app/core/rest-property/forgot-password-check-guard.guard.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { AuthService } from '../auth/auth.service';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { SingleFeatureAuthorizationGuard } from '../data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Guard that checks if the forgot-password feature is enabled
+ */
+export class ForgotPasswordCheckGuard extends SingleFeatureAuthorizationGuard {
+
+  constructor(
+    protected readonly authorizationService: AuthorizationDataService,
+    protected readonly router: Router,
+    protected readonly authService: AuthService,
+  ) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return of(FeatureID.EPersonForgotPassword);
+  }
+
+}
diff --git a/src/app/core/roles/role.service.ts b/src/app/core/roles/role.service.ts
index 7a4b6e6ccf..2a135f8224 100644
--- a/src/app/core/roles/role.service.ts
+++ b/src/app/core/roles/role.service.ts
@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
-
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 
-import { RoleType } from './role-types';
 import { CollectionDataService } from '../data/collection-data.service';
+import { RoleType } from './role-types';
 
 /**
  * A service that provides methods to identify user role.
@@ -25,7 +27,7 @@ export class RoleService {
    */
   isSubmitter(): Observable<boolean> {
     return this.collectionService.hasAuthorizedCollection().pipe(
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/router/router.actions.ts b/src/app/core/router/router.actions.ts
index e4823536c6..e251895f39 100644
--- a/src/app/core/router/router.actions.ts
+++ b/src/app/core/router/router.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../shared/ngrx/type';
 
 /**
diff --git a/src/app/core/router/router.effects.ts b/src/app/core/router/router.effects.ts
index 5df38aa1fc..cee1698b53 100644
--- a/src/app/core/router/router.effects.ts
+++ b/src/app/core/router/router.effects.ts
@@ -1,8 +1,20 @@
-import { filter, map, pairwise } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { RouterNavigationAction, ROUTER_NAVIGATION } from '@ngrx/router-store';
 import { Router } from '@angular/router';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  ROUTER_NAVIGATION,
+  RouterNavigationAction,
+} from '@ngrx/router-store';
+import {
+  filter,
+  map,
+  pairwise,
+} from 'rxjs/operators';
+
 import { RouteUpdateAction } from './router.actions';
 
 @Injectable()
@@ -11,7 +23,7 @@ export class RouterEffects {
    * Effect that fires a new RouteUpdateAction when then path of route is changed
    * @type {Observable<RouteUpdateAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(ROUTER_NAVIGATION),
       pairwise(),
@@ -21,7 +33,7 @@ export class RouterEffects {
           return urlTree.root.children.primary.segments.map((it) => it.path).join('/');
         })),
       filter((actions: string[]) => actions[0] !== actions[1]),
-      map(() => new RouteUpdateAction())
+      map(() => new RouteUpdateAction()),
     ));
 
   constructor(private actions$: Actions, private router: Router) {
diff --git a/src/app/core/server-check/server-check.guard.spec.ts b/src/app/core/server-check/server-check.guard.spec.ts
index 1f126be5e5..ad2120aaaa 100644
--- a/src/app/core/server-check/server-check.guard.spec.ts
+++ b/src/app/core/server-check/server-check.guard.spec.ts
@@ -1,68 +1,97 @@
-import { ServerCheckGuard } from './server-check.guard';
-import { Router } from '@angular/router';
+import {
+  NavigationEnd,
+  NavigationStart,
+  Router,
+  RouterEvent,
+  UrlTree,
+} from '@angular/router';
+import {
+  of,
+  ReplaySubject,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { of } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
 import { RootDataService } from '../data/root-data.service';
+import { ServerCheckGuard } from './server-check.guard';
 import SpyObj = jasmine.SpyObj;
 
 describe('ServerCheckGuard', () => {
   let guard: ServerCheckGuard;
-  let router: SpyObj<Router>;
+  let router: Router;
+  let eventSubject: ReplaySubject<RouterEvent>;
   let rootDataServiceStub: SpyObj<RootDataService>;
-
-  rootDataServiceStub = jasmine.createSpyObj('RootDataService', {
-    checkServerAvailability: jasmine.createSpy('checkServerAvailability'),
-    invalidateRootCache: jasmine.createSpy('invalidateRootCache')
-  });
-  router = jasmine.createSpyObj('Router', {
-    navigateByUrl: jasmine.createSpy('navigateByUrl')
-  });
+  let testScheduler: TestScheduler;
+  let redirectUrlTree: UrlTree;
 
   beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+    rootDataServiceStub = jasmine.createSpyObj('RootDataService', {
+      checkServerAvailability: jasmine.createSpy('checkServerAvailability'),
+      invalidateRootCache: jasmine.createSpy('invalidateRootCache'),
+      findRoot: jasmine.createSpy('findRoot'),
+    });
+    redirectUrlTree = new UrlTree();
+    eventSubject = new ReplaySubject<RouterEvent>(1);
+    router = {
+      events: eventSubject.asObservable(),
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
+      parseUrl: jasmine.createSpy('parseUrl').and.returnValue(redirectUrlTree),
+    } as any;
     guard = new ServerCheckGuard(router, rootDataServiceStub);
   });
 
-  afterEach(() => {
-    router.navigateByUrl.calls.reset();
-    rootDataServiceStub.invalidateRootCache.calls.reset();
-  });
-
   it('should be created', () => {
     expect(guard).toBeTruthy();
   });
 
-  describe('when root endpoint has succeeded', () => {
+  describe('when root endpoint request has succeeded', () => {
     beforeEach(() => {
       rootDataServiceStub.checkServerAvailability.and.returnValue(of(true));
     });
 
-    it('should not redirect to error page', () => {
-      guard.canActivateChild({} as any, {} as any).pipe(
-        take(1)
-      ).subscribe((canActivate: boolean) => {
-        expect(canActivate).toEqual(true);
-        expect(rootDataServiceStub.invalidateRootCache).not.toHaveBeenCalled();
-        expect(router.navigateByUrl).not.toHaveBeenCalled();
+    it('should return true', () => {
+      testScheduler.run(({ expectObservable }) => {
+        const result$ = guard.canActivateChild({} as any, {} as any);
+        expectObservable(result$).toBe('(a|)', { a: true });
       });
     });
   });
 
-  describe('when root endpoint has not succeeded', () => {
+  describe('when root endpoint request has not succeeded', () => {
     beforeEach(() => {
       rootDataServiceStub.checkServerAvailability.and.returnValue(of(false));
     });
 
-    it('should redirect to error page', () => {
-      guard.canActivateChild({} as any, {} as any).pipe(
-        take(1)
-      ).subscribe((canActivate: boolean) => {
-        expect(canActivate).toEqual(false);
-        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith(getPageInternalServerErrorRoute());
+    it('should return a UrlTree with the route to the 500 error page', () => {
+      testScheduler.run(({ expectObservable }) => {
+        const result$ = guard.canActivateChild({} as any, {} as any);
+        expectObservable(result$).toBe('(b|)', { b: redirectUrlTree });
       });
+      expect(router.parseUrl).toHaveBeenCalledWith('/500');
+    });
+  });
+
+  describe(`listenForRouteChanges`, () => {
+    it(`should invalidate the root cache, when the method is first called`, () => {
+      testScheduler.run(() => {
+        guard.listenForRouteChanges();
+        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it(`should invalidate the root cache on every NavigationStart event`, () => {
+      testScheduler.run(() => {
+        guard.listenForRouteChanges();
+        eventSubject.next(new NavigationStart(1,''));
+        eventSubject.next(new NavigationEnd(1,'', ''));
+        eventSubject.next(new NavigationStart(2,''));
+        eventSubject.next(new NavigationEnd(2,'', ''));
+        eventSubject.next(new NavigationStart(3,''));
+      });
+      // once when the method is first called, and then 3 times for NavigationStart events
+      expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1 + 3);
     });
   });
 });
diff --git a/src/app/core/server-check/server-check.guard.ts b/src/app/core/server-check/server-check.guard.ts
index 8a0e26c01d..ccad01d57e 100644
--- a/src/app/core/server-check/server-check.guard.ts
+++ b/src/app/core/server-check/server-check.guard.ts
@@ -1,14 +1,24 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  CanActivateChild,
+  NavigationStart,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { take, tap } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { RootDataService } from '../data/root-data.service';
 import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
+import { RootDataService } from '../data/root-data.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * A guard that checks if root api endpoint is reachable.
@@ -23,17 +33,36 @@ export class ServerCheckGuard implements CanActivateChild {
    */
   canActivateChild(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean> {
+    state: RouterStateSnapshot,
+  ): Observable<boolean | UrlTree> {
 
     return this.rootDataService.checkServerAvailability().pipe(
       take(1),
-      tap((isAvailable: boolean) => {
+      map((isAvailable: boolean) => {
         if (!isAvailable) {
-          this.rootDataService.invalidateRootCache();
-          this.router.navigateByUrl(getPageInternalServerErrorRoute());
+          return this.router.parseUrl(getPageInternalServerErrorRoute());
+        } else {
+          return true;
         }
-      })
+      }),
     );
+  }
 
+  /**
+   * Listen to all router events. Every time a new navigation starts, invalidate the cache
+   * for the root endpoint. That way we retrieve it once per routing operation to ensure the
+   * backend is not down. But if the guard is called multiple times during the same routing
+   * operation, the cached version is used.
+   */
+  listenForRouteChanges(): void {
+    // we'll always be too late for the first NavigationStart event with the router subscribe below,
+    // so this statement is for the very first route operation.
+    this.rootDataService.invalidateRootCache();
+
+    this.router.events.pipe(
+      filter(event => event instanceof NavigationStart),
+    ).subscribe(() => {
+      this.rootDataService.invalidateRootCache();
+    });
   }
 }
diff --git a/src/app/core/services/browser-hard-redirect.service.spec.ts b/src/app/core/services/browser-hard-redirect.service.spec.ts
index 1d8666d259..859bfdc8aa 100644
--- a/src/app/core/services/browser-hard-redirect.service.spec.ts
+++ b/src/app/core/services/browser-hard-redirect.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+
 import { BrowserHardRedirectService } from './browser-hard-redirect.service';
 
 describe('BrowserHardRedirectService', () => {
@@ -15,7 +16,7 @@ describe('BrowserHardRedirectService', () => {
       origin,
       replace: (url: string) => {
         mockLocation.href = url;
-      }
+      },
     } as Location;
     spyOn(mockLocation, 'replace');
 
diff --git a/src/app/core/services/browser-hard-redirect.service.ts b/src/app/core/services/browser-hard-redirect.service.ts
index 4ef9548899..c386e82f2e 100644
--- a/src/app/core/services/browser-hard-redirect.service.ts
+++ b/src/app/core/services/browser-hard-redirect.service.ts
@@ -1,4 +1,9 @@
-import { Inject, Injectable, InjectionToken } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
+
 import { HardRedirectService } from './hard-redirect.service';
 
 export const LocationToken = new InjectionToken('Location');
@@ -10,7 +15,7 @@ export function locationProvider(): Location {
 /**
  * Service for performing hard redirects within the browser app module
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class BrowserHardRedirectService extends HardRedirectService {
 
   constructor(
@@ -38,8 +43,8 @@ export class BrowserHardRedirectService extends HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   getCurrentOrigin(): string {
     return this.location.origin;
diff --git a/src/app/core/services/browser.referrer.service.spec.ts b/src/app/core/services/browser.referrer.service.spec.ts
index 9dc8f466b6..90ce43c995 100644
--- a/src/app/core/services/browser.referrer.service.spec.ts
+++ b/src/app/core/services/browser.referrer.service.spec.ts
@@ -1,6 +1,7 @@
 import { of as observableOf } from 'rxjs';
-import { RouteService } from './route.service';
+
 import { BrowserReferrerService } from './browser.referrer.service';
+import { RouteService } from './route.service';
 
 describe(`BrowserReferrerService`, () => {
   let service: BrowserReferrerService;
@@ -10,12 +11,12 @@ describe(`BrowserReferrerService`, () => {
 
   beforeEach(() => {
     routeService = {
-      getHistory: () => observableOf([])
+      getHistory: () => observableOf([]),
     } as any;
     service = new BrowserReferrerService(
       { referrer: documentReferrer },
       routeService,
-      { getCurrentOrigin: () => origin } as any
+      { getCurrentOrigin: () => origin } as any,
     );
   });
 
@@ -53,7 +54,7 @@ describe(`BrowserReferrerService`, () => {
           '/first/route',
           '/second/route',
           prevUrl,
-          '/current/route'
+          '/current/route',
         ]));
       });
 
diff --git a/src/app/core/services/browser.referrer.service.ts b/src/app/core/services/browser.referrer.service.ts
index 64be95d241..fd2d3d5efd 100644
--- a/src/app/core/services/browser.referrer.service.ts
+++ b/src/app/core/services/browser.referrer.service.ts
@@ -1,11 +1,15 @@
-import { ReferrerService } from './referrer.service';
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { hasNoValue } from '../../shared/empty.util';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { Inject, Injectable } from '@angular/core';
-import { DOCUMENT } from '@angular/common';
 import { HardRedirectService } from './hard-redirect.service';
+import { ReferrerService } from './referrer.service';
 import { RouteService } from './route.service';
 
 /**
@@ -48,7 +52,7 @@ export class BrowserReferrerService extends ReferrerService {
           const prevUrl = reversedHistory.find((url: string) => url !== currentURL);
           return new URLCombiner(this.hardRedirectService.getCurrentOrigin(), prevUrl).toString();
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/services/client-cookie.service.ts b/src/app/core/services/client-cookie.service.ts
index 9e0bfacba7..e187e3352b 100644
--- a/src/app/core/services/client-cookie.service.ts
+++ b/src/app/core/services/client-cookie.service.ts
@@ -1,6 +1,15 @@
 import { Injectable } from '@angular/core';
-import { CookieAttributes, getJSON, remove, set } from 'js-cookie';
-import { CookieService, ICookieService } from './cookie.service';
+import {
+  CookieAttributes,
+  getJSON,
+  remove,
+  set,
+} from 'js-cookie';
+
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
 
 @Injectable()
 export class ClientCookieService extends CookieService implements ICookieService {
diff --git a/src/app/core/services/cookie.service.spec.ts b/src/app/core/services/cookie.service.spec.ts
index 630fc9f755..b8f949b9f1 100644
--- a/src/app/core/services/cookie.service.spec.ts
+++ b/src/app/core/services/cookie.service.spec.ts
@@ -1,7 +1,14 @@
-import { CookieService, ICookieService } from './cookie.service';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
+
 describe(CookieService.name, () => {
   let service: ICookieService;
 
@@ -9,8 +16,8 @@ describe(CookieService.name, () => {
     TestBed.configureTestingModule({
       providers: [
         CookieService,
-        { provide: REQUEST, useValue: {} }
-      ]
+        { provide: REQUEST, useValue: {} },
+      ],
     });
   }));
 
diff --git a/src/app/core/services/cookie.service.ts b/src/app/core/services/cookie.service.ts
index 0098e3ace4..d26112418c 100644
--- a/src/app/core/services/cookie.service.ts
+++ b/src/app/core/services/cookie.service.ts
@@ -1,9 +1,13 @@
-import { Inject, Injectable } from '@angular/core';
-
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-
-import { Subject ,  Observable } from 'rxjs';
 import { CookieAttributes } from 'js-cookie';
+import {
+  Observable,
+  Subject,
+} from 'rxjs';
 
 export interface ICookieService {
   readonly cookies$: Observable<{ readonly [key: string]: any }>;
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index 826c7e4fa9..e6104cefb9 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -25,8 +25,8 @@ export abstract class HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   abstract getCurrentOrigin(): string;
 }
diff --git a/src/app/core/services/link-head.service.spec.ts b/src/app/core/services/link-head.service.spec.ts
index 017fe6af03..fd240db4d9 100644
--- a/src/app/core/services/link-head.service.spec.ts
+++ b/src/app/core/services/link-head.service.spec.ts
@@ -1,45 +1,52 @@
 import { DOCUMENT } from '@angular/common';
-import { Renderer2, RendererFactory2 } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Renderer2,
+  RendererFactory2,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { MockProvider } from 'ng-mocks';
+
 import { LinkHeadService } from './link-head.service';
 
 describe('LinkHeadService', () => {
 
-    let service: LinkHeadService;
+  let service: LinkHeadService;
 
-    const renderer2: Renderer2 = {
-        createRenderer: jasmine.createSpy('createRenderer'),
-        createElement: jasmine.createSpy('createElement'),
-        setAttribute: jasmine.createSpy('setAttribute'),
-        appendChild: jasmine.createSpy('appendChild')
-    } as unknown as Renderer2;
+  const renderer2: Renderer2 = {
+    createRenderer: jasmine.createSpy('createRenderer'),
+    createElement: jasmine.createSpy('createElement'),
+    setAttribute: jasmine.createSpy('setAttribute'),
+    appendChild: jasmine.createSpy('appendChild'),
+  } as unknown as Renderer2;
 
-    beforeEach(waitForAsync(() => {
-        return TestBed.configureTestingModule({
-          providers: [
-            MockProvider(RendererFactory2, {
-                createRenderer: () => renderer2
-            }),
-            { provide: Document, useExisting: DOCUMENT },
-          ]
-        });
-    }));
-
-    beforeEach(() => {
-        service = new LinkHeadService(TestBed.inject(RendererFactory2), TestBed.inject(DOCUMENT));
+  beforeEach(waitForAsync(() => {
+    return TestBed.configureTestingModule({
+      providers: [
+        MockProvider(RendererFactory2, {
+          createRenderer: () => renderer2,
+        }),
+        { provide: Document, useExisting: DOCUMENT },
+      ],
     });
+  }));
 
-    describe('link', () => {
-        it('should create a link tag', () => {
-            const link = service.addTag({
-                href: 'test',
-                type: 'application/atom+xml',
-                rel: 'alternate',
-                title: 'Sitewide Atom feed'
-              });
-            expect(link).not.toBeUndefined();
-        });
+  beforeEach(() => {
+    service = new LinkHeadService(TestBed.inject(RendererFactory2), TestBed.inject(DOCUMENT));
+  });
+
+  describe('link', () => {
+    it('should create a link tag', () => {
+      const link = service.addTag({
+        href: 'test',
+        type: 'application/atom+xml',
+        rel: 'alternate',
+        title: 'Sitewide Atom feed',
+      });
+      expect(link).not.toBeUndefined();
     });
+  });
 
 });
diff --git a/src/app/core/services/link-head.service.ts b/src/app/core/services/link-head.service.ts
index d608618ca4..35bed3bb07 100644
--- a/src/app/core/services/link-head.service.ts
+++ b/src/app/core/services/link-head.service.ts
@@ -1,5 +1,10 @@
-import { Injectable, RendererFactory2, ViewEncapsulation, Inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  RendererFactory2,
+  ViewEncapsulation,
+} from '@angular/core';
 
 /**
  * LinkHead Service injects <link> tag into the head element during runtime.
@@ -8,7 +13,7 @@ import { DOCUMENT } from '@angular/common';
 export class LinkHeadService {
   constructor(
     private rendererFactory: RendererFactory2,
-    @Inject(DOCUMENT) private document
+    @Inject(DOCUMENT) private document,
   ) {
 
   }
@@ -25,7 +30,7 @@ export class LinkHeadService {
         id: '-1',
         encapsulation: ViewEncapsulation.None,
         styles: [],
-        data: {}
+        data: {},
       });
 
       const link = renderer.createElement('link');
@@ -42,7 +47,7 @@ export class LinkHeadService {
       renderer.appendChild(head, link);
       return renderer;
     } catch (e) {
-      console.error('Error within linkService : ', e);
+      console.error('Error within linkService: ', e);
     }
   }
 
@@ -57,7 +62,7 @@ export class LinkHeadService {
           id: '-1',
           encapsulation: ViewEncapsulation.None,
           styles: [],
-          data: {}
+          data: {},
         });
         const head = this.document.head;
         if (head === null) {
@@ -68,7 +73,9 @@ export class LinkHeadService {
           renderer.removeChild(head, link);
         }
       } catch (e) {
-        console.log('Error while removing tag ' + e.message);
+        if (e instanceof Error) {
+          console.error('Error while removing tag: ' + e.message);
+        }
       }
     }
   }
diff --git a/src/app/core/services/route.actions.ts b/src/app/core/services/route.actions.ts
index 87fe0a5c5f..3f64b9dba4 100644
--- a/src/app/core/services/route.actions.ts
+++ b/src/app/core/services/route.actions.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
-import { Action } from '@ngrx/store';
-import { type } from '../../shared/ngrx/type';
 import { Params } from '@angular/router';
+import { Action } from '@ngrx/store';
+
+import { type } from '../../shared/ngrx/type';
 
 /**
  * The list of HrefIndexAction type definitions
diff --git a/src/app/core/services/route.effects.ts b/src/app/core/services/route.effects.ts
index 2b19761d21..b31008f3c1 100644
--- a/src/app/core/services/route.effects.ts
+++ b/src/app/core/services/route.effects.ts
@@ -1,8 +1,19 @@
-import { map, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { ResetRouteStateAction, RouteActionTypes } from './route.actions';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
+
 import { RouterActionTypes } from '../router/router.actions';
+import {
+  ResetRouteStateAction,
+  RouteActionTypes,
+} from './route.actions';
 import { RouteService } from './route.service';
 
 @Injectable()
@@ -11,17 +22,17 @@ export class RouteEffects {
    * Effect that resets the route state on reroute
    * @type {Observable<ResetRouteStateAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(RouterActionTypes.ROUTE_UPDATE),
       map(() => new ResetRouteStateAction()),
     ));
 
-   afterResetChange$ = createEffect(() => this.actions$
+  afterResetChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(RouteActionTypes.RESET),
       tap(() => this.service.setCurrentRouteInfo()),
-    ), {dispatch: false });
+    ), { dispatch: false });
 
   constructor(private actions$: Actions, private service: RouteService) {
   }
diff --git a/src/app/core/services/route.reducer.ts b/src/app/core/services/route.reducer.ts
index 4016dd9440..60bf7a4b19 100644
--- a/src/app/core/services/route.reducer.ts
+++ b/src/app/core/services/route.reducer.ts
@@ -1,4 +1,6 @@
 import { Params } from '@angular/router';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import {
   AddParameterAction,
   AddQueryParameterAction,
@@ -7,9 +9,8 @@ import {
   SetParameterAction,
   SetParametersAction,
   SetQueryParameterAction,
-  SetQueryParametersAction
+  SetQueryParametersAction,
 } from './route.actions';
-import { isNotEmpty } from '../../shared/empty.util';
 
 /**
  * Interface to represent the parameter state of a current route in the store
@@ -24,7 +25,7 @@ export interface RouteState {
  */
 const initialState: RouteState = {
   queryParams: {},
-  params: {}
+  params: {},
 };
 
 /**
diff --git a/src/app/core/services/route.service.spec.ts b/src/app/core/services/route.service.spec.ts
index 18a916753a..7d2b3c1169 100644
--- a/src/app/core/services/route.service.spec.ts
+++ b/src/app/core/services/route.service.spec.ts
@@ -1,14 +1,25 @@
-import { ActivatedRoute, convertToParamMap, NavigationEnd, Params, Router } from '@angular/router';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  convertToParamMap,
+  NavigationEnd,
+  Params,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { getTestScheduler, hot } from 'jasmine-marbles';
-
-import { RouteService } from './route.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { AddUrlToHistoryAction } from '../history/history.actions';
+import { RouteService } from './route.service';
 
 describe('RouteService', () => {
   let scheduler: TestScheduler;
@@ -26,7 +37,7 @@ describe('RouteService', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const router = new RouterMock();
@@ -43,12 +54,12 @@ describe('RouteService', () => {
           useValue: {
             queryParams: observableOf(paramObject),
             params: observableOf(paramObject),
-            queryParamMap: observableOf(convertToParamMap(paramObject))
+            queryParamMap: observableOf(convertToParamMap(paramObject)),
           },
         },
         { provide: Router, useValue: router },
         { provide: Store, useValue: store },
-      ]
+      ],
     });
   }));
 
@@ -129,7 +140,7 @@ describe('RouteService', () => {
 
       serviceAsAny.router.events = hot('a-b', {
         a: new NavigationEnd(0, 'url', 'url'),
-        b: new NavigationEnd(1, 'newurl', 'newurl')
+        b: new NavigationEnd(1, 'newurl', 'newurl'),
       });
 
       scheduler.schedule(() => service.saveRouting());
@@ -144,8 +155,8 @@ describe('RouteService', () => {
     it('should dispatch AddUrlToHistoryAction on NavigationEnd event', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getHistory().subscribe((history) => {
@@ -158,8 +169,8 @@ describe('RouteService', () => {
     it('should return an observable with the current url', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getCurrentUrl().subscribe((history) => {
@@ -172,8 +183,8 @@ describe('RouteService', () => {
     it('should return an observable with the previous url', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getPreviousUrl().subscribe((history) => {
diff --git a/src/app/core/services/route.service.ts b/src/app/core/services/route.service.ts
index 5381762570..6564da0382 100644
--- a/src/app/core/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -1,24 +1,48 @@
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Params, Router, RouterStateSnapshot, } from '@angular/router';
-
-import { combineLatest, Observable } from 'rxjs';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Params,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import isEqual from 'lodash/isEqual';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { AddParameterAction, SetParameterAction, SetParametersAction, SetQueryParameterAction, SetQueryParametersAction } from './route.actions';
-import { coreSelector } from '../core.selectors';
 import { hasValue } from '../../shared/empty.util';
-import { historySelector } from '../history/selectors';
-import { AddUrlToHistoryAction } from '../history/history.actions';
+import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
+import { AddUrlToHistoryAction } from '../history/history.actions';
+import { historySelector } from '../history/selectors';
+import {
+  AddParameterAction,
+  SetParameterAction,
+  SetParametersAction,
+  SetQueryParameterAction,
+  SetQueryParametersAction,
+} from './route.actions';
 
 /**
  * Selector to select all route parameters from the store
  */
 export const routeParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.params : undefined
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.params : undefined,
 );
 
 /**
@@ -26,7 +50,7 @@ export const routeParametersSelector = createSelector(
  */
 export const queryParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.queryParams : undefined
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.queryParams : undefined,
 );
 
 /**
@@ -60,7 +84,7 @@ export function parameterSelector(key: string, paramsSelector: (state: CoreState
  * Service to keep track of the current query parameters
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RouteService {
   constructor(private route: ActivatedRoute, private router: Router, private store: Store<CoreState>) {
@@ -74,7 +98,7 @@ export class RouteService {
   getQueryParameterValues(paramName: string): Observable<string[]> {
     return this.getQueryParamMap().pipe(
       map((params) => [...params.getAll(paramName)]),
-      distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b))
+      distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)),
     );
   }
 
@@ -85,7 +109,7 @@ export class RouteService {
   getQueryParameterValue(paramName: string): Observable<string> {
     return this.getQueryParamMap().pipe(
       map((params) => params.get(paramName)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -96,7 +120,7 @@ export class RouteService {
   hasQueryParam(paramName: string): Observable<boolean> {
     return this.getQueryParamMap().pipe(
       map((params) => params.has(paramName)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -108,7 +132,7 @@ export class RouteService {
   hasQueryParamWithValue(paramName: string, paramValue: string): Observable<boolean> {
     return this.getQueryParamMap().pipe(
       map((params) => params.getAll(paramName).indexOf(paramValue) > -1),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -177,7 +201,7 @@ export class RouteService {
    */
   public getCurrentUrl(): Observable<string> {
     return this.getHistory().pipe(
-      map((history: string[]) => history[history.length - 1] || '')
+      map((history: string[]) => history[history.length - 1] || ''),
     );
   }
 
@@ -186,7 +210,7 @@ export class RouteService {
    */
   public getPreviousUrl(): Observable<string> {
     return this.getHistory().pipe(
-      map((history: string[]) => history[history.length - 2] || '')
+      map((history: string[]) => history[history.length - 2] || ''),
     );
   }
 
@@ -222,7 +246,7 @@ export class RouteService {
         ([params, queryParams]: [Params, Params]) => {
           this.store.dispatch(new SetParametersAction(params));
           this.store.dispatch(new SetQueryParametersAction(queryParams));
-        }
+        },
       );
   }
 }
diff --git a/src/app/core/services/server-cookie.service.ts b/src/app/core/services/server-cookie.service.ts
index 6ae3525c74..e0f38d026c 100644
--- a/src/app/core/services/server-cookie.service.ts
+++ b/src/app/core/services/server-cookie.service.ts
@@ -1,6 +1,10 @@
 import { Injectable } from '@angular/core';
 import { CookieAttributes } from 'js-cookie';
-import { CookieService, ICookieService } from './cookie.service';
+
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
 
 @Injectable()
 export class ServerCookieService extends CookieService implements ICookieService {
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 6bd5828921..27777ed7ba 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index 8c45cc864b..f55eb13567 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -1,6 +1,16 @@
-import { Inject, Injectable } from '@angular/core';
-import { Request, Response } from 'express';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  REQUEST,
+  RESPONSE,
+} from '@nguniversal/express-engine/tokens';
+import {
+  Request,
+  Response,
+} from 'express';
+
 import { HardRedirectService } from './hard-redirect.service';
 
 /**
@@ -69,8 +79,8 @@ export class ServerHardRedirectService extends HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   getCurrentOrigin(): string {
     return this.req.protocol + '://' + this.req.headers.host;
diff --git a/src/app/core/services/server-response.service.ts b/src/app/core/services/server-response.service.ts
index 0b193d536c..29b9d73e9c 100644
--- a/src/app/core/services/server-response.service.ts
+++ b/src/app/core/services/server-response.service.ts
@@ -1,6 +1,9 @@
+import {
+  Inject,
+  Injectable,
+  Optional,
+} from '@angular/core';
 import { RESPONSE } from '@nguniversal/express-engine/tokens';
-import { Inject, Injectable, Optional } from '@angular/core';
-
 import { Response } from 'express';
 
 /**
diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts
index 2bd25b6f03..e4c50c24ea 100644
--- a/src/app/core/services/server-xhr.service.ts
+++ b/src/app/core/services/server-xhr.service.ts
@@ -8,9 +8,15 @@
 
 import { XhrFactory } from '@angular/common';
 import { Injectable } from '@angular/core';
-import { Agent as HttpAgent, AgentOptions as HttpAgentOptions } from 'http';
+import {
+  Agent as HttpAgent,
+  AgentOptions as HttpAgentOptions,
+} from 'http';
 import { Agent as HttpsAgent } from 'https';
-import { prototype, XMLHttpRequest } from 'xhr2';
+import {
+  prototype,
+  XMLHttpRequest,
+} from 'xhr2';
 
 /**
  * Allow HTTP sessions to be kept alive.
diff --git a/src/app/core/services/server.referrer.service.spec.ts b/src/app/core/services/server.referrer.service.spec.ts
index 4a7f841093..f7c308e418 100644
--- a/src/app/core/services/server.referrer.service.spec.ts
+++ b/src/app/core/services/server.referrer.service.spec.ts
@@ -7,7 +7,7 @@ describe(`ServerReferrerService`, () => {
   describe(`getReferrer`, () => {
     describe(`when the referer header is set`, () => {
       beforeEach(() => {
-        service = new ServerReferrerService({ headers: { referer: referrer }});
+        service = new ServerReferrerService({ headers: { referer: referrer } });
       });
 
       it(`should return the referer header`, (done: DoneFn) => {
@@ -20,7 +20,7 @@ describe(`ServerReferrerService`, () => {
 
     describe(`when the referer header is not set`, () => {
       beforeEach(() => {
-        service = new ServerReferrerService({ headers: {}});
+        service = new ServerReferrerService({ headers: {} });
       });
 
       it(`should return an empty string`, (done: DoneFn) => {
diff --git a/src/app/core/services/server.referrer.service.ts b/src/app/core/services/server.referrer.service.ts
index b2f063a07c..4851c5fed8 100644
--- a/src/app/core/services/server.referrer.service.ts
+++ b/src/app/core/services/server.referrer.service.ts
@@ -1,7 +1,14 @@
-import { ReferrerService } from './referrer.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { Inject, Injectable } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { ReferrerService } from './referrer.service';
 
 /**
  * A service to determine the referrer
diff --git a/src/app/core/shared/authorization.model.ts b/src/app/core/shared/authorization.model.ts
index f7bbf78889..0031b054f6 100644
--- a/src/app/core/shared/authorization.model.ts
+++ b/src/app/core/shared/authorization.model.ts
@@ -1,14 +1,22 @@
-import { link, typedObject } from '../cache/builders/build-decorators';
-import { AUTHORIZATION } from './authorization.resource-type';
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { HALLink } from './hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
 import { EPerson } from '../eperson/models/eperson.model';
 import { EPERSON } from '../eperson/models/eperson.resource-type';
-import { FEATURE } from './feature.resource-type';
+import { AUTHORIZATION } from './authorization.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { Feature } from './feature.model';
+import { FEATURE } from './feature.resource-type';
+import { HALLink } from './hal-link.model';
 import { ITEM } from './item.resource-type';
 
 /**
@@ -23,10 +31,10 @@ export class Authorization extends DSpaceObject {
    * Unique identifier for this authorization
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     eperson: HALLink;
     feature: HALLink;
@@ -38,17 +46,17 @@ export class Authorization extends DSpaceObject {
    * Null if the authorization grants access to anonymous users
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The Feature enabled by this Authorization
    */
   @link(FEATURE)
-  feature?: Observable<RemoteData<Feature>>;
+    feature?: Observable<RemoteData<Feature>>;
 
   /**
    * The Object this authorization applies to
    */
   @link(ITEM)
-  object?: Observable<RemoteData<DSpaceObject>>;
+    object?: Observable<RemoteData<DSpaceObject>>;
 }
diff --git a/src/app/core/shared/authorized.operators.ts b/src/app/core/shared/authorized.operators.ts
index c36f0f41d2..6700011347 100644
--- a/src/app/core/shared/authorized.operators.ts
+++ b/src/app/core/shared/authorized.operators.ts
@@ -1,15 +1,29 @@
-import { Router, UrlTree } from '@angular/router';
-import { AuthService } from '../auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, withLatestFrom } from 'rxjs/operators';
 import { InjectionToken } from '@angular/core';
-import { RemoteData } from '../data/remote-data';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import {
+  getForbiddenRoute,
+  getPageNotFoundRoute,
+} from '../../app-routing-paths';
 import { getEndUserAgreementPath } from '../../info/info-routing-paths';
-import { getForbiddenRoute, getPageNotFoundRoute } from '../../app-routing-paths';
+import { AuthService } from '../auth/auth.service';
+import { RemoteData } from '../data/remote-data';
 
 export const REDIRECT_ON_4XX = new InjectionToken<<T>(router: Router, authService: AuthService) => (source: Observable<RemoteData<T>>) => Observable<RemoteData<T>>>('redirectOn4xx', {
   providedIn: 'root',
-  factory: () => redirectOn4xx
+  factory: () => redirectOn4xx,
 });
 /**
  * Operator that checks if a remote data object returned a 4xx error
@@ -41,7 +55,7 @@ export const redirectOn4xx = <T>(router: Router, authService: AuthService) =>
         }
         return true;
       }),
-      map(([rd,]: [RemoteData<T>, boolean]) => rd)
+      map(([rd]: [RemoteData<T>, boolean]) => rd),
     );
 /**
  * Operator that returns a UrlTree to a forbidden page or the login page when the boolean received is false
diff --git a/src/app/core/shared/bitstream-format.model.ts b/src/app/core/shared/bitstream-format.model.ts
index 9e8dc5e1fe..354edb4cbd 100644
--- a/src/app/core/shared/bitstream-format.model.ts
+++ b/src/app/core/shared/bitstream-format.model.ts
@@ -1,12 +1,17 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../cache/id-to-uuid-serializer';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
 import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
+import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * Model class for a Bitstream Format
@@ -20,43 +25,43 @@ export class BitstreamFormat implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * Short description of this Bitstream Format
    */
   @autoserialize
-  shortDescription: string;
+    shortDescription: string;
 
   /**
    * Description of this Bitstream Format
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * String representing the MIME type of this Bitstream Format
    */
   @autoserialize
-  mimetype: string;
+    mimetype: string;
 
   /**
    * The level of support the system offers for this Bitstream Format
    */
   @autoserialize
-  supportLevel: BitstreamFormatSupportLevel;
+    supportLevel: BitstreamFormatSupportLevel;
 
   /**
    * True if the Bitstream Format is used to store system information, rather than the content of items in the system
    */
   @autoserialize
-  internal: boolean;
+    internal: boolean;
 
   /**
    * String representing this Bitstream Format's file extension
    */
   @autoserialize
-  extensions: string[];
+    extensions: string[];
 
   /**
    * Universally unique identifier for this Bitstream Format
@@ -64,7 +69,7 @@ export class BitstreamFormat implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('bitstream-format'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * Identifier for this Bitstream Format
@@ -72,13 +77,13 @@ export class BitstreamFormat implements CacheableObject {
    * but might not be unique across different object types
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The {@link HALLink}s for this BitstreamFormat
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index c855325d2d..d1b821e8cd 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -1,15 +1,23 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
+import { BITSTREAM } from './bitstream.resource-type';
 import { BitstreamFormat } from './bitstream-format.model';
 import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
-import { BITSTREAM } from './bitstream.resource-type';
+import { Bundle } from './bundle.model';
+import { BUNDLE } from './bundle.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import {BUNDLE} from './bundle.resource-type';
-import {Bundle} from './bundle.model';
-import { ChildHALResource } from './child-hal-resource.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -20,25 +28,25 @@ export class Bitstream extends DSpaceObject implements ChildHALResource {
    * The size of this bitstream in bytes
    */
   @autoserialize
-  sizeBytes: number;
+    sizeBytes: number;
 
   /**
    * The description of this Bitstream
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The name of the Bundle this Bitstream is part of
    */
   @autoserialize
-  bundleName: string;
+    bundleName: string;
 
   /**
    * The {@link HALLink}s for this Bitstream
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     bundle: HALLink;
     format: HALLink;
@@ -51,21 +59,21 @@ export class Bitstream extends DSpaceObject implements ChildHALResource {
    * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, false, 'thumbnail')
-  thumbnail?: Observable<RemoteData<Bitstream>>;
+    thumbnail?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The BitstreamFormat of this Bitstream
    * Will be undefined unless the format {@link HALLink} has been resolved.
    */
   @link(BITSTREAM_FORMAT, false, 'format')
-  format?: Observable<RemoteData<BitstreamFormat>>;
+    format?: Observable<RemoteData<BitstreamFormat>>;
 
   /**
    * The owning bundle for this Bitstream
    * Will be undefined unless the bundle{@link HALLink} has been resolved.
    */
   @link(BUNDLE)
-  bundle?: Observable<RemoteData<Bundle>>;
+    bundle?: Observable<RemoteData<Bundle>>;
 
   getParentLinkKey(): keyof this['_links'] {
     return 'format';
diff --git a/src/app/core/shared/bitstream.operators.ts b/src/app/core/shared/bitstream.operators.ts
index 73f38d8c00..c62def49b2 100644
--- a/src/app/core/shared/bitstream.operators.ts
+++ b/src/app/core/shared/bitstream.operators.ts
@@ -1,9 +1,16 @@
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { Bitstream } from './bitstream.model';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../data/feature-authorization/feature-id';
+import { Bitstream } from './bitstream.model';
 
 /**
  * Operator to check if the given bitstream is downloadable
@@ -20,5 +27,5 @@ export const getDownloadableBitstream = (authService: AuthorizationDataService)
         } else {
           return observableOf(null);
         }
-      })
+      }),
     );
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index a5bed53c9f..8e50a57bb5 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,6 @@
 import { autoserialize } from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
@@ -7,10 +9,10 @@ import { CacheableObject } from '../cache/cacheable-object.model';
 export abstract class BrowseDefinition extends CacheableObject {
 
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * Get the render type of the BrowseDefinition model
    */
-  abstract getRenderType(): string;
+  abstract getRenderType(): BrowseByDataType;
 }
diff --git a/src/app/core/shared/browse-entry.model.ts b/src/app/core/shared/browse-entry.model.ts
index d4842e1294..03e3ab3f5b 100644
--- a/src/app/core/shared/browse-entry.model.ts
+++ b/src/app/core/shared/browse-entry.model.ts
@@ -1,12 +1,17 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
+import { TypedObject } from '../cache/typed-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { BROWSE_ENTRY } from './browse-entry.resource-type';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { TypedObject } from '../cache/typed-object.model';
 
 /**
  * Class object representing a browse entry
@@ -20,41 +25,41 @@ export class BrowseEntry extends ListableObject implements TypedObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The authority string of this browse entry
    */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /**
    * The value of this browse entry
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The language of the value of this browse entry
    */
   @autoserializeAs('valueLang')
-  language: string;
+    language: string;
 
   /**
    * Thumbnail link used when browsing items with showThumbs config enabled.
    */
   @autoserializeAs('thumbnail')
-  thumbnail: string;
+    thumbnail: string;
 
   /**
    * The count of this browse entry
    */
   @excludeFromEquals
   @autoserialize
-  count: number;
+    count: number;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     entries: HALLink;
     thumbnail: HALLink;
diff --git a/src/app/core/shared/bundle.model.ts b/src/app/core/shared/bundle.model.ts
index 36b7012e47..e5b92799d4 100644
--- a/src/app/core/shared/bundle.model.ts
+++ b/src/app/core/shared/bundle.model.ts
@@ -1,17 +1,22 @@
-import { deserialize, inheritSerialization } from 'cerialize';
-
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
 
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
 import { BUNDLE } from './bundle.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { BITSTREAM } from './bitstream.resource-type';
-import { Bitstream } from './bitstream.model';
-import { ITEM } from './item.resource-type';
 import { Item } from './item.model';
+import { ITEM } from './item.resource-type';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -22,7 +27,7 @@ export class Bundle extends DSpaceObject {
    * The {@link HALLink}s for this Bundle
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     primaryBitstream: HALLink;
     bitstreams: HALLink;
@@ -34,19 +39,19 @@ export class Bundle extends DSpaceObject {
    * Will be undefined unless the primaryBitstream {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  primaryBitstream?: Observable<RemoteData<Bitstream>>;
+    primaryBitstream?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The list of Bitstreams that are direct children of this Bundle
    * Will be undefined unless the bitstreams {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, true)
-  bitstreams?: Observable<RemoteData<PaginatedList<Bitstream>>>;
+    bitstreams?: Observable<RemoteData<PaginatedList<Bitstream>>>;
 
-    /**
+  /**
      * The owning item for this Bundle
      * Will be undefined unless the Item{@link HALLink} has been resolved.
      */
   @link(ITEM)
-  item?: Observable<RemoteData<Item>>;
+    item?: Observable<RemoteData<Item>>;
 }
diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts
index c97c61eceb..468b0ccc64 100644
--- a/src/app/core/shared/collection.model.ts
+++ b/src/app/core/shared/collection.model.ts
@@ -1,22 +1,30 @@
-import {autoserialize, deserialize, inheritSerialization} from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { Bitstream } from './bitstream.model';
-import { BITSTREAM } from './bitstream.resource-type';
-import { COLLECTION } from './collection.resource-type';
-import { DSpaceObject } from './dspace-object.model';
-import { HALLink } from './hal-link.model';
-import { License } from './license.model';
-import { LICENSE } from './license.resource-type';
 import { ResourcePolicy } from '../resource-policy/models/resource-policy.model';
 import { RESOURCE_POLICY } from '../resource-policy/models/resource-policy.resource-type';
-import { COMMUNITY } from './community.resource-type';
-import { Community } from './community.model';
-import { ChildHALResource } from './child-hal-resource.model';
-import { HandleObject } from './handle-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
+import { COLLECTION } from './collection.resource-type';
+import { Community } from './community.model';
+import { COMMUNITY } from './community.resource-type';
+import { DSpaceObject } from './dspace-object.model';
+import { HALLink } from './hal-link.model';
+import { HandleObject } from './handle-object.model';
+import { License } from './license.model';
+import { LICENSE } from './license.resource-type';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -25,13 +33,13 @@ export class Collection extends DSpaceObject implements ChildHALResource, Handle
 
   @excludeFromEquals
   @autoserialize
-  archivedItemsCount: number;
+    archivedItemsCount: number;
 
   /**
    * The {@link HALLink}s for this Collection
    */
   @deserialize
-  _links: {
+    _links: {
     license: HALLink;
     harvester: HALLink;
     mappedItems: HALLink;
@@ -52,28 +60,28 @@ export class Collection extends DSpaceObject implements ChildHALResource, Handle
    * Will be undefined unless the license {@link HALLink} has been resolved.
    */
   @link(LICENSE)
-  license?: Observable<RemoteData<License>>;
+    license?: Observable<RemoteData<License>>;
 
   /**
    * The logo for this Collection
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  logo?: Observable<RemoteData<Bitstream>>;
+    logo?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The default access conditions for this Collection
    * Will be undefined unless the defaultAccessConditions {@link HALLink} has been resolved.
    */
   @link(RESOURCE_POLICY, true)
-  defaultAccessConditions?: Observable<RemoteData<PaginatedList<ResourcePolicy>>>;
+    defaultAccessConditions?: Observable<RemoteData<PaginatedList<ResourcePolicy>>>;
 
   /**
    * The Community that is a direct parent of this Collection
    * Will be undefined unless the parent community HALLink has been resolved.
    */
   @link(COMMUNITY, false)
-  parentCommunity?: Observable<RemoteData<Community>>;
+    parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
    * A string representing the unique handle of this Collection
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index 03b47fb024..764b15e2ed 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -1,18 +1,26 @@
-import {autoserialize, deserialize, inheritSerialization} from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { Bitstream } from './bitstream.model';
 import { BITSTREAM } from './bitstream.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { Collection } from './collection.model';
 import { COLLECTION } from './collection.resource-type';
 import { COMMUNITY } from './community.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import { ChildHALResource } from './child-hal-resource.model';
 import { HandleObject } from './handle-object.model';
-import {excludeFromEquals} from '../utilities/equals.decorators';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -21,13 +29,13 @@ export class Community extends DSpaceObject implements ChildHALResource, HandleO
 
   @excludeFromEquals
   @autoserialize
-  archivedItemsCount: number;
+    archivedItemsCount: number;
 
   /**
    * The {@link HALLink}s for this Community
    */
   @deserialize
-  _links: {
+    _links: {
     collections: HALLink;
     logo: HALLink;
     subcommunities: HALLink;
@@ -41,28 +49,28 @@ export class Community extends DSpaceObject implements ChildHALResource, HandleO
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  logo?: Observable<RemoteData<Bitstream>>;
+    logo?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The list of Collections that are direct children of this Community
    * Will be undefined unless the collections {@link HALLink} has been resolved.
    */
   @link(COLLECTION, true)
-  collections?: Observable<RemoteData<PaginatedList<Collection>>>;
+    collections?: Observable<RemoteData<PaginatedList<Collection>>>;
 
   /**
    * The list of Communities that are direct children of this Community
    * Will be undefined unless the subcommunities {@link HALLink} has been resolved.
    */
   @link(COMMUNITY, true)
-  subcommunities?: Observable<RemoteData<PaginatedList<Community>>>;
+    subcommunities?: Observable<RemoteData<PaginatedList<Community>>>;
 
   /**
    * The Community that is a direct parent of this Community
    * Will be undefined unless the parent community HALLink has been resolved.
    */
   @link(COMMUNITY, false)
-  parentCommunity?: Observable<RemoteData<Community>>;
+    parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
    * A string representing the unique handle of this Community
diff --git a/src/app/core/shared/configuration-property.model.ts b/src/app/core/shared/configuration-property.model.ts
index 874e80f08d..2b6ab606c9 100644
--- a/src/app/core/shared/configuration-property.model.ts
+++ b/src/app/core/shared/configuration-property.model.ts
@@ -1,10 +1,15 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
+import { CONFIG_PROPERTY } from './config-property.resource-type';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { CONFIG_PROPERTY } from './config-property.resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * Model class for a Configuration Property
@@ -18,31 +23,31 @@ export class ConfigurationProperty implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The uuid of the configuration property
    * The name is used as id for configuration properties
    */
   @autoserializeAs(String, 'name')
-  uuid: string;
+    uuid: string;
 
   /**
    * The name of the configuration property
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The values of the configuration property
    */
   @autoserialize
-  values: string[];
+    values: string[];
 
   /**
    * The links of the configuration property
    */
   @deserialize
-  _links: { self: HALLink };
+    _links: { self: HALLink };
 
 }
diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts
index 7e888f2332..ee535191d0 100644
--- a/src/app/core/shared/content-source.model.ts
+++ b/src/app/core/shared/content-source.model.ts
@@ -1,12 +1,18 @@
-import { autoserializeAs, deserialize, deserializeAs, serializeAs } from 'cerialize';
+import {
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+  serializeAs,
+} from 'cerialize';
+
+import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { CONTENT_SOURCE } from './content-source.resource-type';
+import { ContentSourceSetSerializer } from './content-source-set-serializer';
 import { HALLink } from './hal-link.model';
 import { MetadataConfig } from './metadata-config.model';
-import { typedObject } from '../cache/builders/build-decorators';
-import { CONTENT_SOURCE } from './content-source.resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { ContentSourceSetSerializer } from './content-source-set-serializer';
 
 /**
  * The type of content harvesting used
@@ -32,40 +38,40 @@ export class ContentSource extends CacheableObject {
    * and we need a custom responseparser for ContentSource responses
    */
   @excludeFromEquals
-  type: ResourceType = CONTENT_SOURCE;
+    type: ResourceType = CONTENT_SOURCE;
 
   /**
    * Unique identifier, this is necessary to store the ContentSource in FieldUpdates
    * Because the ContentSource coming from the REST API doesn't have a UUID, we're using the selflink
    */
   @deserializeAs('self')
-  uuid: string;
+    uuid: string;
 
   /**
    * OAI Provider / Source
    */
   @autoserializeAs('oai_source')
-  oaiSource: string;
+    oaiSource: string;
 
   /**
    * OAI Specific set ID
    */
   @deserializeAs(new ContentSourceSetSerializer(), 'oai_set_id')
   @serializeAs(new ContentSourceSetSerializer(), 'oai_set_id')
-  oaiSetId: string;
+    oaiSetId: string;
 
   /**
    * The ID of the metadata format used
    */
   @autoserializeAs('metadata_config_id')
-  metadataConfigId: string;
+    metadataConfigId: string;
 
   /**
    * Type of content being harvested
    * Defaults to 'NONE', meaning the collection doesn't harvest its content from an external source
    */
   @autoserializeAs('harvest_type')
-  harvestType = ContentSourceHarvestType.None;
+    harvestType = ContentSourceHarvestType.None;
 
   /**
    * The available metadata configurations
@@ -76,31 +82,31 @@ export class ContentSource extends CacheableObject {
    * The current harvest status
    */
   @autoserializeAs('harvest_status')
-  harvestStatus: string;
+    harvestStatus: string;
 
   /**
    * The last's harvest start time
    */
   @autoserializeAs('harvest_start_time')
-  harvestStartTime: string;
+    harvestStartTime: string;
 
   /**
    * When the collection was last harvested
    */
   @autoserializeAs('last_harvested')
-  lastHarvested: string;
+    lastHarvested: string;
 
   /**
    * The current harvest message
    */
   @autoserializeAs('harvest_message')
-  message: string;
+    message: string;
 
   /**
    * The {@link HALLink}s for this ContentSource
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
   };
 }
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index b4c02bee63..dcebf5794c 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -39,4 +39,6 @@ export enum Context {
   MyDSpaceValidation = 'mydspaceValidation',
 
   Bitstream = 'bitstream',
+
+  CoarNotify = 'coarNotify',
 }
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 6f5d45544d..dc9b7f5fca 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -1,7 +1,18 @@
-import { autoserialize, autoserializeAs, deserialize, deserializeAs } from 'cerialize';
-import { hasNoValue, hasValue, isUndefined } from '../../shared/empty.util';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
+import {
+  hasNoValue,
+  hasValue,
+  isUndefined,
+} from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSPACE_OBJECT } from './dspace-object.resource-type';
 import { GenericConstructor } from './generic-constructor';
@@ -11,11 +22,10 @@ import {
   MetadataMapSerializer,
   MetadataValue,
   MetadataValueFilter,
-  MetadatumViewModel
+  MetadatumViewModel,
 } from './metadata.models';
 import { Metadata } from './metadata.utils';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * An abstract model class for a DSpaceObject.
@@ -36,20 +46,20 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserializeAs(String, 'uuid')
-  id: string;
+    id: string;
 
   /**
    * The universally unique ide ntifier of this DSpaceObject
    */
   @autoserializeAs(String)
-  uuid: string;
+    uuid: string;
 
   /**
    * A string representing the kind of DSpaceObject, e.g. community, item, …
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * A shorthand to get this DSpaceObject's self link
@@ -63,7 +73,7 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   set self(v: string) {
     this._links.self = {
-      href: v
+      href: v,
     };
   }
 
@@ -90,10 +100,10 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserializeAs(MetadataMapSerializer)
-  metadata: MetadataMap;
+    metadata: MetadataMap;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 
diff --git a/src/app/core/shared/external-source-entry.model.ts b/src/app/core/shared/external-source-entry.model.ts
index 39a5df754e..d743a92310 100644
--- a/src/app/core/shared/external-source-entry.model.ts
+++ b/src/app/core/shared/external-source-entry.model.ts
@@ -1,11 +1,19 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { EXTERNAL_SOURCE_ENTRY } from './external-source-entry.resource-type';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
-import { MetadataMap, MetadataMapSerializer } from './metadata.models';
+import {
+  MetadataMap,
+  MetadataMapSerializer,
+} from './metadata.models';
 import { ResourceType } from './resource-type';
 
 /**
@@ -19,44 +27,44 @@ export class ExternalSourceEntry extends ListableObject {
    * Unique identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The value to display
    */
   @autoserialize
-  display: string;
+    display: string;
 
   /**
    * The value to store the entry with
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The ID of the external source this entry originates from
    */
   @autoserialize
-  externalSource: string;
+    externalSource: string;
 
   /**
    * Metadata of the entry
    */
   @autoserializeAs(MetadataMapSerializer)
-  metadata: MetadataMap;
+    metadata: MetadataMap;
 
   /**
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 
diff --git a/src/app/core/shared/external-source.model.ts b/src/app/core/shared/external-source.model.ts
index 6a1a803122..70766e0494 100644
--- a/src/app/core/shared/external-source.model.ts
+++ b/src/app/core/shared/external-source.model.ts
@@ -1,15 +1,22 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { EXTERNAL_SOURCE } from './external-source.resource-type';
 import { HALLink } from './hal-link.model';
-import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { Observable } from 'rxjs';
-import { ITEM_TYPE } from './item-relationships/item-type.resource-type';
 import { ItemType } from './item-relationships/item-type.model';
+import { ITEM_TYPE } from './item-relationships/item-type.resource-type';
+import { ResourceType } from './resource-type';
 
 /**
  * Model class for an external source
@@ -23,38 +30,38 @@ export class ExternalSource extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * Unique identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this external source
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * Is the source hierarchical?
    */
   @autoserialize
-  hierarchical: boolean;
+    hierarchical: boolean;
 
   /**
    * The list of entity types that are compatible with this external source
    * Will be undefined unless the entityTypes {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE, true)
-  entityTypes?: Observable<RemoteData<PaginatedList<ItemType>>>;
+    entityTypes?: Observable<RemoteData<PaginatedList<ItemType>>>;
 
   /**
    * The {@link HALLink}s for this ExternalSource
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     entries: HALLink;
     entityTypes: HALLink;
diff --git a/src/app/core/shared/feature.model.ts b/src/app/core/shared/feature.model.ts
index 2ba5d8d4e1..270eb2de9d 100644
--- a/src/app/core/shared/feature.model.ts
+++ b/src/app/core/shared/feature.model.ts
@@ -1,7 +1,12 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { FEATURE } from './feature.resource-type';
 import { DSpaceObject } from './dspace-object.model';
+import { FEATURE } from './feature.resource-type';
 import { HALLink } from './hal-link.model';
 
 /**
@@ -16,22 +21,22 @@ export class Feature extends DSpaceObject {
    * Unique identifier for this feature
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * A human readable description of the feature's purpose
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * A list of resource types this feature applies to
    */
   @autoserialize
-  resourcetypes: string[];
+    resourcetypes: string[];
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/shared/file.service.ts b/src/app/core/shared/file.service.ts
index f673629c8d..2a60dd4196 100644
--- a/src/app/core/shared/file.service.ts
+++ b/src/app/core/shared/file.service.ts
@@ -1,20 +1,30 @@
-import { Inject, Injectable } from '@angular/core';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { AuthService } from '../auth/auth.service';
-import { map, take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { hasValue } from '../../shared/empty.util';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * Provides utility methods to save files on the client-side.
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class FileService {
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
-    private authService: AuthService
+    private authService: AuthService,
   ) { }
 
   /**
@@ -25,7 +35,7 @@ export class FileService {
    */
   retrieveFileDownloadLink(url: string): Observable<string> {
     return this.authService.getShortlivedToken().pipe(take(1), map((token) =>
-      hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url
+      hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url,
     ));
   }
   /**
diff --git a/src/app/core/shared/flat-browse-definition.model.ts b/src/app/core/shared/flat-browse-definition.model.ts
index 086fca891b..d9d59d1114 100644
--- a/src/app/core/shared/flat-browse-definition.model.ts
+++ b/src/app/core/shared/flat-browse-definition.model.ts
@@ -1,10 +1,15 @@
-import { inheritSerialization, deserialize } from 'cerialize';
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { FLAT_BROWSE_DEFINITION } from './flat-browse-definition.resource-type';
-import { ResourceType } from './resource-type';
-import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
 import { HALLink } from './hal-link.model';
+import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
+import { ResourceType } from './resource-type';
 
 /**
  * BrowseDefinition model for browses of type 'flatBrowse'
@@ -18,19 +23,19 @@ export class FlatBrowseDefinition extends NonHierarchicalBrowseDefinition {
    * The object type
    */
   @excludeFromEquals
-  type: ResourceType = FLAT_BROWSE_DEFINITION;
+    type: ResourceType = FLAT_BROWSE_DEFINITION;
 
   get self(): string {
     return this._links.self.href;
   }
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     items: HALLink;
   };
 
-  getRenderType(): string {
+  getRenderType(): BrowseByDataType {
     return this.dataType;
   }
 }
diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index 56e890b318..ec0379137b 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -1,36 +1,45 @@
-import { cold, hot } from 'jasmine-marbles';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from './hal-endpoint.service';
-import { EndpointMapRequest } from '../data/request.models';
-import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 import { environment } from '../../../environments/environment';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
+import { EndpointMapRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from './hal-endpoint.service';
+
 
 describe('HALEndpointService', () => {
   let service: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let envConfig;
+  let testScheduler;
+  let remoteDataMocks;
   const endpointMap = {
     test: {
-      href: 'https://rest.api/test'
+      href: 'https://rest.api/test',
     },
     foo: {
-      href: 'https://rest.api/foo'
+      href: 'https://rest.api/foo',
     },
     bar: {
-      href: 'https://rest.api/bar'
+      href: 'https://rest.api/bar',
     },
     endpoint: {
-      href: 'https://rest.api/endpoint'
+      href: 'https://rest.api/endpoint',
     },
     link: {
-      href: 'https://rest.api/link'
+      href: 'https://rest.api/link',
     },
     another: {
-      href: 'https://rest.api/another'
+      href: 'https://rest.api/another',
     },
   };
   const start = 'http://start.com';
@@ -39,19 +48,19 @@ describe('HALEndpointService', () => {
   const endpointMaps = {
     [start]: {
       one: {
-        href: one
+        href: one,
       },
       two: {
-        href: 'empty'
+        href: 'empty',
       },
       endpoint: {
-        href: 'https://rest.api/endpoint'
+        href: 'https://rest.api/endpoint',
       },
       link: {
-        href: 'https://rest.api/link'
+        href: 'https://rest.api/link',
       },
       another: {
-        href: 'https://rest.api/another'
+        href: 'https://rest.api/another',
       },
     },
     [one]: {
@@ -63,26 +72,49 @@ describe('HALEndpointService', () => {
       },
       bar: {
         href: 'https://rest.api/bar',
-      }
-    }
+      },
+    },
   };
   const linkPath = 'test';
 
+  const timeStamp = new Date().getTime();
+  const msToLive = 15 * 60 * 1000;
+  const payload = {
+    _links: endpointMaps[one],
+  };
+  const statusCodeSuccess = 200;
+  const statusCodeError = 404;
+  const errorMessage = 'not found';
+  remoteDataMocks = {
+    RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+    ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+    ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+    Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+    SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+    Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+    ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+  };
+
   beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
     requestService = getMockRequestService();
     rdbService = jasmine.createSpyObj('rdbService', {
       buildFromHref: createSuccessfulRemoteDataObject$({
-        _links: endpointMap
-      })
+        _links: endpointMap,
+      }),
     });
 
     envConfig = {
-      rest: { baseUrl: 'https://rest.api/' }
+      rest: { baseUrl: 'https://rest.api/' },
     } as any;
 
     service = new HALEndpointService(
       requestService,
-      rdbService
+      rdbService,
     );
   });
 
@@ -106,25 +138,33 @@ describe('HALEndpointService', () => {
 
     beforeEach(() => {
       envConfig = {
-        rest: { baseUrl: 'https://rest.api/' }
+        rest: { baseUrl: 'https://rest.api/' },
       } as any;
     });
 
     it(`should return the endpoint URL for the service's linkPath`, () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: 'https://rest.api/test' }));
-      const result = service.getEndpoint(linkPath);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: 'https://rest.api/test' }));
+        const result = service.getEndpoint(linkPath);
 
-      const expected = cold('(b|)', { b: endpointMap.test.href });
-      expect(result).toBeObservable(expected);
+        const expected = '(b|)';
+        const values = {
+          b: endpointMap.test.href,
+        };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return undefined for a linkPath that isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: undefined }));
-      const result = service.getEndpoint('unknown');
-      const expected = cold('(b|)', { b: undefined });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: undefined }));
+        const result = service.getEndpoint('unknown');
+        const expected = '(b|)';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
   });
 
@@ -177,35 +217,124 @@ describe('HALEndpointService', () => {
     beforeEach(() => {
       service = new HALEndpointService(
         requestService,
-        rdbService
+        rdbService,
       );
 
     });
 
     it('should return undefined as long as getRootEndpointMap hasn\'t fired', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('----'));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('----'));
 
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b---', { b: undefined });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b---';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return true if the service\'s linkPath is in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b-c-', { b: undefined, c: true });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-', { a: endpointMap }));
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b-c-';
+        const values = { b: undefined, c: true };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return false if the service\'s linkPath isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-',  { a: endpointMap }));
 
-      const result = service.isEnabledOnRestApi('unknown');
-      const expected = cold('b-c-', { b: undefined, c: false });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi('unknown');
+        const expected = 'b-c-';
+        const values = { b: undefined, c: false };
+        expectObservable(result).toBe(expected, values);
+      });
+    });
+
+  });
+
+  describe(`getEndpointMapAt`, () => {
+    const href = 'https://rest.api/some/sub/path';
+
+    it(`should call requestService.send with a new EndpointMapRequest for the given href. useCachedVersionIfAvailable should be true`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      const expected = new EndpointMapRequest(requestService.generateRequestId(), href);
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+
+    it(`should call rdbService.buildFromHref with the given href`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      expect(rdbService.buildFromHref).toHaveBeenCalledWith(href);
+    });
+
+    describe(`when the RemoteData returned from rdbService is stale`, () => {
+      it(`should re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+        testScheduler.run(({ cold }) => {
+          (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePendingStale }));
+          // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+          (service as any).getEndpointMapAt(href).subscribe();
+        });
+        expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe(`when the RemoteData returned from rdbService isn't stale`, () => {
+      it(`should not re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+        testScheduler.run(({ cold }) => {
+          (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePending }));
+          // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+          (service as any).getEndpointMapAt(href).subscribe();
+        });
+        expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it(`should emit exactly once, returning the endpoint map in the response, when the RemoteData completes`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a-b-c-d-e-f-g-h-i-j-k-l', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.ResponsePendingStale,
+          d: remoteDataMocks.SuccessStale,
+          e: remoteDataMocks.RequestPending,
+          f: remoteDataMocks.ResponsePending,
+          g: remoteDataMocks.Success,
+          h: remoteDataMocks.SuccessStale,
+          i: remoteDataMocks.RequestPending,
+          k: remoteDataMocks.ResponsePending,
+          l: remoteDataMocks.Error,
+        }));
+        const expected = '------------(g|)';
+        const values = {
+          g: endpointMaps[one],
+        };
+        expectObservable((service as any).getEndpointMapAt(one)).toBe(expected, values);
+      });
+    });
+
+    it(`should emit undefined when the response doesn't have a payload`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', {
+          a: remoteDataMocks.Error,
+        }));
+        const expected = '(a|)';
+        const values = {
+          g: undefined,
+        };
+        expectObservable((service as any).getEndpointMapAt(href)).toBe(expected, values);
+      });
     });
 
   });
diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index 8b6316a6ce..66a96f8dde 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -1,23 +1,36 @@
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap, take } from 'rxjs/operators';
-import { RequestService } from '../data/request.service';
-import { EndpointMapRequest } from '../data/request.models';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 import { Injectable } from '@angular/core';
-import { EndpointMap } from '../cache/response.models';
-import { getFirstCompletedRemoteData } from './operators';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { EndpointMap } from '../cache/response.models';
 import { RemoteData } from '../data/remote-data';
-import { UnCacheableObject } from './uncacheable-object.model';
+import { EndpointMapRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { getFirstCompletedRemoteData } from './operators';
 
 @Injectable()
 export class HALEndpointService {
 
   constructor(
     private requestService: RequestService,
-    private rdbService: RemoteDataBuildService
-) {
+    private rdbService: RemoteDataBuildService,
+  ) {
   }
 
   public getRootHref(): string {
@@ -33,9 +46,18 @@ export class HALEndpointService {
 
     this.requestService.send(request, true);
 
-    return this.rdbService.buildFromHref<UnCacheableObject>(href).pipe(
+    return this.rdbService.buildFromHref<CacheableObject>(href).pipe(
+      // Re-request stale responses
+      tap((rd: RemoteData<CacheableObject>) => {
+        if (hasValue(rd) && rd.isStale) {
+          this.getEndpointMapAt(href);
+        }
+      }),
+      // Filter out all stale responses. We're only interested in a single, non-stale,
+      // completed RemoteData
+      filter((rd: RemoteData<CacheableObject>) => !rd.isStale),
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<UnCacheableObject>) => {
+      map((response: RemoteData<CacheableObject>) => {
         if (hasValue(response.payload)) {
           return response.payload._links;
         } else {
@@ -70,7 +92,7 @@ export class HALEndpointService {
         } else {
           throw new Error(`${JSON.stringify(endpointMap)} doesn't contain the link ${nextName}`);
         }
-      })
+      }),
     ) as Observable<string>;
 
     if (halNames.length === 1) {
@@ -78,7 +100,7 @@ export class HALEndpointService {
     } else {
       return nextHref$.pipe(
         switchMap((nextHref) => this.getEndpointAt(nextHref, ...halNames.slice(1))),
-        take(1)
+        take(1),
       );
     }
   }
@@ -88,7 +110,7 @@ export class HALEndpointService {
       // TODO this only works when there's no / in linkPath
       map((endpointMap: EndpointMap) => isNotEmpty(endpointMap[linkPath])),
       startWith(undefined),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/shared/hal-resource.model.ts b/src/app/core/shared/hal-resource.model.ts
index 6e4fe1f502..5f9d107a54 100644
--- a/src/app/core/shared/hal-resource.model.ts
+++ b/src/app/core/shared/hal-resource.model.ts
@@ -1,6 +1,7 @@
-import { HALLink } from './hal-link.model';
 import { deserialize } from 'cerialize';
 
+import { HALLink } from './hal-link.model';
+
 /**
  * Represents HAL resources.
  *
@@ -12,7 +13,7 @@ export class HALResource {
    * The {@link HALLink}s for this {@link HALResource}
    */
   @deserialize
-  _links: {
+    _links: {
 
     /**
      * The {@link HALLink} that refers to this {@link HALResource}
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index d561fff643..97d50c3ca6 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,10 +1,17 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { HIERARCHICAL_BROWSE_DEFINITION } from './hierarchical-browse-definition.resource-type';
-import { HALLink } from './hal-link.model';
-import { ResourceType } from './resource-type';
 import { BrowseDefinition } from './browse-definition.model';
+import { HALLink } from './hal-link.model';
+import { HIERARCHICAL_BROWSE_DEFINITION } from './hierarchical-browse-definition.resource-type';
+import { ResourceType } from './resource-type';
 
 /**
  * BrowseDefinition model for browses of type 'hierarchicalBrowse'
@@ -18,28 +25,28 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
    * The object type
    */
   @excludeFromEquals
-  type: ResourceType = HIERARCHICAL_BROWSE_DEFINITION;
+    type: ResourceType = HIERARCHICAL_BROWSE_DEFINITION;
 
   @autoserialize
-  facetType: string;
+    facetType: string;
 
   @autoserialize
-  vocabulary: string;
+    vocabulary: string;
 
   @autoserializeAs('metadata')
-  metadataKeys: string[];
+    metadataKeys: string[];
 
   get self(): string {
     return this._links.self.href;
   }
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     vocabulary: HALLink;
   };
 
-  getRenderType(): string {
-    return 'hierarchy';
+  getRenderType(): BrowseByDataType {
+    return BrowseByDataType.Hierarchy;
   }
 }
diff --git a/src/app/core/shared/item-relationships/item-type.model.ts b/src/app/core/shared/item-relationships/item-type.model.ts
index c51c3b9035..1d8ca6df98 100644
--- a/src/app/core/shared/item-relationships/item-type.model.ts
+++ b/src/app/core/shared/item-relationships/item-type.model.ts
@@ -1,11 +1,16 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { HALLink } from '../hal-link.model';
 import { ResourceType } from '../resource-type';
 import { ITEM_TYPE } from './item-type.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a type of Item
@@ -19,16 +24,16 @@ export class ItemType implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this ItemType
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The universally unique identifier of this ItemType
@@ -36,13 +41,13 @@ export class ItemType implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(ItemType.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The {@link HALLink}s for this ItemType
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 }
diff --git a/src/app/core/shared/item-relationships/relationship-type.model.ts b/src/app/core/shared/item-relationships/relationship-type.model.ts
index 73e3a7b47c..75d5d70af6 100644
--- a/src/app/core/shared/item-relationships/relationship-type.model.ts
+++ b/src/app/core/shared/item-relationships/relationship-type.model.ts
@@ -1,6 +1,15 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { RemoteData } from '../../data/remote-data';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
@@ -9,7 +18,6 @@ import { ResourceType } from '../resource-type';
 import { ItemType } from './item-type.model';
 import { ITEM_TYPE } from './item-type.resource-type';
 import { RELATIONSHIP_TYPE } from './relationship-type.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a type of Relationship between multiple possible Items
@@ -23,19 +31,19 @@ export class RelationshipType implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The label that describes this RelationshipType
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The identifier of this RelationshipType
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The universally unique identifier of this RelationshipType
@@ -43,49 +51,49 @@ export class RelationshipType implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(RelationshipType.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The label that describes the Relation to the left of this RelationshipType
    */
   @autoserialize
-  leftwardType: string;
+    leftwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the left of this RelationshipType
    */
   @autoserialize
-  leftMaxCardinality: number;
+    leftMaxCardinality: number;
 
   /**
    * The minimum amount of Relationships allowed to the left of this RelationshipType
    */
   @autoserialize
-  leftMinCardinality: number;
+    leftMinCardinality: number;
 
   /**
    * The label that describes the Relation to the right of this RelationshipType
    */
   @autoserialize
-  rightwardType: string;
+    rightwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the right of this RelationshipType
    */
   @autoserialize
-  rightMaxCardinality: number;
+    rightMaxCardinality: number;
 
   /**
    * The minimum amount of Relationships allowed to the right of this RelationshipType
    */
   @autoserialize
-  rightMinCardinality: number;
+    rightMinCardinality: number;
 
   /**
    * The {@link HALLink}s for this RelationshipType
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     leftType: HALLink;
     rightType: HALLink;
@@ -96,12 +104,12 @@ export class RelationshipType implements CacheableObject {
    * Will be undefined unless the leftType {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE)
-  leftType?: Observable<RemoteData<ItemType>>;
+    leftType?: Observable<RemoteData<ItemType>>;
 
   /**
    * The type of Item found on the right side of this RelationshipType
    * Will be undefined unless the rightType {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE)
-  rightType?: Observable<RemoteData<ItemType>>;
+    rightType?: Observable<RemoteData<ItemType>>;
 }
diff --git a/src/app/core/shared/item-relationships/relationship.model.ts b/src/app/core/shared/item-relationships/relationship.model.ts
index db12e1d862..4f6fe2796d 100644
--- a/src/app/core/shared/item-relationships/relationship.model.ts
+++ b/src/app/core/shared/item-relationships/relationship.model.ts
@@ -1,6 +1,15 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { RemoteData } from '../../data/remote-data';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
@@ -8,10 +17,9 @@ import { HALLink } from '../hal-link.model';
 import { Item } from '../item.model';
 import { ITEM } from '../item.resource-type';
 import { ResourceType } from '../resource-type';
+import { RELATIONSHIP } from './relationship.resource-type';
 import { RelationshipType } from './relationship-type.model';
 import { RELATIONSHIP_TYPE } from './relationship-type.resource-type';
-import { RELATIONSHIP } from './relationship.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a Relationship between two Items
@@ -25,7 +33,7 @@ export class Relationship implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The universally unique identifier of this Relationship
@@ -33,43 +41,43 @@ export class Relationship implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(Relationship.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The identifier of this Relationship
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The place of the Item to the left side of this Relationship
    */
   @autoserialize
-  leftPlace: number;
+    leftPlace: number;
 
   /**
    * The place of the Item to the right side of this Relationship
    */
   @autoserialize
-  rightPlace: number;
+    rightPlace: number;
 
   /**
    * The name variant of the Item to the left side of this Relationship
    */
   @autoserialize
-  leftwardValue: string;
+    leftwardValue: string;
 
   /**
    * The name variant of the Item to the right side of this Relationship
    */
   @autoserialize
-  rightwardValue: string;
+    rightwardValue: string;
 
   /**
    * The {@link HALLink}s for this Relationship
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     leftItem: HALLink;
     rightItem: HALLink;
@@ -81,20 +89,20 @@ export class Relationship implements CacheableObject {
    * Will be undefined unless the leftItem {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  leftItem?: Observable<RemoteData<Item>>;
+    leftItem?: Observable<RemoteData<Item>>;
 
   /**
    * The item on the right side of this relationship
    * Will be undefined unless the rightItem {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  rightItem?: Observable<RemoteData<Item>>;
+    rightItem?: Observable<RemoteData<Item>>;
 
   /**
    * The RelationshipType for this Relationship
    * Will be undefined unless the relationshipType {@link HALLink} has been resolved.
    */
   @link(RELATIONSHIP_TYPE)
-  relationshipType?: Observable<RemoteData<RelationshipType>>;
+    relationshipType?: Observable<RemoteData<RelationshipType>>;
 
 }
diff --git a/src/app/core/shared/item-request.model.ts b/src/app/core/shared/item-request.model.ts
index 35dacc67c4..8b1ef94512 100644
--- a/src/app/core/shared/item-request.model.ts
+++ b/src/app/core/shared/item-request.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { ResourceType } from './resource-type';
-import { ITEM_REQUEST } from './item-request.resource-type';
-import { HALLink } from './hal-link.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { HALLink } from './hal-link.model';
+import { ITEM_REQUEST } from './item-request.resource-type';
+import { ResourceType } from './resource-type';
 
 /**
  * Model class for an ItemRequest
@@ -18,70 +22,70 @@ export class ItemRequest implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * opaque string which uniquely identifies this request
    */
   @autoserialize
-  token: string;
+    token: string;
 
   /**
    * true if the request is for all bitstreams of the item.
    */
   @autoserialize
-  allfiles: boolean;
+    allfiles: boolean;
   /**
    * email address of the person requesting the files.
    */
   @autoserialize
-  requestEmail: string;
+    requestEmail: string;
   /**
    * Human-readable name of the person requesting the files.
    */
   @autoserialize
-  requestName: string;
+    requestName: string;
   /**
    * arbitrary message provided by the person requesting the files.
    */
   @autoserialize
-  requestMessage: string;
+    requestMessage: string;
   /**
    * date that the request was recorded.
    */
   @autoserialize
-  requestDate: string;
+    requestDate: string;
   /**
    * true if the request has been granted.
    */
   @autoserialize
-  acceptRequest: boolean;
+    acceptRequest: boolean;
   /**
    * date that the request was granted or denied.
    */
   @autoserialize
-  decisionDate: string;
+    decisionDate: string;
   /**
    * date on which the request is considered expired.
    */
   @autoserialize
-  expires: string;
+    expires: string;
   /**
    * UUID of the requested Item.
    */
   @autoserialize
-  itemId: string;
+    itemId: string;
   /**
    * UUID of the requested bitstream.
    */
   @autoserialize
-  bitstreamId: string;
+    bitstreamId: string;
 
   /**
    * The {@link HALLink}s for this ItemRequest
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     item: HALLink;
     bitstream: HALLink;
diff --git a/src/app/core/shared/item.model.spec.ts b/src/app/core/shared/item.model.spec.ts
index 732ae5b19c..7eaa6f10be 100644
--- a/src/app/core/shared/item.model.spec.ts
+++ b/src/app/core/shared/item.model.spec.ts
@@ -1,6 +1,5 @@
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-
 import { Item } from './item.model';
 
 describe('Item', () => {
@@ -12,22 +11,21 @@ describe('Item', () => {
   const bitstream1Path = 'document.pdf';
   const bitstream2Path = 'otherfile.doc';
 
-  const nonExistingBundleName = 'c1e568f7-d14e-496b-bdd7-07026998cc00';
   let bitstreams;
   let remoteDataThumbnail;
   let remoteDataThumbnailList;
   let remoteDataFiles;
   let remoteDataBundles;
 
-  beforeEach(() => {
+  it('should be possible to create an Item without any errors', () => {
     const thumbnail = {
-      content: thumbnailPath
+      content: thumbnailPath,
     };
 
     bitstreams = [{
-      content: bitstream1Path
+      content: bitstream1Path,
     }, {
-      content: bitstream2Path
+      content: bitstream2Path,
     }];
 
     remoteDataThumbnail = createSuccessfulRemoteDataObject$(thumbnail);
@@ -40,16 +38,17 @@ describe('Item', () => {
         {
           name: thumbnailBundleName,
           primaryBitstream: remoteDataThumbnail,
-          bitstreams: remoteDataThumbnailList
+          bitstreams: remoteDataThumbnailList,
         },
 
         {
           name: originalBundleName,
-          bitstreams: remoteDataFiles
+          bitstreams: remoteDataFiles,
         }];
 
     remoteDataBundles = createSuccessfulRemoteDataObject$(createPaginatedList(bundles));
 
     item = Object.assign(new Item(), { bundles: remoteDataBundles });
+    expect().nothing();
   });
 });
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 20fc275ee2..33a9f3bb38 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -1,31 +1,40 @@
-import { autoserialize, autoserializeAs, deserialize, deserializeAs, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
+import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
+
 import { isEmpty } from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
 import { Bundle } from './bundle.model';
 import { BUNDLE } from './bundle.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { Collection } from './collection.model';
 import { COLLECTION } from './collection.resource-type';
-
 import { DSpaceObject } from './dspace-object.model';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
+import { HandleObject } from './handle-object.model';
+import { ITEM } from './item.resource-type';
 import { Relationship } from './item-relationships/relationship.model';
 import { RELATIONSHIP } from './item-relationships/relationship.resource-type';
-import { ITEM } from './item.resource-type';
-import { ChildHALResource } from './child-hal-resource.model';
 import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
-import { BITSTREAM } from './bitstream.resource-type';
-import { Bitstream } from './bitstream.model';
-import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
-import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
-import { HandleObject } from './handle-object.model';
-import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
-import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
 
 /**
  * Class representing a DSpace Item
@@ -39,37 +48,37 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
    * A string representing the unique handle of this Item
    */
   @autoserialize
-  handle: string;
+    handle: string;
 
   /**
    * The Date of the last modification of this Item
    */
   @deserializeAs(Date)
-  lastModified: Date;
+    lastModified: Date;
 
   /**
    * A boolean representing if this Item is currently archived or not
    */
   @autoserializeAs(Boolean, 'inArchive')
-  isArchived: boolean;
+    isArchived: boolean;
 
   /**
    * A boolean representing if this Item is currently discoverable or not
    */
   @autoserializeAs(Boolean, 'discoverable')
-  isDiscoverable: boolean;
+    isDiscoverable: boolean;
 
   /**
    * A boolean representing if this Item is currently withdrawn or not
    */
   @autoserializeAs(Boolean, 'withdrawn')
-  isWithdrawn: boolean;
+    isWithdrawn: boolean;
 
   /**
    * The {@link HALLink}s for this Item
    */
   @deserialize
-  _links: {
+    _links: {
     mappedCollections: HALLink;
     relationships: HALLink;
     bundles: HALLink;
@@ -87,49 +96,49 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
    * Will be undefined unless the owningCollection {@link HALLink} has been resolved.
    */
   @link(COLLECTION)
-  owningCollection?: Observable<RemoteData<Collection>>;
+    owningCollection?: Observable<RemoteData<Collection>>;
 
   /**
    * The version this item represents in its history
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(VERSION)
-  version?: Observable<RemoteData<Version>>;
+    version?: Observable<RemoteData<Version>>;
 
   /**
    * The list of Bundles inside this Item
    * Will be undefined unless the bundles {@link HALLink} has been resolved.
    */
   @link(BUNDLE, true)
-  bundles?: Observable<RemoteData<PaginatedList<Bundle>>>;
+    bundles?: Observable<RemoteData<PaginatedList<Bundle>>>;
 
   /**
    * The list of Relationships this Item has with others
    * Will be undefined unless the relationships {@link HALLink} has been resolved.
    */
   @link(RELATIONSHIP, true)
-  relationships?: Observable<RemoteData<PaginatedList<Relationship>>>;
+    relationships?: Observable<RemoteData<PaginatedList<Relationship>>>;
 
   /**
    * The thumbnail for this Item
    * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, false, 'thumbnail')
-  thumbnail?: Observable<RemoteData<Bitstream>>;
+    thumbnail?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The access status for this Item
    * Will be undefined unless the access status {@link HALLink} has been resolved.
    */
    @link(ACCESS_STATUS)
-   accessStatus?: Observable<RemoteData<AccessStatusObject>>;
+     accessStatus?: Observable<RemoteData<AccessStatusObject>>;
 
   /**
    * The identifier data for this Item
    * Will be undefined unless the identifiers {@link HALLink} has been resolved.
    */
   @link(IDENTIFIERS, false, 'identifiers')
-  identifiers?: Observable<RemoteData<IdentifierData>>;
+    identifiers?: Observable<RemoteData<IdentifierData>>;
 
   /**
    * Method that returns as which type of object this object should be rendered
diff --git a/src/app/core/shared/license.model.ts b/src/app/core/shared/license.model.ts
index 2b2477c1f8..af85c31eea 100644
--- a/src/app/core/shared/license.model.ts
+++ b/src/app/core/shared/license.model.ts
@@ -1,4 +1,8 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { LICENSE } from './license.resource-type';
@@ -12,11 +16,11 @@ export class License extends DSpaceObject {
    * Is the license custom?
    */
   @autoserialize
-  custom: boolean;
+    custom: boolean;
 
   /**
    * The text of the license
    */
   @autoserialize
-  text: string;
+    text: string;
 }
diff --git a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
index b46dab7180..a580d7b654 100644
--- a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
+++ b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
@@ -1,7 +1,7 @@
-import { MetadataRepresentationType } from '../metadata-representation.model';
-import { ItemMetadataRepresentation } from './item-metadata-representation.model';
 import { Item } from '../../item.model';
 import { MetadataValue } from '../../metadata.models';
+import { MetadataRepresentationType } from '../metadata-representation.model';
+import { ItemMetadataRepresentation } from './item-metadata-representation.model';
 
 describe('ItemMetadataRepresentation', () => {
   const valuePrefix = 'Test value for ';
@@ -11,14 +11,14 @@ describe('ItemMetadataRepresentation', () => {
   item.metadata = {
     'dc.title': [
       {
-        value: `${valuePrefix}dc.title`
-      }
+        value: `${valuePrefix}dc.title`,
+      },
     ] as MetadataValue[],
     'dc.contributor.author': [
       {
-        value: `${valuePrefix}dc.contributor.author`
-      }
-    ] as MetadataValue[]
+        value: `${valuePrefix}dc.contributor.author`,
+      },
+    ] as MetadataValue[],
   };
 
   for (const metadataField of Object.keys(item.metadata)) {
@@ -26,8 +26,8 @@ describe('ItemMetadataRepresentation', () => {
       beforeEach(() => {
         item.metadata['dspace.entity.type'] = [
           Object.assign(new MetadataValue(), {
-            value: itemType
-          })
+            value: itemType,
+          }),
         ];
         itemMetadataRepresentation = Object.assign(new ItemMetadataRepresentation(item.metadata[metadataField][0]), item);
       });
diff --git a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
index 8c50e0b597..9ccece13f2 100644
--- a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
@@ -1,6 +1,9 @@
 import { Item } from '../../item.model';
-import { MetadataRepresentation, MetadataRepresentationType } from '../metadata-representation.model';
 import { MetadataValue } from '../../metadata.models';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../metadata-representation.model';
 
 /**
  * This class determines which fields to use when rendering an Item as a metadata value.
diff --git a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
index ea48d345c5..b81753b1a0 100644
--- a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
+++ b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
@@ -1,17 +1,17 @@
-import { MetadatumRepresentation } from './metadatum-representation.model';
-import { MetadataRepresentationType } from '../metadata-representation.model';
 import { MetadataValue } from '../../metadata.models';
+import { MetadataRepresentationType } from '../metadata-representation.model';
+import { MetadatumRepresentation } from './metadatum-representation.model';
 
 describe('MetadatumRepresentation', () => {
   const itemType = 'Person';
   const normalMetadatum = Object.assign(new MetadataValue(), {
     key: 'dc.contributor.author',
-    value: 'Test Author'
+    value: 'Test Author',
   });
   const authorityMetadatum = Object.assign(new MetadataValue(), {
     key: 'dc.contributor.author',
     value: 'Test Authority Author',
-    authority: '1234'
+    authority: '1234',
   });
 
   let metadatumRepresentation: MetadatumRepresentation;
diff --git a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
index a09de12ae4..9ca24edd57 100644
--- a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
@@ -1,7 +1,10 @@
-import { MetadataRepresentation, MetadataRepresentationType } from '../metadata-representation.model';
 import { hasValue } from '../../../../shared/empty.util';
-import { MetadataValue } from '../../metadata.models';
 import { BrowseDefinition } from '../../browse-definition.model';
+import { MetadataValue } from '../../metadata.models';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../metadata-representation.model';
 
 /**
  * This class defines the way the metadatum it extends should be represented
diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts
index e74e1f9927..4ba78e39f7 100644
--- a/src/app/core/shared/metadata.models.ts
+++ b/src/app/core/shared/metadata.models.ts
@@ -1,6 +1,11 @@
 /* eslint-disable max-classes-per-file */
+import {
+  autoserialize,
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 import { v4 as uuidv4 } from 'uuid';
-import { autoserialize, Serialize, Deserialize } from 'cerialize';
+
 import { hasValue } from '../../shared/empty.util';
 
 export const VIRTUAL_METADATA_PREFIX = 'virtual::';
@@ -32,26 +37,26 @@ export class MetadataValue implements MetadataValueInterface {
 
   /** The language. */
   @autoserialize
-  language: string;
+    language: string;
 
   /** The string value. */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The place of this MetadataValue within its list of metadata
    * This is used to render metadata in a specific custom order
    */
   @autoserialize
-  place: number;
+    place: number;
 
   /** The authority key used for authority-controlled metadata */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /** The authority confidence value */
   @autoserialize
-  confidence: number;
+    confidence: number;
 
   /**
    * Returns true if this Metadatum's authority key starts with 'virtual::'
@@ -136,5 +141,5 @@ export const MetadataMapSerializer = {
       metadataMap[key] = Deserialize(json[key], MetadataValue);
     });
     return metadataMap;
-  }
+  },
 };
diff --git a/src/app/core/shared/metadata.utils.spec.ts b/src/app/core/shared/metadata.utils.spec.ts
index 812e65bcba..2ba96201b0 100644
--- a/src/app/core/shared/metadata.utils.spec.ts
+++ b/src/app/core/shared/metadata.utils.spec.ts
@@ -1,6 +1,12 @@
-import { isUndefined } from '../../shared/empty.util';
 import { v4 as uuidv4 } from 'uuid';
-import { MetadataMap, MetadataValue, MetadataValueFilter, MetadatumViewModel } from './metadata.models';
+
+import { isUndefined } from '../../shared/empty.util';
+import {
+  MetadataMap,
+  MetadataValue,
+  MetadataValueFilter,
+  MetadatumViewModel,
+} from './metadata.models';
 import { Metadata } from './metadata.utils';
 
 const mdValue = (value: string, language?: string, authority?: string): MetadataValue => {
@@ -10,7 +16,7 @@ const mdValue = (value: string, language?: string, authority?: string): Metadata
     language: isUndefined(language) ? null : language,
     place: 0,
     authority: isUndefined(authority) ? null : authority,
-    confidence: undefined
+    confidence: undefined,
   });
 };
 
@@ -28,7 +34,7 @@ const multiMap = {
   'dc.description': [dcDescription],
   'dc.description.abstract': [dcAbstract],
   'dc.title': [dcTitle1, dcTitle2],
-  'foo': [bar]
+  'foo': [bar],
 };
 
 const regexTestMap = {
@@ -41,7 +47,7 @@ const multiViewModelList = [
   { key: 'dc.description.abstract', ...dcAbstract, order: 0 },
   { key: 'dc.title', ...dcTitle1, order: 0 },
   { key: 'dc.title', ...dcTitle2, order: 1 },
-  { key: 'foo', ...bar, order: 0 }
+  { key: 'foo', ...bar, order: 0 },
 ];
 
 const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, expected, filter?) => {
@@ -231,7 +237,7 @@ describe('Metadata', () => {
 
     const metadataMap = {
       'dc.description': [mdValue('Test description')],
-      'dc.title': [mdValue('Test title 1'), mdValue('Test title 2')]
+      'dc.title': [mdValue('Test title 1'), mdValue('Test title 2')],
     };
 
     const testSetFirstValue = (map: MetadataMap, key: string, value: string) => {
diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 87a90b53a3..1ad10356fb 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -1,12 +1,18 @@
-import { isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
+import groupBy from 'lodash/groupBy';
+import sortBy from 'lodash/sortBy';
+
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../shared/empty.util';
 import {
   MetadataMapInterface,
   MetadataValue,
   MetadataValueFilter,
-  MetadatumViewModel
+  MetadatumViewModel,
 } from './metadata.models';
-import groupBy from 'lodash/groupBy';
-import sortBy from 'lodash/sortBy';
 
 /**
  * Utility class for working with DSpace object metadata.
@@ -33,7 +39,7 @@ export class Metadata {
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   public static all(mapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                    filter?: MetadataValueFilter): MetadataValue[] {
+    filter?: MetadataValueFilter): MetadataValue[] {
     const mdMaps: MetadataMapInterface[] = mapOrMaps instanceof Array ? mapOrMaps : [mapOrMaps];
     const matches: MetadataValue[] = [];
     for (const mdMap of mdMaps) {
@@ -64,7 +70,7 @@ export class Metadata {
    * @returns {string[]} the matching string values or an empty array.
    */
   public static allValues(mapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                          filter?: MetadataValueFilter): string[] {
+    filter?: MetadataValueFilter): string[] {
     return Metadata.all(mapOrMaps, keyOrKeys, filter).map((mdValue) => mdValue.value);
   }
 
@@ -77,7 +83,7 @@ export class Metadata {
    * @returns {MetadataValue} the first matching value, or `undefined`.
    */
   public static first(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                      filter?: MetadataValueFilter): MetadataValue {
+    filter?: MetadataValueFilter): MetadataValue {
     const mdMaps: MetadataMapInterface[] = mdMapOrMaps instanceof Array ? mdMapOrMaps : [mdMapOrMaps];
     for (const mdMap of mdMaps) {
       for (const key of Metadata.resolveKeys(mdMap, keyOrKeys)) {
@@ -98,7 +104,7 @@ export class Metadata {
    * @returns {string} the first matching string value, or `undefined`.
    */
   public static firstValue(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                           filter?: MetadataValueFilter): string {
+    filter?: MetadataValueFilter): string {
     const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
     return isUndefined(value) ? undefined : value.value;
   }
@@ -112,7 +118,7 @@ export class Metadata {
    * @returns {boolean} whether a match is found.
    */
   public static has(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                    filter?: MetadataValueFilter): boolean {
+    filter?: MetadataValueFilter): boolean {
     return isNotUndefined(Metadata.first(mdMapOrMaps, keyOrKeys, filter));
   }
 
@@ -188,7 +194,7 @@ export class Metadata {
               metadataValue,
               {
                 order: index,
-                key
+                key,
               }));
         metadatumList = [...metadatumList, ...fields];
       });
@@ -209,11 +215,11 @@ export class Metadata {
       .forEach((key: string) => {
         const orderedValues = sortBy(groupedList[key], ['order']);
         metadataMap[key] = orderedValues.map((value: MetadatumViewModel) => {
-            const val = Object.assign(new MetadataValue(), value);
-            delete (val as any).order;
-            delete (val as any).key;
-            return val;
-          }
+          const val = Object.assign(new MetadataValue(), value);
+          delete (val as any).order;
+          delete (val as any).key;
+          return val;
+        },
         );
       });
     return metadataMap;
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index d5481fcc8d..769d70629d 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -1,7 +1,12 @@
-import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
-import { SortOption } from './sort-option.model';
-import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-decorator';
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { BrowseDefinition } from './browse-definition.model';
+import { SortOption } from './sort-option.model';
 
 /**
  * Super class for NonHierarchicalBrowseDefinition models,
@@ -11,14 +16,14 @@ import { BrowseDefinition } from './browse-definition.model';
 export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
 
   @autoserialize
-  sortOptions: SortOption[];
+    sortOptions: SortOption[];
 
   @autoserializeAs('order')
-  defaultSortOrder: string;
+    defaultSortOrder: string;
 
   @autoserializeAs('metadata')
-  metadataKeys: string[];
+    metadataKeys: string[];
 
   @autoserialize
-  dataType: BrowseByDataType;
+    dataType: BrowseByDataType;
 }
diff --git a/src/app/core/shared/operators.spec.ts b/src/app/core/shared/operators.spec.ts
index 077c0a17d8..07ba82caba 100644
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -1,21 +1,31 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { GetRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { redirectOn4xx } from './authorized.operators';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from './operators';
-import { of as observableOf } from 'rxjs';
 import {
-  createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject
-} from '../../shared/remote-data.utils';
-import { getRequestFromRequestHref, getRequestFromRequestUUID, getResponseFromEntry, sendRequest } from './request.operators';
-import { redirectOn4xx } from './authorized.operators';
-import { RequestEntry } from '../data/request-entry.model';
+  getRequestFromRequestHref,
+  getRequestFromRequestUUID,
+  getResponseFromEntry,
+  sendRequest,
+} from './request.operators';
 
 /* eslint-disable @typescript-eslint/no-shadow */
 
@@ -32,7 +42,7 @@ describe('Core Module - RxJS Operators', () => {
     d: { response: { isSuccessful: true, resourceSelfLinks: ['j', 'k', 'l', 'm', 'n'] } },
     e: { response: { isSuccessful: 1, resourceSelfLinks: [] } },
     f: { response: undefined },
-    g: undefined
+    g: undefined,
   };
 
   const testResponses = {
@@ -40,7 +50,7 @@ describe('Core Module - RxJS Operators', () => {
     b: testRCEs.b.response,
     c: testRCEs.c.response,
     d: testRCEs.d.response,
-    e: testRCEs.e.response
+    e: testRCEs.e.response,
   };
 
   beforeEach(() => {
@@ -147,7 +157,7 @@ describe('Core Module - RxJS Operators', () => {
         b: testRCEs.b.response,
         c: testRCEs.c.response,
         d: testRCEs.d.response,
-        e: testRCEs.e.response
+        e: testRCEs.e.response,
       });
 
       expect(result).toBeObservable(expected);
@@ -183,7 +193,7 @@ describe('Core Module - RxJS Operators', () => {
       router = jasmine.createSpyObj('router', ['navigateByUrl']);
       authService = jasmine.createSpyObj('authService', {
         isAuthenticated: observableOf(true),
-        setRedirectUrl: {}
+        setRedirectUrl: {},
       });
     });
 
@@ -296,7 +306,7 @@ describe('Core Module - RxJS Operators', () => {
         b: testRCEs.b.response,
         c: testRCEs.c.response,
         d: testRCEs.d.response,
-        e: testRCEs.e.response
+        e: testRCEs.e.response,
       });
 
       expect(result).toBeObservable(expected);
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 94ca25235b..c98b60b649 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,6 +1,28 @@
-import { combineLatest as observableCombineLatest, Observable, interval } from 'rxjs';
-import { filter, find, map, switchMap, take, takeWhile, debounce, debounceTime } from 'rxjs/operators';
-import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
+import { InjectionToken } from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  interval,
+  MonoTypeOperatorFunction,
+  Observable,
+  SchedulerLike,
+} from 'rxjs';
+import {
+  debounce,
+  debounceTime,
+  filter,
+  find,
+  map,
+  switchMap,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
@@ -8,8 +30,6 @@ import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
-import { InjectionToken } from '@angular/core';
-import { MonoTypeOperatorFunction, SchedulerLike } from 'rxjs/internal/types';
 
 /**
  * Use this method instead of the RxJs debounceTime if you're waiting for debouncing in tests;
@@ -23,7 +43,7 @@ export const debounceTimeWorkaround = <T>(dueTime: number, scheduler?: Scheduler
 
 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
   providedIn: 'root',
-  factory: () => debounceTime
+  factory: () => debounceTime,
 });
 
 export const getRemoteDataPayload = <T>() =>
@@ -68,7 +88,7 @@ export const getFirstSucceededRemoteDataPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -85,7 +105,7 @@ export const getFirstSucceededRemoteDataWithNotEmptyPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getFirstSucceededRemoteWithNotEmptyData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -102,7 +122,7 @@ export const getAllSucceededRemoteDataPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getAllSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -124,7 +144,7 @@ export const getFirstSucceededRemoteListPayload = <T>() =>
     source.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      getPaginatedListPayload()
+      getPaginatedListPayload(),
     );
 
 /**
@@ -146,7 +166,7 @@ export const getAllSucceededRemoteListPayload = <T>() =>
     source.pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
-      getPaginatedListPayload()
+      getPaginatedListPayload(),
     );
 
 export const getFinishedRemoteData = <T>() =>
@@ -165,7 +185,7 @@ export const toDSpaceObjectListRD = <T extends DSpaceObject>() =>
         const dsoPage: T[] = rd.payload.page.filter((result) => hasValue(result)).map((searchResult: SearchResult<T>) => searchResult.indexableObject);
         const payload = Object.assign(rd.payload, { page: dsoPage }) as PaginatedList<T>;
         return Object.assign(rd, { payload: payload });
-      })
+      }),
     );
 
 /**
@@ -179,7 +199,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
       getRemoteDataPayload(),
       getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
-        .find((def: BrowseDefinition) => def.id === definitionID)
+        .find((def: BrowseDefinition) => def.id === definitionID),
       ),
       map((def: BrowseDefinition) => {
         if (isNotEmpty(def)) {
@@ -187,7 +207,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
         } else {
           throw new Error(`No metadata browse definition could be found for id '${definitionID}'`);
         }
-      })
+      }),
     );
 
 /**
@@ -196,7 +216,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
 export const getFirstOccurrence = () =>
   <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<T>>>): Observable<RemoteData<T>> =>
     source.pipe(
-      map((rd) => Object.assign(rd, { payload: rd.payload.page.length > 0 ? rd.payload.page[0] : undefined }))
+      map((rd) => Object.assign(rd, { payload: rd.payload.page.length > 0 ? rd.payload.page[0] : undefined })),
     );
 
 /**
@@ -206,7 +226,7 @@ export const paginatedListToArray = () =>
   <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<T>>>): Observable<T[]> =>
     source.pipe(
       hasValueOperator(),
-      map((objectRD: RemoteData<PaginatedList<T>>) => objectRD.payload.page.filter((object: T) => hasValue(object)))
+      map((objectRD: RemoteData<PaginatedList<T>>) => objectRD.payload.page.filter((object: T) => hasValue(object))),
     );
 
 /**
@@ -223,13 +243,13 @@ export const metadataFieldsToString = () =>
         const fieldSchemaArray = fields.map((field: MetadataField) => {
           return field.schema.pipe(
             getFirstSucceededRemoteDataPayload(),
-            map((schema: MetadataSchema) => ({ field, schema }))
+            map((schema: MetadataSchema) => ({ field, schema })),
           );
         });
         return isNotEmpty(fieldSchemaArray) ? observableCombineLatest(fieldSchemaArray) : [[]];
       }),
       map((fieldSchemaArray: { field: MetadataField, schema: MetadataSchema }[]): string[] => {
         return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString());
-      })
+      }),
     );
 
diff --git a/src/app/core/shared/page-info.model.ts b/src/app/core/shared/page-info.model.ts
index ccb0aae471..5594e58309 100644
--- a/src/app/core/shared/page-info.model.ts
+++ b/src/app/core/shared/page-info.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { hasValue } from '../../shared/empty.util';
 import { HALLink } from './hal-link.model';
 import { HALResource } from './hal-resource.model';
@@ -12,31 +17,31 @@ export class PageInfo implements HALResource {
    * The number of elements on a page
    */
   @autoserializeAs(Number, 'size')
-  elementsPerPage: number;
+    elementsPerPage: number;
 
   /**
    * The total number of elements in the entire set
    */
   @autoserialize
-  totalElements: number;
+    totalElements: number;
 
   /**
    * The total number of pages
    */
   @autoserialize
-  totalPages: number;
+    totalPages: number;
 
   /**
    * The number of the current page, zero-based
    */
   @autoserializeAs(Number, 'number')
-  currentPage: number;
+    currentPage: number;
 
   /**
    * The {@link HALLink}s for this PageInfo
    */
   @deserialize
-  _links: {
+    _links: {
     first: HALLink;
     prev: HALLink;
     next: HALLink;
@@ -50,7 +55,7 @@ export class PageInfo implements HALResource {
       totalElements: number,
       totalPages: number,
       currentPage: number
-    }
+    },
   ) {
     if (hasValue(options)) {
       this.elementsPerPage = options.elementsPerPage;
diff --git a/src/app/core/shared/registration.model.ts b/src/app/core/shared/registration.model.ts
index bc4488964f..e2efa6a02c 100644
--- a/src/app/core/shared/registration.model.ts
+++ b/src/app/core/shared/registration.model.ts
@@ -1,6 +1,6 @@
 import { typedObject } from '../cache/builders/build-decorators';
-import { ResourceType } from './resource-type';
 import { REGISTRATION } from './registration.resource-type';
+import { ResourceType } from './resource-type';
 import { UnCacheableObject } from './uncacheable-object.model';
 
 @typedObject
diff --git a/src/app/core/shared/request.operators.ts b/src/app/core/shared/request.operators.ts
index c529259f03..0cb8593f40 100644
--- a/src/app/core/shared/request.operators.ts
+++ b/src/app/core/shared/request.operators.ts
@@ -1,10 +1,19 @@
-import { RequestService } from '../data/request.service';
 import { Observable } from 'rxjs';
-import { filter, map, mergeMap, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../shared/empty.util';
-import { RestRequest } from '../data/rest-request.model';
+import {
+  filter,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../shared/empty.util';
+import { RequestService } from '../data/request.service';
 import { RequestEntry } from '../data/request-entry.model';
 import { ResponseState } from '../data/response-state.model';
+import { RestRequest } from '../data/rest-request.model';
 
 /**
  * This file contains custom RxJS operators that can be used in multiple places
@@ -14,19 +23,19 @@ export const getRequestFromRequestHref = (requestService: RequestService) =>
   (source: Observable<string>): Observable<RequestEntry> =>
     source.pipe(
       mergeMap((href: string) => requestService.getByHref(href)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 export const getRequestFromRequestUUID = (requestService: RequestService) =>
   (source: Observable<string>): Observable<RequestEntry> =>
     source.pipe(
       mergeMap((uuid: string) => requestService.getByUUID(uuid)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 export const getResponseFromEntry = () =>
   (source: Observable<RequestEntry>): Observable<ResponseState> =>
     source.pipe(
       filter((entry: RequestEntry) => hasValue(entry) && hasValue(entry.response)),
-      map((entry: RequestEntry) => entry.response)
+      map((entry: RequestEntry) => entry.response),
     );
 export const sendRequest = (requestService: RequestService) =>
   (source: Observable<RestRequest>): Observable<RestRequest> =>
diff --git a/src/app/core/shared/search/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts
index d0fbd46d3a..7a47abbfd4 100644
--- a/src/app/core/shared/search/search-configuration.service.spec.ts
+++ b/src/app/core/shared/search/search-configuration.service.spec.ts
@@ -1,18 +1,26 @@
 /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-import { SearchConfigurationService } from './search-configuration.service';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../../../shared/search/models/search-filter.model';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { map } from 'rxjs/operators';
-import { RemoteData } from '../../data/remote-data';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { RequestEntry } from '../../data/request-entry.model';
 import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestEntry } from '../../data/request-entry.model';
+import { SearchConfigurationService } from './search-configuration.service';
 
 describe('SearchConfigurationService', () => {
   let service: SearchConfigurationService;
@@ -20,25 +28,25 @@ describe('SearchConfigurationService', () => {
   const prefixFilter = {
     'f.author': ['another value'],
     'f.date.min': ['2013'],
-    'f.date.max': ['2018']
+    'f.date.max': ['2018'],
   };
   const defaults = new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 }),
     sort: new SortOptions('score', SortDirection.DESC),
     configuration: 'default',
     query: '',
-    scope: ''
+    scope: '',
   });
 
   const backendFilters = [
     new SearchFilter('f.author', ['another value']),
-    new SearchFilter('f.date', ['[2013 TO 2018]'], 'equals')
+    new SearchFilter('f.date', ['[2013 TO 2018]'], 'equals'),
   ];
 
   const routeService = jasmine.createSpyObj('RouteService', {
     getQueryParameterValue: observableOf(value1),
     getQueryParamsWithPrefix: observableOf(prefixFilter),
-    getRouteParameterValue: observableOf('')
+    getRouteParameterValue: observableOf(''),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -49,7 +57,7 @@ describe('SearchConfigurationService', () => {
   const requestService: any = getMockRequestService();
   const halService: any = {
     getEndpoint: () => {
-    }
+    },
   };
 
   const rdb: any = {
@@ -57,7 +65,7 @@ describe('SearchConfigurationService', () => {
       return observableCombineLatest([requestEntryObs, payloadObs]).pipe(
         map(([req, pay]) => {
           return { req, pay };
-        })
+        }),
       );
     },
     aggregate: (input: Observable<RemoteData<any>>[]): Observable<RemoteData<any[]>> => {
@@ -65,9 +73,9 @@ describe('SearchConfigurationService', () => {
     },
     buildFromHref: (href: string): Observable<RemoteData<any>> => {
       return createSuccessfulRemoteDataObject$(Object.assign(new SearchObjects(), {
-        page: []
+        page: [],
       }));
-    }
+    },
   };
   beforeEach(() => {
     service = new SearchConfigurationService(routeService, paginationService as any, activatedRoute, linkService, halService, requestService, rdb);
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index eed93ae201..1e54fd4e6b 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -1,33 +1,64 @@
-import { Injectable, OnDestroy } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  merge as observableMerge,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
-import { filter, map, startWith, take } from 'rxjs/operators';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../../shared/empty.util';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../../../shared/search/models/search-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../../../shared/search/models/search-filter.model';
-import { RemoteData } from '../../data/remote-data';
-import { DSpaceObjectType } from '../dspace-object-type.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
-import { RouteService } from '../../services/route.service';
-import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteData } from '../operators';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { SearchConfig, SortConfig } from './search-filters/search-config.model';
-import { PaginationService } from '../../pagination/pagination.service';
-import { LinkService } from '../../cache/builders/link.service';
-import { HALEndpointService } from '../hal-endpoint.service';
-import { RequestService } from '../../data/request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { GetRequest } from '../../data/request.models';
-import { URLCombiner } from '../../url-combiner/url-combiner';
-import { GenericConstructor } from '../generic-constructor';
-import { ResponseParsingService } from '../../data/parsing.service';
-import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
-import { ViewMode } from '../view-mode.model';
 import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
+import { SearchOptions } from '../../../shared/search/models/search-options.model';
+import { LinkService } from '../../cache/builders/link.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
+import { ResponseParsingService } from '../../data/parsing.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { DSpaceObjectType } from '../dspace-object-type.model';
+import { GenericConstructor } from '../generic-constructor';
+import { HALEndpointService } from '../hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteData,
+} from '../operators';
+import { ViewMode } from '../view-mode.model';
+import {
+  SearchConfig,
+  SortConfig,
+} from './search-filters/search-config.model';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -66,7 +97,7 @@ export class SearchConfigurationService implements OnDestroy {
   protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
     id: this.paginationID,
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -105,7 +136,7 @@ export class SearchConfigurationService implements OnDestroy {
               protected linkService: LinkService,
               protected halService: HALEndpointService,
               protected requestService: RequestService,
-              protected rdb: RemoteDataBuildService,) {
+              protected rdb: RemoteDataBuildService) {
 
     this.initDefaults();
   }
@@ -118,7 +149,7 @@ export class SearchConfigurationService implements OnDestroy {
       const options = new PaginatedSearchOptions({
         pagination: this.defaultPagination,
         scope: this.defaultScope,
-        query: this.defaultQuery
+        query: this.defaultQuery,
       });
       this._defaults = createSuccessfulRemoteDataObject$(options, new Date().getTime());
     }
@@ -131,11 +162,11 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentConfiguration(defaultConfiguration: string) {
     return observableCombineLatest([
       this.routeService.getQueryParameterValue('configuration').pipe(startWith(undefined)),
-      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined))
+      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined)),
     ]).pipe(
       map(([queryConfig, routeConfig]) => {
         return queryConfig || routeConfig || defaultConfiguration;
-      })
+      }),
     );
   }
 
@@ -163,7 +194,7 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentDSOType(): Observable<DSpaceObjectType> {
     return this.routeService.getQueryParameterValue('dsoType').pipe(
       filter((type) => isNotEmpty(type) && hasValue(DSpaceObjectType[type.toUpperCase()])),
-      map((type) => DSpaceObjectType[type.toUpperCase()]),);
+      map((type) => DSpaceObjectType[type.toUpperCase()]));
   }
 
   /**
@@ -235,7 +266,7 @@ export class SearchConfigurationService implements OnDestroy {
    */
   getConfigurationSearchConfig(configuration: string, scope?: string): Observable<SearchConfig> {
     return this.getSearchConfigurationFor(scope, configuration).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -246,7 +277,7 @@ export class SearchConfigurationService implements OnDestroy {
   getConfigurationSortOptions(searchConfig: SearchConfig): SortOptions[] {
     return searchConfig.sortOptions.map((entry: SortConfig) => ({
       field: entry.name,
-      direction: entry.sortOrder.toLowerCase() === SortDirection.ASC.toLowerCase() ? SortDirection.ASC : SortDirection.DESC
+      direction: entry.sortOrder.toLowerCase() === SortDirection.ASC.toLowerCase() ? SortDirection.ASC : SortDirection.DESC,
     }));
   }
 
@@ -255,8 +286,8 @@ export class SearchConfigurationService implements OnDestroy {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
       const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, {
         pagination: Object.assign({}, currentValue.pagination, {
-          id: paginationId
-        })
+          id: paginationId,
+        }),
       });
       // unsubscribe from subscription related to old pagination id
       this.unsubscribeFromSearchOptions(this.paginationID);
@@ -275,7 +306,7 @@ export class SearchConfigurationService implements OnDestroy {
     this.subs
       .forEach((subs: Subscription[]) => subs
         .filter((sub) => hasValue(sub))
-        .forEach((sub) => sub.unsubscribe())
+        .forEach((sub) => sub.unsubscribe()),
       );
 
     this.subs = new Map<string, Subscription[]>(null);
@@ -299,7 +330,7 @@ export class SearchConfigurationService implements OnDestroy {
     this.unsubscribeFromSearchOptions(paginationID);
     const subs = [
       this.subscribeToSearchOptions(defaults),
-      this.subscribeToPaginatedSearchOptions(paginationID || defaults.pagination.id, defaults)
+      this.subscribeToPaginatedSearchOptions(paginationID || defaults.pagination.id, defaults),
     ];
     this.subs.set(this.paginationID, subs);
   }
@@ -317,7 +348,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
-      this.getViewModePart(defaults.view)
+      this.getViewModePart(defaults.view),
     ).subscribe((update) => {
       const currentValue: SearchOptions = this.searchOptions.getValue();
       const updatedValue: SearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -341,7 +372,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
-      this.getViewModePart(defaults.view)
+      this.getViewModePart(defaults.view),
     ).subscribe((update) => {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
       const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -493,7 +524,7 @@ export class SearchConfigurationService implements OnDestroy {
       request = Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return FacetConfigResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request, true);
     });
@@ -521,7 +552,7 @@ export class SearchConfigurationService implements OnDestroy {
         } else {
           return rd as any as RemoteData<SearchFilterConfig[]>;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/shared/search/search-filter.service.spec.ts b/src/app/core/shared/search/search-filter.service.spec.ts
index f18999bbe6..47e76754af 100644
--- a/src/app/core/shared/search/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -1,5 +1,8 @@
-import { SearchFilterService } from './search-filter.service';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+
+import { FilterType } from '../../../shared/search/models/filter-type.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -7,14 +10,15 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from '../../../shared/search/search-filters/search-filter/search-filter.actions';
 import { SearchFiltersState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { FilterType } from '../../../shared/search/models/filter-type.model';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { SearchFilterService } from './search-filter.service';
 
 describe('SearchFilterService', () => {
   let service: SearchFilterService;
@@ -24,7 +28,7 @@ describe('SearchFilterService', () => {
     filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const value1 = 'random value';
@@ -33,7 +37,7 @@ describe('SearchFilterService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   const routeServiceStub: any = {
@@ -55,12 +59,12 @@ describe('SearchFilterService', () => {
       return observableOf({});
     },
     getRouteParameterValue: (param: string) => {
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const activatedRoute: any = new ActivatedRouteStub();
   const searchServiceStub: any = {
-    uiSearchRoute: '/search'
+    uiSearchRoute: '/search',
   };
 
   beforeEach(() => {
diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 80ba200d38..427ee55fd5 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -1,11 +1,30 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { Injectable, InjectionToken } from '@angular/core';
 import {
-  SearchFiltersState,
-  SearchFilterState
-} from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -13,20 +32,24 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from '../../../shared/search/search-filters/search-filter/search-filter.actions';
-import { hasValue, isNotEmpty, } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import {
+  SearchFiltersState,
+  SearchFilterState,
+} from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
 import { RouteService } from '../../services/route.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { Params } from '@angular/router';
 
 const filterStateSelector = (state: SearchFiltersState) => state.searchFilter;
 
 export const FILTER_CONFIG: InjectionToken<SearchFilterConfig> = new InjectionToken<SearchFilterConfig>('filterConfig');
 export const IN_PLACE_SEARCH: InjectionToken<boolean> = new InjectionToken<boolean>('inPlaceSearch');
 export const REFRESH_FILTER: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('refreshFilters');
+export const SCOPE: InjectionToken<string> = new InjectionToken<string>('scope');
 
 /**
  * Service that performs all actions that have to do with search filters and facets
@@ -85,7 +108,7 @@ export class SearchFilterService {
     return observableCombineLatest(page$, size$).pipe(map(([page, size]) => {
       return Object.assign(new PaginationComponentOptions(), pagination, {
         currentPage: page || 1,
-        pageSize: size || pagination.pageSize
+        pageSize: size || pagination.pageSize,
       });
     }));
   }
@@ -100,10 +123,10 @@ export class SearchFilterService {
     const sortDirection$ = this.routeService.getQueryParameterValue('sortDirection');
     const sortField$ = this.routeService.getQueryParameterValue('sortField');
     return observableCombineLatest(sortDirection$, sortField$).pipe(map(([sortDirection, sortField]) => {
-        const field = sortField || defaultSort.field;
-        const direction = SortDirection[sortDirection] || defaultSort.direction;
-        return new SortOptions(field, direction);
-      }
+      const field = sortField || defaultSort.field;
+      const direction = SortDirection[sortDirection] || defaultSort.direction;
+      return new SortOptions(field, direction);
+    },
     ));
   }
 
@@ -135,12 +158,12 @@ export class SearchFilterService {
     );
     return observableCombineLatest(values$, prefixValues$).pipe(
       map(([values, prefixValues]) => {
-          if (isNotEmpty(values)) {
-            return values;
-          }
-          return prefixValues;
+        if (isNotEmpty(values)) {
+          return values;
         }
-      )
+        return prefixValues;
+      },
+      ),
     );
   }
 
@@ -159,7 +182,7 @@ export class SearchFilterService {
           return false;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/shared/search/search-filters/search-config.model.ts b/src/app/core/shared/search/search-filters/search-config.model.ts
index c971fe0430..ccc9827e59 100644
--- a/src/app/core/shared/search/search-filters/search-config.model.ts
+++ b/src/app/core/shared/search/search-filters/search-config.model.ts
@@ -1,10 +1,13 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 
-import { SEARCH_CONFIG } from './search-config.resource-type';
 import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
 import { HALLink } from '../../hal-link.model';
 import { ResourceType } from '../../resource-type';
-import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { SEARCH_CONFIG } from './search-config.resource-type';
 
 /**
  * The configuration for a search
@@ -17,31 +20,31 @@ export class SearchConfig implements CacheableObject {
    * The id of this search configuration.
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The configured filters.
    */
   @autoserialize
-  filters: FilterConfig[];
+    filters: FilterConfig[];
 
   /**
    * The configured sort options.
    */
   @autoserialize
-  sortOptions: SortConfig[];
+    sortOptions: SortConfig[];
 
   /**
    * The object type.
    */
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The {@link HALLink}s for this Item
    */
   @deserialize
-  _links: {
+    _links: {
     facets: HALLink;
     objects: HALLink;
     self: HALLink;
diff --git a/src/app/core/shared/search/search-filters/search-config.resource-type.ts b/src/app/core/shared/search/search-filters/search-config.resource-type.ts
index 967a654006..2047f52fdb 100644
--- a/src/app/core/shared/search/search-filters/search-config.resource-type.ts
+++ b/src/app/core/shared/search/search-filters/search-config.resource-type.ts
@@ -1,4 +1,4 @@
-import {ResourceType} from '../../resource-type';
+import { ResourceType } from '../../resource-type';
 
 /**
  * The resource type for SearchConfig
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index fe5b495ab0..eac178fb1c 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -1,32 +1,40 @@
-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
-import { SearchService } from './search.service';
-import { Router, UrlTree } from '@angular/router';
-import { RequestService } from '../../data/request.service';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { HALEndpointService } from '../hal-endpoint.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { RemoteData } from '../../data/remote-data';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { CommunityDataService } from '../../data/community-data.service';
-import { ViewMode } from '../view-mode.model';
-import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
-import { map } from 'rxjs/operators';
-import { RouteService } from '../../services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { SearchObjects } from '../../../shared/search/models/search-objects.model';
-import { PaginationService } from '../../pagination/pagination.service';
-import { SearchConfigurationService } from './search-configuration.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { RequestEntry } from '../../data/request-entry.model';
+import { TestBed } from '@angular/core/testing';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Angulartics2 } from 'angulartics2';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
+import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CommunityDataService } from '../../data/community-data.service';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { HALEndpointService } from '../hal-endpoint.service';
+import { ViewMode } from '../view-mode.model';
+import { SearchService } from './search.service';
+import { SearchConfigurationService } from './search-configuration.service';
 import anything = jasmine.anything;
 
 @Component({ template: '' })
@@ -45,10 +53,10 @@ describe('SearchService', () => {
           CommonModule,
           RouterTestingModule.withRoutes([
             { path: 'search', component: DummyComponent, pathMatch: 'full' },
-          ])
+          ]),
         ],
         declarations: [
-          DummyComponent
+          DummyComponent,
         ],
         providers: [
           { provide: Router, useValue: router },
@@ -61,7 +69,7 @@ describe('SearchService', () => {
           { provide: PaginationService, useValue: {} },
           { provide: SearchConfigurationService, useValue: searchConfigService },
           { provide: Angulartics2, useValue: {} },
-          SearchService
+          SearchService,
         ],
       });
       searchService = TestBed.inject(SearchService);
@@ -81,7 +89,7 @@ describe('SearchService', () => {
     const halService = {
       /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
       getEndpoint: () => {
-      }
+      },
       /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
 
     };
@@ -91,7 +99,7 @@ describe('SearchService', () => {
         return observableCombineLatest([requestEntryObs, payloadObs]).pipe(
           map(([req, pay]) => {
             return { req, pay };
-          })
+          }),
         );
       },
       aggregate: (input: Observable<RemoteData<any>>[]): Observable<RemoteData<any[]>> => {
@@ -99,9 +107,9 @@ describe('SearchService', () => {
       },
       buildFromHref: (href: string): Observable<RemoteData<any>> => {
         return createSuccessfulRemoteDataObject$(Object.assign(new SearchObjects(), {
-          page: []
+          page: [],
         }));
-      }
+      },
     };
 
     const paginationService = new PaginationServiceStub();
@@ -114,10 +122,10 @@ describe('SearchService', () => {
           CommonModule,
           RouterTestingModule.withRoutes([
             { path: 'search', component: DummyComponent, pathMatch: 'full' },
-          ])
+          ]),
         ],
         declarations: [
-          DummyComponent
+          DummyComponent,
         ],
         providers: [
           { provide: Router, useValue: router },
@@ -130,7 +138,7 @@ describe('SearchService', () => {
           { provide: PaginationService, useValue: paginationService },
           { provide: SearchConfigurationService, useValue: searchConfigService },
           { provide: Angulartics2, useValue: {} },
-          SearchService
+          SearchService,
         ],
       });
       searchService = TestBed.inject(SearchService);
@@ -141,13 +149,13 @@ describe('SearchService', () => {
 
     it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.ListElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.ListElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.ListElement },
       );
     });
 
     it('should call the navigate method on the Router with view mode grid parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.GridElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.GridElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.GridElement },
       );
     });
 
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index a88a8b0d16..346000f05a 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,37 +1,55 @@
 /* eslint-disable max-classes-per-file */
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { Injectable, OnDestroy } from '@angular/core';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { FacetValues } from '../../../shared/search/models/facet-values.model';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
+import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { BaseDataService } from '../../data/base/base-data.service';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
 import { ResponseParsingService } from '../../data/parsing.service';
 import { RemoteData } from '../../data/remote-data';
 import { GetRequest } from '../../data/request.models';
 import { RequestService } from '../../data/request.service';
+import { RestRequest } from '../../data/rest-request.model';
+import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { URLCombiner } from '../../url-combiner/url-combiner';
 import { DSpaceObject } from '../dspace-object.model';
 import { GenericConstructor } from '../generic-constructor';
 import { HALEndpointService } from '../hal-endpoint.service';
-import { URLCombiner } from '../../url-combiner/url-combiner';
-import { hasValue, hasValueOperator, isNotEmpty } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
-import { SearchObjects } from '../../../shared/search/models/search-objects.model';
-import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../operators';
 import { ViewMode } from '../view-mode.model';
-import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../operators';
-import { RouteService } from '../../services/route.service';
-import { SearchResult } from '../../../shared/search/models/search-result.model';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
-import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
-import { FacetValues } from '../../../shared/search/models/facet-values.model';
-import { PaginationService } from '../../pagination/pagination.service';
 import { SearchConfigurationService } from './search-configuration.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { RestRequest } from '../../data/rest-request.model';
-import { BaseDataService } from '../../data/base/base-data.service';
-import { Angulartics2 } from 'angulartics2';
 
 /**
  * A limited data service implementation for the 'discover' endpoint
@@ -122,7 +140,7 @@ export class SearchService implements OnDestroy {
         } else {
           return url;
         }
-      })
+      }),
     );
   }
 
@@ -149,7 +167,7 @@ export class SearchService implements OnDestroy {
         } else {
           return href;
         }
-      })
+      }),
     ).subscribe((url: string) => {
       const request = new this.request(this.requestService.generateRequestId(), url);
 
@@ -160,14 +178,14 @@ export class SearchService implements OnDestroy {
       Object.assign(request, {
         responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
         getResponseParser: getResponseParserFn,
-        searchOptions: searchOptions
+        searchOptions: searchOptions,
       });
 
       this.requestService.send(request, useCachedVersionIfAvailable);
     });
 
     const sqr$ = href$.pipe(
-      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href)),
     );
 
     return this.directlyAttachIndexableObjects(sqr$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
@@ -182,7 +200,7 @@ export class SearchService implements OnDestroy {
     const href$ = this.getEndpoint(searchOptions);
 
     const sqr$ = href$.pipe(
-      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href)),
     );
 
     return this.directlyAttachIndexableObjects(sqr$);
@@ -221,10 +239,10 @@ export class SearchService implements OnDestroy {
 
                 // Attach the payload directly to the indexableObject property on the result
                 return Object.assign(new resultConstructor(), result, {
-                  indexableObject
+                  indexableObject,
                 }) as SearchResult<T>;
               }),
-            )
+            ),
           );
 
           // Swap the original page in the remoteData with the new one, now that the results have the
@@ -233,7 +251,7 @@ export class SearchService implements OnDestroy {
             map((page: SearchResult<T>[]) => {
 
               const payload = Object.assign(new SearchObjects(), resultsRd.payload, {
-                page
+                page,
               }) as SearchObjects<T>;
 
               return new RemoteData(
@@ -245,13 +263,13 @@ export class SearchService implements OnDestroy {
                 payload,
                 resultsRd.statusCode,
               );
-            })
+            }),
           );
         }
         // If we don't have a payload, or the page is empty, simply pass on the unmodified
         // RemoteData object
         return [resultsRd];
-      })
+      }),
     );
   }
 
@@ -276,8 +294,8 @@ export class SearchService implements OnDestroy {
       searchOptions = Object.assign(new PaginatedSearchOptions({}), searchOptions, {
         pagination: Object.assign({}, searchOptions.pagination, {
           currentPage: valuePage,
-          pageSize: filterConfig.pageSize
-        })
+          pageSize: filterConfig.pageSize,
+        }),
       });
       href = searchOptions.toRestUrl(filterConfig._links.self.href, args);
     } else {
@@ -289,7 +307,7 @@ export class SearchService implements OnDestroy {
     request = Object.assign(request, {
       getResponseParser(): GenericConstructor<ResponseParsingService> {
         return FacetValueResponseParsingService;
-      }
+      },
     });
     this.requestService.send(request, useCachedVersionIfAvailable);
 
@@ -354,7 +372,7 @@ export class SearchService implements OnDestroy {
         },
         sort: {
           by: config.sort.field,
-          order: config.sort.direction
+          order: config.sort.direction,
         },
         filters: filters,
         clickedObject,
diff --git a/src/app/core/shared/site.model.ts b/src/app/core/shared/site.model.ts
index 483fd7402f..6c6c2ff621 100644
--- a/src/app/core/shared/site.model.ts
+++ b/src/app/core/shared/site.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { SITE } from './site.resource-type';
diff --git a/src/app/core/shared/sort-option.model.ts b/src/app/core/shared/sort-option.model.ts
index c735e87b9a..b179d159b6 100644
--- a/src/app/core/shared/sort-option.model.ts
+++ b/src/app/core/shared/sort-option.model.ts
@@ -2,8 +2,8 @@ import { autoserialize } from 'cerialize';
 
 export class SortOption {
   @autoserialize
-  name: string;
+    name: string;
 
   @autoserialize
-  metadata: string;
+    metadata: string;
 }
diff --git a/src/app/core/shared/template-item.model.ts b/src/app/core/shared/template-item.model.ts
index cb8a45cd68..4c33a2bd92 100644
--- a/src/app/core/shared/template-item.model.ts
+++ b/src/app/core/shared/template-item.model.ts
@@ -1,11 +1,15 @@
 import { inheritSerialization } from 'cerialize';
-import { Item } from './item.model';
 import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
 import { Collection } from './collection.model';
-import { ITEM_TEMPLATE } from './template-item.resource-type';
-import { link, typedObject } from '../cache/builders/build-decorators';
 import { COLLECTION } from './collection.resource-type';
+import { Item } from './item.model';
+import { ITEM_TEMPLATE } from './template-item.resource-type';
 
 /**
  * Class representing a DSpace Template Item
@@ -19,6 +23,6 @@ export class TemplateItem extends Item {
    * The Collection that this item is a template for
    */
   @link(COLLECTION)
-  templateItemOf: Observable<RemoteData<Collection>>;
+    templateItemOf: Observable<RemoteData<Collection>>;
 
 }
diff --git a/src/app/core/shared/value-list-browse-definition.model.ts b/src/app/core/shared/value-list-browse-definition.model.ts
index 3378263962..80ad73e761 100644
--- a/src/app/core/shared/value-list-browse-definition.model.ts
+++ b/src/app/core/shared/value-list-browse-definition.model.ts
@@ -1,10 +1,15 @@
-import { inheritSerialization, deserialize } from 'cerialize';
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { VALUE_LIST_BROWSE_DEFINITION } from './value-list-browse-definition.resource-type';
-import { ResourceType } from './resource-type';
-import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
 import { HALLink } from './hal-link.model';
+import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
+import { ResourceType } from './resource-type';
+import { VALUE_LIST_BROWSE_DEFINITION } from './value-list-browse-definition.resource-type';
 
 /**
  * BrowseDefinition model for browses of type 'valueList'
@@ -18,19 +23,19 @@ export class ValueListBrowseDefinition extends NonHierarchicalBrowseDefinition {
    * The object type
    */
   @excludeFromEquals
-  type: ResourceType = VALUE_LIST_BROWSE_DEFINITION;
+    type: ResourceType = VALUE_LIST_BROWSE_DEFINITION;
 
   get self(): string {
     return this._links.self.href;
   }
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     entries: HALLink;
   };
 
-  getRenderType(): string {
+  getRenderType(): BrowseByDataType {
     return this.dataType;
   }
 }
diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts
index 1e75b8f321..9792a20ff3 100644
--- a/src/app/core/shared/version-history.model.ts
+++ b/src/app/core/shared/version-history.model.ts
@@ -1,14 +1,22 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { excludeFromEquals } from '../utilities/equals.decorators';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
-import { Version } from './version.model';
-import { VERSION_HISTORY } from './version-history.resource-type';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
+import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
+import { VERSION_HISTORY } from './version-history.resource-type';
 
 /**
  * Class representing a DSpace Version History
@@ -19,7 +27,7 @@ export class VersionHistory extends DSpaceObject {
   static type = VERSION_HISTORY;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     versions: HALLink;
     draftVersion: HALLink;
@@ -29,30 +37,30 @@ export class VersionHistory extends DSpaceObject {
    * The identifier of this Version History
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The summary of this Version History
    */
   @autoserialize
-  summary: string;
+    summary: string;
 
   /**
    * The name of the submitter of this Version History
    */
   @autoserialize
-  submitterName: string;
+    submitterName: string;
 
   /**
    * Whether exist a workspace item
    */
   @autoserialize
-  draftVersion: boolean;
+    draftVersion: boolean;
 
   /**
    * The list of versions within this history
    */
   @excludeFromEquals
   @link(VERSION, true)
-  versions: Observable<RemoteData<PaginatedList<Version>>>;
+    versions: Observable<RemoteData<PaginatedList<Version>>>;
 }
diff --git a/src/app/core/shared/version.model.ts b/src/app/core/shared/version.model.ts
index 7207637a21..f66bc8938b 100644
--- a/src/app/core/shared/version.model.ts
+++ b/src/app/core/shared/version.model.ts
@@ -1,17 +1,25 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { Item } from './item.model';
-import { RemoteData } from '../data/remote-data';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { VersionHistory } from './version-history.model';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
 import { EPerson } from '../eperson/models/eperson.model';
-import { VERSION } from './version.resource-type';
-import { HALLink } from './hal-link.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
-import { VERSION_HISTORY } from './version-history.resource-type';
-import { ITEM } from './item.resource-type';
 import { EPERSON } from '../eperson/models/eperson.resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSpaceObject } from './dspace-object.model';
+import { HALLink } from './hal-link.model';
+import { Item } from './item.model';
+import { ITEM } from './item.resource-type';
+import { VERSION } from './version.resource-type';
+import { VersionHistory } from './version-history.model';
+import { VERSION_HISTORY } from './version-history.resource-type';
 
 /**
  * Class representing a DSpace Version
@@ -22,7 +30,7 @@ export class Version extends DSpaceObject {
   static type = VERSION;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     item: HALLink;
     versionhistory: HALLink;
@@ -33,50 +41,50 @@ export class Version extends DSpaceObject {
    * The identifier of this Version
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The version number of the version's history this version represents
    */
   @autoserialize
-  version: number;
+    version: number;
 
   /**
    * The summary for the changes made in this version
    */
   @autoserialize
-  summary: string;
+    summary: string;
 
   /**
    * The name of the submitter of this version
    */
   @autoserialize
-  submitterName: string;
+    submitterName: string;
 
   /**
    * The Date this version was created
    */
   @deserialize
-  created: Date;
+    created: Date;
 
   /**
    * The full version history this version is apart of
    */
   @excludeFromEquals
   @link(VERSION_HISTORY)
-  versionhistory: Observable<RemoteData<VersionHistory>>;
+    versionhistory: Observable<RemoteData<VersionHistory>>;
 
   /**
    * The item this version represents
    */
   @excludeFromEquals
   @link(ITEM)
-  item: Observable<RemoteData<Item>>;
+    item: Observable<RemoteData<Item>>;
 
   /**
    * The e-person who created this version
    */
   @excludeFromEquals
   @link(EPERSON)
-  eperson: Observable<RemoteData<EPerson>>;
+    eperson: Observable<RemoteData<EPerson>>;
 }
diff --git a/src/app/core/shared/view-mode.model.ts b/src/app/core/shared/view-mode.model.ts
index a27cb6954b..9c2f499b3d 100644
--- a/src/app/core/shared/view-mode.model.ts
+++ b/src/app/core/shared/view-mode.model.ts
@@ -7,4 +7,5 @@ export enum ViewMode {
   GridElement = 'grid',
   DetailedListElement = 'detailed',
   StandalonePage = 'standalone',
+  Table = 'table',
 }
diff --git a/src/app/core/statistics/models/usage-report.model.ts b/src/app/core/statistics/models/usage-report.model.ts
index da976a8b90..b8a415667d 100644
--- a/src/app/core/statistics/models/usage-report.model.ts
+++ b/src/app/core/statistics/models/usage-report.model.ts
@@ -1,11 +1,16 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
-import { HALResource } from '../../shared/hal-resource.model';
-import { USAGE_REPORT } from './usage-report.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
-import { deserialize, autoserializeAs } from 'cerialize';
+import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { USAGE_REPORT } from './usage-report.resource-type';
 
 /**
  * A usage report.
@@ -21,19 +26,19 @@ export class UsageReport extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserializeAs('report-type')
-  reportType: string;
+    reportType: string;
 
   @autoserialize
-  points: Point[];
+    points: Point[];
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index fde8298488..0901275195 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -1,20 +1,27 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { USAGE_REPORT } from './models/usage-report.resource-type';
-import { UsageReport } from './models/usage-report.model';
-import { Observable } from 'rxjs';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map } from 'rxjs/operators';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { FindListOptions } from '../data/find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { UsageReport } from './models/usage-report.model';
+import { USAGE_REPORT } from './models/usage-report.resource-type';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
diff --git a/src/app/core/submission/correctiontype-data.service.ts b/src/app/core/submission/correctiontype-data.service.ts
new file mode 100644
index 0000000000..684da34c01
--- /dev/null
+++ b/src/app/core/submission/correctiontype-data.service.ts
@@ -0,0 +1,95 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchDataImpl } from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getPaginatedListPayload,
+} from '../shared/operators';
+import { CorrectionType } from './models/correctiontype.model';
+
+/**
+ * A service that provides methods to make REST requests with correctiontypes endpoint.
+ */
+@Injectable()
+@dataService(CorrectionType.type)
+export class CorrectionTypeDataService extends IdentifiableDataService<CorrectionType> {
+  protected linkPath = 'correctiontypes';
+  protected searchByTopic = 'findByTopic';
+  protected searchFindByItem = 'findByItem';
+  private searchData: SearchDataImpl<CorrectionType>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('correctiontypes', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Get the correction type by id
+   * @param id the id of the correction type
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @param reRequestOnStale re-request on stale
+   * @returns {Observable<RemoteData<CorrectionType>>} the correction type
+   */
+  getCorrectionTypeById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<CorrectionType>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale);
+  }
+
+  /**
+   * Search for the correction types for the item
+   * @param itemUuid the uuid of the item
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @returns the list of correction types for the item
+   */
+  findByItem(itemUuid: string, useCachedVersionIfAvailable): Observable<RemoteData<PaginatedList<CorrectionType>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', itemUuid)];
+    return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable);
+  }
+
+  /**
+   * Find the correction type for the topic
+   * @param topic the topic of the correction type to search for
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @param reRequestOnStale re-request on stale
+   * @returns the correction type for the topic
+   */
+  findByTopic(topic: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<CorrectionType> {
+    const options = new FindListOptions();
+    options.searchParams = [
+      {
+        fieldName: 'topic',
+        fieldValue: topic,
+      },
+    ];
+
+    return this.searchData.searchBy(this.searchByTopic, options, useCachedVersionIfAvailable, reRequestOnStale).pipe(
+      getAllSucceededRemoteDataPayload(),
+      getPaginatedListPayload(),
+      map((list: CorrectionType[]) => {
+        return list[0];
+      }),
+    );
+  }
+}
diff --git a/src/app/core/submission/models/correctiontype.model.ts b/src/app/core/submission/models/correctiontype.model.ts
new file mode 100644
index 0000000000..0b9dd75545
--- /dev/null
+++ b/src/app/core/submission/models/correctiontype.model.ts
@@ -0,0 +1,53 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+
+@typedObject
+/**
+ * Represents a correction type. It extends the CacheableObject.
+ * The correction type represents a type of correction that can be applied to a submission.
+ */
+export class CorrectionType extends CacheableObject {
+  static type = new ResourceType('correctiontype');
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+  @autoserialize
+  /**
+   * The unique identifier for the correction type mode.
+   */
+    id: string;
+  @autoserialize
+  /**
+   * The topic of the correction type mode.
+   */
+    topic: string;
+  @autoserialize
+  /**
+   * The discovery configuration for the correction type mode.
+   */
+    discoveryConfiguration: string;
+  @autoserialize
+  /**
+   * The form used for creating a correction type.
+   */
+    creationForm: string;
+  @deserialize
+  /**
+   * Represents the links associated with the correction type mode.
+   */
+    _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/core/submission/models/submission-cc-license-url.model.ts b/src/app/core/submission/models/submission-cc-license-url.model.ts
index a7c933ecb1..85fa1d0896 100644
--- a/src/app/core/submission/models/submission-cc-license-url.model.ts
+++ b/src/app/core/submission/models/submission-cc-license-url.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { SUBMISSION_CC_LICENSE_URL } from './submission-cc-licence-link.resource-type';
 
 @typedObject
@@ -16,8 +20,8 @@ export class SubmissionCcLicenceUrl extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  url: string;
+    url: string;
 }
diff --git a/src/app/core/submission/models/submission-cc-license.model.ts b/src/app/core/submission/models/submission-cc-license.model.ts
index 92c48fdbfe..c730aa44fc 100644
--- a/src/app/core/submission/models/submission-cc-license.model.ts
+++ b/src/app/core/submission/models/submission-cc-license.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { SUBMISSION_CC_LICENSE } from './submission-cc-licence.resource-type';
 
 @typedObject
@@ -16,16 +20,16 @@ export class SubmissionCcLicence extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  name: string;
+    name: string;
 
   @autoserialize
-  fields: Field[];
+    fields: Field[];
 }
 
 export interface Field {
diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts
index e2d1a4396b..882fafb467 100644
--- a/src/app/core/submission/models/submission-object.model.ts
+++ b/src/app/core/submission/models/submission-object.model.ts
@@ -1,8 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link } from '../../cache/builders/build-decorators';
 
+import { link } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { SubmissionDefinitionsModel } from '../../config/models/config-submission-definitions.model';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
@@ -11,12 +17,10 @@ import { COLLECTION } from '../../shared/collection.resource-type';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ITEM } from '../../shared/item.resource-type';
+import { SupervisionOrder } from '../../supervision-order/models/supervision-order.model';
+import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-order.resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-order.resource-type';
-import { PaginatedList } from '../../data/paginated-list.model';
-import { SupervisionOrder } from '../../supervision-order/models/supervision-order.model';
 
 export interface SubmissionObjectError {
   message: string;
@@ -31,38 +35,38 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
 
   @excludeFromEquals
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The SubmissionObject last modified date
    */
   @autoserialize
-  lastModified: Date;
+    lastModified: Date;
 
   /**
    * The collection this submission applies to
    * Will be undefined unless the collection {@link HALLink} has been resolved.
    */
   @link(COLLECTION)
-  collection?: Observable<RemoteData<Collection>> | Collection;
+    collection?: Observable<RemoteData<Collection>> | Collection;
 
   /**
    * The SubmissionObject's last section's data
    */
   @autoserialize
-  sections: WorkspaceitemSectionsObject;
+    sections: WorkspaceitemSectionsObject;
 
   /**
    * The SubmissionObject's last section's errors
    */
   @autoserialize
-  errors: SubmissionObjectError[];
+    errors: SubmissionObjectError[];
 
   /**
    * The {@link HALLink}s for this SubmissionObject
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     collection: HALLink;
     item: HALLink;
@@ -81,21 +85,21 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
    */
   @link(ITEM)
   /* This was changed from 'Observable<RemoteData<Item>> | Item' to 'any' to prevent issues in templates with async */
-  item?: any;
+    item?: any;
 
   /**
    * The configuration object that define this submission
    * Will be undefined unless the submissionDefinition {@link HALLink} has been resolved.
    */
   @link(SubmissionDefinitionsModel.type)
-  submissionDefinition?: Observable<RemoteData<SubmissionDefinitionsModel>> | SubmissionDefinitionsModel;
+    submissionDefinition?: Observable<RemoteData<SubmissionDefinitionsModel>> | SubmissionDefinitionsModel;
 
   /**
    * The submitter for this SubmissionObject
    * Will be undefined unless the submitter {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  submitter?: Observable<RemoteData<EPerson>> | EPerson;
+    submitter?: Observable<RemoteData<EPerson>> | EPerson;
 
   /**
    * The submission supervision order
@@ -103,6 +107,6 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
    */
   @link(SUPERVISION_ORDER)
   /* This was changed from 'Observable<RemoteData<WorkspaceItem>> | WorkspaceItem' to 'any' to prevent issues in templates with async */
-  supervisionOrders?: Observable<RemoteData<PaginatedList<SupervisionOrder>>>;
+    supervisionOrders?: Observable<RemoteData<PaginatedList<SupervisionOrder>>>;
 
 }
diff --git a/src/app/core/submission/models/workflowitem.model.ts b/src/app/core/submission/models/workflowitem.model.ts
index b8054a66d0..63fdda7c10 100644
--- a/src/app/core/submission/models/workflowitem.model.ts
+++ b/src/app/core/submission/models/workflowitem.model.ts
@@ -1,5 +1,12 @@
-import { deserializeAs, inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+import {
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
 import { SubmissionObject } from './submission-object.model';
@@ -19,5 +26,5 @@ export class WorkflowItem extends SubmissionObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(WorkflowItem.type.value), 'id')
-  uuid: string;
+    uuid: string;
 }
diff --git a/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts
new file mode 100644
index 0000000000..f9441fa790
--- /dev/null
+++ b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts
@@ -0,0 +1,8 @@
+/*
+ * Object model for the data returned by the REST API to present potential duplicates in a submission section
+ */
+import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model';
+
+export interface WorkspaceitemSectionDuplicatesObject {
+  potentialDuplicates?: Duplicate[]
+}
diff --git a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
index 177473b7d5..725e646d76 100644
--- a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
@@ -29,6 +29,18 @@ export class WorkspaceitemSectionUploadFileObject {
     value: string;
   };
 
+  /**
+   * The file format information
+   */
+  format: {
+    shortDescription: string,
+    description: string,
+    mimetype: string,
+    supportLevel: string,
+    internal: boolean,
+    type: string
+  };
+
   /**
    * The file url
    */
diff --git a/src/app/core/submission/models/workspaceitem-section-upload.model.ts b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
index f98e0584eb..d992567df4 100644
--- a/src/app/core/submission/models/workspaceitem-section-upload.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
@@ -4,7 +4,10 @@ import { WorkspaceitemSectionUploadFileObject } from './workspaceitem-section-up
  * An interface to represent submission's upload section data.
  */
 export interface WorkspaceitemSectionUploadObject {
-
+  /**
+   * Primary bitstream flag
+   */
+  primary: string | null;
   /**
    * A list of [[WorkspaceitemSectionUploadFileObject]]
    */
diff --git a/src/app/core/submission/models/workspaceitem-sections.model.ts b/src/app/core/submission/models/workspaceitem-sections.model.ts
index a3ccd49dac..46a0590977 100644
--- a/src/app/core/submission/models/workspaceitem-sections.model.ts
+++ b/src/app/core/submission/models/workspaceitem-sections.model.ts
@@ -1,10 +1,11 @@
 import { WorkspaceitemSectionAccessesObject } from './workspaceitem-section-accesses.model';
-import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
-import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
-import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
-import {WorkspaceitemSectionIdentifiersObject} from './workspaceitem-section-identifiers.model';
+import { WorkspaceitemSectionDuplicatesObject } from './workspaceitem-section-duplicates.model';
+import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
+import { WorkspaceitemSectionIdentifiersObject } from './workspaceitem-section-identifiers.model';
+import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
 import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 
 /**
  * An interface to represent submission's section object.
@@ -25,4 +26,7 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionAccessesObject
   | WorkspaceitemSectionSherpaPoliciesObject
   | WorkspaceitemSectionIdentifiersObject
+  | WorkspaceitemSectionDuplicatesObject
   | string;
+
+
diff --git a/src/app/core/submission/models/workspaceitem.model.ts b/src/app/core/submission/models/workspaceitem.model.ts
index 62f21cb2f3..d9aad957f2 100644
--- a/src/app/core/submission/models/workspaceitem.model.ts
+++ b/src/app/core/submission/models/workspaceitem.model.ts
@@ -1,8 +1,15 @@
-import { deserializeAs, inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+import {
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
-import { SubmissionObject } from './submission-object.model';
 import { WORKSPACEITEM } from '../../eperson/models/workspaceitem.resource-type';
+import { SubmissionObject } from './submission-object.model';
 
 /**
  * A model class for a WorkspaceItem.
@@ -19,5 +26,5 @@ export class WorkspaceItem extends SubmissionObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(WorkspaceItem.type.value), 'id')
-  uuid: string;
+    uuid: string;
 }
diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts
index 09561fbafa..8c4a08e68c 100644
--- a/src/app/core/submission/resolver/submission-object.resolver.ts
+++ b/src/app/core/submission/resolver/submission-object.resolver.ts
@@ -1,41 +1,46 @@
-import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
 import { RemoteData } from '../../data/remote-data';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
 export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
-    constructor(
+  constructor(
       protected dataService: IdentifiableDataService<any>,
       protected store: Store<any>,
-    ) {
-    }
+  ) {
+  }
 
-    /**
+  /**
      * Method for resolving an item based on the parameters in the current route
      * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
      * @param {RouterStateSnapshot} state The current RouterStateSnapshot
      * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
      * or an error if something went wrong
      */
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<T>> {
-        const itemRD$ = this.dataService.findById(route.params.id,
-            true,
-            false,
-            followLink('item'),
-        ).pipe(
-            getFirstCompletedRemoteData(),
-            switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
-            getFirstCompletedRemoteData()
-        );
-        return itemRD$;
-    }
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<T>> {
+    const itemRD$ = this.dataService.findById(route.params.id,
+      true,
+      false,
+      followLink('item'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
+      getFirstCompletedRemoteData(),
+    );
+    return itemRD$;
+  }
 }
diff --git a/src/app/core/submission/submission-cc-license-data.service.spec.ts b/src/app/core/submission/submission-cc-license-data.service.spec.ts
index b3650bac0a..4fda651e40 100644
--- a/src/app/core/submission/submission-cc-license-data.service.spec.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.spec.ts
@@ -5,8 +5,8 @@
  *
  * http://www.dspace.org/license/
  */
-import { SubmissionCcLicenseDataService } from './submission-cc-license-data.service';
 import { testFindAllDataImplementation } from '../data/base/find-all-data.spec';
+import { SubmissionCcLicenseDataService } from './submission-cc-license-data.service';
 
 describe('SubmissionCcLicenseDataService', () => {
 
diff --git a/src/app/core/submission/submission-cc-license-data.service.ts b/src/app/core/submission/submission-cc-license-data.service.ts
index e92de06a6b..83879a39ab 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -1,18 +1,22 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { BaseDataService } from '../data/base/base-data.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../data/base/find-all-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SUBMISSION_CC_LICENSE } from './models/submission-cc-licence.resource-type';
 import { SubmissionCcLicence } from './models/submission-cc-license.model';
-import { BaseDataService } from '../data/base/base-data.service';
-import {FindAllData, FindAllDataImpl} from '../data/base/find-all-data';
-import { FindListOptions } from '../data/find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 3d5dedb505..cd440bd8a1 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -1,21 +1,35 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
-import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
-import { Field, Option, SubmissionCcLicence } from './models/submission-cc-license.model';
-import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
 import { BaseDataService } from '../data/base/base-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { FindListOptions } from '../data/find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
+import {
+  Field,
+  Option,
+  SubmissionCcLicence,
+} from './models/submission-cc-license.model';
+import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
@@ -45,7 +59,7 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
         searchParams: [
           {
             fieldName: 'license',
-            fieldValue: ccLicense.id
+            fieldValue: ccLicense.id,
           },
           ...ccLicense.fields.map(
             (field) => {
@@ -54,8 +68,8 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
                 fieldValue: options.get(field).id,
               };
             }),
-        ]
-      }
+        ],
+      },
     ).pipe(
       switchMap((href) => this.findByHref(href)),
       getFirstSucceededRemoteData(),
diff --git a/src/app/core/submission/submission-duplicate-data.service.spec.ts b/src/app/core/submission/submission-duplicate-data.service.spec.ts
new file mode 100644
index 0000000000..88d02b74e7
--- /dev/null
+++ b/src/app/core/submission/submission-duplicate-data.service.spec.ts
@@ -0,0 +1,30 @@
+import { RequestParam } from '../cache/models/request-param.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { SubmissionDuplicateDataService } from './submission-duplicate-data.service';
+
+/**
+ * Basic tests for the submission-duplicate-data.service.ts service
+ */
+describe('SubmissionDuplicateDataService', () => {
+  const duplicateDataService = new SubmissionDuplicateDataService(null, null, null, null);
+
+  // Test the findDuplicates method to make sure that a call results in an expected
+  // call to searchBy, using the 'findByItem' search method
+  describe('findDuplicates', () => {
+    beforeEach(() => {
+      spyOn(duplicateDataService, 'searchBy');
+    });
+
+    it('should call searchBy with the correct arguments', () => {
+      // Set up expected search parameters and find options
+      const searchParams = [];
+      searchParams.push(new RequestParam('uuid', 'test'));
+      let findListOptions = new FindListOptions();
+      findListOptions.searchParams = searchParams;
+      // Perform test search using uuid 'test' using the findDuplicates method
+      const result = duplicateDataService.findDuplicates('test', new FindListOptions(), true, true);
+      // Expect searchBy('findByItem'...) to have been used as SearchData impl with the expected options (uuid=test)
+      expect(duplicateDataService.searchBy).toHaveBeenCalledWith('findByItem', findListOptions, true, true);
+    });
+  });
+});
diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts
new file mode 100644
index 0000000000..50e6d83bd8
--- /dev/null
+++ b/src/app/core/submission/submission-duplicate-data.service.ts
@@ -0,0 +1,142 @@
+/* eslint-disable max-classes-per-file */
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model';
+import { DUPLICATE } from '../../shared/object-list/duplicate-data/duplicate.resource-type';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { BaseDataService } from '../data/base/base-data.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { GetRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { SearchResponseParsingService } from '../data/search-response-parsing.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+
+/**
+ * Service that handles search requests for potential duplicate items.
+ * This uses the /api/submission/duplicates endpoint to look for other archived or in-progress items (if user
+ * has READ permission) that match the item (for the given uuid).
+ * Matching is configured in the backend in dspace/config/modulesduplicate-detection.cfg
+ * The returned results are small preview 'stubs' of items, and displayed in either a submission section
+ * or the workflow pooled/claimed task page.
+ *
+ */
+@Injectable()
+@dataService(DUPLICATE)
+export class SubmissionDuplicateDataService extends BaseDataService<Duplicate> implements SearchData<Duplicate> {
+
+  /**
+   * The ResponseParsingService constructor name
+   */
+  private parser: GenericConstructor<ResponseParsingService> = SearchResponseParsingService;
+
+  /**
+   * The RestRequest constructor name
+   */
+  private request: GenericConstructor<RestRequest> = GetRequest;
+
+  /**
+   * SearchData interface to implement
+   * @private
+   */
+  private searchData: SearchData<Duplicate>;
+
+  /**
+   * Subscription to unsubscribe from
+   */
+  private sub;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('duplicates', requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Implement the searchBy method to return paginated lists of Duplicate resources
+   *
+   * @param searchMethod the search method name
+   * @param options find list options
+   * @param useCachedVersionIfAvailable whether to use cached version if available
+   * @param reRequestOnStale whether to rerequest results on stale
+   * @param linksToFollow links to follow in results
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Duplicate>[]): Observable<RemoteData<PaginatedList<Duplicate>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Helper method to get the duplicates endpoint
+   * @protected
+   */
+  protected getEndpoint(): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Method to set service options
+   * @param {GenericConstructor<ResponseParsingService>} parser The ResponseParsingService constructor name
+   * @param {boolean} request The RestRequest constructor name
+   */
+  setServiceOptions(parser: GenericConstructor<ResponseParsingService>, request: GenericConstructor<RestRequest>) {
+    if (parser) {
+      this.parser = parser;
+    }
+    if (request) {
+      this.request = request;
+    }
+  }
+
+  /**
+   * Find duplicates for a given item UUID. Locates and returns results from the /api/submission/duplicates/search/findByItem
+   * SearchRestMethod, which is why this implements SearchData<Duplicate> and searchBy
+   *
+   * @param uuid the item UUID
+   * @param options any find list options e.g. paging
+   * @param useCachedVersionIfAvailable whether to use cached version if available
+   * @param reRequestOnStale whether to rerequest results on stale
+   * @param linksToFollow links to follow in results
+   */
+  public findDuplicates(uuid: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Duplicate>[]): Observable<RemoteData<PaginatedList<Duplicate>>> {
+    const searchParams = [new RequestParam('uuid', uuid)];
+    let findListOptions = new FindListOptions();
+    if (options) {
+      findListOptions = Object.assign(new FindListOptions(), options);
+    }
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+    } else {
+      findListOptions.searchParams = searchParams;
+    }
+
+    // Return actual search/findByItem results
+    return this.searchBy('findByItem', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+  }
+
+  /**
+   * Unsubscribe from the subscription
+   */
+  ngOnDestroy(): void {
+    if (this.sub !== undefined) {
+      this.sub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/core/submission/submission-json-patch-operations.service.spec.ts b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
index 5472e86856..76e487400b 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.spec.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
@@ -1,14 +1,13 @@
 import { Store } from '@ngrx/store';
-
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { SubmissionJsonPatchOperationsService } from './submission-json-patch-operations.service';
-import { RequestService } from '../data/request.service';
-import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { SubmissionJsonPatchOperationsService } from './submission-json-patch-operations.service';
 
 describe('SubmissionJsonPatchOperationsService', () => {
   let scheduler: TestScheduler;
@@ -23,7 +22,7 @@ describe('SubmissionJsonPatchOperationsService', () => {
       requestService,
       store,
       rdbService,
-      halEndpointService
+      halEndpointService,
     );
   }
 
diff --git a/src/app/core/submission/submission-json-patch-operations.service.ts b/src/app/core/submission/submission-json-patch-operations.service.ts
index 5771c85b57..5852e52cb2 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.ts
@@ -1,14 +1,13 @@
 import { Injectable } from '@angular/core';
-
 import { Store } from '@ngrx/store';
 
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { JsonPatchOperationsService } from '../json-patch/json-patch-operations.service';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
-import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { JsonPatchOperationsService } from '../json-patch/json-patch-operations.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 
 /**
  * A service that provides methods to make JSON Patch requests.
diff --git a/src/app/core/submission/submission-object-data.service.spec.ts b/src/app/core/submission/submission-object-data.service.spec.ts
index 47b4542561..168fb915d3 100644
--- a/src/app/core/submission/submission-object-data.service.spec.ts
+++ b/src/app/core/submission/submission-object-data.service.spec.ts
@@ -1,11 +1,11 @@
 import { SubmissionService } from '../../submission/submission.service';
 import { RemoteData } from '../data/remote-data';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionObjectDataService } from './submission-object-data.service';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 
 describe('SubmissionObjectDataService', () => {
   let service: SubmissionObjectDataService;
@@ -20,20 +20,20 @@ describe('SubmissionObjectDataService', () => {
 
   beforeEach(() => {
     workspaceitemDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
-      findById: wsiResult
+      findById: wsiResult,
     });
     workflowItemDataService = jasmine.createSpyObj('WorkflowItemDataService', {
-      findById: wfiResult
+      findById: wfiResult,
     });
     halService = jasmine.createSpyObj('HALEndpointService', {
-      getEndpoint: '/workspaceItem'
+      getEndpoint: '/workspaceItem',
     });
   });
 
   describe('findById', () => {
     it('should call SubmissionService.getSubmissionScope to determine the type of submission object', () => {
       submissionService = jasmine.createSpyObj('SubmissionService', {
-        getSubmissionScope: {}
+        getSubmissionScope: {},
       });
       service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       service.findById(submissionId);
@@ -43,7 +43,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the submission ID refers to a WorkspaceItem', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: SubmissionScopeType.WorkspaceItem
+          getSubmissionScope: SubmissionScopeType.WorkspaceItem,
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
@@ -58,7 +58,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the submission ID refers to a WorkflowItem', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: SubmissionScopeType.WorkflowItem
+          getSubmissionScope: SubmissionScopeType.WorkflowItem,
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
@@ -73,7 +73,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the type of submission object is unknown', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: 'Something else'
+          getSubmissionScope: 'Something else',
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 18816fbfd2..4cf45fa84b 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -1,31 +1,35 @@
 import { Injectable } from '@angular/core';
-import { of as observableOf, Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { SubmissionService } from '../../submission/submission.service';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { map } from 'rxjs/operators';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { environment } from '../../../environments/environment';
-import { RequestEntryState } from '../data/request-entry-state.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
  * without knowing their type
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SubmissionObjectDataService {
   constructor(
     private workspaceitemDataService: WorkspaceitemDataService,
     private workflowItemDataService: WorkflowItemDataService,
     private submissionService: SubmissionService,
-    private halService: HALEndpointService
+    private halService: HALEndpointService,
   ) {
   }
 
@@ -57,7 +61,7 @@ export class SubmissionObjectDataService {
         return this.workspaceitemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
       case SubmissionScopeType.WorkflowItem:
         return this.workflowItemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-      default:
+      default: {
         const now = new Date().getTime();
         return observableOf(new RemoteData(
           now,
@@ -66,8 +70,9 @@ export class SubmissionObjectDataService {
           RequestEntryState.Error,
           'The request couldn\'t be sent. Unable to determine the type of submission object',
           undefined,
-          400
+          400,
         ));
+      }
     }
   }
 }
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index ff84776235..a9d26c185e 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -1,19 +1,23 @@
 import { Injectable } from '@angular/core';
 import { deepClone } from 'fast-json-patch';
-import { DSOResponseParsingService } from '../data/dso-response-parsing.service';
 
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
+import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { ParsedResponse } from '../cache/response.models';
-import { isEmpty, isNotEmpty, isNotNull } from '../../shared/empty.util';
 import { ConfigObject } from '../config/models/config.model';
 import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { DSOResponseParsingService } from '../data/dso-response-parsing.service';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { SubmissionObject } from './models/submission-object.model';
 import { WorkflowItem } from './models/workflowitem.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
-import { RestRequest } from '../data/rest-request.model';
 
 /**
  * Export a function to check if object has same properties of FormFieldMetadataValueObject
@@ -49,7 +53,7 @@ export function normalizeSectionData(obj: any, objIndex?: number) {
         (obj.display || obj.value),
         obj.place || objIndex,
         obj.confidence,
-        obj.otherInformation
+        obj.otherInformation,
       );
     } else if (Array.isArray(obj)) {
       result = [];
@@ -88,7 +92,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
   protected shouldDirectlyAttachEmbeds = true;
 
   constructor(protected objectCache: ObjectCacheService,
-              protected dsoParser: DSOResponseParsingService
+              protected dsoParser: DSOResponseParsingService,
   ) {
     super();
   }
diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 46e536ff7d..5512e683cd 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -1,19 +1,19 @@
-import { TestScheduler } from 'rxjs/testing';
 import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionRestService } from './submission-rest.service';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import {
   SubmissionDeleteRequest,
   SubmissionPatchRequest,
   SubmissionPostRequest,
-  SubmissionRequest
+  SubmissionRequest,
 } from '../data/request.models';
-import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { RequestService } from '../data/request.service';
+import { SubmissionRestService } from './submission-rest.service';
 
 describe('SubmissionRestService test suite', () => {
   let scheduler: TestScheduler;
@@ -33,7 +33,7 @@ describe('SubmissionRestService test suite', () => {
     return new SubmissionRestService(
       rdbService,
       requestService,
-      halService
+      halService,
     );
   }
 
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index cf4b741af2..84e68f451a 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -1,27 +1,35 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
 
-import { RequestService } from '../data/request.service';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
 import {
   DeleteRequest,
   PostRequest,
   SubmissionDeleteRequest,
   SubmissionPatchRequest,
   SubmissionPostRequest,
-  SubmissionRequest
+  SubmissionRequest,
 } from '../data/request.models';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { RemoteData } from '../data/remote-data';
 import { SubmissionResponse } from './submission-response.model';
-import { RestRequest } from '../data/rest-request.model';
 
 /**
  * The service handling all submission REST requests
@@ -54,7 +62,7 @@ export class SubmissionRestService {
           return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
index 2e066bae95..3dcb0d374a 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 
+import { typedObject } from '../../../cache/builders/build-decorators';
 import { HALLink } from '../../../shared/hal-link.model';
 import { VOCABULARY_ENTRY_DETAIL } from './vocabularies.resource-type';
-import { typedObject } from '../../../cache/builders/build-decorators';
 import { VocabularyEntry } from './vocabulary-entry.model';
 
 /**
@@ -17,19 +21,19 @@ export class VocabularyEntryDetail extends VocabularyEntry {
    * The unique id of the entry
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * In an hierarchical vocabulary representing if entry is selectable as value
    */
   @autoserialize
-  selectable: boolean;
+    selectable: boolean;
 
   /**
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     vocabulary: HALLink;
     parent: HALLink;
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
index d1e9adf8a9..323db57de1 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
@@ -1,14 +1,17 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 
-import { HALLink } from '../../../shared/hal-link.model';
-import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
-import { typedObject } from '../../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { isNotEmpty } from '../../../../shared/empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { OtherInformation } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
-import { isNotEmpty } from '../../../../shared/empty.util';
 import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model';
+import { typedObject } from '../../../cache/builders/build-decorators';
 import { GenericConstructor } from '../../../shared/generic-constructor';
+import { HALLink } from '../../../shared/hal-link.model';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
 
 /**
  * Model class for a VocabularyEntry
@@ -21,25 +24,25 @@ export class VocabularyEntry extends ListableObject {
    * The identifier of this vocabulary entry
    */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /**
    * The display value of this vocabulary entry
    */
   @autoserialize
-  display: string;
+    display: string;
 
   /**
    * The value of this vocabulary entry
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * An object containing additional information related to this vocabulary entry
    */
   @autoserialize
-  otherInformation: OtherInformation;
+    otherInformation: OtherInformation;
 
   /**
    * A string representing the kind of vocabulary entry
@@ -52,7 +55,7 @@ export class VocabularyEntry extends ListableObject {
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     vocabularyEntryDetail?: HALLink;
   };
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
index 7feacd591b..f9b061f0f7 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
@@ -1,6 +1,6 @@
-import { SortOptions } from '../../../cache/models/sort-options.model';
-import { RequestParam } from '../../../cache/models/request-param.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
+import { RequestParam } from '../../../cache/models/request-param.model';
+import { SortOptions } from '../../../cache/models/sort-options.model';
 import { FindListOptions } from '../../../data/find-list-options.model';
 
 /**
@@ -14,8 +14,8 @@ export class VocabularyFindOptions extends FindListOptions {
               public entryID?: string,
               public elementsPerPage?: number,
               public currentPage?: number,
-              public sort?: SortOptions
-              ) {
+              public sort?: SortOptions,
+  ) {
     super();
 
     const searchParams = [];
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
index fd103718e1..7f54b8599d 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
@@ -14,7 +14,7 @@ export class VocabularyOptions {
   closed: boolean;
 
   constructor(name: string,
-              closed: boolean = false) {
+    closed: boolean = false) {
     this.name = name;
     this.closed = closed;
   }
diff --git a/src/app/core/submission/vocabularies/models/vocabulary.model.ts b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
index 9cfc779115..9026ce677a 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
@@ -1,14 +1,23 @@
-import { autoserialize, deserialize } from 'cerialize';
-
-import { HALLink } from '../../../shared/hal-link.model';
-import { VOCABULARY, VOCABULARY_ENTRY } from './vocabularies.resource-type';
-import { typedObject, link } from '../../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../data/remote-data';
-import { PaginatedList } from '../../../data/paginated-list.model';
-import { VocabularyEntry } from './vocabulary-entry.model';
+
+import {
+  link,
+  typedObject,
+} from '../../../cache/builders/build-decorators';
 import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { HALLink } from '../../../shared/hal-link.model';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import {
+  VOCABULARY,
+  VOCABULARY_ENTRY,
+} from './vocabularies.resource-type';
+import { VocabularyEntry } from './vocabulary-entry.model';
 
 /**
  * Model class for a Vocabulary
@@ -20,32 +29,32 @@ export class Vocabulary implements CacheableObject {
    * The identifier of this Vocabulary
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this Vocabulary
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * True if it is possible to scroll all the entries in the vocabulary without providing a filter parameter
    */
   @autoserialize
-  scrollable: boolean;
+    scrollable: boolean;
 
   /**
    * True if the vocabulary exposes a tree structure where some entries are parent of others
    */
   @autoserialize
-  hierarchical: boolean;
+    hierarchical: boolean;
 
   /**
    * For hierarchical vocabularies express the preference to preload the tree at a specific
    * level of depth (0 only the top nodes are shown, 1 also their children are preloaded and so on)
    */
   @autoserialize
-  preloadLevel: any;
+    preloadLevel: any;
 
   /**
    * A string representing the kind of Vocabulary model
@@ -55,13 +64,13 @@ export class Vocabulary implements CacheableObject {
   public type: any;
 
   @link(VOCABULARY_ENTRY, true)
-  entries?: Observable<RemoteData<PaginatedList<VocabularyEntry>>>;
+    entries?: Observable<RemoteData<PaginatedList<VocabularyEntry>>>;
 
   /**
    * The {@link HALLink}s for this Vocabulary
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     entries: HALLink
   };
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
index bafd8bbdc7..04fa7240ba 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
@@ -7,8 +7,8 @@
  */
 
 import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
-import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 import { testSearchDataImplementation } from '../../data/base/search-data.spec';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 describe('VocabularyEntryDetailsDataService', () => {
   function initTestService() {
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index 184b4c1e97..b94b353071 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -5,22 +5,29 @@
  *
  * http://www.dspace.org/license/
  */
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
-import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
-import { RequestService } from '../../data/request.service';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindAllData, FindAllDataImpl } from '../../data/base/find-all-data';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
-import { SearchData, SearchDataImpl } from '../../data/base/search-data';
-import { Injectable } from '@angular/core';
-import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
 import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../data/base/search-data';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
 
 /**
  * Data service to retrieve vocabulary entry details from the REST server.
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
index 4b35871418..68c7c3ff80 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
@@ -5,10 +5,19 @@
  *
  * http://www.dspace.org/license/
  */
-import { VocabularyDataService } from './vocabulary.data.service';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+
+import { RequestParam } from '../../cache/models/request-param.model';
 import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { VocabularyDataService } from './vocabulary.data.service';
 
 describe('VocabularyDataService', () => {
+  let service: VocabularyDataService;
+  service = initTestService();
+  let restEndpointURL = 'https://rest.api/server/api/submission/vocabularies';
+  let vocabularyByMetadataAndCollectionEndpoint = `${restEndpointURL}/search/byMetadataAndCollection?metadata=dc.contributor.author&collection=1234-1234`;
+
   function initTestService() {
     return new VocabularyDataService(null, null, null, null);
   }
@@ -17,4 +26,18 @@ describe('VocabularyDataService', () => {
     const initService = () => new VocabularyDataService(null, null, null, null);
     testFindAllDataImplementation(initService);
   });
+
+  describe('getVocabularyByMetadataAndCollection', () => {
+    it('search vocabulary by metadata and collection calls expected methods', () => {
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(vocabularyByMetadataAndCollectionEndpoint);
+      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+      service.getVocabularyByMetadataAndCollection('dc.contributor.author', '1234-1234');
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('metadata', encodeURIComponent('dc.contributor.author'))),
+          Object.assign(new RequestParam('collection', encodeURIComponent('1234-1234')))],
+      });
+      expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byMetadataAndCollection', options);
+      expect(service.findByHref).toHaveBeenCalledWith(vocabularyByMetadataAndCollectionEndpoint, true, true);
+    });
+  });
 });
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index a67b67ced7..2dd3b124b8 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -5,21 +5,27 @@
  *
  * http://www.dspace.org/license/
  */
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
-import { RequestService } from '../../data/request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { Vocabulary } from './models/vocabulary.model';
-import { FindAllData, FindAllDataImpl } from '../../data/base/find-all-data';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
 import { Injectable } from '@angular/core';
-import { VOCABULARY } from './models/vocabularies.resource-type';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { SearchDataImpl } from '../../data/base/search-data';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { VOCABULARY } from './models/vocabularies.resource-type';
+import { Vocabulary } from './models/vocabulary.model';
 
 /**
  * Data service to retrieve vocabularies from the REST server.
@@ -27,7 +33,10 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY)
 export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {
+  protected searchByMetadataAndCollectionPath = 'byMetadataAndCollection';
+
   private findAllData: FindAllData<Vocabulary>;
+  private searchData: SearchDataImpl<Vocabulary>;
 
   constructor(
     protected requestService: RequestService,
@@ -38,6 +47,7 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
     super('vocabularies', requestService, rdbService, objectCache, halService);
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -57,4 +67,23 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
   public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<PaginatedList<Vocabulary>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Return the controlled vocabulary configured for the specified metadata and collection if any (/submission/vocabularies/search/{@link searchByMetadataAndCollectionPath}?metadata=<>&collection=<>)
+   * @param metadataField               metadata field to search
+   * @param collectionUUID              collection UUID where is configured the vocabulary
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  public getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<Vocabulary>> {
+    const findListOptions = new FindListOptions();
+    findListOptions.searchParams = [new RequestParam('metadata', encodeURIComponent(metadataField)),
+      new RequestParam('collection', encodeURIComponent(collectionUUID))];
+    const href$ = this.searchData.getSearchByHref(this.searchByMetadataAndCollectionPath, findListOptions, ...linksToFollow);
+    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
index faa5823520..5e3fdeb034 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -1,29 +1,34 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { RequestService } from '../../data/request.service';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { PageInfo } from '../../shared/page-info.model';
-import { buildPaginatedList } from '../../data/paginated-list.model';
+import { getMockHrefOnlyDataService } from '../../../shared/mocks/href-only-data.service.mock';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import {
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
-import { RestResponse } from '../../cache/response.models';
-import { VocabularyService } from './vocabulary.service';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { VocabularyOptions } from './models/vocabulary-options.model';
-import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
-import { HrefOnlyDataService } from '../../data/href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../../shared/mocks/href-only-data.service.mock';
+import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { HrefOnlyDataService } from '../../data/href-only-data.service';
+import { buildPaginatedList } from '../../data/paginated-list.model';
+import { RequestService } from '../../data/request.service';
 import { RequestEntry } from '../../data/request-entry.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { PageInfo } from '../../shared/page-info.model';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { VocabularyOptions } from './models/vocabulary-options.model';
 import { VocabularyDataService } from './vocabulary.data.service';
+import { VocabularyService } from './vocabulary.service';
 import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 describe('VocabularyService', () => {
@@ -47,12 +52,12 @@ describe('VocabularyService', () => {
     entries: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types',
       },
       entries: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries',
       },
-    }
+    },
   };
 
   const hierarchicalVocabulary: any = {
@@ -66,33 +71,33 @@ describe('VocabularyService', () => {
     entries: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types',
       },
       entries: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries',
       },
-    }
+    },
   };
 
   const vocabularyEntry: any = {
     display: 'testValue1',
     value: 'testValue1',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntry2: any = {
     display: 'testValue2',
     value: 'testValue2',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntry3: any = {
     display: 'testValue3',
     value: 'testValue3',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntryParentDetail: any = {
@@ -102,20 +107,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authorityId2',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:VR131402'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:VR131402',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const vocabularyEntryChildDetail: any = {
@@ -125,20 +130,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authoritytestChild1',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild1'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild1',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const vocabularyEntryChild2Detail: any = {
@@ -148,20 +153,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authoritytestChild2',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild2'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild2',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const endpointURL = `https://rest.api/rest/api/submission/vocabularies`;
@@ -182,7 +187,7 @@ describe('VocabularyService', () => {
   const entryByIDRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries?entryID=${entryID}`;
   const vocabularyOptions: VocabularyOptions = {
     name: vocabularyId,
-    closed: false
+    closed: false,
   };
   const pageInfo = new PageInfo();
   const array = [vocabulary, hierarchicalVocabulary];
@@ -199,12 +204,13 @@ describe('VocabularyService', () => {
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
   const getRequestEntries$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: arrayEntries } as any
+      response: { isSuccessful: successful, payload: arrayEntries } as any,
     } as RequestEntry);
   };
 
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
+    objectCache = new ObjectCacheServiceStub() as ObjectCacheService;
 
     return new VocabularyService(
       requestService,
@@ -241,7 +247,7 @@ describe('VocabularyService', () => {
         });
         rdbService = jasmine.createSpyObj('rdbService', {
           buildSingle: hot('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           }),
           buildList: hot('a|', {
             a: paginatedListRD,
@@ -253,7 +259,9 @@ describe('VocabularyService', () => {
         spyOn((service as any).vocabularyDataService, 'findById').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findAll').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findByHref').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'getVocabularyByMetadataAndCollection').and.callThrough();
         spyOn((service as any).vocabularyDataService.findAllData, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
+        spyOn((service as any).vocabularyDataService.searchData, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
       });
 
       afterEach(() => {
@@ -271,7 +279,7 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<Vocabulary> for the object with the given id', () => {
           const result = service.findVocabularyById(vocabularyId);
           const expected = cold('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -288,7 +296,7 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<Vocabulary> for the object with the given URL', () => {
           const result = service.findVocabularyByHref(requestURL);
           const expected = cold('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -305,7 +313,24 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<PaginatedList<Vocabulary>>', () => {
           const result = service.findAllVocabularies();
           const expected = cold('a|', {
-            a: paginatedListRD
+            a: paginatedListRD,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getVocabularyByMetadataAndCollection', () => {
+        it('should proxy the call to vocabularyDataService.getVocabularyByMetadataAndCollection', () => {
+          scheduler.schedule(() => service.getVocabularyByMetadataAndCollection(metadata, collectionUUID));
+          scheduler.flush();
+
+          expect((service as any).vocabularyDataService.getVocabularyByMetadataAndCollection).toHaveBeenCalledWith(metadata, collectionUUID, true, true);
+        });
+
+        it('should return a RemoteData<Vocabulary> for the object with the given metadata and collection', () => {
+          const result = service.getVocabularyByMetadataAndCollection(metadata, collectionUUID);
+          const expected = cold('a|', {
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -334,7 +359,7 @@ describe('VocabularyService', () => {
               filter: null,
               exact: null,
               entryID: null,
-            })
+            }),
           }));
         });
       });
@@ -349,7 +374,7 @@ describe('VocabularyService', () => {
             findListOptions: jasmine.objectContaining({
               filter: 'test',
               exact: false,
-            })
+            }),
           }));
         });
       });
@@ -364,7 +389,7 @@ describe('VocabularyService', () => {
             findListOptions: jasmine.objectContaining({
               filter: 'test',
               exact: true,
-            })
+            }),
           }));
         });
       });
@@ -377,7 +402,7 @@ describe('VocabularyService', () => {
           expect(service.findVocabularyById).toHaveBeenCalledWith(vocabularyOptions.name, true, true, jasmine.objectContaining({
             findListOptions: jasmine.objectContaining({
               entryID,
-            })
+            }),
           }));
         });
       });
@@ -391,7 +416,7 @@ describe('VocabularyService', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: entryDetailEndpointURL })
+        getEndpoint: cold('a', { a: entryDetailEndpointURL }),
       });
 
       responseCacheEntry = new RequestEntry();
@@ -407,10 +432,10 @@ describe('VocabularyService', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         }),
         buildList: hot('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         }),
       });
 
@@ -441,7 +466,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
         const result = service.findEntryDetailByHref(entryDetailRequestURL);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -458,7 +483,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given id', () => {
         const result = service.findEntryDetailById('testValue', hierarchicalVocabulary.id);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -475,7 +500,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
         const result = service.getEntryDetailParent('testValue', hierarchicalVocabulary.id);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -489,7 +514,7 @@ describe('VocabularyService', () => {
           null,
           null,
           pageInfo.elementsPerPage,
-          pageInfo.currentPage
+          pageInfo.currentPage,
         );
         scheduler.schedule(() => service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, pageInfo).subscribe());
         scheduler.flush();
@@ -500,7 +525,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the object with the given URL', () => {
         const result = service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, new PageInfo());
         const expected = cold('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -514,7 +539,7 @@ describe('VocabularyService', () => {
           null,
           null,
           pageInfo.elementsPerPage,
-          pageInfo.currentPage
+          pageInfo.currentPage,
         );
         options.searchParams = [new RequestParam('vocabulary', 'srsc')];
         scheduler.schedule(() => service.searchTopEntries('srsc', pageInfo));
@@ -526,7 +551,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the search', () => {
         const result = service.searchTopEntries('srsc', pageInfo);
         const expected = cold('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index 1ff5b30ee0..117f6d0417 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -1,25 +1,33 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap, mergeMap } from 'rxjs/operators';
-import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
-import { RequestService } from '../../data/request.service';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
-import { Vocabulary } from './models/vocabulary.model';
-import { VocabularyEntry } from './models/vocabulary-entry.model';
+import {
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteListPayload,
 } from '../../shared/operators';
-import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
-import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { VocabularyOptions } from './models/vocabulary-options.model';
 import { PageInfo } from '../../shared/page-info.model';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
+import { Vocabulary } from './models/vocabulary.model';
+import { VocabularyEntry } from './models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { VocabularyOptions } from './models/vocabulary-options.model';
 import { VocabularyDataService } from './vocabulary.data.service';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the vocabularies endpoint
@@ -87,6 +95,23 @@ export class VocabularyService {
     return this.vocabularyDataService.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+     * Return the controlled vocabulary configured for the specified metadata and collection if any
+     * @param metadataField               metadata field to search
+     * @param collectionUUID              collection UUID where is configured the vocabulary
+     * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+     *                                    no valid cached version. Defaults to true
+     * @param reRequestOnStale            Whether or not the request should automatically be re-
+     *                                    requested after the response becomes stale
+     * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+     *                                    {@link HALLink}s should be automatically resolved
+     * @return {Observable<RemoteData<Vocabulary>>}
+     *    Return an observable that emits vocabulary object
+     */
+  getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<Vocabulary>> {
+    return this.vocabularyDataService.getVocabularyByMetadataAndCollection(metadataField, collectionUUID, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
   /**
    * Return the {@link VocabularyEntry} list for a given {@link Vocabulary}
    *
@@ -103,7 +128,7 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -130,7 +155,7 @@ export class VocabularyService {
       exact,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -159,7 +184,7 @@ export class VocabularyService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
@@ -179,7 +204,7 @@ export class VocabularyService {
       null,
       ID,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -193,7 +218,7 @@ export class VocabularyService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
@@ -254,7 +279,7 @@ export class VocabularyService {
 
     return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${linkPath}`),
-      mergeMap((href) => this.vocabularyEntryDetailDataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      mergeMap((href) => this.vocabularyEntryDetailDataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -280,12 +305,12 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
       map(href => `${href}/${name}:${value}/children`),
-      switchMap(href => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      switchMap(href => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -309,7 +334,7 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
     options.searchParams = [new RequestParam('vocabulary', name)];
     return this.vocabularyEntryDetailDataService.searchBy(this.searchTopMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
diff --git a/src/app/core/submission/workflowitem-data.service.spec.ts b/src/app/core/submission/workflowitem-data.service.spec.ts
index 3f6ec54fda..a07ac238cd 100644
--- a/src/app/core/submission/workflowitem-data.service.spec.ts
+++ b/src/app/core/submission/workflowitem-data.service.spec.ts
@@ -1,24 +1,28 @@
 import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
-import { Store } from '@ngrx/store';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Item } from '../shared/item.model';
-import { WorkflowItemDataService } from './workflowitem-data.service';
-import { WorkflowItem } from './models/workflowitem.model';
 import { CoreState } from '../core-state.model';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
+import { RequestService } from '../data/request.service';
 import { RequestEntry } from '../data/request-entry.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { WorkflowItem } from './models/workflowitem.model';
+import { WorkflowItemDataService } from './workflowitem-data.service';
 
 describe('WorkflowItemDataService test', () => {
   let scheduler: TestScheduler;
@@ -38,28 +42,28 @@ describe('WorkflowItemDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
   const wsi = Object.assign(new WorkflowItem(), { item: observableOf(itemRD), id: '1234', uuid: '1234' });
@@ -96,7 +100,7 @@ describe('WorkflowItemDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: cold('a', { a: endpointURL }),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -111,8 +115,8 @@ describe('WorkflowItemDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: wsiRD
-        })
+          a: wsiRD,
+        }),
       });
 
       service = initTestService();
@@ -126,7 +130,7 @@ describe('WorkflowItemDataService test', () => {
     });
 
     describe('findByItem', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.findByItem('1234-1234', true, true, pageInfo));
         scheduler.flush();
 
@@ -136,7 +140,7 @@ describe('WorkflowItemDataService test', () => {
       it('should return a RemoteData<WorkspaceItem> for the search', () => {
         const result = service.findByItem('1234-1234', true, true, pageInfo);
         const expected = cold('a|', {
-          a: wsiRD
+          a: wsiRD,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 47d18470d3..d1faf19ad1 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -1,26 +1,36 @@
 import { Injectable } from '@angular/core';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { WorkflowItem } from './models/workflowitem.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DeleteByIDRequest } from '../data/request.models';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { Observable } from 'rxjs';
-import { find, map } from 'rxjs/operators';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { DeleteByIDRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { WorkflowItem } from './models/workflowitem.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
@@ -65,7 +75,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
   sendBack(id: string): Observable<boolean> {
     return this.deleteWFI(id, false).pipe(
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
     );
   }
 
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index e766a6a039..644cae85cb 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -1,26 +1,41 @@
-import { HttpClient } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
-import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Item } from '../shared/item.model';
-import { WorkspaceItem } from './models/workspaceitem.model';
-import { RequestEntry } from '../data/request-entry.model';
 import { CoreState } from '../core-state.model';
-import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { DeleteData } from '../data/base/delete-data';
 import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
+import { SearchData } from '../data/base/search-data';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { WorkspaceItem } from './models/workspaceitem.model';
+import { WorkspaceitemDataService } from './workspaceitem-data.service';
 
 describe('WorkspaceitemDataService test', () => {
   let scheduler: TestScheduler;
@@ -40,43 +55,40 @@ describe('WorkspaceitemDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
   const wsi = Object.assign(new WorkspaceItem(), { item: observableOf(itemRD), id: '1234', uuid: '1234' });
   const wsiRD = createSuccessfulRemoteDataObject(wsi);
 
   const endpointURL = `https://rest.api/rest/api/submission/workspaceitems`;
-  const searchRequestURL = `https://rest.api/rest/api/submission/workspaceitems/search/item?uuid=1234-1234`;
-  const searchRequestURL$ = observableOf(searchRequestURL);
 
   const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
 
   objectCache = {} as ObjectCacheService;
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
-  const comparator = {} as any;
   const comparatorEntry = {} as any;
   const store = {} as Store<CoreState>;
   const pageInfo = new PageInfo();
@@ -84,18 +96,23 @@ describe('WorkspaceitemDataService test', () => {
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new WorkspaceitemDataService(
+      comparatorEntry,
+      halService,
+      http,
+      notificationsService,
       requestService,
       rdbService,
       objectCache,
-      halService,
-      notificationsService,
+      store,
     );
   }
 
   describe('composition', () => {
-    const initService = () => new WorkspaceitemDataService(null, null, null, null, null);
-    testSearchDataImplementation(initService);
-    testDeleteDataImplementation(initService);
+    const initSearchService = () => new WorkspaceitemDataService(null, null, null, null, null, null, null, null) as unknown as SearchData<any>;
+    const initDeleteService = () => new WorkspaceitemDataService(null, null, null, null, null, null, null, null) as unknown as DeleteData<any>;
+
+    testSearchDataImplementation(initSearchService);
+    testDeleteDataImplementation(initDeleteService);
   });
 
   describe('', () => {
@@ -104,7 +121,7 @@ describe('WorkspaceitemDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: observableOf(endpointURL),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -119,14 +136,14 @@ describe('WorkspaceitemDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: wsiRD
-        })
+          a: wsiRD,
+        }),
+        buildFromRequestUUID: createSuccessfulRemoteDataObject$({}),
       });
 
       service = initTestService();
 
       spyOn((service as any), 'findByHref').and.callThrough();
-      spyOn((service as any), 'getSearchByHref').and.returnValue(searchRequestURL$);
     });
 
     afterEach(() => {
@@ -134,22 +151,35 @@ describe('WorkspaceitemDataService test', () => {
     });
 
     describe('findByItem', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.findByItem('1234-1234', true, true, pageInfo));
         scheduler.flush();
-
-        expect((service as any).findByHref).toHaveBeenCalledWith(searchRequestURL$, true, true);
+        const searchUrl = service.getIDHref('item', [new RequestParam('uuid', encodeURIComponent('1234-1234'))]);
+        expect((service as any).findByHref).toHaveBeenCalledWith(searchUrl, true, true);
       });
 
       it('should return a RemoteData<WorkspaceItem> for the search', () => {
         const result = service.findByItem('1234-1234', true, true, pageInfo);
         const expected = cold('a|', {
-          a: wsiRD
+          a: wsiRD,
         });
         expect(result).toBeObservable(expected);
       });
 
     });
-  });
 
+    describe('importExternalSourceEntry', () => {
+      it('should send a POST request containing the provided item request', (done) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'text/uri-list');
+        options.headers = headers;
+
+        service.importExternalSourceEntry('externalHref', 'testId').subscribe(() => {
+          expect(requestService.send).toHaveBeenCalledWith(new PostRequest(requestUUID, `${endpointURL}?owningCollection=testId`, 'externalHref', options));
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index f285fb6eca..3332ef0785 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,103 +1,67 @@
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { WorkspaceItem } from './models/workspaceitem.model';
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { NoContent } from '../shared/NoContent.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { WorkspaceItem } from './models/workspaceitem.model';
 
 /**
  * A service that provides methods to make REST requests with workspaceitems endpoint.
  */
 @Injectable()
 @dataService(WorkspaceItem.type)
-export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements SearchData<WorkspaceItem>, DeleteData<WorkspaceItem> {
+export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements DeleteData<WorkspaceItem>, SearchData<WorkspaceItem>{
+  protected linkPath = 'workspaceitems';
   protected searchByItemLinkPath = 'item';
-
-  private searchData: SearchDataImpl<WorkspaceItem>;
-  private deleteData: DeleteDataImpl<WorkspaceItem>;
+  private deleteData: DeleteData<WorkspaceItem>;
+  private searchData: SearchData<WorkspaceItem>;
 
   constructor(
+    protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-  ) {
+    protected store: Store<CoreState>) {
     super('workspaceitems', requestService, rdbService, objectCache, halService);
-
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
-
-  /**
-   * Return the WorkspaceItem object found through the UUID of an item
-   *
-   * @param uuid           The uuid of the item
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param options        The {@link FindListOptions} object
-   * @param linksToFollow  List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
-    const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
-    const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
-    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Create the HREF for a specific object's search method with given options object
-   *
-   * @param searchMethod The search method for the object
-   * @param options The [[FindListOptions]] object
-   * @return {Observable<string>}
-   *    Return an observable that emits created HREF
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
-  /**
-   * Make a new FindListRequest with given search method
-   *
-   * @param searchMethod                The search method for the object
-   * @param options                     The [[FindListOptions]] object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   * @return {Observable<RemoteData<PaginatedList<T>>}
-   *    Return an observable that emits response from the server
-   */
-  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
-    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Delete an existing object on the server
-   * @param   objectId The id of the object to be removed
-   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
-   *                            metadata should be saved as real metadata
-   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
-   *          errorMessage, timeCompleted, etc
-   */
   public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.delete(objectId, copyVirtualMetadata);
   }
@@ -115,4 +79,64 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
 
+  /**
+   * Return the WorkspaceItem object found through the UUID of an item
+   *
+   * @param uuid           The uuid of the item
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param options        The {@link FindListOptions} object
+   * @param linksToFollow  List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
+    const findListOptions = new FindListOptions();
+    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    const href$ = this.getIDHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
+    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Import an external source entry into a collection
+   * @param externalSourceEntryHref
+   * @param collectionId
+   */
+  public importExternalSourceEntry(externalSourceEntryHref: string, collectionId: string): Observable<RemoteData<WorkspaceItem>> {
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+
+    const requestId = this.requestService.generateRequestId();
+    const href$ = this.halService.getEndpoint(this.linkPath).pipe(map((href) => `${href}?owningCollection=${collectionId}`));
+
+    href$.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, externalSourceEntryHref, options);
+        this.requestService.send(request);
+      }),
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/supervision-order/models/supervision-order.model.ts b/src/app/core/supervision-order/models/supervision-order.model.ts
index e881c06d1b..64087c8a21 100644
--- a/src/app/core/supervision-order/models/supervision-order.model.ts
+++ b/src/app/core/supervision-order/models/supervision-order.model.ts
@@ -1,17 +1,25 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
-import { link, typedObject } from '../../cache/builders/build-decorators';
-import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
-import { HALLink } from '../../shared/hal-link.model';
-import { SUPERVISION_ORDER } from './supervision-order.resource-type';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { GROUP } from '../../eperson/models/group.resource-type';
-import { Group } from '../../eperson/models/group.model';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { CacheableObject } from '../../cache/cacheable-object.model';
-import { ITEM } from '../../shared/item.resource-type';
+import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { RemoteData } from '../../data/remote-data';
+import { Group } from '../../eperson/models/group.model';
+import { GROUP } from '../../eperson/models/group.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
 import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUPERVISION_ORDER } from './supervision-order.resource-type';
 
 /**
  * Model class for a Supervision Order
@@ -24,21 +32,21 @@ export class SupervisionOrder implements CacheableObject {
    * The identifier for this Supervision Order
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  ordertype: string;
+    ordertype: string;
 
   /**
    * The universally unique identifier for this Supervision Order
@@ -46,13 +54,13 @@ export class SupervisionOrder implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('supervision-order'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The {@link HALLink}s for this SupervisionOrder
    */
   @deserialize
-  _links: {
+    _links: {
     item: HALLink,
     group: HALLink,
     self: HALLink,
@@ -63,12 +71,12 @@ export class SupervisionOrder implements CacheableObject {
    * Will be undefined unless the item {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  item?: Observable<RemoteData<Item>>;
+    item?: Observable<RemoteData<Item>>;
 
   /**
    * The group linked by this supervision order
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(GROUP)
-  group?: Observable<RemoteData<Group>>;
+    group?: Observable<RemoteData<Group>>;
 }
diff --git a/src/app/core/supervision-order/supervision-order-data.service.spec.ts b/src/app/core/supervision-order/supervision-order-data.service.spec.ts
index b12817fa1a..945a3f44e8 100644
--- a/src/app/core/supervision-order/supervision-order-data.service.spec.ts
+++ b/src/app/core/supervision-order/supervision-order-data.service.spec.ts
@@ -1,29 +1,34 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { SupervisionOrderDataService } from './supervision-order-data.service';
-import { ActionType } from './models/action-type.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from '../data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from '../data/request-entry.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
 import { GroupDataService } from '../eperson/group-data.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PageInfo } from '../shared/page-info.model';
+import { ActionType } from './models/action-type.model';
+import { SupervisionOrderDataService } from './supervision-order-data.service';
 
 describe('SupervisionOrderService', () => {
   let scheduler: TestScheduler;
   let service: SupervisionOrderDataService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
-  let objectCache: ObjectCacheService;
+  let objectCache: ObjectCacheServiceStub;
   let halService: HALEndpointService;
   let responseCacheEntry: RequestEntry;
   let groupService: GroupDataService;
@@ -39,12 +44,12 @@ describe('SupervisionOrderService', () => {
     uuid: 'supervision-order-1',
     _links: {
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/supervisionorder/1'
+        href: 'https://rest.api/rest/api/supervisionorder/1',
       },
-    }
+    },
   };
 
   const anothersupervisionOrder: any = {
@@ -58,12 +63,12 @@ describe('SupervisionOrderService', () => {
     uuid: 'supervision-order-2',
     _links: {
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/supervisionorder/1'
+        href: 'https://rest.api/rest/api/supervisionorder/1',
       },
-    }
+    },
   };
   const endpointURL = `https://rest.api/rest/api/supervisionorder`;
   const requestURL = `https://rest.api/rest/api/supervisionorder/${supervisionOrder.id}`;
@@ -85,7 +90,7 @@ describe('SupervisionOrderService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: endpointURL })
+      getEndpoint: cold('a', { a: endpointURL }),
     });
 
     responseCacheEntry = new RequestEntry();
@@ -102,39 +107,39 @@ describe('SupervisionOrderService', () => {
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
-        a: supervisionOrderRD
+        a: supervisionOrderRD,
       }),
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: hot('a|', {
-        a: supervisionOrderRD
+        a: supervisionOrderRD,
       }),
       buildFromRequestUUIDAndAwait: hot('a|', {
-        a: supervisionOrderRD
-      })
+        a: supervisionOrderRD,
+      }),
     });
     groupService = jasmine.createSpyObj('groupService', {
       getBrowseEndpoint: hot('a', {
-        a: groupEndpoint
+        a: groupEndpoint,
       }),
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/group/groups/' + groupUUID
+        a: 'https://rest.api/rest/api/group/groups/' + groupUUID,
       }),
     });
     groupService = jasmine.createSpyObj('groupService', {
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/group/groups/' + groupUUID
+        a: 'https://rest.api/rest/api/group/groups/' + groupUUID,
       }),
     });
-    objectCache = {} as ObjectCacheService;
+    objectCache = new ObjectCacheServiceStub();
     const notificationsService = {} as NotificationsService;
     const comparator = {} as any;
 
     service = new SupervisionOrderDataService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
       notificationsService,
       comparator,
@@ -179,7 +184,7 @@ describe('SupervisionOrderService', () => {
     it('should return a RemoteData<supervisionOrder> for the object with the given id', () => {
       const result = service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType);
       const expected = cold('a|', {
-        a: supervisionOrderRD
+        a: supervisionOrderRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -207,7 +212,7 @@ describe('SupervisionOrderService', () => {
     it('should return a RemoteData<supervisionOrder> for the object with the given id', () => {
       const result = service.findById(supervisionOrderId);
       const expected = cold('a|', {
-        a: supervisionOrderRD
+        a: supervisionOrderRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -217,7 +222,7 @@ describe('SupervisionOrderService', () => {
     it('should return a RemoteData<supervisionOrder> for the object with the given URL', () => {
       const result = service.findByHref(requestURL);
       const expected = cold('a|', {
-        a: supervisionOrderRD
+        a: supervisionOrderRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -248,7 +253,7 @@ describe('SupervisionOrderService', () => {
     it('should return a RemoteData<PaginatedList<supervisionOrder>) for the search', () => {
       const result = service.searchByGroup(groupUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -268,7 +273,7 @@ describe('SupervisionOrderService', () => {
     it('should return a RemoteData<PaginatedList<supervisionOrder>) for the search', () => {
       const result = service.searchByItem(itemUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/supervision-order/supervision-order-data.service.ts b/src/app/core/supervision-order/supervision-order-data.service.ts
index fed0c57b09..dc0a7f117d 100644
--- a/src/app/core/supervision-order/supervision-order-data.service.ts
+++ b/src/app/core/supervision-order/supervision-order-data.service.ts
@@ -1,35 +1,39 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { SupervisionOrder } from './models/supervision-order.model';
-import { RemoteData } from '../data/remote-data';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SUPERVISION_ORDER } from './models/supervision-order.resource-type';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { PaginatedList } from '../data/paginated-list.model';
-import { RequestParam } from '../cache/models/request-param.model';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../shared/empty.util';
-import { first, map } from 'rxjs/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CreateDataImpl } from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import { DeleteDataImpl } from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { PatchDataImpl } from '../data/base/patch-data';
+import { SearchDataImpl } from '../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { PutRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { GroupDataService } from '../eperson/group-data.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { FindListOptions } from '../data/find-list-options.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PutRequest } from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from '../data/parsing.service';
-import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
-import { GroupDataService } from '../eperson/group-data.service';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { CreateDataImpl } from '../data/base/create-data';
-import { SearchDataImpl } from '../data/base/search-data';
-import { PatchDataImpl } from '../data/base/patch-data';
-import { DeleteDataImpl } from '../data/base/delete-data';
-import { dataService } from '../data/base/data-service.decorator';
+import { SupervisionOrder } from './models/supervision-order.model';
+import { SUPERVISION_ORDER } from './models/supervision-order.resource-type';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the supervisionorders endpoint
@@ -170,7 +174,7 @@ export class SupervisionOrderDataService extends IdentifiableDataService<Supervi
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return StatusCodeOnlyResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request);
     });
diff --git a/src/app/core/tasks/claimed-task-data.service.spec.ts b/src/app/core/tasks/claimed-task-data.service.spec.ts
index 8ff8b38fa8..a0df1e3202 100644
--- a/src/app/core/tasks/claimed-task-data.service.spec.ts
+++ b/src/app/core/tasks/claimed-task-data.service.spec.ts
@@ -1,17 +1,17 @@
 import { HttpHeaders } from '@angular/common/http';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ClaimedTaskDataService } from './claimed-task-data.service';
-import { of as observableOf } from 'rxjs/internal/observable/of';
 import { RequestParam } from '../cache/models/request-param.model';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { FindListOptions } from '../data/find-list-options.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { ClaimedTaskDataService } from './claimed-task-data.service';
 
 describe('ClaimedTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -28,7 +28,7 @@ describe('ClaimedTaskDataService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
 
   function initTestService(): ClaimedTaskDataService {
@@ -58,7 +58,7 @@ describe('ClaimedTaskDataService', () => {
     it('should call postToEndpoint method', () => {
       const scopeId = '1234';
       const body = {
-        submit_approve: 'true'
+        submit_approve: 'true',
       };
 
       spyOn(service, 'postToEndpoint');
@@ -110,7 +110,7 @@ describe('ClaimedTaskDataService', () => {
 
       const findListOptions = new FindListOptions();
       findListOptions.searchParams = [
-        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c')
+        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c'),
       ];
 
       expect(service.searchTask).toHaveBeenCalledWith('findByItem', findListOptions);
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 4e5c43c146..08dc553b10 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -1,20 +1,21 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstSucceededRemoteData } from '../shared/operators';
 import { ClaimedTask } from './models/claimed-task-object.model';
 import { CLAIMED_TASK } from './models/claimed-task-object.resource-type';
 import { ProcessTaskResponse } from './models/process-task-response';
 import { TasksService } from './tasks.service';
-import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getFirstSucceededRemoteData } from '../shared/operators';
-import { FindListOptions } from '../data/find-list-options.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for ClaimedTask
@@ -94,7 +95,7 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
   public findByItem(uuid: string): Observable<RemoteData<ClaimedTask>> {
     const options = new FindListOptions();
     options.searchParams = [
-      new RequestParam('uuid', uuid)
+      new RequestParam('uuid', uuid),
     ];
     return this.searchTask('findByItem', options).pipe(getFirstSucceededRemoteData());
   }
diff --git a/src/app/core/tasks/models/advanced-workflow-info.model.ts b/src/app/core/tasks/models/advanced-workflow-info.model.ts
index 87991a375c..6e5feec357 100644
--- a/src/app/core/tasks/models/advanced-workflow-info.model.ts
+++ b/src/app/core/tasks/models/advanced-workflow-info.model.ts
@@ -6,6 +6,6 @@ import { autoserialize } from 'cerialize';
 export abstract class AdvancedWorkflowInfo {
 
   @autoserialize
-  id: string;
+    id: string;
 
 }
diff --git a/src/app/core/tasks/models/claimed-task-object.model.ts b/src/app/core/tasks/models/claimed-task-object.model.ts
index 3ea78595f2..456c01cc79 100644
--- a/src/app/core/tasks/models/claimed-task-object.model.ts
+++ b/src/app/core/tasks/models/claimed-task-object.model.ts
@@ -1,5 +1,9 @@
 import { inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { CLAIMED_TASK } from './claimed-task-object.resource-type';
 import { TaskObject } from './task-object.model';
 
diff --git a/src/app/core/tasks/models/pool-task-object.model.ts b/src/app/core/tasks/models/pool-task-object.model.ts
index 501849e8ec..a3fb26a4c2 100644
--- a/src/app/core/tasks/models/pool-task-object.model.ts
+++ b/src/app/core/tasks/models/pool-task-object.model.ts
@@ -1,5 +1,9 @@
 import { inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { POOL_TASK } from './pool-task-object.resource-type';
 import { TaskObject } from './task-object.model';
 
diff --git a/src/app/core/tasks/models/process-task-response.ts b/src/app/core/tasks/models/process-task-response.ts
index 95260b665b..400657425d 100644
--- a/src/app/core/tasks/models/process-task-response.ts
+++ b/src/app/core/tasks/models/process-task-response.ts
@@ -5,7 +5,7 @@ export class ProcessTaskResponse {
   constructor(
     private isSuccessful: boolean,
     public statusCode?: number,
-    public errorMessage?: string
+    public errorMessage?: string,
   ) {
   }
 
diff --git a/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts b/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts
index b7861d4fe4..892806f7d1 100644
--- a/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts
+++ b/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts
@@ -1,8 +1,12 @@
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { inheritSerialization, autoserialize } from 'cerialize';
-import { RATING_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
-import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
 import { ResourceType } from '../../shared/resource-type';
+import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
+import { RATING_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
 
 /**
  * A model class for a {@link RatingAdvancedWorkflowInfo}
@@ -17,12 +21,12 @@ export class RatingAdvancedWorkflowInfo extends AdvancedWorkflowInfo {
    * Whether the description is required.
    */
   @autoserialize
-  descriptionRequired: boolean;
+    descriptionRequired: boolean;
 
   /**
    * The maximum value.
    */
   @autoserialize
-  maxValue: number;
+    maxValue: number;
 
 }
diff --git a/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts b/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts
index b87770596e..d202593efb 100644
--- a/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts
+++ b/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts
@@ -1,8 +1,12 @@
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { inheritSerialization, autoserialize } from 'cerialize';
-import { SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
-import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
 import { ResourceType } from '../../shared/resource-type';
+import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
+import { SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
 
 /**
  * A model class for a {@link SelectReviewerAdvancedWorkflowInfo}
@@ -14,6 +18,6 @@ export class SelectReviewerAdvancedWorkflowInfo extends AdvancedWorkflowInfo {
   static type: ResourceType = SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO;
 
   @autoserialize
-  group: string;
+    group: string;
 
 }
diff --git a/src/app/core/tasks/models/task-object.model.ts b/src/app/core/tasks/models/task-object.model.ts
index dc4aa8b5ae..cea886a1c6 100644
--- a/src/app/core/tasks/models/task-object.model.ts
+++ b/src/app/core/tasks/models/task-object.model.ts
@@ -1,19 +1,26 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
 
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
 import { Group } from '../../eperson/models/group.model';
 import { GROUP } from '../../eperson/models/group.resource-type';
+import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { TASK_OBJECT } from './task-object.resource-type';
-import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
-import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 import { WorkflowAction } from './workflow-action-object.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
+import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 
 /**
  * An abstract model class for a TaskObject.
@@ -27,19 +34,19 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    * The task identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The workflow step
    */
   @autoserialize
-  step: string;
+    step: string;
 
   /**
    * The {@link HALLink}s for this TaskObject
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     owner: HALLink;
     group: HALLink;
@@ -52,14 +59,14 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    * Will be undefined unless the eperson {@link HALLink} has been resolved.
    */
   @link(EPERSON, false, 'owner')
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The Group for this task
    * Will be undefined unless the group {@link HALLink} has been resolved.
    */
   @link(GROUP)
-  group?: Observable<RemoteData<Group>>;
+    group?: Observable<RemoteData<Group>>;
 
   /**
    * The WorkflowItem for this task
@@ -67,13 +74,13 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    */
   @link(WORKFLOWITEM)
   /* This was changed from 'WorkflowItem | Observable<RemoteData<WorkflowItem>>' to 'any' to prevent issues in templates with async */
-  workflowitem?: any;
+    workflowitem?: any;
 
   /**
    * The task action type
    * Will be undefined unless the group {@link HALLink} has been resolved.
    */
   @link(WORKFLOW_ACTION, false, 'action')
-  action: Observable<RemoteData<WorkflowAction>>;
+    action: Observable<RemoteData<WorkflowAction>>;
 
 }
diff --git a/src/app/core/tasks/models/workflow-action-object.model.ts b/src/app/core/tasks/models/workflow-action-object.model.ts
index 0896e6b8f8..53ae4249c8 100644
--- a/src/app/core/tasks/models/workflow-action-object.model.ts
+++ b/src/app/core/tasks/models/workflow-action-object.model.ts
@@ -1,8 +1,12 @@
-import { inheritSerialization, autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { DSpaceObject } from '../../shared/dspace-object.model';
-import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
+import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 
 /**
  * A model class for a WorkflowAction
@@ -16,30 +20,30 @@ export class WorkflowAction extends DSpaceObject {
    * The workflow action's identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The options available for this workflow action
    */
   @autoserialize
-  options: string[];
+    options: string[];
 
   /**
    * Whether this action has advanced options
    */
   @autoserialize
-  advanced: boolean;
+    advanced: boolean;
 
   /**
    * The advanced options that the user can select at this action
    */
   @autoserialize
-  advancedOptions: string[];
+    advancedOptions: string[];
 
   /**
    * The advanced info required by the advanced options
    */
   @autoserialize
-  advancedInfo: AdvancedWorkflowInfo[];
+    advancedInfo: AdvancedWorkflowInfo[];
 
 }
diff --git a/src/app/core/tasks/pool-task-data.service.spec.ts b/src/app/core/tasks/pool-task-data.service.spec.ts
index c346e81150..266c3c6223 100644
--- a/src/app/core/tasks/pool-task-data.service.spec.ts
+++ b/src/app/core/tasks/pool-task-data.service.spec.ts
@@ -1,17 +1,17 @@
 import { HttpHeaders } from '@angular/common/http';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { PoolTaskDataService } from './pool-task-data.service';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
 import { RequestParam } from '../cache/models/request-param.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { FindListOptions } from '../data/find-list-options.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { PoolTaskDataService } from './pool-task-data.service';
 
 describe('PoolTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -27,7 +27,7 @@ describe('PoolTaskDataService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
 
   function initTestService(): PoolTaskDataService {
@@ -63,7 +63,7 @@ describe('PoolTaskDataService', () => {
 
       const findListOptions = new FindListOptions();
       findListOptions.searchParams = [
-        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c')
+        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c'),
       ];
 
       expect(service.searchTask).toHaveBeenCalledWith('findByItem', findListOptions);
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index ec44184934..224ca94675 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { PoolTask } from './models/pool-task-object.model';
 import { POOL_TASK } from './models/pool-task-object.resource-type';
 import { TasksService } from './tasks.service';
-import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { FindListOptions } from '../data/find-list-options.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for PoolTask
@@ -47,7 +47,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
   public findByItem(uuid: string): Observable<RemoteData<PoolTask>> {
     const options = new FindListOptions();
     options.searchParams = [
-      new RequestParam('uuid', uuid)
+      new RequestParam('uuid', uuid),
     ];
     return this.searchTask('findByItem', options).pipe(getFirstCompletedRemoteData());
   }
diff --git a/src/app/core/tasks/task-response-parsing.service.ts b/src/app/core/tasks/task-response-parsing.service.ts
index e2e009386f..1d4ab641f4 100644
--- a/src/app/core/tasks/task-response-parsing.service.ts
+++ b/src/app/core/tasks/task-response-parsing.service.ts
@@ -1,12 +1,11 @@
 import { Injectable } from '@angular/core';
 
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { ParsedResponse } from '../cache/response.models';
+import { BaseResponseParsingService } from '../data/base-response-parsing.service';
+import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
 /**
  * Provides methods to parse response for a task request.
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 249a5e01f2..8c1d33d953 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -1,26 +1,32 @@
 /* eslint-disable max-classes-per-file */
+import { HttpHeaders } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { TasksService } from './tasks.service';
-import { RequestService } from '../data/request.service';
-import { TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { TaskObject } from './models/task-object.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpHeaders } from '@angular/common/http';
-import { ChangeAnalyzer } from '../data/change-analyzer';
-import { compare, Operation } from 'fast-json-patch';
-import { of as observableOf } from 'rxjs';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { ChangeAnalyzer } from '../data/change-analyzer';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  TaskDeleteRequest,
+  TaskPostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { TaskObject } from './models/task-object.model';
+import { TasksService } from './tasks.service';
 
 const LINK_NAME = 'test';
 
@@ -62,7 +68,7 @@ describe('TasksService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
   const store = {} as Store<CoreState>;
 
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index aaad31af21..2920fe4ac8 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -1,23 +1,44 @@
 import { HttpHeaders } from '@angular/common/http';
-
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, tap } from 'rxjs/operators';
-import { DeleteRequest, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { ProcessTaskResponse } from './models/process-task-response';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteData } from '../data/remote-data';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { PaginatedList } from '../data/paginated-list.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import {
+  DeleteRequest,
+  PostRequest,
+  TaskDeleteRequest,
+  TaskPostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData,
+} from '../shared/operators';
+import { ProcessTaskResponse } from './models/process-task-response';
 
 /**
  * An abstract class that provides methods to handle task requests.  todo: data in name
@@ -124,8 +145,8 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
       find((href: string) => hasValue(href)),
       mergeMap((href) => this.findByHref(href, false, true).pipe(
         getAllCompletedRemoteData(),
-        tap(() => this.requestService.setStaleByHrefSubstring(href)))
-      )
+        tap(() => this.requestService.setStaleByHrefSubstring(href))),
+      ),
     );
   }
 
@@ -146,7 +167,7 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
         } else {
           return new ProcessTaskResponse(true, response.statusCode);
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/url-combiner/rest-url-combiner.ts b/src/app/core/url-combiner/rest-url-combiner.ts
index ef3a176a32..e3667dbe29 100644
--- a/src/app/core/url-combiner/rest-url-combiner.ts
+++ b/src/app/core/url-combiner/rest-url-combiner.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from './url-combiner';
 import { environment } from '../../../environments/environment';
+import { URLCombiner } from './url-combiner';
 
 /**
  * Combines a variable number of strings representing parts
diff --git a/src/app/core/url-combiner/ui-url-combiner.ts b/src/app/core/url-combiner/ui-url-combiner.ts
index 534c5620b5..2dae5217d7 100644
--- a/src/app/core/url-combiner/ui-url-combiner.ts
+++ b/src/app/core/url-combiner/ui-url-combiner.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from './url-combiner';
 import { environment } from '../../../environments/environment';
+import { URLCombiner } from './url-combiner';
 
 /**
  * Combines a variable number of strings representing parts
diff --git a/src/app/core/utilities/enter-zone.scheduler.ts b/src/app/core/utilities/enter-zone.scheduler.ts
index 96aee7d9a5..6c95eae263 100644
--- a/src/app/core/utilities/enter-zone.scheduler.ts
+++ b/src/app/core/utilities/enter-zone.scheduler.ts
@@ -1,5 +1,8 @@
-import { SchedulerLike, Subscription } from 'rxjs';
 import { NgZone } from '@angular/core';
+import {
+  SchedulerLike,
+  Subscription,
+} from 'rxjs';
 
 /**
  *  An RXJS scheduler that will re-enter the Angular zone to run what's scheduled
@@ -9,7 +12,7 @@ export class EnterZoneScheduler implements SchedulerLike {
 
   schedule(...args: any[]): Subscription {
     return this.zone.run(() =>
-      this.scheduler.schedule.apply(this.scheduler, args)
+      this.scheduler.schedule.apply(this.scheduler, args),
     );
   }
 
diff --git a/src/app/core/utilities/equals.decorators.ts b/src/app/core/utilities/equals.decorators.ts
index 159d8a70c1..78bfd01740 100644
--- a/src/app/core/utilities/equals.decorators.ts
+++ b/src/app/core/utilities/equals.decorators.ts
@@ -1,4 +1,8 @@
-import { hasNoValue, hasValue, isEmpty } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
 import { GenericConstructor } from '../shared/generic-constructor';
 
 const excludedFromEquals = new Map();
diff --git a/src/app/core/utilities/equatable.spec.ts b/src/app/core/utilities/equatable.spec.ts
index 037cea8cc5..808c21b39f 100644
--- a/src/app/core/utilities/equatable.spec.ts
+++ b/src/app/core/utilities/equatable.spec.ts
@@ -1,7 +1,12 @@
 /* eslint-disable max-classes-per-file */
-import { EquatableObject, excludeFromEquals, fieldsForEquals } from './equals.decorators';
 import cloneDeep from 'lodash/cloneDeep';
 
+import {
+  EquatableObject,
+  excludeFromEquals,
+  fieldsForEquals,
+} from './equals.decorators';
+
 class Dog extends EquatableObject<Dog> {
   public name: string;
 
@@ -16,12 +21,12 @@ class Dog extends EquatableObject<Dog> {
 
 class Owner extends EquatableObject<Owner> {
   @excludeFromEquals
-  favouriteFood: string;
+    favouriteFood: string;
 
   constructor(
     public name: string,
     public age: number,
-    favouriteFood: string
+    favouriteFood: string,
   ) {
     super();
     this.favouriteFood = favouriteFood;
diff --git a/src/app/core/utilities/leave-zone.scheduler.ts b/src/app/core/utilities/leave-zone.scheduler.ts
index 2587563661..47d1400b4e 100644
--- a/src/app/core/utilities/leave-zone.scheduler.ts
+++ b/src/app/core/utilities/leave-zone.scheduler.ts
@@ -1,5 +1,8 @@
-import { SchedulerLike, Subscription } from 'rxjs';
 import { NgZone } from '@angular/core';
+import {
+  SchedulerLike,
+  Subscription,
+} from 'rxjs';
 
 /**
  * An RXJS scheduler that will run what's scheduled outside of the Angular zone
@@ -9,7 +12,7 @@ export class LeaveZoneScheduler implements SchedulerLike {
 
   schedule(...args: any[]): Subscription {
     return this.zone.runOutsideAngular(() =>
-      this.scheduler.schedule.apply(this.scheduler, args)
+      this.scheduler.schedule.apply(this.scheduler, args),
     );
   }
 
diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index 4a78b60fc1..1668407e04 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -1,12 +1,21 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpHeaders,
+  HttpXsrfTokenExtractor,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { HttpHeaders, HTTP_INTERCEPTORS, HttpXsrfTokenExtractor } from '@angular/common/http';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { CookieService } from '../services/cookie.service';
+
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
-import { XsrfInterceptor } from './xsrf.interceptor';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
+import { RequestError } from '../data/request-error.model';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { CookieService } from '../services/cookie.service';
+import { XsrfInterceptor } from './xsrf.interceptor';
 
 describe(`XsrfInterceptor`, () => {
   let service: DspaceRestService;
@@ -19,7 +28,7 @@ describe(`XsrfInterceptor`, () => {
   // Mock payload/statuses are dummy content as we are not testing the results
   // of any below requests. We are only testing for X-XSRF-TOKEN header.
   const mockPayload = {
-    id: 1
+    id: 1,
   };
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
@@ -35,7 +44,7 @@ describe(`XsrfInterceptor`, () => {
           multi: true,
         },
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
-        { provide: CookieService, useValue: new CookieServiceMock() }
+        { provide: CookieService, useValue: new CookieServiceMock() },
       ],
     });
 
@@ -132,7 +141,7 @@ describe(`XsrfInterceptor`, () => {
     httpRequest.flush(mockPayload, {
       headers: new HttpHeaders().set('DSPACE-XSRF-TOKEN', mockNewXSRFToken),
       status: mockStatusCode,
-      statusText: mockStatusText
+      statusText: mockStatusText,
     });
   });
 
@@ -145,19 +154,20 @@ describe(`XsrfInterceptor`, () => {
     const mockErrorMessage = 'CSRF token mismatch';
 
     service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe({
-      error: (error) => {
+      error: (error: unknown) => {
         expect(error).toBeTruthy();
+        expect(error instanceof RequestError).toBeTrue();
 
         // ensure mock error (added in below flush() call) is returned.
-        expect(error.statusCode).toBe(mockErrorCode);
-        expect(error.statusText).toBe(mockErrorText);
+        expect((error as RequestError).statusCode).toBe(mockErrorCode);
+        expect((error as RequestError).statusText).toBe(mockErrorText);
 
         // ensure our XSRF-TOKEN cookie exists & has the same value as the new DSPACE-XSRF-TOKEN header
         expect(cookieService.get('XSRF-TOKEN')).not.toBeNull();
         expect(cookieService.get('XSRF-TOKEN')).toBe(mockNewXSRFToken.toString());
 
         done();
-      }
+      },
     });
 
     const httpRequest = httpMock.expectOne('server/api/core/items');
@@ -166,7 +176,7 @@ describe(`XsrfInterceptor`, () => {
     httpRequest.flush(mockErrorMessage, {
       headers: new HttpHeaders().set('DSPACE-XSRF-TOKEN', mockNewXSRFToken),
       status: mockErrorCode,
-      statusText: mockErrorText
+      statusText: mockErrorText,
     });
   });
 
diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts
index c728a5cbd0..91e780590b 100644
--- a/src/app/core/xsrf/xsrf.interceptor.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.ts
@@ -1,4 +1,3 @@
-import { Injectable } from '@angular/core';
 import {
   HttpErrorResponse,
   HttpEvent,
@@ -6,13 +5,25 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HttpXsrfTokenExtractor
+  HttpXsrfTokenExtractor,
 } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { tap, catchError } from 'rxjs/operators';
-import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  throwError,
+} from 'rxjs';
+import {
+  catchError,
+  tap,
+} from 'rxjs/operators';
+
 import { CookieService } from '../services/cookie.service';
-import { XSRF_COOKIE, XSRF_REQUEST_HEADER, XSRF_RESPONSE_HEADER } from './xsrf.constants';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import {
+  XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from './xsrf.constants';
 
 /**
  * Custom Http Interceptor intercepting Http Requests & Responses to
@@ -42,79 +53,79 @@ import { XSRF_COOKIE, XSRF_REQUEST_HEADER, XSRF_RESPONSE_HEADER } from './xsrf.c
 @Injectable()
 export class XsrfInterceptor implements HttpInterceptor {
 
-    constructor(private tokenExtractor: HttpXsrfTokenExtractor, private cookieService: CookieService) {
-    }
+  constructor(private tokenExtractor: HttpXsrfTokenExtractor, private cookieService: CookieService) {
+  }
 
-    /**
+  /**
      * Intercept http requests and add the XSRF/CSRF token to the X-Forwarded-For header
      * @param httpRequest
      * @param next
      */
-    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-        // Ensure EVERY request from Angular includes "withCredentials: true".
-        // This allows Angular to receive & send cookies via a CORS request (to
-        // the backend). ONLY requests with credentials will:
-        // 1. Ensure a user's browser sends the server-side XSRF cookie back to
-        //    the backend
-        // 2. Ensure a user's browser saves changes to the server-side XSRF
-        //    cookie (to ensure it is kept in sync with client side cookie)
-        req = req.clone({ withCredentials: true });
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    // Ensure EVERY request from Angular includes "withCredentials: true".
+    // This allows Angular to receive & send cookies via a CORS request (to
+    // the backend). ONLY requests with credentials will:
+    // 1. Ensure a user's browser sends the server-side XSRF cookie back to
+    //    the backend
+    // 2. Ensure a user's browser saves changes to the server-side XSRF
+    //    cookie (to ensure it is kept in sync with client side cookie)
+    req = req.clone({ withCredentials: true });
 
-        // Get request URL
-        const reqUrl = req.url.toLowerCase();
+    // Get request URL
+    const reqUrl = req.url.toLowerCase();
 
-        // Get root URL of configured REST API
-        const restUrl = new RESTURLCombiner('/').toString().toLowerCase();
+    // Get root URL of configured REST API
+    const restUrl = new RESTURLCombiner('/').toString().toLowerCase();
 
-        // Skip any non-mutating request. This is because our REST API does NOT
-        // require CSRF verification for read-only requests like GET or HEAD
-        // Also skip any request which is NOT to our trusted/configured REST API
-        if (req.method !== 'GET' && req.method !== 'HEAD' && reqUrl.startsWith(restUrl)) {
-            // parse token from XSRF-TOKEN (client-side) cookie
-            const token = this.tokenExtractor.getToken() as string;
+    // Skip any non-mutating request. This is because our REST API does NOT
+    // require CSRF verification for read-only requests like GET or HEAD
+    // Also skip any request which is NOT to our trusted/configured REST API
+    if (req.method !== 'GET' && req.method !== 'HEAD' && reqUrl.startsWith(restUrl)) {
+      // parse token from XSRF-TOKEN (client-side) cookie
+      const token = this.tokenExtractor.getToken() as string;
 
-            // send token in request's X-XSRF-TOKEN header (anti-CSRF security) to backend
-            if (token !== null && !req.headers.has(XSRF_REQUEST_HEADER)) {
-                req = req.clone({ headers: req.headers.set(XSRF_REQUEST_HEADER, token) });
-            }
-        }
-        // Pass to next interceptor, but intercept EVERY response event as well
-        return next.handle(req).pipe(
-            // Check event that came back...is it an HttpResponse from backend?
-            tap((response) => {
-                if (response instanceof HttpResponse) {
-                    // For every response that comes back, check for the custom
-                    // DSPACE-XSRF-TOKEN header sent from the backend.
-                    if (response.headers.has(XSRF_RESPONSE_HEADER)) {
-                        // value of header is a new XSRF token
-                        this.saveXsrfToken(response.headers.get(XSRF_RESPONSE_HEADER));
-                    }
-                }
-            }),
-            catchError((error) => {
-                if (error instanceof HttpErrorResponse) {
-                    // For every error that comes back, also check for the custom
-                    // DSPACE-XSRF-TOKEN header sent from the backend.
-                    if (error.headers.has(XSRF_RESPONSE_HEADER)) {
-                        // value of header is a new XSRF token
-                        this.saveXsrfToken(error.headers.get(XSRF_RESPONSE_HEADER));
-                    }
-                }
-                // Return error response as is.
-                return throwError(error);
-            })
-        ) as any;
+      // send token in request's X-XSRF-TOKEN header (anti-CSRF security) to backend
+      if (token !== null && !req.headers.has(XSRF_REQUEST_HEADER)) {
+        req = req.clone({ headers: req.headers.set(XSRF_REQUEST_HEADER, token) });
+      }
     }
+    // Pass to next interceptor, but intercept EVERY response event as well
+    return next.handle(req).pipe(
+      // Check event that came back...is it an HttpResponse from backend?
+      tap((response) => {
+        if (response instanceof HttpResponse) {
+          // For every response that comes back, check for the custom
+          // DSPACE-XSRF-TOKEN header sent from the backend.
+          if (response.headers.has(XSRF_RESPONSE_HEADER)) {
+            // value of header is a new XSRF token
+            this.saveXsrfToken(response.headers.get(XSRF_RESPONSE_HEADER));
+          }
+        }
+      }),
+      catchError((error: unknown) => {
+        if (error instanceof HttpErrorResponse) {
+          // For every error that comes back, also check for the custom
+          // DSPACE-XSRF-TOKEN header sent from the backend.
+          if (error.headers.has(XSRF_RESPONSE_HEADER)) {
+            // value of header is a new XSRF token
+            this.saveXsrfToken(error.headers.get(XSRF_RESPONSE_HEADER));
+          }
+        }
+        // Return error response as is.
+        return throwError(error);
+      }),
+    ) as any;
+  }
 
-    /**
+  /**
      * Save XSRF token found in response
      * @param token token found
      */
-    private saveXsrfToken(token: string) {
-        // Save token value as a *new* value of our client-side XSRF-TOKEN cookie.
-        // This is the cookie that is parsed by Angular's tokenExtractor(),
-        // which we will send back in the X-XSRF-TOKEN header per Angular best practices.
-        this.cookieService.remove(XSRF_COOKIE);
-        this.cookieService.set(XSRF_COOKIE, token);
-    }
+  private saveXsrfToken(token: string) {
+    // Save token value as a *new* value of our client-side XSRF-TOKEN cookie.
+    // This is the cookie that is parsed by Angular's tokenExtractor(),
+    // which we will send back in the X-XSRF-TOKEN header per Angular best practices.
+    this.cookieService.remove(XSRF_COOKIE);
+    this.cookieService.set(XSRF_COOKIE, token);
+  }
 }
diff --git a/src/app/correlation-id/correlation-id.actions.ts b/src/app/correlation-id/correlation-id.actions.ts
index d57d41a637..2f7edcabd9 100644
--- a/src/app/correlation-id/correlation-id.actions.ts
+++ b/src/app/correlation-id/correlation-id.actions.ts
@@ -1,8 +1,9 @@
-import { type } from '../shared/ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../shared/ngrx/type';
+
 export const CorrelationIDActionTypes = {
-  SET: type('dspace/core/correlationId/SET')
+  SET: type('dspace/core/correlationId/SET'),
 };
 
 /**
diff --git a/src/app/correlation-id/correlation-id.reducer.spec.ts b/src/app/correlation-id/correlation-id.reducer.spec.ts
index c784def1d9..876bd93114 100644
--- a/src/app/correlation-id/correlation-id.reducer.spec.ts
+++ b/src/app/correlation-id/correlation-id.reducer.spec.ts
@@ -1,5 +1,5 @@
-import { correlationIdReducer } from './correlation-id.reducer';
 import { SetCorrelationIdAction } from './correlation-id.actions';
+import { correlationIdReducer } from './correlation-id.reducer';
 
 describe('correlationIdReducer', () => {
   it('should set the correlatinId with SET action', () => {
diff --git a/src/app/correlation-id/correlation-id.reducer.ts b/src/app/correlation-id/correlation-id.reducer.ts
index d18c7bc83e..6555196848 100644
--- a/src/app/correlation-id/correlation-id.reducer.ts
+++ b/src/app/correlation-id/correlation-id.reducer.ts
@@ -1,4 +1,8 @@
-import { CorrelationIdAction, CorrelationIDActionTypes, SetCorrelationIdAction } from './correlation-id.actions';
+import {
+  CorrelationIdAction,
+  CorrelationIDActionTypes,
+  SetCorrelationIdAction,
+} from './correlation-id.actions';
 
 const initialState = null;
 
diff --git a/src/app/correlation-id/correlation-id.service.spec.ts b/src/app/correlation-id/correlation-id.service.spec.ts
index 816c3694a5..5108ee1713 100644
--- a/src/app/correlation-id/correlation-id.service.spec.ts
+++ b/src/app/correlation-id/correlation-id.service.spec.ts
@@ -1,11 +1,19 @@
-import { CorrelationIdService } from './correlation-id.service';
-import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
-import { UUIDService } from '../core/shared/uuid.service';
-import { MockStore } from '@ngrx/store/testing';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { appReducers, AppState, storeModuleConfig } from '../app.reducer';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { MockStore } from '@ngrx/store/testing';
+
+import {
+  appReducers,
+  AppState,
+  storeModuleConfig,
+} from '../app.reducer';
+import { UUIDService } from '../core/shared/uuid.service';
+import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
 import { SetCorrelationIdAction } from './correlation-id.actions';
+import { CorrelationIdService } from './correlation-id.service';
 
 describe('CorrelationIdService', () => {
   let service: CorrelationIdService;
diff --git a/src/app/correlation-id/correlation-id.service.ts b/src/app/correlation-id/correlation-id.service.ts
index b14ea803fe..057708b954 100644
--- a/src/app/correlation-id/correlation-id.service.ts
+++ b/src/app/correlation-id/correlation-id.service.ts
@@ -1,18 +1,22 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { take } from 'rxjs/operators';
+
+import { AppState } from '../app.reducer';
 import { CookieService } from '../core/services/cookie.service';
 import { UUIDService } from '../core/shared/uuid.service';
-import { Store, select } from '@ngrx/store';
-import { AppState } from '../app.reducer';
 import { isEmpty } from '../shared/empty.util';
-import { take } from 'rxjs/operators';
 import { SetCorrelationIdAction } from './correlation-id.actions';
-import { Injectable } from '@angular/core';
 import { correlationIdSelector } from './correlation-id.selector';
 
 /**
  * Service to manage the correlation id, an id used to give context to server side logs
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CorrelationIdService {
 
@@ -53,7 +57,7 @@ export class CorrelationIdService {
 
     this.store.pipe(
       select(correlationIdSelector),
-      take(1)
+      take(1),
     ).subscribe((storeId: string) => {
       // we can do this because ngrx selects are synchronous
       correlationId = storeId;
diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts
index dc70b925e8..18bb6961c2 100644
--- a/src/app/curation-form/curation-form.component.spec.ts
+++ b/src/app/curation-form/curation-form.component.spec.ts
@@ -1,21 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { CurationFormComponent } from './curation-form.component';
-import { ScriptDataService } from '../core/data/processes/script-data.service';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
-import { Process } from '../process-page/processes/process.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
-import { RouterStub } from '../shared/testing/router.stub';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { Process } from '../process-page/processes/process.model';
 import { HandleService } from '../shared/handle.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { CurationFormComponent } from './curation-form.component';
 
 describe('CurationFormComponent', () => {
   let comp: CurationFormComponent;
@@ -28,16 +42,16 @@ describe('CurationFormComponent', () => {
   let notificationsService;
   let router;
 
-  const process = Object.assign(new Process(), {processId: 'process-id'});
+  const process = Object.assign(new Process(), { processId: 'process-id' });
 
   beforeEach(waitForAsync(() => {
 
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      invoke: createSuccessfulRemoteDataObject$(process)
+      invoke: createSuccessfulRemoteDataObject$(process),
     });
 
     processDataService = jasmine.createSpyObj('processDataService', {
-      findByHref: createSuccessfulRemoteDataObject$(process)
+      findByHref: createSuccessfulRemoteDataObject$(process),
     });
 
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
@@ -48,13 +62,13 @@ describe('CurationFormComponent', () => {
           '',
           'org.dspace.ctask.general.RequiredMetadata = requiredmetadata',
           'org.dspace.ctask.general.MetadataValueLinkChecker = checklinks',
-          'value-to-be-skipped'
-        ]
-      }))
+          'value-to-be-skipped',
+        ],
+      })),
     });
 
     handleService = {
-      normalizeHandle: (a) => a
+      normalizeHandle: (a: string) => observableOf(a),
     } as any;
 
     notificationsService = new NotificationsServiceStub();
@@ -68,10 +82,10 @@ describe('CurationFormComponent', () => {
         { provide: ProcessDataService, useValue: processDataService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: HandleService, useValue: handleService },
-        { provide: Router, useValue: router},
+        { provide: Router, useValue: router },
         { provide: ConfigurationDataService, useValue: configurationDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,8 +124,8 @@ describe('CurationFormComponent', () => {
       comp.submit();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-        {name: '-t', value: 'profileformats'},
-        {name: '-i', value: 'test-handle'},
+        { name: '-t', value: 'profileformats' },
+        { name: '-i', value: 'test-handle' },
       ], []);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('process-id'));
@@ -123,8 +137,8 @@ describe('CurationFormComponent', () => {
       comp.submit();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-        {name: '-t', value: 'profileformats'},
-        {name: '-i', value: 'test-handle'},
+        { name: '-t', value: 'profileformats' },
+        { name: '-i', value: 'test-handle' },
       ], []);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(processDataService.findByHref).not.toHaveBeenCalled();
@@ -137,8 +151,8 @@ describe('CurationFormComponent', () => {
     comp.submit();
 
     expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-      {name: '-t', value: 'profileformats'},
-      {name: '-i', value: 'form-handle'},
+      { name: '-t', value: 'profileformats' },
+      { name: '-i', value: 'form-handle' },
     ], []);
   });
   it('should use "all" when the handle provided by the form is empty and when no dsoHandle is provided', () => {
@@ -146,17 +160,18 @@ describe('CurationFormComponent', () => {
     comp.submit();
 
     expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-      {name: '-t', value: 'profileformats'},
-      {name: '-i', value: 'all'},
+      { name: '-t', value: 'profileformats' },
+      { name: '-i', value: 'all' },
     ], []);
   });
 
-  it(`should show an error notification and return when an invalid dsoHandle is provided`, () => {
+  it(`should show an error notification and return when an invalid dsoHandle is provided`, fakeAsync(() => {
     comp.dsoHandle = 'test-handle';
-    spyOn(handleService, 'normalizeHandle').and.returnValue(null);
+    spyOn(handleService, 'normalizeHandle').and.returnValue(observableOf(null));
     comp.submit();
+    flush();
 
     expect(notificationsService.error).toHaveBeenCalled();
     expect(scriptDataService.invoke).not.toHaveBeenCalled();
-  });
+  }));
 });
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 2c0e900a66..74287b567c 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,67 +1,91 @@
-import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
-import { ScriptDataService } from '../core/data/processes/script-data.service';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { find, map } from 'rxjs/operators';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
-import { Process } from '../process-page/processes/process.model';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { Observable } from 'rxjs';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../core/shared/operators';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { Process } from '../process-page/processes/process.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../shared/empty.util';
 import { HandleService } from '../shared/handle.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
 
 export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
+
 /**
  * Component responsible for rendering the Curation Task form
  */
 @Component({
   selector: 'ds-curation-form',
-  templateUrl: './curation-form.component.html'
+  templateUrl: './curation-form.component.html',
 })
-export class CurationFormComponent implements OnInit {
+export class CurationFormComponent implements OnDestroy, OnInit {
 
   config: Observable<RemoteData<ConfigurationProperty>>;
   tasks: string[];
   form: UntypedFormGroup;
 
   @Input()
-  dsoHandle: string;
+    dsoHandle: string;
+
+  subs: Subscription[] = [];
 
   constructor(
     private scriptDataService: ScriptDataService,
     private configurationDataService: ConfigurationDataService,
-    private processDataService: ProcessDataService,
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private handleService: HandleService,
     private router: Router,
-    private cdr: ChangeDetectorRef
+    private cdr: ChangeDetectorRef,
   ) {
   }
 
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
+
   ngOnInit(): void {
     this.form = new UntypedFormGroup({
       task: new UntypedFormControl(''),
-      handle: new UntypedFormControl('')
+      handle: new UntypedFormControl(''),
     });
 
     this.config = this.configurationDataService.findByPropertyName(CURATION_CFG);
-    this.config.pipe(
-      find((rd: RemoteData<ConfigurationProperty>) => rd.hasSucceeded),
-      map((rd: RemoteData<ConfigurationProperty>) => rd.payload)
-    ).subscribe((configProperties) => {
+    this.subs.push(this.config.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe((configProperties: ConfigurationProperty) => {
       this.tasks = configProperties.values
         .filter((value) => isNotEmpty(value) && value.includes('='))
         .map((value) => value.split('=')[1].trim());
       this.form.get('task').patchValue(this.tasks[0]);
       this.cdr.detectChanges();
-    });
+    }));
   }
 
   /**
@@ -77,33 +101,41 @@ export class CurationFormComponent implements OnInit {
    */
   submit() {
     const taskName = this.form.get('task').value;
-    let handle;
+    let handle$: Observable<string | null>;
     if (this.hasHandleValue()) {
-      handle = this.handleService.normalizeHandle(this.dsoHandle);
-      if (isEmpty(handle)) {
-        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
-          this.translateService.get('curation.form.submit.error.invalid-handle'));
-        return;
-      }
+      handle$ = this.handleService.normalizeHandle(this.dsoHandle).pipe(
+        map((handle: string | null) => {
+          if (isEmpty(handle)) {
+            this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+              this.translateService.get('curation.form.submit.error.invalid-handle'));
+          }
+          return handle;
+        }),
+      );
     } else {
-      handle = this.handleService.normalizeHandle(this.form.get('handle').value);
-      if (isEmpty(handle)) {
-        handle = 'all';
-      }
+      handle$ = this.handleService.normalizeHandle(this.form.get('handle').value).pipe(
+        map((handle: string | null) => isEmpty(handle) ? 'all' : handle),
+      );
     }
 
-    this.scriptDataService.invoke('curate', [
-      { name: '-t', value: taskName },
-      { name: '-i', value: handle },
-    ], []).pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<Process>) => {
-      if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get('curation.form.submit.success.head'),
-          this.translateService.get('curation.form.submit.success.content'));
-        this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
-      } else {
-        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
-          this.translateService.get('curation.form.submit.error.content'));
+    this.subs.push(handle$.subscribe((handle: string) => {
+      if (hasValue(handle)) {
+        this.subs.push(this.scriptDataService.invoke('curate', [
+          { name: '-t', value: taskName },
+          { name: '-i', value: handle },
+        ], []).pipe(
+          getFirstCompletedRemoteData(),
+        ).subscribe((rd: RemoteData<Process>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(this.translateService.get('curation.form.submit.success.head'),
+              this.translateService.get('curation.form.submit.success.content'));
+            void this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+          } else {
+            this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+              this.translateService.get('curation.form.submit.error.content'));
+          }
+        }));
       }
-    });
+    }));
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index 9f74216d54..aee9fb980c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -3,6 +3,7 @@
   <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
                               [dso]="dso"
                               [mdValue]="mdValue"
+                              [mdField]="mdField"
                               [dsoType]="dsoType"
                               [saving$]="saving$"
                               [isOnlyValue]="form.fields[mdField].length === 1"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
index 3ca0dba3b6..9d9ec3d337 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
@@ -1,15 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata-field-values.component';
-import { DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
-import { of } from 'rxjs/internal/observable/of';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { By } from '@angular/platform-browser';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata-field-values.component';
 
 describe('DsoEditMetadataFieldValuesComponent', () => {
   let component: DsoEditMetadataFieldValuesComponent;
@@ -58,7 +65,7 @@ describe('DsoEditMetadataFieldValuesComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
index 2702e0ba1f..0d752486bc 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -1,9 +1,24 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from '../dso-edit-metadata-form';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  CdkDragDrop,
+  moveItemInArray,
+} from '@angular/cdk/drag-drop';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataForm,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
 
 @Component({
   selector: 'ds-dso-edit-metadata-field-values',
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
index 5f8680088a..01a6ba48ca 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
@@ -1,6 +1,9 @@
-import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { MetadataValue } from '../../core/shared/metadata.models';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataForm,
+} from './dso-edit-metadata-form';
 
 describe('DsoEditMetadataForm', () => {
   let form: DsoEditMetadataForm;
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 8206ec9135..f45f43181b 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -1,12 +1,24 @@
 /* eslint-disable max-classes-per-file */
-import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { MoveOperation, Operation } from 'fast-json-patch';
-import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model';
-import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model';
-import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
+import {
+  MoveOperation,
+  Operation,
+} from 'fast-json-patch';
+
 import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
 import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model';
+import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model';
+import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../core/shared/metadata.models';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 
 /**
  * Enumeration for the type of change occurring on a metadata value
@@ -75,7 +87,8 @@ export class DsoEditMetadataValue {
   confirmChanges(finishEditing = false) {
     this.reordered = this.originalValue.place !== this.newValue.place;
     if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
-      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
+      if (this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language
+        || this.originalValue.authority !== this.newValue.authority || this.originalValue.confidence !== this.newValue.confidence) {
         this.change = DsoEditMetadataChangeType.UPDATE;
       } else {
         this.change = undefined;
@@ -404,10 +417,13 @@ export class DsoEditMetadataForm {
           if (hasValue(value.change)) {
             if (value.change === DsoEditMetadataChangeType.UPDATE) {
               // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below.
-              if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language) {
+              if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language
+                || value.originalValue.authority !== value.newValue.authority  || value.originalValue.confidence !== value.newValue.confidence) {
                 replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, {
                   value: value.newValue.value,
                   language: value.newValue.language,
+                  authority: value.newValue.authority,
+                  confidence: value.newValue.confidence,
                 }));
               }
             } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
@@ -416,6 +432,8 @@ export class DsoEditMetadataForm {
               addOperations.push(new MetadataPatchAddOperation(field, {
                 value: value.newValue.value,
                 language: value.newValue.language,
+                authority: value.newValue.authority,
+                confidence: value.newValue.confidence,
               }));
             } else {
               console.warn('Illegal metadata change state detected for', value);
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
index a0a1da1f1e..2e67af08eb 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
@@ -1,10 +1,15 @@
-import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers.component';
 
 describe('DsoEditMetadataHeadersComponent', () => {
   let component: DsoEditMetadataHeadersComponent;
@@ -16,7 +21,7 @@ describe('DsoEditMetadataHeadersComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
index 9c21c8ac9e..e256b76c90 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-dso-edit-metadata-headers',
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
index 20d479ac88..29b93f3150 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -24,7 +24,7 @@
   }
 
   &.ds-warning {
-    background-color: var(--bs-warning-bg);
+    background-color: var(--ds-warning-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-warning);
@@ -32,7 +32,7 @@
   }
 
   &.ds-danger {
-    background-color: var(--bs-danger-bg);
+    background-color: var(--ds-danger-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-danger);
@@ -40,7 +40,7 @@
   }
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-success-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-success);
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
index dfda2a50d1..a15da89e42 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-dso-edit-metadata-value-headers',
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 525b42610b..c9afc6ca63 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,10 +1,58 @@
 <div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual" role="row"
      cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
      [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
-  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
+  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex flex-column" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
-    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && (isAuthorityControlled() | async) !== true" [(ngModel)]="mdValue.newValue.value"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+                                    [bindId]="mdField"
+                                    [group]="group"
+                                    [model]="getModel() | async"
+                                    (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-scrollable-dropdown>
+    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
+                      [group]="group"
+                      [model]="getModel() | async"
+                      (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-onebox>
+    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
+      <span class="badge badge-light border" >
+        <i dsAuthorityConfidenceState
+           class="fas fa-fw p-0"
+           aria-hidden="true"
+           [authorityValue]="mdValue.newValue"
+           [iconMode]="true"
+        ></i>
+        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+      </span>
+    </div>
+    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
+      <div class="btn-group w-75">
+        <i dsAuthorityConfidenceState
+          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
+          aria-hidden="true"
+          [authorityValue]="mdValue.newValue.confidence"
+          [iconMode]="true"
+      ></i>
+        <input class="form-control form-outline" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
+              (change)="onChangeAuthorityKey()" />
+        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(true)">
+          <i class="fas fa-lock fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(false)">
+          <i class="fas fa-lock-open fa-fw"></i>
+        </button>
+      </div>
+    </div>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
       <ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>
@@ -13,44 +61,45 @@
   <div class="ds-flex-cell ds-lang-cell" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
     <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language"
+           [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
            [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell" role="cell">
     <div class="btn-group">
       <div class="edit-field">
         <div class="btn-group edit-buttons" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
-          <button class="btn btn-outline-primary btn-sm ng-star-inserted" id="metadata-edit-btn" *ngIf="!mdValue.editing"
+          <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
                   [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
             <i class="fas fa-edit fa-fw"></i>
           </button>
-          <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="mdValue.editing"
+          <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
                   [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
-          <button class="btn btn-outline-danger btn-sm" id="metadata-remove-btn"
+          <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                   [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
             <i class="fas fa-trash-alt fa-fw"></i>
           </button>
-          <button class="btn btn-outline-warning btn-sm" id="metadata-undo-btn"
+          <button class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                   [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
+          <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
+                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+                  [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
+                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
+            <i class="fas fa-grip-vertical fa-fw"></i>
+          </button>
         </div>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
-              [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
-              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
-        <i class="fas fa-grip-vertical fa-fw"></i>
-      </button>
     </div>
   </div>
 </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index 4a207ee1a4..e555191300 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -1,5 +1,5 @@
 .ds-success {
-  background-color: var(--bs-success-bg);
+  background-color: var(--ds-success-bg);
   border: 1px solid var(--bs-success);
 }
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
index 67a6f98ac0..61f2460bc7 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -1,16 +1,49 @@
-import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { of } from 'rxjs/internal/observable/of';
-import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
-import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
+import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
+import { RegistryService } from 'src/app/core/registry/registry.service';
+import { ConfidenceType } from 'src/app/core/shared/confidence-type';
+import { Vocabulary } from 'src/app/core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service';
+import { DynamicOneboxModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { DynamicScrollableDropdownModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+import { createPaginatedList } from 'src/app/shared/testing/utils.test';
+import { VocabularyServiceStub } from 'src/app/shared/testing/vocabulary-service.stub';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  MetadataValue,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -24,17 +57,111 @@ describe('DsoEditMetadataValueComponent', () => {
 
   let relationshipService: RelationshipDataService;
   let dsoNameService: DSONameService;
+  let vocabularyServiceStub: any;
+  let itemService: ItemDataService;
+  let registryService: RegistryService;
+  let notificationsService: NotificationsService;
 
   let editMetadataValue: DsoEditMetadataValue;
   let metadataValue: MetadataValue;
+  let dso: DSpaceObject;
+
+  const collection =  Object.assign(new Collection(), {
+    uuid: 'fake-uuid',
+  });
+
+  const item = Object.assign(new Item(), {
+    _links: {
+      self: { href: 'fake-item-url/item' },
+    },
+    id: 'item',
+    uuid: 'item',
+    owningCollection: createSuccessfulRemoteDataObject$(collection),
+  });
+
+  const mockVocabularyScrollable: Vocabulary = {
+    id: 'scrollable',
+    name: 'scrollable',
+    scrollable: true,
+    hierarchical: false,
+    preloadLevel: 0,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  const mockVocabularyHierarchical: Vocabulary = {
+    id: 'hierarchical',
+    name: 'hierarchical',
+    scrollable: false,
+    hierarchical: true,
+    preloadLevel: 2,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  const mockVocabularySuggester: Vocabulary = {
+    id: 'suggester',
+    name: 'suggester',
+    scrollable: false,
+    hierarchical: false,
+    preloadLevel: 0,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  let metadataSchema: MetadataSchema;
+  let metadataFields: MetadataField[];
 
   function initServices(): void {
+    metadataSchema = Object.assign(new MetadataSchema(), {
+      id: 0,
+      prefix: 'metadata',
+      namespace: 'http://example.com/',
+    });
+    metadataFields = [
+      Object.assign(new MetadataField(), {
+        id: 0,
+        element: 'regular',
+        qualifier: null,
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+    ];
+
     relationshipService = jasmine.createSpyObj('relationshipService', {
       resolveMetadataRepresentation: of(new ItemMetadataRepresentation(metadataValue)),
     });
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
       getName: 'Related Name',
     });
+    itemService = jasmine.createSpyObj('itemService', {
+      findByHref: createSuccessfulRemoteDataObject$(item),
+    });
+    vocabularyServiceStub = new VocabularyServiceStub();
+    registryService = jasmine.createSpyObj('registryService', {
+      queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
   }
 
   beforeEach(waitForAsync(() => {
@@ -45,6 +172,11 @@ describe('DsoEditMetadataValueComponent', () => {
       authority: undefined,
     });
     editMetadataValue = new DsoEditMetadataValue(metadataValue);
+    dso = Object.assign(new DSpaceObject(), {
+      _links: {
+        self: { href: 'fake-dso-url/dso' },
+      },
+    });
 
     initServices();
 
@@ -54,8 +186,12 @@ describe('DsoEditMetadataValueComponent', () => {
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
         { provide: DSONameService, useValue: dsoNameService },
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: ItemDataService, useValue: itemService },
+        { provide: RegistryService, useValue: registryService },
+        { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -63,6 +199,7 @@ describe('DsoEditMetadataValueComponent', () => {
     fixture = TestBed.createComponent(DsoEditMetadataValueComponent);
     component = fixture.componentInstance;
     component.mdValue = editMetadataValue;
+    component.dso = dso;
     component.saving$ = of(false);
     fixture.detectChanges();
   });
@@ -144,12 +281,228 @@ describe('DsoEditMetadataValueComponent', () => {
     assertButton(DRAG_BTN, true, false);
   });
 
+  describe('when the metadata field not uses a vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(null, 204));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Regular value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.regular';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render a textarea', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('textarea'))).toBeTruthy();
+    });
+  });
+
+  describe('when the metadata field uses a scrollable vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularyScrollable));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.scrollable';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicScrollableDropdownComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-scrollable-dropdown'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicScrollableDropdownModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicScrollableDropdownModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularyScrollable.name);
+      });
+    });
+  });
+
+  describe('when the  metadata field uses a hierarchical vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularyHierarchical));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.hierarchical';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicOneboxComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-onebox'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicOneboxModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicOneboxModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularyHierarchical.name);
+      });
+    });
+  });
+
+  describe('when the metadata field uses a suggester vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularySuggester));
+      spyOn(component.confirm, 'emit');
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: 'authority-key',
+        confidence: ConfidenceType.CF_UNCERTAIN,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.suggester';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicOneboxComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-onebox'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicOneboxModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicOneboxModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularySuggester.name);
+      });
+    });
+
+    describe('authority key edition', () => {
+
+      it('should update confidence to CF_NOVALUE when authority is cleared', () => {
+        component.mdValue.newValue.authority = '';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_NOVALUE);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should update confidence to CF_ACCEPTED when authority key is edited', () => {
+        component.mdValue.newValue.authority = 'newAuthority';
+        component.mdValue.originalValue.authority = 'oldAuthority';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_ACCEPTED);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should not update confidence when authority key remains the same', () => {
+        component.mdValue.newValue.authority = 'sameAuthority';
+        component.mdValue.originalValue.authority = 'sameAuthority';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_UNCERTAIN);
+        expect(component.confirm.emit).not.toHaveBeenCalled();
+      });
+
+      it('should call onChangeEditingAuthorityStatus with true when clicking the lock button', () => {
+        spyOn(component, 'onChangeEditingAuthorityStatus');
+        const lockButton = fixture.nativeElement.querySelector('#metadata-confirm-btn');
+
+        lockButton.click();
+
+        expect(component.onChangeEditingAuthorityStatus).toHaveBeenCalledWith(true);
+      });
+
+      it('should disable the input when editingAuthority is false', () => {
+        component.editingAuthority = false;
+
+        fixture.detectChanges();
+
+        const inputElement = fixture.nativeElement.querySelector('input');
+        expect(inputElement.disabled).toBe(true);
+      });
+
+      it('should enable the input when editingAuthority is true', () => {
+        component.editingAuthority = true;
+
+        fixture.detectChanges();
+
+        const inputElement = fixture.nativeElement.querySelector('input');
+        expect(inputElement.disabled).toBe(false);
+      });
+
+      it('should update mdValue.newValue properties when authority is present', () => {
+        const event = {
+          value: 'Some value',
+          authority: 'Some authority',
+        };
+
+        component.onChangeAuthorityField(event);
+
+        expect(component.mdValue.newValue.value).toBe(event.value);
+        expect(component.mdValue.newValue.authority).toBe(event.authority);
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_ACCEPTED);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should update mdValue.newValue properties when authority is not present', () => {
+        const event = {
+          value: 'Some value',
+          authority: null,
+        };
+
+        component.onChangeAuthorityField(event);
+
+        expect(component.mdValue.newValue.value).toBe(event.value);
+        expect(component.mdValue.newValue.authority).toBeNull();
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_UNSET);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+    });
+
+  });
+
   function assertButton(name: string, exists: boolean, disabled: boolean = false): void {
     describe(`${name} button`, () => {
       let btn: DebugElement;
 
       beforeEach(() => {
-        btn = fixture.debugElement.query(By.css(`#metadata-${name}-btn`));
+        btn = fixture.debugElement.query(By.css(`button[data-test="metadata-${name}-btn"]`));
       });
 
       if (exists) {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 3fdcd381ab..76c10282d5 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -1,17 +1,69 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { RegistryService } from 'src/app/core/registry/registry.service';
+import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import {
   MetadataRepresentation,
-  MetadataRepresentationType
+  MetadataRepresentationType,
 } from '../../../core/shared/metadata-representation/metadata-representation.model';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { map } from 'rxjs/operators';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+  metadataFieldsToString,
+} from '../../../core/shared/operators';
+import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { EMPTY } from 'rxjs/internal/observable/empty';
+import { isNotEmpty } from '../../../shared/empty.util';
+import {
+  DsDynamicOneboxModelConfig,
+  DynamicOneboxModel,
+} from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import {
+  DynamicScrollableDropdownModel,
+  DynamicScrollableDropdownModelConfig,
+} from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
 
 @Component({
   selector: 'ds-dso-edit-metadata-value',
@@ -21,7 +73,7 @@ import { EMPTY } from 'rxjs/internal/observable/empty';
 /**
  * Component displaying a single editable row for a metadata value
  */
-export class DsoEditMetadataValueComponent implements OnInit {
+export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
   /**
    * The parent {@link DSpaceObject} to display a metadata form for
    * Also used to determine metadata-representations in case of virtual metadata
@@ -51,6 +103,11 @@ export class DsoEditMetadataValueComponent implements OnInit {
    */
   @Input() isOnlyValue = false;
 
+  /**
+   * MetadataField to edit
+   */
+  @Input() mdField?: string;
+
   /**
    * Emits when the user clicked edit
    */
@@ -82,6 +139,12 @@ export class DsoEditMetadataValueComponent implements OnInit {
    */
   public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
 
+  /**
+   * The ConfidenceType enumeration for access in the component's template
+   * @type {ConfidenceType}
+   */
+  public ConfidenceTypeEnum = ConfidenceType;
+
   /**
    * The item this metadata value represents in case it's virtual (if any, otherwise null)
    */
@@ -97,12 +160,48 @@ export class DsoEditMetadataValueComponent implements OnInit {
    */
   mdRepresentationName$: Observable<string | null>;
 
+  /**
+   * Whether or not the authority field is currently being edited
+   */
+  public editingAuthority = false;
+
+  /**
+   * Field group used by authority field
+   * @type {UntypedFormGroup}
+   */
+  group = new UntypedFormGroup({ authorityField : new UntypedFormControl() });
+
+  /**
+   * Observable property of the model to use for editinf authorities values
+   */
+  private model$: Observable<DynamicOneboxModel | DynamicScrollableDropdownModel>;
+
+  /**
+   * Observable with information about the authority vocabulary used
+   */
+  private vocabulary$: Observable<Vocabulary>;
+
+  /**
+   * Observables with information about the authority vocabulary type used
+   */
+  private isAuthorityControlled$: Observable<boolean>;
+  private isHierarchicalVocabulary$: Observable<boolean>;
+  private isScrollableVocabulary$: Observable<boolean>;
+  private isSuggesterVocabulary$: Observable<boolean>;
+
   constructor(protected relationshipService: RelationshipDataService,
-              protected dsoNameService: DSONameService) {
+              protected dsoNameService: DSONameService,
+              protected vocabularyService: VocabularyService,
+              protected itemService: ItemDataService,
+              protected cdr: ChangeDetectorRef,
+              protected registryService: RegistryService,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService) {
   }
 
   ngOnInit(): void {
     this.initVirtualProperties();
+    this.initAuthorityProperties();
   }
 
   /**
@@ -113,8 +212,8 @@ export class DsoEditMetadataValueComponent implements OnInit {
       this.relationshipService.resolveMetadataRepresentation(this.mdValue.newValue, this.dso, 'Item')
         .pipe(
           map((mdRepresentation: MetadataRepresentation) =>
-            mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation as ItemMetadataRepresentation : null
-          )
+            mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation as ItemMetadataRepresentation : null,
+          ),
         ) : EMPTY;
     this.mdRepresentationItemRoute$ = this.mdRepresentation$.pipe(
       map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null),
@@ -123,4 +222,223 @@ export class DsoEditMetadataValueComponent implements OnInit {
       map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null),
     );
   }
+
+  /**
+   * Initialise potential properties of a authority controlled metadata field
+   */
+  initAuthorityProperties(): void {
+
+    if (isNotEmpty(this.mdField)) {
+
+      const owningCollection$: Observable<Collection> = this.itemService.findByHref(this.dso._links.self.href, true, true, followLink('owningCollection'))
+        .pipe(
+          getFirstSucceededRemoteData(),
+          getRemoteDataPayload(),
+          switchMap((item: Item) => item.owningCollection),
+          getFirstSucceededRemoteData(),
+          getRemoteDataPayload(),
+        );
+
+      this.vocabulary$ = owningCollection$.pipe(
+        switchMap((c: Collection) => this.vocabularyService
+          .getVocabularyByMetadataAndCollection(this.mdField, c.uuid)
+          .pipe(
+            getFirstSucceededRemoteDataPayload(),
+          )),
+      );
+    } else {
+      this.vocabulary$ = observableOf(undefined);
+    }
+
+    this.isAuthorityControlled$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result)),
+    );
+
+    this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && result.hierarchical),
+    );
+
+    this.isScrollableVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && result.scrollable),
+    );
+
+    this.isSuggesterVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && !result.hierarchical && !result.scrollable),
+    );
+
+    this.model$ = this.vocabulary$.pipe(
+      map((vocabulary: Vocabulary) => {
+        let formFieldValue;
+        if (isNotEmpty(this.mdValue.newValue.value)) {
+          formFieldValue = new FormFieldMetadataValueObject();
+          formFieldValue.value = this.mdValue.newValue.value;
+          formFieldValue.display = this.mdValue.newValue.value;
+          if (this.mdValue.newValue.authority) {
+            formFieldValue.authority = this.mdValue.newValue.authority;
+            formFieldValue.confidence = this.mdValue.newValue.confidence;
+          }
+        } else {
+          formFieldValue = this.mdValue.newValue.value;
+        }
+
+        const vocabularyOptions = vocabulary ? {
+          closed: false,
+          name: vocabulary.name,
+        } as VocabularyOptions : null;
+
+        if (!vocabulary.scrollable) {
+          const model: DsDynamicOneboxModelConfig = {
+            id: 'authorityField',
+            label: `${this.dsoType}.edit.metadata.edit.value`,
+            vocabularyOptions: vocabularyOptions,
+            metadataFields: [this.mdField],
+            value: formFieldValue,
+            repeatable: false,
+            submissionId: 'edit-metadata',
+            hasSelectableMetadata: false,
+          };
+          return new DynamicOneboxModel(model);
+        } else {
+          const model: DynamicScrollableDropdownModelConfig = {
+            id: 'authorityField',
+            label: `${this.dsoType}.edit.metadata.edit.value`,
+            placeholder: `${this.dsoType}.edit.metadata.edit.value`,
+            vocabularyOptions: vocabularyOptions,
+            metadataFields: [this.mdField],
+            value: formFieldValue,
+            repeatable: false,
+            submissionId: 'edit-metadata',
+            hasSelectableMetadata: false,
+            maxOptions: 10,
+          };
+          return new DynamicScrollableDropdownModel(model);
+        }
+      }));
+  }
+
+  /**
+   * Change callback for the component. Check if the mdField has changed to retrieve whether it is metadata
+   * that uses a controlled vocabulary and update the related properties
+   *
+   * @param {SimpleChanges} changes
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (isNotEmpty(changes.mdField) && !changes.mdField.firstChange) {
+      if (isNotEmpty(changes.mdField.currentValue) ) {
+        if (isNotEmpty(changes.mdField.previousValue) &&
+          changes.mdField.previousValue !== changes.mdField.currentValue) {
+          // Clear authority value in case it has been assigned with the previous metadataField used
+          this.mdValue.newValue.authority = null;
+          this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+        }
+
+        // Only ask if the current mdField have a period character to reduce request
+        if (changes.mdField.currentValue.includes('.')) {
+          this.validateMetadataField().subscribe((isValid: boolean) => {
+            if (isValid) {
+              this.initAuthorityProperties();
+              this.cdr.detectChanges();
+            }
+          });
+        }
+      }
+    }
+  }
+
+  /**
+   * Validate the metadata field to check if it exists on the server and return an observable boolean for success/error
+   */
+  validateMetadataField(): Observable<boolean> {
+    return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd) => {
+        if (rd.hasSucceeded) {
+          return observableOf(rd).pipe(
+            metadataFieldsToString(),
+            take(1),
+            map((fields: string[]) => fields.indexOf(this.mdField) > -1),
+          );
+        } else {
+          this.notificationsService.error(this.translate.instant(`${this.dsoType}.edit.metadata.metadatafield.error`), rd.errorMessage);
+          return [false];
+        }
+      }),
+    );
+  }
+
+  /**
+   * Checks if this field use a authority vocabulary
+   */
+  isAuthorityControlled(): Observable<boolean> {
+    return this.isAuthorityControlled$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Hierarchical or not
+   */
+  isHierarchicalVocabulary(): Observable<boolean> {
+    return this.isHierarchicalVocabulary$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Scrollable or not
+   */
+  isScrollableVocabulary(): Observable<boolean> {
+    return this.isScrollableVocabulary$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Suggester or not
+   * (a vocabulary not Scrollable and not Hierarchical that uses an autocomplete field)
+   */
+  isSuggesterVocabulary(): Observable<boolean> {
+    return this.isSuggesterVocabulary$;
+  }
+
+  /**
+   * Process the change of authority field value updating the authority key and confidence as necessary
+   */
+  onChangeAuthorityField(event): void {
+    this.mdValue.newValue.value = event.value;
+    if (event.authority) {
+      this.mdValue.newValue.authority = event.authority;
+      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+    } else {
+      this.mdValue.newValue.authority = null;
+      this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+    }
+    this.confirm.emit(false);
+  }
+
+  /**
+   * Returns an observable with the {@link DynamicOneboxModel} or {@link DynamicScrollableDropdownModel} model used
+   * for the authority field
+   */
+  getModel(): Observable<DynamicOneboxModel | DynamicScrollableDropdownModel> {
+    return this.model$;
+  }
+
+  /**
+   * Change the status of the editingAuthority property
+   * @param status
+   */
+  onChangeEditingAuthorityStatus(status: boolean) {
+    this.editingAuthority = status;
+  }
+
+  /**
+   * Processes the change in authority value, updating the confidence as necessary.
+   * If the authority key is cleared, the confidence is set to {@link ConfidenceType.CF_NOVALUE}.
+   * If the authority key is edited and differs from the original, the confidence is set to {@link ConfidenceType.CF_ACCEPTED}.
+   */
+  onChangeAuthorityKey() {
+    if (this.mdValue.newValue.authority === '') {
+      this.mdValue.newValue.confidence = ConfidenceType.CF_NOVALUE;
+      this.confirm.emit(false);
+    } else if (this.mdValue.newValue.authority !== this.mdValue.originalValue.authority) {
+      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+      this.confirm.emit(false);
+    }
+  }
+
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 24c3dc5cd7..d6c72abdb9 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -2,23 +2,23 @@
   <div class="button-row top d-flex my-2 space-children-mr ml-gap">
     <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
-            (click)="add()"><i class="fas fa-plus"></i>
+            (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
     <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-            (click)="reinstate()"><i class="fas fa-undo-alt"></i>
+            (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
-            (click)="submit()"><i class="fas fa-save"></i>
+            (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [disabled]="!hasChanges || (saving$ | async)"
-            (click)="discard()"><i class="fas fa-times"></i>
+            (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
   </div>
@@ -40,6 +40,7 @@
                                       [dsoType]="dsoType"
                                       [saving$]="savingOrLoadingFieldValidation$"
                                       [isOnlyValue]="true"
+                                      [mdField]="newMdField"
                                       (confirm)="confirmNewValue($event)"
                                       (remove)="form.newValue = undefined"
                                       (undo)="form.newValue = undefined">
@@ -74,16 +75,19 @@
     <div class="mt-2 float-right space-children-mr ml-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
+              (click)="reinstate()">
+        <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
       <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
-              (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
+              (click)="submit()">
+        <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
               [disabled]="!hasChanges || (saving$ | async)"
-              (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+              (click)="discard()">
+        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index 4e5e9ff1d4..3a181fd130 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -7,7 +7,7 @@
   border: 1px solid var(--bs-gray-200);
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-success-bg);
     border: 1px solid var(--bs-success);
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
index 7067c44fbb..2064d198e1 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -1,21 +1,30 @@
-import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  DebugElement,
+  Injectable,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, Injectable, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
+import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Item } from '../../core/shared/item.model';
-import { MetadataValue } from '../../core/shared/metadata.models';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { By } from '@angular/platform-browser';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
 import { ITEM } from '../../core/shared/item.resource-type';
-import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
-import { Operation } from 'fast-json-patch';
-import { RemoteData } from '../../core/data/remote-data';
-import { Observable } from 'rxjs/internal/Observable';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -79,7 +88,7 @@ describe('DsoEditMetadataComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         ArrayMoveChangeAnalyzer,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index d67a7ea738..e48f1d4ebe 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,27 +1,42 @@
-import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { AlertType } from '../../shared/alert/aletr-type';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DsoEditMetadataForm } from './dso-edit-metadata-form';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Data } from '@angular/router';
-import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { RemoteData } from '../../core/data/remote-data';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import {
-  getFirstCompletedRemoteData,
-} from '../../core/shared/operators';
-import { UpdateDataService } from '../../core/data/update-data.service';
-import { ResourceType } from '../../core/shared/resource-type';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+  Component,
+  Inject,
+  Injector,
+  Input,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
 import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { HALDataService } from '../../core/data/base/hal-data-service.interface';
+import { RemoteData } from '../../core/data/remote-data';
+import { UpdateDataService } from '../../core/data/update-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -121,7 +136,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     if (hasNoValue(this.dso)) {
       this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe(
         map(([data, parentData]: [Data, Data]) => Object.assign({}, data, parentData)),
-        map((data: any) => data.dso)
+        map((data: any) => data.dso),
       ).subscribe((rd: RemoteData<DSpaceObject>) => {
         this.dso = rd.payload;
         this.initDataService();
@@ -150,7 +165,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
       const provider = this.getDataServiceFor(type);
       this.updateDataService = Injector.create({
         providers: [],
-        parent: this.parentInjector
+        parent: this.parentInjector,
       }).get(provider);
     }
     this.dsoType = type.value;
@@ -182,15 +197,15 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   submit(): void {
     this.saving$.next(true);
     this.updateDataService.patch(this.dso, this.form.getOperations(this.arrayMoveChangeAnalyser)).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<DSpaceObject>) => {
       this.saving$.next(false);
       if (rd.hasFailed) {
         this.notificationsService.error(this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.error.title`), rd.errorMessage);
       } else {
         this.notificationsService.success(
-            this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.title`),
-            this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.content`)
+          this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.title`),
+          this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.content`),
         );
         this.dso = rd.payload;
         this.initForm();
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index 4c310bd81b..3f5af76051 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -1,6 +1,7 @@
 <div class="w-100 position-relative">
   <input type="text" #mdFieldInput
          class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+         [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
          [value]="mdField"
          [formControl]="input"
          (focusin)="query$.next(mdField)"
@@ -10,9 +11,9 @@
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
     <div class="dropdown-list">
       <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
-        <a href="javascript:void(0);" class="d-block dropdown-item" (click)="select(mdFieldOption)">
+        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
           <span [innerHTML]="mdFieldOption"></span>
-        </a>
+        </button>
       </div>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
index de8736df94..c05d31d4c5 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -1,18 +1,29 @@
-import { MetadataFieldSelectorComponent } from './metadata-field-selector.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { By } from '@angular/platform-browser';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataFieldSelectorComponent } from './metadata-field-selector.component';
 
 describe('MetadataFieldSelectorComponent', () => {
   let component: MetadataFieldSelectorComponent;
@@ -57,7 +68,7 @@ describe('MetadataFieldSelectorComponent', () => {
         { provide: RegistryService, useValue: registryService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index fc0d57046d..b7669333b0 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -7,30 +7,43 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  ViewChild
+  ViewChild,
 } from '@angular/core';
-import { debounceTime, distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { UntypedFormControl } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { RegistryService } from '../../../core/registry/registry.service';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
-  metadataFieldsToString
+  metadataFieldsToString,
 } from '../../../core/shared/operators';
-import { Observable } from 'rxjs/internal/Observable';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { UntypedFormControl } from '@angular/forms';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { hasValue } from '../../../shared/empty.util';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { of } from 'rxjs/internal/observable/of';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-metadata-field-selector',
   styleUrls: ['./metadata-field-selector.component.scss'],
-  templateUrl: './metadata-field-selector.component.html'
+  templateUrl: './metadata-field-selector.component.html',
 })
 /**
  * Component displaying a searchable input for metadata-fields
diff --git a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
index ba21907c99..614217047b 100644
--- a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
@@ -1,8 +1,12 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { UpdateDataService } from '../../core/data/update-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
-import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { UpdateDataService } from '../../core/data/update-data.service';
 
 @Component({
   selector: 'ds-themed-dso-edit-metadata',
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
index 7d44d6a920..d097e27f6c 100644
--- a/src/app/dso-shared/dso-shared.module.ts
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -1,16 +1,19 @@
 import { NgModule } from '@angular/core';
+
+import { FormModule } from '../shared/form/form.module';
 import { SharedModule } from '../shared/shared.module';
 import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
-import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
-import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
+import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-edit-metadata.component';
 
 @NgModule({
   imports: [
     SharedModule,
+    FormModule,
   ],
   declarations: [
     DsoEditMetadataComponent,
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
index 6c55616760..af19acfdb9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { of as observableOf } from 'rxjs';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'The journal title'
-      }
-    ]
-  }
+        value: 'The journal title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueGridElementComponent', () => {
@@ -53,9 +60,9 @@ describe('JournalIssueGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
index 3e57731613..29d2d1600e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalIssue', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
index 14f63d5781..9bdd1b915a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { of as observableOf } from 'rxjs';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description for the journal volume'
-      }
-    ]
-  }
+        value: 'A description for the journal volume',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeGridElementComponent', () => {
@@ -53,9 +60,9 @@ describe('JournalVolumeGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
index eb88c25a12..93b0fa3ab9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalVolume', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
index e4a2375441..492d10b86d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { JournalGridElementComponent } from './journal-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalGridElementComponent } from './journal-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.editor': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'A company'
-      }
+        value: 'A company',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'This is the description'
-      }
-    ]
-  }
+        value: 'This is the description',
+      },
+    ],
+  },
 });
 
 describe('JournalGridElementComponent', () => {
@@ -59,9 +66,9 @@ describe('JournalGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
index 1d7c1e5b73..a2977e7d22 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Journal', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index 13c5286e71..33ce615305 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
                 <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-themed-thumbnail>
@@ -34,9 +34,9 @@
           <span [innerHTML]="firstMetadataValue('journal.title')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
index 0d71c0652f..a268c4b97b 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalIssueSearchResultGridElementComponent } from './journal-issue-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalIssueSearchResultGridElementComponent } from './journal-issue-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'The journal title'
-      }
-    ]
-  }
+        value: 'The journal title',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalIssueSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'journal-title']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
index a2a6c91d2d..c2c608507f 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-issue-search-result-grid-element',
   styleUrls: ['./journal-issue-search-result-grid-element.component.scss'],
   templateUrl: './journal-issue-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index c64da0b632..de80448e8d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
                 <div>
                     <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                     </ds-themed-thumbnail>
@@ -34,9 +34,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
index 55948428f1..ba8793237a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalVolumeSearchResultGridElementComponent } from './journal-volume-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalVolumeSearchResultGridElementComponent } from './journal-volume-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description for the journal volume'
-      }
-    ]
-  }
+        value: 'A description for the journal volume',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalVolumeSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'description']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
index 17c8575a0e..e1c2cfb56d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-volume-search-result-grid-element',
   styleUrls: ['./journal-volume-search-result-grid-element.component.scss'],
   templateUrl: './journal-volume-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 9037e364d8..b537fb60d9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
                 <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-themed-thumbnail>
@@ -38,9 +38,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
index 44e6be0b12..40d7987c14 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalSearchResultGridElementComponent } from './journal-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalSearchResultGridElementComponent } from './journal-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,28 +14,28 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.editor': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'A company'
-      }
+        value: 'A company',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'This is the description'
-      }
-    ]
-  }
+        value: 'This is the description',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -46,10 +46,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['editor', 'publisher', 'description']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
index 4fa554ff3b..061f017e47 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-search-result-grid-element',
   styleUrls: ['./journal-search-result-grid-element.component.scss'],
   templateUrl: './journal-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
index 59af3b9e7b..4e519784e9 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalIssueListElementComponent } from './journal-issue-list-element.component';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalIssueListElementComponent } from './journal-issue-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,22 +22,22 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'publicationissue.issueNumber': [
       {
         language: 'en_US',
-        value: '5678'
-      }
-    ]
-  }
+        value: '5678',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueListElementComponent', () => {
@@ -48,9 +55,9 @@ describe('JournalIssueListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
index 454c140050..a3891acd96 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalIssue', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-issue-list-element',
   styleUrls: ['./journal-issue-list-element.component.scss'],
-  templateUrl: './journal-issue-list-element.component.html'
+  templateUrl: './journal-issue-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
index 663c1e477e..6fa7f7aea4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalVolumeListElementComponent } from './journal-volume-list-element.component';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalVolumeListElementComponent } from './journal-volume-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,22 +22,22 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'This is just another journal title'
-      }
+        value: 'This is just another journal title',
+      },
     ],
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
-    ]
-  }
+        value: '1234',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeListElementComponent', () => {
@@ -48,9 +55,9 @@ describe('JournalVolumeListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
index 5a5bfde49e..2e091f4560 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
+
 import { Item } from '../../../../core/shared/item.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent('JournalVolume', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-volume-list-element',
   styleUrls: ['./journal-volume-list-element.component.scss'],
-  templateUrl: './journal-volume-list-element.component.html'
+  templateUrl: './journal-volume-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
index e5dd55772b..bd8bdef60d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalListElementComponent } from './journal-list-element.component';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalListElementComponent } from './journal-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativeworkseries.issn': [
       {
         language: 'en_US',
-        value: '1234'
-      }
-    ]
-  }
+        value: '1234',
+      },
+    ],
+  },
 });
 
 describe('JournalListElementComponent', () => {
@@ -42,9 +49,9 @@ describe('JournalListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
index fa83c3cff4..a5d1278360 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Journal', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-list-element',
   styleUrls: ['./journal-list-element.component.scss'],
-  templateUrl: './journal-list-element.component.html'
+  templateUrl: './journal-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index e3293be3a0..545e8c67a6 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
@@ -14,11 +14,11 @@
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index 178ed86c40..c615550cd4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalIssueSearchResultListElementComponent>;
@@ -23,23 +31,23 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'publicationvolume.volumeNumber': [
           {
             language: 'en_US',
-            value: '1234'
-          }
+            value: '1234',
+          },
         ],
         'publicationissue.issueNumber': [
           {
             language: 'en_US',
-            value: '5678'
-          }
-        ]
-      }
-    })
+            value: '5678',
+          },
+        ],
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -51,23 +59,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalIssueSearchResultListElementComponent', () => {
@@ -77,12 +85,12 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -163,14 +171,14 @@ describe('JournalIssueSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index d804006eb1..351adffb4d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-issue-search-result-list-element',
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
-  templateUrl: './journal-issue-search-result-list-element.component.html'
+  templateUrl: './journal-issue-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 8d7fbda4af..2ccbbe1095 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
@@ -14,11 +14,11 @@
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index 71fa83a3b1..ce90672c6f 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalVolumeSearchResultListElementComponent>;
@@ -23,23 +31,23 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'journal.title': [
           {
             language: 'en_US',
-            value: 'This is just another journal title'
-          }
+            value: 'This is just another journal title',
+          },
         ],
         'publicationvolume.volumeNumber': [
           {
             language: 'en_US',
-            value: '1234'
-          }
-        ]
-      }
-    })
+            value: '1234',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -50,23 +58,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalVolumeSearchResultListElementComponent', () => {
@@ -76,12 +84,12 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -161,14 +169,14 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 2a01d20668..88df3817b7 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-volume-search-result-list-element',
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
-  templateUrl: './journal-volume-search-result-list-element.component.html'
+  templateUrl: './journal-volume-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 6d7f9293ec..3074d53df6 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,11 +1,11 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
@@ -13,10 +13,10 @@
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index 07970d7128..2c7a360e13 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalSearchResultListElementComponent>;
@@ -23,17 +31,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'creativeworkseries.issn': [
           {
             language: 'en_US',
-            value: '1234'
-          }
-        ]
-      }
-    })
+            value: '1234',
+          },
+        ],
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -45,24 +53,24 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
-  }
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
+  },
 );
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalSearchResultListElementComponent', () => {
@@ -72,12 +80,12 @@ describe('JournalSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -133,14 +141,14 @@ describe('JournalSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 38150d1a6a..f753006dad 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-search-result-list-element',
   styleUrls: ['./journal-search-result-list-element.component.scss'],
-  templateUrl: './journal-search-result-list-element.component.html'
+  templateUrl: './journal-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
index b9593e7612..5cf06fdead 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalIssueSidebarSearchListElementComponent } from './journal-issue-sidebar-search-list-element.component';
@@ -10,33 +10,33 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'publicationvolume.volumeNumber': [
         {
-          value: '5'
-        }
+          value: '5',
+        },
       ],
       'publicationissue.issueNumber': [
         {
-          value: '7'
-        }
-      ]
-    }
-  })
+          value: '7',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7')
+  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index 84764e9e60..2e05cd7d02 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-issue-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
index eca1775c7d..16f1394533 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalVolumeSidebarSearchListElementComponent } from './journal-volume-sidebar-search-list-element.component';
@@ -10,36 +10,36 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'journal.title': [
         {
-          value: 'journal title'
-        }
+          value: 'journal title',
+        },
       ],
       'publicationvolume.volumeNumber': [
         {
-          value: '1'
+          value: '1',
         },
         {
-          value: '2'
-        }
-      ]
-    }
-  })
+          value: '2',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)')
+  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 7af5487f40..b20e0045bc 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-volume-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
index a47dbf0e2e..a7c2af3806 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalSidebarSearchListElementComponent } from './journal-sidebar-search-list-element.component';
@@ -10,31 +10,31 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'creativeworkseries.issn': [
         {
-          value: '1234'
+          value: '1234',
         },
         {
-          value: '5678'
-        }
-      ]
-    }
-  })
+          value: '5678',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678')
+  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index 4a26b293d9..02359078d5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 75f4587a3d..3648b53b51 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field [item]="object" class="mr-auto">
   </ds-themed-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
index 9228ffb009..74a83c1c83 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { JournalIssueComponent } from './journal-issue.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { JournalIssueComponent } from './journal-issue.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,29 +14,29 @@ const mockItem: Item = Object.assign(new Item(), {
     'publicationissue.issueNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.datePublished': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
+        value: 'desc',
+      },
     ],
     'creativework.keywords': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
-    ]
+        value: 'keyword',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('JournalIssueComponent', getItemPageFieldsTest(mockItem, JournalIssueComponent));
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index b749edd732..e2aec38148 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal-issue',
   styleUrls: ['./journal-issue.component.scss'],
-  templateUrl: './journal-issue.component.html'
+  templateUrl: './journal-issue.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 213581a519..b906905b47 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field [item]="object" class="mr-auto">
   </ds-themed-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
index eb18109da8..6c2549a497 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { JournalVolumeComponent } from './journal-volume.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { JournalVolumeComponent } from './journal-volume.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,23 +14,23 @@ const mockItem: Item = Object.assign(new Item(), {
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.datePublished': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
+        value: 'desc',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('JournalVolumeComponent', getItemPageFieldsTest(mockItem, JournalVolumeComponent));
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index 89ee4ad1d2..677f307d96 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal-volume',
   styleUrls: ['./journal-volume.component.scss'],
-  templateUrl: './journal-volume.component.html'
+  templateUrl: './journal-volume.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 3b2cce061b..e8a6904242 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field [item]="object" class="mr-auto">
   </ds-themed-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 6e2ded334b..659ced0fec 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -1,11 +1,24 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -16,29 +29,26 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
+import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { JournalComponent } from './journal.component';
-import { RouteService } from '../../../../core/services/route.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
-import {
-  BrowseDefinitionDataServiceStub
-} from '../../../../shared/testing/browse-definition-data-service.stub';
-import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -49,29 +59,29 @@ const mockItem: Item = Object.assign(new Item(), {
     'creativeworkseries.issn': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
-  }
+        value: 'desc',
+      },
+    ],
+  },
 });
 
 describe('JournalComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -79,8 +89,8 @@ describe('JournalComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -105,12 +115,12 @@ describe('JournalComponent', () => {
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 4fc03b31c7..079deaa298 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal',
   styleUrls: ['./journal.component.scss'],
-  templateUrl: './journal.component.html'
+  templateUrl: './journal.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 338bbe0cd6..a61a96c8f2 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -1,27 +1,28 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { JournalComponent } from './item-pages/journal/journal.component';
-import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component';
-import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component';
+import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
+import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
+import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
+import { JournalSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
+import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
+import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
 import { JournalListElementComponent } from './item-list-elements/journal/journal-list-element.component';
 import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component';
 import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component';
-import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
-import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
-import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
 import { JournalSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
-import { JournalSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
 import { JournalIssueSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
 import { JournalVolumeSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
-import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
-import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
-import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
-import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
 import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
+import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
+import { JournalComponent } from './item-pages/journal/journal.component';
+import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component';
+import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -51,11 +52,11 @@ const ENTRY_COMPONENTS = [
     ItemSharedModule,
     SharedModule,
     ResultsBackButtonModule,
-    DsoPageModule
+    DsoPageModule,
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
-  ]
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class JournalEntitiesModule {
   /**
@@ -65,7 +66,7 @@ export class JournalEntitiesModule {
   static withEntryComponents() {
     return {
       ngModule: JournalEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
index 097e973201..27726048e2 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { OrgUnitGridElementComponent } from './org-unit-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { OrgUnitGridElementComponent } from './org-unit-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'organization.foundingDate': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'organization.address.addressCountry': [
       {
         language: 'en_US',
-        value: 'Belgium'
-      }
+        value: 'Belgium',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'Brussels'
-      }
-    ]
-  }
+        value: 'Brussels',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitGridElementComponent', () => {
@@ -59,9 +66,9 @@ describe('OrgUnitGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
index 05a7f6c8c5..1825f9be62 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('OrgUnit', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
index ca0784e997..772ada7412 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { PersonGridElementComponent } from './person-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { PersonGridElementComponent } from './person-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.email': [
       {
         language: 'en_US',
-        value: 'Smith-Donald@gmail.com'
-      }
+        value: 'Smith-Donald@gmail.com',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Web Developer'
-      }
-    ]
-  }
+        value: 'Web Developer',
+      },
+    ],
+  },
 });
 
 describe('PersonGridElementComponent', () => {
@@ -53,9 +60,9 @@ describe('PersonGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
index 2e3ce5804e..885680cde2 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Person', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
index 3f92bfe410..2af97e0fb0 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { ProjectGridElementComponent } from './project-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { ProjectGridElementComponent } from './project-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,16 +26,16 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'The project description'
-      }
-    ]
-  }
+        value: 'The project description',
+      },
+    ],
+  },
 });
 
 describe('ProjectGridElementComponent', () => {
@@ -47,9 +54,9 @@ describe('ProjectGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
index 58547960cf..4bb09005bf 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Project', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 502365e60a..c1d027d7e7 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
                 <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-themed-thumbnail>
@@ -40,9 +40,9 @@
           </span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
index d01bcc44d2..a73ba72cc6 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { OrgUnitSearchResultGridElementComponent } from './org-unit-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { OrgUnitSearchResultGridElementComponent } from './org-unit-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,28 +14,28 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'organization.foundingDate': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'organization.address.addressCountry': [
       {
         language: 'en_US',
-        value: 'Belgium'
-      }
+        value: 'Belgium',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'Brussels'
-      }
-    ]
-  }
+        value: 'Brussels',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -46,10 +46,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitSearchResultGridElementComponent', getEntityGridElementTestComponent(OrgUnitSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'country', 'city']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
index 872b4b27e3..37576c5cf7 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-org-unit-search-result-grid-element',
   styleUrls: ['./org-unit-search-result-grid-element.component.scss'],
   templateUrl: './org-unit-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 0cbe19c1e0..976d2c55e5 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
                 <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-themed-thumbnail>
@@ -33,9 +33,9 @@
           <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
index b27aa8cff0..46f08feda1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { PersonSearchResultGridElementComponent } from './person-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { PersonSearchResultGridElementComponent } from './person-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.email': [
       {
         language: 'en_US',
-        value: 'Smith-Donald@gmail.com'
-      }
+        value: 'Smith-Donald@gmail.com',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Web Developer'
-      }
-    ]
-  }
+        value: 'Web Developer',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('PersonSearchResultGridElementComponent', getEntityGridElementTestComponent(PersonSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['email', 'jobtitle']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
index 851d900755..5b1dd5a440 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-person-search-result-grid-element',
   styleUrls: ['./person-search-result-grid-element.component.scss'],
   templateUrl: './person-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 97d4016ec4..1025b4c35d 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -3,16 +3,16 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None"
+       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -28,9 +28,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      <div *ngIf="linkType !== linkTypes.None" class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
            class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
index 2cc64cf7b1..9745ff5554 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { ProjectSearchResultGridElementComponent } from './project-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { ProjectSearchResultGridElementComponent } from './project-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,16 +14,16 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'The project description'
-      }
-    ]
-  }
+        value: 'The project description',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -34,10 +34,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ProjectSearchResultGridElementComponent', getEntityGridElementTestComponent(ProjectSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['description']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
index 6dfbe93e3e..2ee7da3beb 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-project-search-result-grid-element',
   styleUrls: ['./project-search-result-grid-element.component.scss'],
   templateUrl: './project-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
index 275accc956..cbe8a9988a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { OrgUnitListElementComponent } from './org-unit-list-element.component';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { OrgUnitListElementComponent } from './org-unit-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description about the OrgUnit'
-      }
-    ]
-  }
+        value: 'A description about the OrgUnit',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitListElementComponent', () => {
@@ -42,9 +49,9 @@ describe('OrgUnitListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
index 32254595aa..16d7294cef 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('OrgUnit', ViewMode.ListElement)
 @Component({
   selector: 'ds-org-unit-list-element',
   styleUrls: ['./org-unit-list-element.component.scss'],
-  templateUrl: './org-unit-list-element.component.html'
+  templateUrl: './org-unit-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
index dc874b8ec8..9ab9748839 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { PersonListElementComponent } from './person-list-element.component';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { PersonListElementComponent } from './person-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
-    ]
-  }
+        value: 'Developer',
+      },
+    ],
+  },
 });
 
 describe('PersonListElementComponent', () => {
@@ -42,9 +49,9 @@ describe('PersonListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
index f35ed90c58..9d283b4143 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Person', ViewMode.ListElement)
 @Component({
   selector: 'ds-person-list-element',
   styleUrls: ['./person-list-element.component.scss'],
-  templateUrl: './person-list-element.component.html'
+  templateUrl: './person-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Person
diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
index 02241e3060..a4884d0482 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ProjectListElementComponent } from './project-list-element.component';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { ProjectListElementComponent } from './project-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,8 +22,8 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     // 'project.identifier.status': [
     //   {
@@ -24,7 +31,7 @@ const mockItem: Item = Object.assign(new Item(), {
     //     value: 'A status about the project'
     //   }
     // ]
-  }
+  },
 });
 
 describe('ProjectListElementComponent', () => {
@@ -42,9 +49,9 @@ describe('ProjectListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
index 5f158158d8..1c6420c35c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
+
 import { Item } from '../../../../core/shared/item.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent('Project', ViewMode.ListElement)
 @Component({
   selector: 'ds-project-list-element',
   styleUrls: ['./project-list-element.component.scss'],
-  templateUrl: './project-list-element.component.html'
+  templateUrl: './project-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 07c7c5bb89..60251c15b8 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
     <div *ngIf="showThumbnails" class="col-3 col-md-2">
-        <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+        <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
            [routerLink]="[itemPageRoute]" class="dont-break-out">
             <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
@@ -9,7 +9,7 @@
                           [placeholder]="'thumbnail.orgunit.placeholder'">
             </ds-thumbnail>
         </a>
-        <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+        <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
             <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                           [alt]="'thumbnail.orgunit.alt'"
@@ -20,11 +20,11 @@
     <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
         <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
         <ds-truncatable [id]="dso.id">
-            <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-               [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+            <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+               [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
                [routerLink]="[itemPageRoute]" class="lead"
                [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
-            <span *ngIf="linkType == linkTypes.None"
+            <span *ngIf="linkType === linkTypes.None"
                   class="lead"
                   [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
             <span class="text-muted">
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index 9609a9582a..3624701952 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -1,17 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { OrgUnitSearchResultListElementComponent } from './org-unit-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { OrgUnitSearchResultListElementComponent } from './org-unit-search-result-list-element.component';
 
 let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListElementComponent>;
@@ -25,17 +36,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.description': [
           {
             language: 'en_US',
-            value: 'A description about the OrgUnit'
-          }
-        ]
-      }
-    })
+            value: 'A description about the OrgUnit',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -46,45 +57,45 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [ OrgUnitSearchResultListElementComponent , TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [ NO_ERRORS_SCHEMA ]
+      schemas: [ NO_ERRORS_SCHEMA ],
     }).overrideComponent(OrgUnitSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -139,22 +150,22 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index a9edb530cb..4502704c29 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
@@ -7,7 +8,7 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
 @Component({
   selector: 'ds-org-unit-search-result-list-element',
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
-  templateUrl: './org-unit-search-result-list-element.component.html'
+  templateUrl: './org-unit-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index f3f892bc98..3d3749714f 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
@@ -9,7 +9,7 @@
                     [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
@@ -20,11 +20,11 @@
   <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead"
          [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead"
             [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
       <span class="text-muted">
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 31018520f6..b454f52543 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -1,17 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { PersonSearchResultListElementComponent } from './person-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { PersonSearchResultListElementComponent } from './person-search-result-list-element.component';
 
 let personListElementComponent: PersonSearchResultListElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListElementComponent>;
@@ -25,17 +36,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'person.jobTitle': [
           {
             language: 'en_US',
-            value: 'Developer'
-          }
-        ]
-      }
-    })
+            value: 'Developer',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -46,45 +57,45 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -139,22 +150,22 @@ describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 41e9e14b1a..221173fa83 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,20 +1,23 @@
-import { Component, Inject } from '@angular/core';
 import {
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+  Component,
+  Inject,
+} from '@angular/core';
+
 import {
-  ItemSearchResultListElementComponent
-} from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-person-search-result-list-element',
   styleUrls: ['./person-search-result-list-element.component.scss'],
-  templateUrl: './person-search-result-list-element.component.html'
+  templateUrl: './person-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Person
@@ -24,7 +27,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
   public constructor(
     protected truncatableService: TruncatableService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 93289aa525..d4dfe0a792 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/project-placeholder.svg'"
@@ -9,7 +9,7 @@
                     [placeholder]="'thumbnail.project.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/project-placeholder.svg'"
                     [alt]="'thumbnail.project.alt'"
@@ -20,11 +20,11 @@
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
       <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <!--<span class="text-muted">-->
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 0cb3e63e87..b2a7c3ffe1 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component';
 
 let projectListElementComponent: ProjectSearchResultListElementComponent;
 let fixture: ComponentFixture<ProjectSearchResultListElementComponent>;
@@ -23,8 +31,8 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         // 'project.identifier.status': [
         //   {
@@ -32,8 +40,8 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         //     value: 'A status about the project'
         //   }
         // ]
-      }
-    })
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -45,23 +53,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ProjectSearchResultListElementComponent', () => {
@@ -71,12 +79,12 @@ describe('ProjectSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -132,15 +140,15 @@ describe('ProjectSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ProjectSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
 
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index aaf98a8091..c78ff3984d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-project-search-result-list-element',
   styleUrls: ['./project-search-result-list-element.component.scss'],
-  templateUrl: './project-search-result-list-element.component.html'
+  templateUrl: './project-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
index ab8e1b8363..4d3f27f6ef 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { OrgUnitSidebarSearchListElementComponent } from './org-unit-sidebar-search-list-element.component';
@@ -10,33 +10,33 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dspace.entity.type': [
         {
-          value: 'OrgUnit'
-        }
+          value: 'OrgUnit',
+        },
       ],
       'organization.legalName': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 25ff6181b2..a09f685d43 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-org-unit-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
index f49ec452c9..6e614c5811 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component';
@@ -11,38 +11,38 @@ const object = Object.assign(new ItemSearchResult(), {
       'dspace.entity.type': [
         {
           value: 'Person',
-        }
+        },
       ],
       'person.familyName': [
         {
-          value: 'family name'
-        }
+          value: 'family name',
+        },
       ],
       'person.givenName': [
         {
-          value: 'given name'
-        }
+          value: 'given name',
+        },
       ],
       'person.jobTitle': [
         {
-          value: 'job title'
-        }
-      ]
-    }
-  })
+          value: 'job title',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('PersonSidebarSearchListElementComponent',
   createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
-  ])
+  ]),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index edae6c9ec9..db481bf758 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -1,21 +1,22 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { isNotEmpty } from '../../../../../shared/empty.util';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TranslateService } from '@ngx-translate/core';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-person-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
index ec0eb0e7bb..a7be69965f 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { ProjectSidebarSearchListElementComponent } from './project-sidebar-search-list-element.component';
@@ -10,23 +10,23 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
-      ]
-    }
-  })
+          value: 'title',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('ProjectSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined)
+  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index 6fbb9d26fc..52e46d928a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-project-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index c79d19e267..f28550a4e0 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field [item]="object" class="mr-auto">
   </ds-themed-item-page-title-field>
@@ -32,6 +32,18 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-xs-12 col-md-7">
+    <ds-item-page-img-field
+      [fields]="['organization.identifier.ror']"
+      [img]="{
+        URI: './assets/images/ror-icon.svg',
+        alt: 'item.page.image.alt.ROR',
+        heightVar: '--ds-item-page-img-field-ror-inline-height'
+      }"
+      [item]="object"
+      [label]="'orgunit.page.ror'"
+      [urlRegex]="'(.*)ror.org'"
+    >
+    </ds-item-page-img-field>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
index 3377712f13..e40335a4db 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { OrgUnitComponent } from './org-unit.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { OrgUnitComponent } from './org-unit.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,35 +14,35 @@ const mockItem: Item = Object.assign(new Item(), {
     'organization.foundingDate': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'New York'
-      }
+        value: 'New York',
+      },
     ],
     'organization.adress.addressCountry': [
       {
         language: 'en_US',
-        value: 'USA'
-      }
+        value: 'USA',
+      },
     ],
     'dc.identifier': [
       {
         language: 'en_US',
-        value: '1'
-      }
+        value: '1',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
+        value: 'desc',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('OrgUnitComponent', getItemPageFieldsTest(mockItem, OrgUnitComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index 03a91c34b5..89574ed332 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-org-unit',
   styleUrls: ['./org-unit.component.scss'],
-  templateUrl: './org-unit.component.html'
+  templateUrl: './org-unit.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 83a2e76dd8..ec99c845be 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field class="mr-auto" [item]="object">
   </ds-themed-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
index efbc48a209..5ebd795032 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
@@ -1,10 +1,10 @@
-import {
-  createRelationshipsObservable,
-  getItemPageFieldsTest
-} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import {
+  createRelationshipsObservable,
+  getItemPageFieldsTest,
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { PersonComponent } from './person.component';
 
@@ -14,40 +14,40 @@ const mockItem: Item = Object.assign(new Item(), {
     'person.email': [
       {
         language: 'en_US',
-        value: 'fake@email.com'
-      }
+        value: 'fake@email.com',
+      },
     ],
     'person.birthDate': [
       {
         language: 'en_US',
-        value: '1993'
-      }
+        value: '1993',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
+        value: 'Developer',
+      },
     ],
     'person.familyName': [
       {
         language: 'en_US',
-        value: 'Doe'
-      }
+        value: 'Doe',
+      },
     ],
     'person.givenName': [
       {
         language: 'en_US',
-        value: 'John'
-      }
-    ]
+        value: 'John',
+      },
+    ],
   },
   relationships: createRelationshipsObservable(),
   _links: {
     self : {
-      href: 'item-href'
-    }
-  }
+      href: 'item-href',
+    },
+  },
 });
 
 const mockItemWithTitle: Item = Object.assign(new Item(), {
@@ -56,34 +56,34 @@ const mockItemWithTitle: Item = Object.assign(new Item(), {
     'person.email': [
       {
         language: 'en_US',
-        value: 'fake@email.com'
-      }
+        value: 'fake@email.com',
+      },
     ],
     'person.birthDate': [
       {
         language: 'en_US',
-        value: '1993'
-      }
+        value: '1993',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
+        value: 'Developer',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Doe, John'
-      }
-    ]
+        value: 'Doe, John',
+      },
+    ],
   },
   relationships: createRelationshipsObservable(),
   _links: {
     self : {
-      href: 'item-href'
-    }
-  }
+      href: 'item-href',
+    },
+  },
 });
 
 describe('PersonComponent with family and given names', getItemPageFieldsTest(mockItem, PersonComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index e5e2a52338..9a6d1e2ccf 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-person',
   styleUrls: ['./person.component.scss'],
-  templateUrl: './person.component.html'
+  templateUrl: './person.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Person
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 0d9679ef1e..944766b6f7 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-themed-item-page-title-field [item]="object" class="mr-auto">
   </ds-themed-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
index ed60d3dac4..3d8fccaa6f 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
@@ -1,10 +1,10 @@
-import {
-  createRelationshipsObservable,
-  getItemPageFieldsTest
-} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import {
+  createRelationshipsObservable,
+  getItemPageFieldsTest,
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ProjectComponent } from './project.component';
 
@@ -20,8 +20,8 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.identifier': [
       {
         language: 'en_US',
-        value: '1'
-      }
+        value: '1',
+      },
     ],
     // 'project.identifier.expectedcompletion': [
     //   {
@@ -32,17 +32,17 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.description': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
+        value: 'keyword',
+      },
     ],
     'dc.subject': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
-    ]
+        value: 'keyword',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('ProjectComponent', getItemPageFieldsTest(mockItem, ProjectComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index b573ffc58e..8efa5030eb 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-project',
   styleUrls: ['./project.component.scss'],
-  templateUrl: './project.component.html'
+  templateUrl: './project.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
index 429f2986b9..7cff2f9930 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
 
 const description = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
 const organisation = 'Anonymous';
@@ -22,12 +28,12 @@ describe('OrgUnitItemMetadataListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports:[
-        NgbModule
+        NgbModule,
       ],
       declarations: [OrgUnitItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
index 183bebe10c..763eb1b810 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+
 import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('OrgUnit', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-org-unit-item-metadata-list-element',
-  templateUrl: './org-unit-item-metadata-list-element.component.html'
+  templateUrl: './org-unit-item-metadata-list-element.component.html',
 })
 /**
  * The component for displaying an item of the type OrgUnit as a metadata field
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
index b9ebf19b67..41d3b6169c 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
 
 const jobTitle = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
 const firstName = 'Joe';
@@ -24,12 +30,12 @@ describe('PersonItemMetadataListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports:[
-        NgbModule
+        NgbModule,
       ],
       declarations: [PersonItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index f3d0a28fda..d02c6debb4 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+
 import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Person', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-person-item-metadata-list-element',
-  templateUrl: './person-item-metadata-list-element.component.html'
+  templateUrl: './person-item-metadata-list-element.component.html',
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts
index afa565ce40..c4787647cb 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts
@@ -1,15 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { Item } from '../../../../core/shared/item.model';
-import { ProjectItemMetadataListElementComponent } from './project-item-metadata-list-element.component';
-import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { ProjectItemMetadataListElementComponent } from './project-item-metadata-list-element.component';
 
 const projectTitle = 'Lorem ipsum dolor sit amet';
 const mockItem = Object.assign(new Item(), { metadata: { 'dc.title': [{ value: projectTitle }] } });
@@ -24,15 +30,15 @@ describe('ProjectItemMetadataListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports:[
-        NgbModule
+        NgbModule,
       ],
       declarations: [ProjectItemMetadataListElementComponent],
       providers: [
-        { provide: DSONameService, useValue: new DSONameServiceMock() }
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
index a38a1f5cff..a3137f6d91 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
-import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Project', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-project-item-metadata-list-element',
-  templateUrl: './project-item-metadata-list-element.component.html'
+  templateUrl: './project-item-metadata-list-element.component.html',
 })
 /**
  * The component for displaying an item of the type Project as a metadata field
@@ -19,8 +20,8 @@ export class ProjectItemMetadataListElementComponent extends ItemMetadataReprese
    * @param dsoNameService
    */
   constructor(
-    public dsoNameService: DSONameService
+    public dsoNameService: DSONameService,
   ) {
-      super();
+    super();
   }
 }
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index 95b183f630..ef2aed0c93 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -1,37 +1,38 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
-import { PersonComponent } from './item-pages/person/person.component';
-import { ProjectComponent } from './item-pages/project/project.component';
+import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
+import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
+import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
+import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
+import { PersonSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
+import { ProjectSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
 import { OrgUnitListElementComponent } from './item-list-elements/org-unit/org-unit-list-element.component';
 import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component';
 import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component';
-import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
-import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
-import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
 import { OrgUnitSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component';
 import { PersonSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
 import { ProjectSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/project/project-search-result-list-element.component';
-import { PersonSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
-import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
-import { ProjectSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
-import { PersonItemMetadataListElementComponent } from './metadata-representations/person/person-item-metadata-list-element.component';
-import { OrgUnitItemMetadataListElementComponent } from './metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
-import { ProjectItemMetadataListElementComponent } from './metadata-representations/project/project-item-metadata-list-element.component';
-import { PersonSearchResultListSubmissionElementComponent } from './submission/item-list-elements/person/person-search-result-list-submission-element.component';
-import { PersonInputSuggestionsComponent } from './submission/item-list-elements/person/person-suggestions/person-input-suggestions.component';
-import { NameVariantModalComponent } from './submission/name-variant-modal/name-variant-modal.component';
-import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component';
-import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
-import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
 import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component';
 import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
 import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
+import { PersonComponent } from './item-pages/person/person.component';
+import { ProjectComponent } from './item-pages/project/project.component';
+import { OrgUnitItemMetadataListElementComponent } from './metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
+import { PersonItemMetadataListElementComponent } from './metadata-representations/person/person-item-metadata-list-element.component';
+import { ProjectItemMetadataListElementComponent } from './metadata-representations/project/project-item-metadata-list-element.component';
+import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
+import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
+import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component';
+import { PersonSearchResultListSubmissionElementComponent } from './submission/item-list-elements/person/person-search-result-list-submission-element.component';
+import { PersonInputSuggestionsComponent } from './submission/item-list-elements/person/person-suggestions/person-input-suggestions.component';
+import { NameVariantModalComponent } from './submission/name-variant-modal/name-variant-modal.component';
 
 const ENTRY_COMPONENTS = [
 // put only entry components that use custom decorator
@@ -65,7 +66,7 @@ const ENTRY_COMPONENTS = [
 const COMPONENTS = [
   NameVariantModalComponent,
   PersonInputSuggestionsComponent,
-  ...ENTRY_COMPONENTS
+  ...ENTRY_COMPONENTS,
 ];
 
 @NgModule({
@@ -79,7 +80,7 @@ const COMPONENTS = [
   ],
   declarations: [
     ...COMPONENTS,
-  ]
+  ],
 })
 export class ResearchEntitiesModule {
   /**
@@ -89,7 +90,7 @@ export class ResearchEntitiesModule {
   static withEntryComponents() {
     return {
       ngModule: ResearchEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
index a5d56c1554..9eeb318c7e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
@@ -1,8 +1,13 @@
-import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
+import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component';
 
 describe('ExternalSourceEntryListSubmissionElementComponent', () => {
   let component: ExternalSourceEntryListSubmissionElementComponent;
@@ -16,17 +21,17 @@ describe('ExternalSourceEntryListSubmissionElementComponent', () => {
     metadata: {
       'dc.identifier.uri': [
         {
-          value: uri
-        }
-      ]
-    }
+          value: uri,
+        },
+      ],
+    },
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ExternalSourceEntryListSubmissionElementComponent],
       imports: [TranslateModule.forRoot()],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index 7dee15ca05..3d82677a3f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -1,18 +1,22 @@
-import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { Context } from '../../../../../core/shared/context.model';
-import { Component, OnInit } from '@angular/core';
-import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
 import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-external-source-entry-list-submission-element',
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
-  templateUrl: './external-source-entry-list-submission-element.component.html'
+  templateUrl: './external-source-entry-list-submission-element.component.html',
 })
 /**
  * The component for displaying a list element of an external source entry
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
index 45f5c5f41c..ebf5a006bc 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -1,11 +1,25 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -20,6 +34,7 @@ import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../../core/shared/item.model';
 import { UUIDService } from '../../../../../core/shared/uuid.service';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
@@ -27,10 +42,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { OrgUnitSearchResultListSubmissionElementComponent } from './org-unit-search-result-list-submission-element.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: OrgUnitSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListSubmissionElementComponent>;
@@ -51,23 +62,23 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
+              value: 'This is just another title',
+            },
           ],
           'organization.address.addressLocality': [
             {
               language: 'en_US',
-              value: 'Europe'
-            }
+              value: 'Europe',
+            },
           ],
           'organization.address.addressCountry': [
             {
               language: 'en_US',
-              value: 'Belgium'
-            }
-          ]
-        }
-      })
+              value: 'Belgium',
+            },
+          ],
+        },
+      }),
     });
   mockItemWithoutMetadata = Object.assign(
     new ItemSearchResult(),
@@ -78,16 +89,16 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
-          ]
-        }
-      })
+              value: 'This is just another title',
+            },
+          ],
+        },
+      }),
     });
 
   nameVariant = 'Doe J.';
   mockRelationshipService = {
-    getNameVariant: () => observableOf(nameVariant)
+    getNameVariant: () => observableOf(nameVariant),
   };
 }
 
@@ -97,7 +108,7 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       declarations: [OrgUnitSearchResultListSubmissionElementComponent, TruncatePipe],
@@ -120,12 +131,12 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index ef58007bae..7d8dff9e08 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,30 +1,38 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { take } from 'rxjs/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
-  templateUrl: './org-unit-search-result-list-submission-element.component.html'
+  templateUrl: './org-unit-search-result-list-submission-element.component.html',
 })
 
 /**
@@ -50,7 +58,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
               public dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -68,8 +76,8 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
       this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
         .pipe(take(1))
         .subscribe((nameVariant: string) => {
-            this.selectedName = nameVariant || defaultValue;
-          }
+          this.selectedName = nameVariant || defaultValue;
+        },
         );
     }
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
@@ -100,15 +108,15 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
             Object.assign({}, this.dso, {
               metadata: {
                 ...this.dso.metadata,
-                ...alternativeNames
+                ...alternativeNames,
               },
             });
           this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
         }).catch(() => {
         // user clicked cancel: use the name variant only for this relation, no further action required
-      }).finally(() => {
-        this.select(value);
-      });
+        }).finally(() => {
+          this.select(value);
+        });
     }
   }
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index c4e31d3d81..58f39b8d0b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -11,7 +11,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
index 0981d895ec..d2a1639d40 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
@@ -1,7 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
 
 let component: OrgUnitInputSuggestionsComponent;
 let fixture: ComponentFixture<OrgUnitInputSuggestionsComponent>;
@@ -21,12 +30,13 @@ describe('OrgUnitInputSuggestionsComponent', () => {
       declarations: [OrgUnitInputSuggestionsComponent],
       imports: [
         FormsModule,
+        TranslateModule.forRoot(),
       ],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index a7fe2a99dd..9926350a40 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,5 +1,11 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../../../../../../shared/input-suggestions/input-suggestions.component';
 
 @Component({
@@ -12,9 +18,9 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => OrgUnitInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index dd2589c726..66db99a6af 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,14 +1,14 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 9e4d347150..25e382f60b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -1,11 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -27,7 +39,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { PersonSearchResultListSubmissionElementComponent } from './person-search-result-list-submission-element.component';
-import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let personListElementComponent: PersonSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListSubmissionElementComponent>;
@@ -40,14 +51,14 @@ let mockRelationshipService;
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 function init() {
@@ -60,17 +71,17 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
+              value: 'This is just another title',
+            },
           ],
           'person.jobTitle': [
             {
               language: 'en_US',
-              value: 'Developer'
-            }
-          ]
-        }
-      })
+              value: 'Developer',
+            },
+          ],
+        },
+      }),
     });
   mockItemWithoutMetadata = Object.assign(
     new ItemSearchResult(),
@@ -81,16 +92,16 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
-          ]
-        }
-      })
+              value: 'This is just another title',
+            },
+          ],
+        },
+      }),
     });
 
   nameVariant = 'Doe J.';
   mockRelationshipService = {
-    getNameVariant: () => observableOf(nameVariant)
+    getNameVariant: () => observableOf(nameVariant),
   };
 }
 
@@ -98,7 +109,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     init();
@@ -112,7 +123,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: NgbModal, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
-        { provide: Store, useValue: {}},
+        { provide: Store, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
@@ -122,12 +133,12 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -178,7 +189,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     init();
@@ -192,7 +203,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: NgbModal, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
-        { provide: Store, useValue: {}},
+        { provide: Store, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
@@ -202,12 +213,12 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index c9826e440b..3dcb135a33 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,29 +1,37 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { take } from 'rxjs/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-search-result-list-submission-element',
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
-  templateUrl: './person-search-result-list-submission-element.component.html'
+  templateUrl: './person-search-result-list-submission-element.component.html',
 })
 
 /**
@@ -48,7 +56,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
               public dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -63,7 +71,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
       .pipe(take(1))
       .subscribe((nameVariant: string) => {
         this.selectedName = nameVariant || defaultValue;
-        }
+      },
       );
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
@@ -84,25 +92,25 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
       this.openModal(value)
         .then(() => {
           // user clicked ok: store the name variant in the item
-            const newName: MetadataValue = new MetadataValue();
-            newName.value = value;
+          const newName: MetadataValue = new MetadataValue();
+          newName.value = value;
 
-            const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
-            const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
-            const updatedItem =
+          const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
+          const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
+          const updatedItem =
               Object.assign({}, this.dso, {
                 metadata: {
                   ...this.dso.metadata,
-                  ...alternativeNames
+                  ...alternativeNames,
                 },
               });
-            this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
-            this.itemDataService.commitUpdates();
-      }).catch(() => {
+          this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
+          this.itemDataService.commitUpdates();
+        }).catch(() => {
         // user clicked cancel: use the name variant only for this relation, no further action required
-      }).finally(() => {
-        this.select(value);
-      });
+        }).finally(() => {
+          this.select(value);
+        });
     }
   }
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index b1621dbd2c..53260ceaa3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -12,7 +12,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 5109a19963..df52d4d5a9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,5 +1,11 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../../../../../../shared/input-suggestions/input-suggestions.component';
 
 @Component({
@@ -12,9 +18,9 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => PersonInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
index 4a28c203fc..944034bad5 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
@@ -1,9 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { NameVariantModalComponent } from './name-variant-modal.component';
-import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
 
 describe('NameVariantModalComponent', () => {
   let component: NameVariantModalComponent;
@@ -19,7 +26,7 @@ describe('NameVariantModalComponent', () => {
     TestBed.configureTestingModule({
       declarations: [NameVariantModalComponent],
       imports: [NgbModule, TranslateModule.forRoot()],
-      providers: [{ provide: NgbActiveModal, useValue: modal }]
+      providers: [{ provide: NgbActiveModal, useValue: modal }],
     })
       .compileComponents();
   }));
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
index eb6f7d01ac..12c7d3ea38 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 /**
@@ -8,7 +11,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 @Component({
   selector: 'ds-name-variant-modal',
   templateUrl: './name-variant-modal.component.html',
-  styleUrls: ['./name-variant-modal.component.scss']
+  styleUrls: ['./name-variant-modal.component.scss'],
 })
 /**
  * The component for the modal to add a name variant to an item
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 13d84e6e2e..b937b2ce60 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -62,25 +62,32 @@
         <a class="text-white"
            href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
-      <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
+      <ul class="footer-info list-unstyled d-flex justify-content-center mb-0">
         <li>
-            <a class="text-white" href="javascript:void(0);"
-             (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
+          <button class="btn btn-link text-white" type="button" (click)="showCookieSettings()">
+            {{ 'footer.link.cookies' | translate}}
+          </button>
         </li>
         <li *ngIf="showPrivacyPolicy">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
         <li *ngIf="showEndUserAgreement">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
         <li *ngIf="showSendFeedback$ | async">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
         </li>
       </ul>
     </div>
+    <div class="notify-enabled text-white" [hidden]="!coarLdnEnabled">
+      <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
+        <img class="n-coar" src="assets/images/n-coar.png" [attr.alt]="'menu.header.image.logo' | translate" />
+        COAR Notify
+      </a>
+    </div>
   </div>
   <!-- Copyright -->
 </footer>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 350295b870..5f86137b44 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -22,13 +22,40 @@
     }
 
     .bottom-footer {
+      .notify-enabled {
+        position: absolute;
+        bottom: 4px;
+        right: 0;
+
+        .coar-notify-support-route {
+          padding: 0 calc(var(--bs-spacer) / 2);
+          color: inherit;
+        }
+
+        .n-coar {
+          height: var(--ds-footer-n-coar-height);
+          margin-bottom: 8.5px;
+        }
+
+        margin-top: 20px;
+      }
       ul {
         li {
           display: inline-flex;
 
-          a {
+          a, .btn-link {
             padding: 0 calc(var(--bs-spacer) / 2);
-            color: inherit
+            color: inherit;
+            font-size: .875em;
+
+            &:focus {
+              box-shadow: none;
+              text-decoration: underline;
+            }
+
+            &:focus-visible {
+              box-shadow: 0 0 0 0.2rem rgba(255, 255, 255, 0.5);
+            }
           }
 
           &:not(:last-child) {
@@ -45,3 +72,4 @@
 }
 
 
+
diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts
index 9f0250edc4..7a88c66eab 100644
--- a/src/app/footer/footer.component.spec.ts
+++ b/src/app/footer/footer.component.spec.ts
@@ -1,54 +1,67 @@
 // ... test imports
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-
 import { CommonModule } from '@angular/common';
-
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { environment } from 'src/environments/environment';
 
+import { storeModuleConfig } from '../app.reducer';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { AuthorizationDataServiceStub } from '../shared/testing/authorization-service.stub';
 // Load the implementations that should be tested
 import { FooterComponent } from './footer.component';
 
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-import { storeModuleConfig } from '../app.reducer';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { AuthorizationDataServiceStub } from '../shared/testing/authorization-service.stub';
-
 let comp: FooterComponent;
+let compAny: any;
 let fixture: ComponentFixture<FooterComponent>;
 let de: DebugElement;
 let el: HTMLElement;
 
-describe('Footer component', () => {
+let notifyInfoService = {
+  isCoarConfigEnabled: () => of(true),
+};
 
-  // waitForAsync beforeEach
+describe('Footer component', () => {
   beforeEach(waitForAsync(() => {
     return TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [FooterComponent], // declare the test component
       providers: [
         FooterComponent,
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
+        { provide: NotifyInfoService, useValue: notifyInfoService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }));
 
   // synchronous beforeEach
   beforeEach(() => {
     fixture = TestBed.createComponent(FooterComponent);
-
-    comp = fixture.componentInstance; // component test instance
-
+    comp = fixture.componentInstance;
+    compAny = comp as any;
     // query for the title <p> by CSS element selector
     de = fixture.debugElement.query(By.css('p'));
     el = de.nativeElement;
@@ -59,4 +72,56 @@ describe('Footer component', () => {
     expect(app).toBeTruthy();
   }));
 
+
+  it('should set showPrivacyPolicy to the value of environment.info.enablePrivacyStatement', () => {
+    expect(comp.showPrivacyPolicy).toBe(environment.info.enablePrivacyStatement);
+  });
+
+  it('should set showEndUserAgreement to the value of environment.info.enableEndUserAgreement', () => {
+    expect(comp.showEndUserAgreement).toBe(environment.info.enableEndUserAgreement);
+  });
+
+  describe('showCookieSettings', () => {
+    it('should call cookies.showSettings() if cookies is defined', () => {
+      const cookies = jasmine.createSpyObj('cookies', ['showSettings']);
+      compAny.cookies = cookies;
+      comp.showCookieSettings();
+      expect(cookies.showSettings).toHaveBeenCalled();
+    });
+
+    it('should not call cookies.showSettings() if cookies is undefined', () => {
+      compAny.cookies = undefined;
+      expect(() => comp.showCookieSettings()).not.toThrow();
+    });
+
+    it('should return false', () => {
+      expect(comp.showCookieSettings()).toBeFalse();
+    });
+  });
+
+  describe('when coarLdnEnabled is true', () => {
+    beforeEach(() => {
+      spyOn(notifyInfoService, 'isCoarConfigEnabled').and.returnValue(of(true));
+      fixture.detectChanges();
+    });
+
+    it('should set coarLdnEnabled based on notifyInfoService', () => {
+      expect(comp.coarLdnEnabled).toBeTruthy();
+      // Check if COAR Notify section is rendered
+      const notifySection = fixture.debugElement.query(By.css('.notify-enabled'));
+      expect(notifySection).toBeTruthy();
+    });
+
+    it('should redirect to info/coar-notify-support', () => {
+      // Check if the link to the COAR Notify support page is present
+      const routerLink = fixture.debugElement.query(By.css('a[routerLink="info/coar-notify-support"].coar-notify-support-route'));
+      expect(routerLink).toBeTruthy();
+    });
+
+    it('should have an img tag with the class "n-coar" when coarLdnEnabled is true', fakeAsync(() => {
+      // Check if the img tag with the class "n-coar" is present
+      const imgTag = fixture.debugElement.query(By.css('.notify-enabled img.n-coar'));
+      expect(imgTag).toBeTruthy();
+    }));
+  });
 });
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index f5e4c3799a..9012a2ccb2 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,15 +1,20 @@
-import { Component, Optional } from '@angular/core';
-import { hasValue } from '../shared/empty.util';
-import { KlaroService } from '../shared/cookies/klaro.service';
-import { environment } from '../../environments/environment';
+import {
+  Component,
+  Optional,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import { environment } from '../../environments/environment';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { KlaroService } from '../shared/cookies/klaro.service';
+import { hasValue } from '../shared/empty.util';
 
 @Component({
   selector: 'ds-footer',
   styleUrls: ['footer.component.scss'],
-  templateUrl: 'footer.component.html'
+  templateUrl: 'footer.component.html',
 })
 export class FooterComponent {
   dateObj: number = Date.now();
@@ -21,12 +26,17 @@ export class FooterComponent {
   showPrivacyPolicy = environment.info.enablePrivacyStatement;
   showEndUserAgreement = environment.info.enableEndUserAgreement;
   showSendFeedback$: Observable<boolean>;
+  coarLdnEnabled: boolean;
 
   constructor(
     @Optional() private cookies: KlaroService,
     private authorizationService: AuthorizationDataService,
+    private notifyInfoService: NotifyInfoService,
   ) {
     this.showSendFeedback$ = this.authorizationService.isAuthorized(FeatureID.CanSendFeedback);
+    this.notifyInfoService.isCoarConfigEnabled().subscribe(coarLdnEnabled => {
+      this.coarLdnEnabled = coarLdnEnabled;
+    });
   }
 
   showCookieSettings() {
diff --git a/src/app/footer/themed-footer.component.ts b/src/app/footer/themed-footer.component.ts
index e8f64f3434..11f3ae98f9 100644
--- a/src/app/footer/themed-footer.component.ts
+++ b/src/app/footer/themed-footer.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { FooterComponent } from './footer.component';
 
diff --git a/src/app/forbidden/forbidden.component.ts b/src/app/forbidden/forbidden.component.ts
index b622a0f066..be8065384a 100644
--- a/src/app/forbidden/forbidden.component.ts
+++ b/src/app/forbidden/forbidden.component.ts
@@ -1,4 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { AuthService } from '../core/auth/auth.service';
 import { ServerResponseService } from '../core/services/server-response.service';
 
@@ -8,7 +12,7 @@ import { ServerResponseService } from '../core/services/server-response.service'
 @Component({
   selector: 'ds-forbidden',
   templateUrl: './forbidden.component.html',
-  styleUrls: ['./forbidden.component.scss']
+  styleUrls: ['./forbidden.component.scss'],
 })
 export class ForbiddenComponent implements OnInit {
 
diff --git a/src/app/forbidden/themed-forbidden.component.ts b/src/app/forbidden/themed-forbidden.component.ts
index 830529c8fa..ae461ec462 100644
--- a/src/app/forbidden/themed-forbidden.component.ts
+++ b/src/app/forbidden/themed-forbidden.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ForbiddenComponent } from './forbidden.component';
 
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
index 995108cdbc..aaa0c27b46 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.html
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -1,3 +1,3 @@
-<ds-register-email-form
+<ds-themed-register-email-form
     [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="typeRequest">
-</ds-register-email-form>
+</ds-themed-register-email-form>
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
index 6ce13c31d3..16aa899722 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
@@ -1,9 +1,14 @@
-import { ForgotEmailComponent } from './forgot-email.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ForgotEmailComponent } from './forgot-email.component';
 
 describe('ForgotEmailComponent', () => {
   let comp: ForgotEmailComponent;
@@ -13,7 +18,7 @@ describe('ForgotEmailComponent', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [ForgotEmailComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
index 66a61ed7ee..173ff762c0 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { TYPE_REQUEST_FORGOT } from '../../register-email-form/register-email-form.component';
 
 @Component({
   selector: 'ds-forgot-email',
   styleUrls: ['./forgot-email.component.scss'],
-  templateUrl: './forgot-email.component.html'
+  templateUrl: './forgot-email.component.html',
 })
 /**
  * Component responsible the forgot password email step
diff --git a/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
index da3848db1d..bc4e5c2192 100644
--- a/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
+++ b/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ForgotEmailComponent } from './forgot-email.component';
 
@@ -8,7 +9,7 @@ import { ForgotEmailComponent } from './forgot-email.component';
 @Component({
   selector: 'ds-themed-forgot-email',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedForgotEmailComponent extends ThemedComponent<ForgotEmailComponent> {
   protected getComponentName(): string {
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 5fb0006279..189d0bee40 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,13 +1,13 @@
 <div class="container" *ngIf="(registration$ |async)">
-    <h3 class="mb-4">{{'forgot-password.form.head' | translate}}</h3>
+    <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="card mb-4">
         <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
-                           for="email">{{'forgot-password.form.identification.email' | translate}}</label>
-                    <span id="email">{{(registration$ |async).email}}</span></div>
+                    <span class="font-weight-bold">{{'forgot-password.form.identification.email' | translate}} </span>
+                    <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
index 92d72d83df..c6c6bbe9f8 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -1,26 +1,38 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { Registration } from '../../core/shared/registration.model';
-import { ForgotPasswordFormComponent } from './forgot-password-form.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { CoreState } from '../../core/core-state.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { CoreState } from '../../core/core-state.model';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
+import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 
 describe('ForgotPasswordFormComponent', () => {
   let comp: ForgotPasswordFormComponent;
@@ -35,17 +47,17 @@ describe('ForgotPasswordFormComponent', () => {
   const registration = Object.assign(new Registration(), {
     email: 'test@email.org',
     user: 'test-uuid',
-    token: 'test-token'
+    token: 'test-token',
   });
 
   beforeEach(waitForAsync(() => {
 
-    route = {data: observableOf({registration: createSuccessfulRemoteDataObject(registration)})};
+    route = { data: observableOf({ registration: createSuccessfulRemoteDataObject(registration) }) };
     router = new RouterStub();
     notificationsService = new NotificationsServiceStub();
 
     ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
-      patchPasswordWithToken: createSuccessfulRemoteDataObject$({})
+      patchPasswordWithToken: createSuccessfulRemoteDataObject$({}),
     });
 
     store = jasmine.createSpyObj('store', {
@@ -54,16 +66,19 @@ describe('ForgotPasswordFormComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
-      declarations: [ForgotPasswordFormComponent],
-      providers: [
-        {provide: Router, useValue: router},
-        {provide: ActivatedRoute, useValue: route},
-        {provide: Store, useValue: store},
-        {provide: EPersonDataService, useValue: ePersonDataService},
-        {provide: UntypedFormBuilder, useValue: new UntypedFormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
+      declarations: [
+        BrowserOnlyPipe,
+        ForgotPasswordFormComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      providers: [
+        { provide: Router, useValue: router },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Store, useValue: store },
+        { provide: EPersonDataService, useValue: ePersonDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -75,7 +90,7 @@ describe('ForgotPasswordFormComponent', () => {
 
   describe('init', () => {
     it('should initialise mail address', () => {
-      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      const elem = fixture.debugElement.queryAll(By.css('span[data-test="email"]'))[0].nativeElement;
       expect(elem.innerHTML).toContain('test@email.org');
     });
   });
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index e20683e6e3..52bb8074e6 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,22 +1,29 @@
 import { Component } from '@angular/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Observable } from 'rxjs';
-import { Registration } from '../../core/shared/registration.model';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthenticateAction } from '../../core/auth/auth.actions';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { RemoteData } from '../../core/data/remote-data';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, } from '../../core/shared/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AuthenticateAction } from '../../core/auth/auth.actions';
 import { CoreState } from '../../core/core-state.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-forgot-password-form',
   styleUrls: ['./forgot-password-form.component.scss'],
-  templateUrl: './forgot-password-form.component.html'
+  templateUrl: './forgot-password-form.component.html',
 })
 /**
  * Component for a user to enter a new password for a forgot token.
@@ -73,18 +80,18 @@ export class ForgotPasswordFormComponent {
   submit() {
     if (!this.isInValid) {
       this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((response: RemoteData<EPerson>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
-            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content'),
           );
           this.store.dispatch(new AuthenticateAction(this.email, this.password));
           this.router.navigate(['/home']);
         } else {
           this.notificationsService.error(
-            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage,
           );
         }
       });
diff --git a/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
index 3fb1b67e01..600efa2935 100644
--- a/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 
@@ -8,7 +9,7 @@ import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 @Component({
   selector: 'ds-themed-forgot-password-form',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedForgotPasswordFormComponent extends ThemedComponent<ForgotPasswordFormComponent> {
   protected getComponentName(): string {
diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts
index ee4e081d5f..0d7c493d1c 100644
--- a/src/app/forgot-password/forgot-password-routing.module.ts
+++ b/src/app/forgot-password/forgot-password-routing.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { ItemPageResolver } from '../item-page/item-page.resolver';
-import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
-import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
 import { RegistrationGuard } from '../register-page/registration.guard';
+import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
+import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
 
 @NgModule({
   imports: [
@@ -11,18 +12,18 @@ import { RegistrationGuard } from '../register-page/registration.guard';
       {
         path: '',
         component: ThemedForgotEmailComponent,
-        data: {title: 'forgot-password.title'},
+        data: { title: 'forgot-password.title' },
       },
       {
         path: ':token',
         component: ThemedForgotPasswordFormComponent,
         canActivate: [ RegistrationGuard ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
     ItemPageResolver,
-  ]
+  ],
 })
 /**
  * This module defines the routing to the components related to the forgot password components.
diff --git a/src/app/forgot-password/forgot-password.module.ts b/src/app/forgot-password/forgot-password.module.ts
index 593149d2a5..23b446fad5 100644
--- a/src/app/forgot-password/forgot-password.module.ts
+++ b/src/app/forgot-password/forgot-password.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
 import { SharedModule } from '../shared/shared.module';
 import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
-import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
-import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
-import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
-import { ProfilePageModule } from '../profile-page/profile-page.module';
-import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
 import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
+import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
 
 @NgModule({
   imports: [
@@ -23,7 +24,7 @@ import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgo
     ForgotPasswordFormComponent,
     ThemedForgotPasswordFormComponent,
   ],
-  providers: []
+  providers: [],
 })
 
 /**
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
index f99070b738..ba3060ff69 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
+<div [ngClass]="{'open': (isNavBarCollapsed$ | async) !== true}" id="header-navbar-wrapper">
     <ds-themed-header></ds-themed-header>
     <ds-themed-navbar></ds-themed-navbar>
 </div>
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index b02b3c378c..c1bc9c7e90 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -1,4 +1,6 @@
 :host {
   position: relative;
-  z-index: var(--ds-nav-z-index);
+  div#header-navbar-wrapper {
+    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
+  }
 }
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index a610b2cb02..0bca2cef4b 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,8 +1,13 @@
-import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { AppState } from '../app.reducer';
-import { hasValue } from '../shared/empty.util';
-import { Observable, Subscription } from 'rxjs';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
 
@@ -14,26 +19,22 @@ import { MenuID } from '../shared/menu/menu-id.model';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
 })
-export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy {
-  @HostBinding('class.open') isOpen = false;
-  private sub: Subscription;
-  public isNavBarCollapsed: Observable<boolean>;
+export class HeaderNavbarWrapperComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
-    private store: Store<AppState>,
-    private menuService: MenuService
+    private menuService: MenuService,
+    protected windowService: HostWindowService,
   ) {
   }
 
   ngOnInit(): void {
-    this.isNavBarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed);
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
   }
 
-  ngOnDestroy() {
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
-  }
 }
diff --git a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
index 02d09c44ef..41c8a000e3 100644
--- a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HeaderNavbarWrapperComponent } from './header-navbar-wrapper.component';
 
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 2d1b5bad20..680c2e746b 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -1,10 +1,15 @@
-import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-
-import { ContextHelpToggleComponent } from './context-help-toggle.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ContextHelpService } from '../../shared/context-help.service';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ContextHelpService } from '../../shared/context-help.service';
+import { ContextHelpToggleComponent } from './context-help-toggle.component';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
@@ -13,7 +18,7 @@ describe('ContextHelpToggleComponent', () => {
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService', [
-      'tooltipCount$', 'toggleIcons'
+      'tooltipCount$', 'toggleIcons',
     ]);
     contextHelpService.tooltipCount$.and.returnValue(observableOf(0));
     await TestBed.configureTestingModule({
@@ -21,7 +26,7 @@ describe('ContextHelpToggleComponent', () => {
       providers: [
         { provide: ContextHelpService, useValue: contextHelpService },
       ],
-      imports: [ TranslateModule.forRoot() ]
+      imports: [ TranslateModule.forRoot() ],
     })
       .compileComponents();
   });
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 6685df7106..d4fb22713c 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,8 +1,16 @@
-import { Component, OnInit } from '@angular/core';
-import { ContextHelpService } from '../../shared/context-help.service';
-import { Observable } from 'rxjs';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { ContextHelpService } from '../../shared/context-help.service';
+
 /**
  * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page.
  * If there are no tooltip buttons available on the current page, the toggle is unclickable.
@@ -10,17 +18,28 @@ import { map } from 'rxjs/operators';
 @Component({
   selector: 'ds-context-help-toggle',
   templateUrl: './context-help-toggle.component.html',
-  styleUrls: ['./context-help-toggle.component.scss']
+  styleUrls: ['./context-help-toggle.component.scss'],
 })
 export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable<boolean>;
 
+  subscriptions: Subscription[] = [];
+
   constructor(
-    private contextHelpService: ContextHelpService,
-  ) { }
+    protected elRef: ElementRef,
+    protected contextHelpService: ContextHelpService,
+  ) {
+  }
 
   ngOnInit(): void {
     this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0));
+    this.subscriptions.push(this.buttonVisible$.subscribe((showContextHelpToggle: boolean) => {
+      if (showContextHelpToggle) {
+        this.elRef.nativeElement.classList.remove('d-none');
+      } else {
+        this.elRef.nativeElement.classList.add('d-none');
+      }
+    }));
   }
 
   onClick() {
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 4d87983523..e98959d162 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -7,15 +7,15 @@
 
       <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
         <ds-themed-search-navbar></ds-themed-search-navbar>
-        <ds-lang-switch></ds-lang-switch>
+        <ds-themed-lang-switch></ds-themed-lang-switch>
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div class="pl-2">
-          <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
+        <div *ngIf="isMobile$ | async" class="pl-2">
+          <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
                   aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-            <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+            <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
           </button>
         </div>
       </nav>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index cca3ed2abb..e002e0c347 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -1,22 +1,31 @@
-.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-  max-width: 100%;
-  @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-    max-height: var(--ds-header-logo-height-xs);
+:host {
+  header {
+    background-color: var(--ds-header-bg);
+  }
+
+  .navbar-brand img {
+    max-height: var(--ds-header-logo-height);
+    max-width: 100%;
+  }
+
+  .navbar-toggler {
+    border: none;
+    color: var(--ds-header-icon-color);
+
+    &:hover, &:focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+
+    .toggler-icon {
+      width: 1.5em;
+      height: 1.5em;
+      line-height: 1.5;
+    }
+  }
+
+  .navbar {
+    display: flex;
+    gap: calc(var(--bs-spacer) / 3);
+    align-items: center;
   }
 }
-
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
-
-.navbar-toggler {
-  border: none;
-  color: var(--ds-header-icon-color);
-
-  &:hover, &:focus {
-    color: var(--ds-header-icon-color-hover);
-  }
-}
-
diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts
index 9bc952cee3..4a0094e78c 100644
--- a/src/app/header/header.component.spec.ts
+++ b/src/app/header/header.component.spec.ts
@@ -1,15 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-
 import { of as observableOf } from 'rxjs';
 
-import { HeaderComponent } from './header.component';
-import { ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { HeaderComponent } from './header.component';
 
 let comp: HeaderComponent;
 let fixture: ComponentFixture<HeaderComponent>;
@@ -26,9 +31,10 @@ describe('HeaderComponent', () => {
         ReactiveFormsModule],
       declarations: [HeaderComponent],
       providers: [
-        { provide: MenuService, useValue: menuService }
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: MenuService, useValue: menuService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();  // compile template and css
   }));
@@ -40,7 +46,7 @@ describe('HeaderComponent', () => {
     fixture = TestBed.createComponent(HeaderComponent);
 
     comp = fixture.componentInstance;
-
+    fixture.detectChanges();
   });
 
   describe('when the toggle button is clicked', () => {
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 366b4f5e7a..6395a4701a 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,5 +1,13 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
 
@@ -11,20 +19,27 @@ import { MenuID } from '../shared/menu/menu-id.model';
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
 })
-export class HeaderComponent {
+export class HeaderComponent implements OnInit {
   /**
    * Whether user is authenticated.
    * @type {Observable<string>}
    */
   public isAuthenticated: Observable<boolean>;
-  public showAuth = false;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
-    private menuService: MenuService
+    protected menuService: MenuService,
+    protected windowService: HostWindowService,
   ) {
   }
 
+  ngOnInit(): void {
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
+  }
+
   public toggleNavbar(): void {
     this.menuService.toggleMenu(this.menuID);
   }
diff --git a/src/app/header/themed-header.component.ts b/src/app/header/themed-header.component.ts
index 51c817b63d..eaab64526b 100644
--- a/src/app/header/themed-header.component.ts
+++ b/src/app/header/themed-header.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HeaderComponent } from './header.component';
 
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index dbaaa7a6b6..84cba4d92f 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,16 +1,16 @@
 <div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
   <div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-info-component [healthInfoComponent]="entry.value"
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
index b4532415b8..0d575c72b2 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
@@ -1,15 +1,23 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { HealthInfoComponentComponent } from './health-info-component.component';
-import { HealthInfoComponentOne, HealthInfoComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  HealthInfoComponentOne,
+  HealthInfoComponentTwo,
+} from '../../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { HealthInfoComponentComponent } from './health-info-component.component';
 
 describe('HealthInfoComponentComponent', () => {
   let component: HealthInfoComponentComponent;
@@ -24,14 +32,14 @@ describe('HealthInfoComponentComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthInfoComponentComponent,
-        ObjNgFor
-      ]
+        ObjNgFor,
+      ],
     })
       .compileComponents();
   });
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
index d2cb393f09..2aa5b165d4 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { HealthInfoComponent } from '../../models/health-component.model';
 import { HealthComponentComponent } from '../../health-panel/health-component/health-component.component';
+import { HealthInfoComponent } from '../../models/health-component.model';
 
 /**
  * Shows a health info object
@@ -9,7 +12,7 @@ import { HealthComponentComponent } from '../../health-panel/health-component/he
 @Component({
   selector: 'ds-health-info-component',
   templateUrl: './health-info-component.component.html',
-  styleUrls: ['./health-info-component.component.scss']
+  styleUrls: ['./health-info-component.component.scss'],
 })
 export class HealthInfoComponentComponent extends HealthComponentComponent {
 
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index 4bafcaa2d8..b590695b0b 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -2,14 +2,14 @@
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
     <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
       <ng-template ngbPanelHeader>
-        <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
-          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                  aria-controls="collapsePanels">
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                  [attr.aria-controls]="'health-info-' + entry.key + '-content'">
             {{ getPanelLabel(entry.key) | titlecase }}
           </button>
-          <div class="text-right d-flex">
+          <div class="text-right d-flex gap-2">
             <ds-health-status [status]="entry.value?.status"></ds-health-status>
-            <div class="ml-3 d-inline-block">
+            <div class="d-flex my-auto">
               <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
               <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
             </div>
@@ -17,8 +17,9 @@
         </div>
       </ng-template>
       <ng-template ngbPanelContent>
-        <ds-health-info-component [healthInfoComponentName]="entry.key"
-                                  [healthInfoComponent]="entry.value"></ds-health-info-component>
+        <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
+                                  [id]="'health-info-' + entry.key + '-content'">
+        </ds-health-info-component>
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
diff --git a/src/app/health-page/health-info/health-info.component.spec.ts b/src/app/health-page/health-info/health-info.component.spec.ts
index 5a9b8bf0aa..05c9153f52 100644
--- a/src/app/health-page/health-info/health-info.component.spec.ts
+++ b/src/app/health-page/health-info/health-info.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HealthInfoComponent } from './health-info.component';
-import { HealthInfoResponseObj } from '../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { HealthInfoResponseObj } from '../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { HealthInfoComponent } from './health-info.component';
 
 describe('HealthInfoComponent', () => {
   let component: HealthInfoComponent;
@@ -20,17 +26,17 @@ describe('HealthInfoComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthInfoComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
index 186d00299c..ddecf90600 100644
--- a/src/app/health-page/health-info/health-info.component.ts
+++ b/src/app/health-page/health-info/health-info.component.ts
@@ -1,5 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { HealthInfoResponse } from '../models/health-component.model';
@@ -14,7 +17,7 @@ import { HealthInfoResponse } from '../models/health-component.model';
 @Component({
   selector: 'ds-health-info',
   templateUrl: './health-info.component.html',
-  styleUrls: ['./health-info.component.scss']
+  styleUrls: ['./health-info.component.scss'],
 })
 export class HealthInfoComponent implements OnInit  {
 
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 8083389e1b..d8cba1d46d 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,8 +1,8 @@
 <div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
-  <h2>{{'health-page.heading' | translate}}</h2>
+  <h1>{{'health-page.heading' | translate}}</h1>
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
-      <li [ngbNavItem]="'status'">
+      <li [ngbNavItem]="'status'" role="presentation">
         <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
@@ -10,7 +10,7 @@
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'info'">
+      <li [ngbNavItem]="'info'" role="presentation">
         <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
@@ -21,7 +21,7 @@
     </ul>
     <div [ngbNavOutlet]="nav" class="mt-2"></div>
   </div>
-  <ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="'alert-danger'" [content]="'health-page.error.msg'"></ds-alert>
+  <ds-alert *ngIf="(healthResponse | async) === null || (healthInfoResponse | async) === null" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
 </div>
 
 
diff --git a/src/app/health-page/health-page.component.spec.ts b/src/app/health-page/health-page.component.spec.ts
index f3847ab092..cd048ad298 100644
--- a/src/app/health-page/health-page.component.spec.ts
+++ b/src/app/health-page/health-page.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of } from 'rxjs';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { HealthPageComponent } from './health-page.component';
-import { HealthService } from './health.service';
-import { HealthInfoResponseObj, HealthResponseObj } from '../shared/mocks/health-endpoint.mocks';
 import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
+import {
+  HealthInfoResponseObj,
+  HealthResponseObj,
+} from '../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { HealthService } from './health.service';
+import { HealthPageComponent } from './health-page.component';
 
 describe('HealthPageComponent', () => {
   let component: HealthPageComponent;
@@ -24,13 +32,13 @@ describe('HealthPageComponent', () => {
   const healthRestResponse$ = of({
     payload: HealthResponseObj,
     statusCode: 200,
-    statusText: 'OK'
+    statusText: 'OK',
   } as RawRestResponse);
 
   const healthInfoRestResponse$ = of({
     payload: HealthInfoResponseObj,
     statusCode: 200,
-    statusText: 'OK'
+    statusText: 'OK',
   } as RawRestResponse);
 
   beforeEach(async () => {
@@ -41,16 +49,16 @@ describe('HealthPageComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ HealthPageComponent ],
       providers: [
-        { provide: HealthService, useValue: healthService }
-      ]
+        { provide: HealthService, useValue: healthService },
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index aa7bd7cba4..9048479bc7 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -1,15 +1,21 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { AlertType } from '../shared/alert/alert-type';
 import { HealthService } from './health.service';
-import { HealthInfoResponse, HealthResponse } from './models/health-component.model';
+import {
+  HealthInfoResponse,
+  HealthResponse,
+} from './models/health-component.model';
 
 @Component({
   selector: 'ds-health-page',
   templateUrl: './health-page.component.html',
-  styleUrls: ['./health-page.component.scss']
+  styleUrls: ['./health-page.component.scss'],
 })
 export class HealthPageComponent implements OnInit {
 
@@ -33,6 +39,8 @@ export class HealthPageComponent implements OnInit {
    */
   healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  readonly AlertType = AlertType;
+
   constructor(private healthDataService: HealthService) {
   }
 
@@ -48,7 +56,7 @@ export class HealthPageComponent implements OnInit {
       error: () => {
         this.healthResponse.next(null);
         this.healthResponseInitialised.next(true);
-      }
+      },
     });
 
     this.healthDataService.getInfo().pipe(take(1)).subscribe({
@@ -59,7 +67,7 @@ export class HealthPageComponent implements OnInit {
       error: () => {
         this.healthInfoResponse.next(null);
         this.healthInfoResponseInitialised.next(true);
-      }
+      },
     });
 
   }
diff --git a/src/app/health-page/health-page.module.ts b/src/app/health-page/health-page.module.ts
index 02a6a91a5f..56933753e1 100644
--- a/src/app/health-page/health-page.module.ts
+++ b/src/app/health-page/health-page.module.ts
@@ -1,17 +1,16 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { HealthPageRoutingModule } from './health-page.routing.module';
-import { HealthPanelComponent } from './health-panel/health-panel.component';
-import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
 import { SharedModule } from '../shared/shared.module';
-import { HealthPageComponent } from './health-page.component';
-import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
 import { HealthInfoComponent } from './health-info/health-info.component';
 import { HealthInfoComponentComponent } from './health-info/health-info-component/health-info-component.component';
+import { HealthPageComponent } from './health-page.component';
+import { HealthPageRoutingModule } from './health-page.routing.module';
+import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
+import { HealthPanelComponent } from './health-panel/health-panel.component';
+import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
 
 
 @NgModule({
@@ -20,7 +19,7 @@ import { HealthInfoComponentComponent } from './health-info/health-info-componen
     HealthPageRoutingModule,
     NgbModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
   ],
   declarations: [
     HealthPageComponent,
@@ -29,7 +28,7 @@ import { HealthInfoComponentComponent } from './health-info/health-info-componen
     HealthComponentComponent,
     HealthInfoComponent,
     HealthInfoComponentComponent,
-  ]
+  ],
 })
 export class HealthPageModule {
 }
diff --git a/src/app/health-page/health-page.routing.module.ts b/src/app/health-page/health-page.routing.module.ts
index 82d541dc31..a845584107 100644
--- a/src/app/health-page/health-page.routing.module.ts
+++ b/src/app/health-page/health-page.routing.module.ts
@@ -1,11 +1,9 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { HealthPageComponent } from './health-page.component';
-import {
-  SiteAdministratorGuard
-} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 
 @NgModule({
   imports: [
@@ -18,10 +16,10 @@ import {
           title: 'health-page.title',
         },
         canActivate: [SiteAdministratorGuard],
-        component: HealthPageComponent
-      }
-    ])
-  ]
+        component: HealthPageComponent,
+      },
+    ]),
+  ],
 })
 export class HealthPageRoutingModule {
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index 1f29c8c9fc..f962e66052 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,16 +1,16 @@
 <ng-container *ngIf="healthComponent?.components">
   <div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-component-' + entry.key + 'content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-component [healthComponent]="entry.value"
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.spec.ts b/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
index a8ec2b65e0..051eb12ffc 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { HealthComponentComponent } from './health-component.component';
-import { HealthComponentOne, HealthComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  HealthComponentOne,
+  HealthComponentTwo,
+} from '../../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { HealthComponentComponent } from './health-component.component';
 
 describe('HealthComponentComponent', () => {
   let component: HealthComponentComponent;
@@ -25,17 +33,17 @@ describe('HealthComponentComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthComponentComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
index e212a07289..718f43ed35 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -1,9 +1,11 @@
-import { Component, Input } from '@angular/core';
-
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
+import { AlertType } from '../../../shared/alert/alert-type';
 import { HealthComponent } from '../../models/health-component.model';
-import { AlertType } from '../../../shared/alert/aletr-type';
 
 /**
  * A component to render a "health component" object.
@@ -15,7 +17,7 @@ import { AlertType } from '../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-health-component',
   templateUrl: './health-component.component.html',
-  styleUrls: ['./health-component.component.scss']
+  styleUrls: ['./health-component.component.scss'],
 })
 export class HealthComponentComponent {
 
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index 2d67fa537b..ec2a27ce40 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -1,15 +1,18 @@
-<p class="h4">{{'health-page.status' | translate}} : <ds-health-status [status]="healthResponse.status"></ds-health-status></p>
+<p class="h4">
+  {{'health-page.status' | translate}}:
+  <ds-health-status [status]="healthResponse.status" class="d-inline-flex"></ds-health-status>
+</p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
   <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
           {{ getPanelLabel(entry.key) | titlecase }}
         </button>
-        <div class="text-right d-flex">
+        <div class="text-right d-flex gap-2">
           <ds-health-status [status]="entry.value?.status"></ds-health-status>
-          <div class="ml-3 d-inline-block">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,9 +20,9 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"></ds-health-component>
+      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
+                           [id]="'health-panel-' + entry.key + '-content'" role="presentation">
+      </ds-health-component>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
-
-
diff --git a/src/app/health-page/health-panel/health-panel.component.spec.ts b/src/app/health-page/health-panel/health-panel.component.spec.ts
index 1d9c856ddb..319ef1a61e 100644
--- a/src/app/health-page/health-panel/health-panel.component.spec.ts
+++ b/src/app/health-page/health-panel/health-panel.component.spec.ts
@@ -1,16 +1,24 @@
 import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  NgbAccordionModule,
+  NgbNavModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { NgbAccordionModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { HealthPanelComponent } from './health-panel.component';
 import { HealthResponseObj } from '../../shared/mocks/health-endpoint.mocks';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { HealthPanelComponent } from './health-panel.component';
 
 describe('HealthPanelComponent', () => {
   let component: HealthPanelComponent;
@@ -26,15 +34,15 @@ describe('HealthPanelComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [
         HealthPanelComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   });
 
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
index 1c056daf20..c02f194247 100644
--- a/src/app/health-page/health-panel/health-panel.component.ts
+++ b/src/app/health-page/health-panel/health-panel.component.ts
@@ -1,5 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { HealthResponse } from '../models/health-component.model';
@@ -10,7 +13,7 @@ import { HealthResponse } from '../models/health-component.model';
 @Component({
   selector: 'ds-health-panel',
   templateUrl: './health-panel.component.html',
-  styleUrls: ['./health-panel.component.scss']
+  styleUrls: ['./health-panel.component.scss'],
 })
 export class HealthPanelComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index 38a6f72601..e8710a0760 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,12 @@
 <ng-container [ngSwitch]="status">
   <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success ml-2 mt-1"
+     class="fa fa-check-circle text-success my-auto"
      ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
   <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning ml-2 mt-1"
+     class="fa fa-exclamation-triangle text-warning my-auto"
      ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
   <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger ml-2 mt-1"
+     class="fa fa-times-circle text-danger my-auto"
      ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
 </ng-container>
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.scss b/src/app/health-page/health-panel/health-status/health-status.component.scss
index e69de29bb2..79ff2d5269 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.scss
+++ b/src/app/health-page/health-panel/health-status/health-status.component.scss
@@ -0,0 +1,3 @@
+:host {
+  display: flex;
+}
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.spec.ts b/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
index f0f61ebdbb..a2745a0d83 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { HealthStatusComponent } from './health-status.component';
-import { HealthStatus } from '../../models/health-component.model';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { HealthStatus } from '../../models/health-component.model';
+import { HealthStatusComponent } from './health-status.component';
 
 describe('HealthStatusComponent', () => {
   let component: HealthStatusComponent;
@@ -18,13 +24,13 @@ describe('HealthStatusComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
-      declarations: [ HealthStatusComponent ]
+      declarations: [ HealthStatusComponent ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
index 172baeee71..0af2b91367 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { HealthStatus } from '../../models/health-component.model';
 
 /**
@@ -7,7 +11,7 @@ import { HealthStatus } from '../../models/health-component.model';
 @Component({
   selector: 'ds-health-status',
   templateUrl: './health-status.component.html',
-  styleUrls: ['./health-status.component.scss']
+  styleUrls: ['./health-status.component.scss'],
 })
 export class HealthStatusComponent {
   /**
diff --git a/src/app/health-page/health.service.ts b/src/app/health-page/health.service.ts
index 7c238769a1..bbe8e3f562 100644
--- a/src/app/health-page/health.service.ts
+++ b/src/app/health-page/health.service.ts
@@ -1,32 +1,36 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { DspaceRestService } from '../core/dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
 import { HALEndpointService } from '../core/shared/hal-endpoint.service';
 
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class HealthService {
-    constructor(protected halService: HALEndpointService,
+  constructor(protected halService: HALEndpointService,
         protected restService: DspaceRestService) {
-        }
-    /**
+  }
+  /**
      * @returns health data
      */
-    getHealth(): Observable<RawRestResponse> {
-       return this.halService.getEndpoint('/actuator').pipe(
-           map((restURL: string) => restURL + '/health'),
-           switchMap((endpoint: string) => this.restService.get(endpoint)));
-    }
+  getHealth(): Observable<RawRestResponse> {
+    return this.halService.getEndpoint('/actuator').pipe(
+      map((restURL: string) => restURL + '/health'),
+      switchMap((endpoint: string) => this.restService.get(endpoint)));
+  }
 
-    /**
+  /**
      * @returns information of server
      */
-    getInfo(): Observable<RawRestResponse> {
-        return this.halService.getEndpoint('/actuator').pipe(
-            map((restURL: string) => restURL + '/info'),
-            switchMap((endpoint: string) => this.restService.get(endpoint)));
-    }
+  getInfo(): Observable<RawRestResponse> {
+    return this.halService.getEndpoint('/actuator').pipe(
+      map((restURL: string) => restURL + '/info'),
+      switchMap((endpoint: string) => this.restService.get(endpoint)));
+  }
 }
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 6bee3cd76f..8d3f99b60d 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="jumbotron jumbotron-fluid">
+<div class="jumbotron jumbotron-fluid mt-ncs">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
diff --git a/src/app/home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
index 9ab24daa25..911a2fafc5 100644
--- a/src/app/home-page/home-news/home-news.component.scss
+++ b/src/app/home-page/home-news/home-news.component.scss
@@ -1,7 +1,5 @@
 :host {
     display: block;
-    margin-top: calc(-1 * var(--ds-content-spacing));
-    margin-bottom: calc(-1 * var(--ds-content-spacing));
 }
 
 .display-3 {
diff --git a/src/app/home-page/home-news/home-news.component.ts b/src/app/home-page/home-news/home-news.component.ts
index 62c8e94671..3d3b5fb503 100644
--- a/src/app/home-page/home-news/home-news.component.ts
+++ b/src/app/home-page/home-news/home-news.component.ts
@@ -1,9 +1,9 @@
-import { Component, } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-home-news',
   styleUrls: ['./home-news.component.scss'],
-  templateUrl: './home-news.component.html'
+  templateUrl: './home-news.component.html',
 })
 
 /**
diff --git a/src/app/home-page/home-news/themed-home-news.component.ts b/src/app/home-page/home-news/themed-home-news.component.ts
index da7233f4a4..551553e0e6 100644
--- a/src/app/home-page/home-news/themed-home-news.component.ts
+++ b/src/app/home-page/home-news/themed-home-news.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { HomeNewsComponent } from './home-news.component';
 
diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts
index 196a290552..4d284e651f 100644
--- a/src/app/home-page/home-page-routing.module.ts
+++ b/src/app/home-page/home-page-routing.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { HomePageResolver } from './home-page.resolver';
 import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { ThemedHomePageComponent } from './themed-home-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { HomePageResolver } from './home-page.resolver';
+import { ThemedHomePageComponent } from './themed-home-page.component';
 
 @NgModule({
   imports: [
@@ -30,14 +30,14 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
           },
         },
         resolve: {
-          site: HomePageResolver
-        }
-      }
-    ])
+          site: HomePageResolver,
+        },
+      },
+    ]),
   ],
   providers: [
-    HomePageResolver
-  ]
+    HomePageResolver,
+  ],
 })
 export class HomePageRoutingModule {
 }
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index caa86ac290..c1d4b8a98c 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,9 +1,19 @@
 <ds-themed-home-news></ds-themed-home-news>
-<div class="container">
-  <ng-container *ngIf="(site$ | async) as site">
-    <ds-view-tracker [object]="site"></ds-view-tracker>
-  </ng-container>
-  <ds-themed-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-themed-search-form>
-  <ds-themed-top-level-community-list></ds-themed-top-level-community-list>
-  <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
+<div [ngClass]="appConfig.homePage.showDiscoverFilters ? 'container-fluid' : 'container'">
+  <div class="row m-5">
+    <div class="col-sm-3" *ngIf="appConfig.homePage.showDiscoverFilters">
+      <ds-configuration-search-page [sideBarWidth]="12" [showViewModes]="false" [searchEnabled]="false"
+        [inPlaceSearch]="false" [showScopeSelector]="false"></ds-configuration-search-page>
+    </div>
+    <div [ngClass]="appConfig.homePage.showDiscoverFilters ? 'col-sm-9' : 'col-sm-12'">
+      <ng-container *ngIf="(site$ | async) as site">
+        <ds-view-tracker [object]="site"></ds-view-tracker>
+      </ng-container>
+      <ds-themed-search-form [inPlaceSearch]="false"
+        [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-themed-search-form>
+      <ds-themed-top-level-community-list></ds-themed-top-level-community-list>
+      <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
+    </div>
+    </div>
 </div>
+<ds-suggestions-popup></ds-suggestions-popup>
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index c151cbbb16..f607b1a2a9 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,22 +1,73 @@
-import { Component, OnInit } from '@angular/core';
-import { map } from 'rxjs/operators';
+import { isPlatformServer } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { Site } from '../core/shared/site.model';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+
 import { environment } from '../../environments/environment';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../core/services/link-head.service';
+import { ServerResponseService } from '../core/services/server-response.service';
+import { Site } from '../core/shared/site.model';
+import { isNotEmpty } from '../shared/empty.util';
+
 @Component({
   selector: 'ds-home-page',
   styleUrls: ['./home-page.component.scss'],
-  templateUrl: './home-page.component.html'
+  templateUrl: './home-page.component.html',
 })
-export class HomePageComponent implements OnInit {
+export class HomePageComponent implements OnInit, OnDestroy {
 
   site$: Observable<Site>;
   recentSubmissionspageSize: number;
+  /**
+   * An array of LinkDefinition objects representing inbox links for the home page.
+   */
+  inboxLinks: LinkDefinition[] = [];
+
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private route: ActivatedRoute,
+    private responseService: ServerResponseService,
+    private notifyInfoService: NotifyInfoService,
+    protected linkHeadService: LinkHeadService,
+    @Inject(PLATFORM_ID) private platformId: string,
   ) {
     this.recentSubmissionspageSize = environment.homePage.recentSubmissions.pageSize;
+    // Get COAR REST API URLs from REST configuration
+    // only if COAR configuration is enabled
+    this.notifyInfoService.isCoarConfigEnabled().pipe(
+      switchMap((coarLdnEnabled: boolean) => {
+        if (coarLdnEnabled) {
+          return this.notifyInfoService.getCoarLdnLocalInboxUrls();
+        } else {
+          return of([]);
+        }
+      }),
+    ).subscribe((coarRestApiUrls: string[]) => {
+      if (coarRestApiUrls.length > 0) {
+        this.initPageLinks(coarRestApiUrls);
+      }
+    });
   }
 
   ngOnInit(): void {
@@ -24,4 +75,38 @@ export class HomePageComponent implements OnInit {
       map((data) => data.site as Site),
     );
   }
+
+  /**
+   * Initializes page links for COAR REST API URLs.
+   * @param coarRestApiUrls An array of COAR REST API URLs.
+   */
+  private initPageLinks(coarRestApiUrls: string[]): void {
+    const rel = this.notifyInfoService.getInboxRelationLink();
+    let links = '';
+    coarRestApiUrls.forEach((coarRestApiUrl: string) => {
+      // Add link to head
+      const tag: LinkDefinition = {
+        href: coarRestApiUrl,
+        rel: rel,
+      };
+      this.inboxLinks.push(tag);
+      this.linkHeadService.addTag(tag);
+
+      links = links + (isNotEmpty(links) ? ', ' : '') + `<${coarRestApiUrl}> ; rel="${rel}"`;
+    });
+
+    if (isPlatformServer(this.platformId)) {
+      // Add link to response header
+      this.responseService.setHeader('Link', links);
+    }
+  }
+
+  /**
+   * It removes the inbox links from the head of the html.
+   */
+  ngOnDestroy(): void {
+    this.inboxLinks.forEach((link: LinkDefinition) => {
+      this.linkHeadService.removeTag(`href='${link.href}'`);
+    });
+  }
 }
diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts
index 1681abd805..5d86c7d433 100644
--- a/src/app/home-page/home-page.module.ts
+++ b/src/app/home-page/home-page.module.ts
@@ -1,18 +1,20 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
-import { HomeNewsComponent } from './home-news/home-news.component';
-import { HomePageRoutingModule } from './home-page-routing.module';
 
-import { HomePageComponent } from './home-page.component';
-import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
-import { ThemedHomePageComponent } from './themed-home-page.component';
-import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { HomeNewsComponent } from './home-news/home-news.component';
+import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
+import { HomePageComponent } from './home-page.component';
+import { HomePageRoutingModule } from './home-page-routing.module';
+import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
+import { ThemedHomePageComponent } from './themed-home-page.component';
 import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
+import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -21,17 +23,19 @@ const DECLARATIONS = [
   ThemedTopLevelCommunityListComponent,
   ThemedHomeNewsComponent,
   HomeNewsComponent,
-  RecentItemListComponent
+  RecentItemListComponent,
 ];
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule.withEntryComponents(),
+    SearchModule,
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
     HomePageRoutingModule,
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
+    NotificationsModule,
   ],
   declarations: [
     ...DECLARATIONS,
diff --git a/src/app/home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts
index 6b63a4e782..94607e4387 100644
--- a/src/app/home-page/home-page.resolver.ts
+++ b/src/app/home-page/home-page.resolver.ts
@@ -1,10 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { SiteDataService } from '../core/data/site-data.service';
-import { Site } from '../core/shared/site.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { SiteDataService } from '../core/data/site-data.service';
+import { Site } from '../core/shared/site.model';
+
 /**
  * The class that resolve the Site object for a route
  */
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index cd14891b3f..82262be1b3 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -1,12 +1,12 @@
 <ng-container *ngVar="(itemRD$ | async) as itemRD">
         <div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
-                <div class="d-flex flex-row border-bottom mb-4 pb-4 ng-tns-c416-2"></div>
+                <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
                 <h2> {{'home.recent-submissions.head' | translate}}</h2>
                 <div class="my-4" *ngFor="let item of itemRD?.payload?.page">
                         <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
                         </ds-listable-object-component-loader>
                 </div>
-                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-left ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
         </div>
         <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
         <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
index edcb4f84f8..c18202588e 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
@@ -1,19 +1,26 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { PLATFORM_ID } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
 import { SearchService } from 'src/app/core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
 import { SearchServiceStub } from 'src/app/shared/testing/search-service.stub';
 import { createPaginatedList } from 'src/app/shared/testing/utils.test';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { RecentItemListComponent } from './recent-item-list.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
-import { PLATFORM_ID } from '@angular/core';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { RecentItemListComponent } from './recent-item-list.component';
 
 describe('RecentItemListComponent', () => {
   let component: RecentItemListComponent;
@@ -23,7 +30,7 @@ describe('RecentItemListComponent', () => {
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   });
   paginationService = new PaginationServiceStub();
@@ -31,12 +38,12 @@ describe('RecentItemListComponent', () => {
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
     sort: new SortOptions('dc.date.accessioned', SortDirection.DESC),
   }));
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -49,7 +56,7 @@ describe('RecentItemListComponent', () => {
         { provide: PLATFORM_ID, useValue: 'browser' },
       ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 9a8535d970..f958e45add 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -1,23 +1,43 @@
-import { ChangeDetectionStrategy, Component, ElementRef, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { Item } from '../../core/shared/item.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { environment } from '../../../environments/environment';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { toDSpaceObjectListRD } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { isPlatformBrowser } from '@angular/common';
-import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { Item } from '../../core/shared/item.model';
+import { toDSpaceObjectListRD } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
+import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils';
 
 @Component({
   selector: 'ds-recent-item-list',
@@ -26,8 +46,8 @@ import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class RecentItemListComponent implements OnInit {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
@@ -48,14 +68,14 @@ export class RecentItemListComponent implements OnInit {
     public searchConfigurationService: SearchConfigurationService,
     protected elementRef: ElementRef,
     @Inject(APP_CONFIG) private appConfig: AppConfig,
-    @Inject(PLATFORM_ID) private platformId: Object,
+    @Inject(PLATFORM_ID) private platformId: any,
   ) {
 
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
       id: 'hp',
       pageSize: environment.homePage.recentSubmissions.pageSize,
       currentPage: 1,
-      maxSize: 1
+      maxSize: 1,
     });
     this.sortConfig = new SortOptions(environment.homePage.recentSubmissions.sortField, SortDirection.DESC);
   }
@@ -76,7 +96,7 @@ export class RecentItemListComponent implements OnInit {
       undefined,
       ...linksToFollow,
     ).pipe(
-      toDSpaceObjectListRD()
+      toDSpaceObjectListRD(),
     ) as Observable<RemoteData<PaginatedList<Item>>>;
   }
 
@@ -88,7 +108,7 @@ export class RecentItemListComponent implements OnInit {
     this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], {
       sortField: environment.homePage.recentSubmissions.sortField,
       sortDirection: 'DESC' as SortDirection,
-      page: 1
+      page: 1,
     });
   }
 
diff --git a/src/app/home-page/themed-home-page.component.ts b/src/app/home-page/themed-home-page.component.ts
index c0ef723b38..c9869a960b 100644
--- a/src/app/home-page/themed-home-page.component.ts
+++ b/src/app/home-page/themed-home-page.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HomePageComponent } from './home-page.component';
-import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-home-page',
diff --git a/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts
index 6eb74cc0a9..3175f4c902 100644
--- a/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { TopLevelCommunityListComponent } from './top-level-community-list.component';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { TopLevelCommunityListComponent } from './top-level-community-list.component';
 
 @Component({
   selector: 'ds-themed-top-level-community-list',
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
index d1a3d3631f..457100d98e 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -1,38 +1,41 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { TopLevelCommunityListComponent } from './top-level-community-list.component';
-import { Community } from '../../core/shared/community.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { SharedModule } from '../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment.test';
 
-describe('TopLevelCommunityList Component', () => {
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { Community } from '../../core/shared/community.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../shared/host-window.service';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { TopLevelCommunityListComponent } from './top-level-community-list.component';
+
+describe('TopLevelCommunityListComponent', () => {
   let comp: TopLevelCommunityListComponent;
   let fixture: ComponentFixture<TopLevelCommunityListComponent>;
   let communityDataServiceStub: any;
@@ -43,58 +46,58 @@ describe('TopLevelCommunityList Component', () => {
     id: '123456789-1',
     metadata: {
       'dc.title': [
-        { language: 'en_US', value: 'TopCommunity 1' }
-      ]
-    }
+        { language: 'en_US', value: 'TopCommunity 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '12345678942',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 7' },
+      ],
+    },
   }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '12345678942',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 7' }
-        ]
-      }
-    })
   ];
 
   communityDataServiceStub = {
@@ -113,7 +116,7 @@ describe('TopLevelCommunityList Component', () => {
       }
       return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), topCommList.slice(startPageIndex, endPageIndex)));
 
-    }
+    },
   };
 
   paginationService = new PaginationServiceStub();
@@ -121,7 +124,7 @@ describe('TopLevelCommunityList Component', () => {
   themeService = getMockThemeService();
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -134,9 +137,9 @@ describe('TopLevelCommunityList Component', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -146,7 +149,7 @@ describe('TopLevelCommunityList Component', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         NgbModule,
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [TopLevelCommunityListComponent],
       providers: [
@@ -161,7 +164,7 @@ describe('TopLevelCommunityList Component', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -173,17 +176,17 @@ describe('TopLevelCommunityList Component', () => {
   });
 
 
-  it('should display a list of top-communities', () => {
-    waitForAsync(() => {
-      const subComList = fixture.debugElement.queryAll(By.css('li'));
+  it('should display a list of top-communities', async () => {
+    await fixture.whenStable();
+    fixture.detectChanges();
+    const subComList = fixture.debugElement.queryAll(By.css('li'));
 
-      expect(subComList.length).toEqual(5);
-      expect(subComList[0].nativeElement.textContent).toContain('TopCommunity 1');
-      expect(subComList[1].nativeElement.textContent).toContain('TopCommunity 2');
-      expect(subComList[2].nativeElement.textContent).toContain('TopCommunity 3');
-      expect(subComList[3].nativeElement.textContent).toContain('TopCommunity 4');
-      expect(subComList[4].nativeElement.textContent).toContain('TopCommunity 5');
-    });
+    expect(subComList.length).toEqual(5);
+    expect(subComList[0].nativeElement.textContent).toContain('TopCommunity 1');
+    expect(subComList[1].nativeElement.textContent).toContain('TopCommunity 2');
+    expect(subComList[2].nativeElement.textContent).toContain('TopCommunity 3');
+    expect(subComList[3].nativeElement.textContent).toContain('TopCommunity 4');
+    expect(subComList[4].nativeElement.textContent).toContain('TopCommunity 5');
   });
 
 });
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 7d58f57196..6c46ccc7a4 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,18 +1,33 @@
-import { ChangeDetectionStrategy, Component, OnInit, OnDestroy, Inject } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { Community } from '../../core/shared/community.model';
 import { fadeInOut } from '../../shared/animations/fade';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { hasValue } from '../../shared/empty.util';
-import { switchMap } from 'rxjs/operators';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 
 /**
  * this component renders the Top-Level Community list
@@ -22,7 +37,7 @@ import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
   styleUrls: ['./top-level-community-list.component.scss'],
   templateUrl: './top-level-community-list.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 
 export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
@@ -54,7 +69,7 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
   constructor(
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private cds: CommunityDataService,
-    private paginationService: PaginationService
+    private paginationService: PaginationService,
   ) {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
@@ -80,9 +95,9 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
         return this.cds.findTop({
           currentPage: currentPagination.currentPage,
           elementsPerPage: currentPagination.pageSize,
-          sort: {field: currentSort.field, direction: currentSort.direction}
+          sort: { field: currentSort.field, direction: currentSort.direction },
         });
-      })
+      }),
     ).subscribe((results) => {
       this.communitiesRD$.next(results);
     });
diff --git a/src/app/import-external-page/import-external-page.component.spec.ts b/src/app/import-external-page/import-external-page.component.spec.ts
index 00bdd4be28..2c080cdc4e 100644
--- a/src/app/import-external-page/import-external-page.component.spec.ts
+++ b/src/app/import-external-page/import-external-page.component.spec.ts
@@ -1,8 +1,13 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ImportExternalPageComponent } from './import-external-page.component';
-import { ThemeService } from '../shared/theme-support/theme.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { getMockThemeService } from '../shared/mocks/theme-service.mock';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { ImportExternalPageComponent } from './import-external-page.component';
 
 describe('ImportExternalPageComponent', () => {
   let component: ImportExternalPageComponent;
@@ -14,9 +19,9 @@ describe('ImportExternalPageComponent', () => {
       providers:[
         { provide: ThemeService, useValue: getMockThemeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/import-external-page/import-external-page.component.ts b/src/app/import-external-page/import-external-page.component.ts
index 00709dad16..0eb815387f 100644
--- a/src/app/import-external-page/import-external-page.component.ts
+++ b/src/app/import-external-page/import-external-page.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-import-external-page',
   templateUrl: './import-external-page.component.html',
-  styleUrls: ['./import-external-page.component.scss']
+  styleUrls: ['./import-external-page.component.scss'],
 })
 export class ImportExternalPageComponent {
 
diff --git a/src/app/import-external-page/import-external-page.module.ts b/src/app/import-external-page/import-external-page.module.ts
index 1a0fd9e360..2fb6d5e158 100644
--- a/src/app/import-external-page/import-external-page.module.ts
+++ b/src/app/import-external-page/import-external-page.module.ts
@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '../shared/shared.module';
 import { CoreModule } from '../core/core.module';
-import { ImportExternalRoutingModule } from './import-external-routing.module';
-import { SubmissionModule } from '../submission/submission.module';
-import { ImportExternalPageComponent } from './import-external-page.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { SharedModule } from '../shared/shared.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { ImportExternalPageComponent } from './import-external-page.component';
+import { ImportExternalRoutingModule } from './import-external-routing.module';
 
 @NgModule({
   imports: [
@@ -17,11 +17,11 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
     ImportExternalRoutingModule,
     SubmissionModule,
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: [
-    ImportExternalPageComponent
-  ]
+    ImportExternalPageComponent,
+  ],
 })
 
 /**
diff --git a/src/app/import-external-page/import-external-routing.module.ts b/src/app/import-external-page/import-external-routing.module.ts
index e5c6da5b21..3736e943af 100644
--- a/src/app/import-external-page/import-external-routing.module.ts
+++ b/src/app/import-external-page/import-external-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ThemedSubmissionImportExternalComponent } from '../submission/import-external/themed-submission-import-external.component';
 
@@ -12,12 +13,12 @@ import { ThemedSubmissionImportExternalComponent } from '../submission/import-ex
         component: ThemedSubmissionImportExternalComponent,
         pathMatch: 'full',
         data: {
-          title: 'submission.import-external.page.title'
-        }
-      }
-    ])
+          title: 'submission.import-external.page.title',
+        },
+      },
+    ]),
   ],
-  providers: [ ]
+  providers: [ ],
 })
 export class ImportExternalRoutingModule {
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
index 64a15bfc4e..a9d71dabb4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
 
 describe('EndUserAgreementContentComponent', () => {
   let component: EndUserAgreementContentComponent;
@@ -11,7 +16,7 @@ describe('EndUserAgreementContentComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [EndUserAgreementContentComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
index faa7d5a78f..faa131d722 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-end-user-agreement-content',
   templateUrl: './end-user-agreement-content.component.html',
-  styleUrls: ['./end-user-agreement-content.component.scss']
+  styleUrls: ['./end-user-agreement-content.component.scss'],
 })
 /**
  * Component displaying the contents of the End User Agreement
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index dc4f4cf412..95161dffcb 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EndUserAgreementComponent } from './end-user-agreement.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateModule } from '@ngx-translate/core';
-import { AuthService } from '../../core/auth/auth.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { By } from '@angular/platform-browser';
-import { LogOutAction } from '../../core/auth/auth.actions';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { EndUserAgreementComponent } from './end-user-agreement.component';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
@@ -30,18 +38,18 @@ describe('EndUserAgreementComponent', () => {
 
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
       hasCurrentUserOrCookieAcceptedAgreement: observableOf(false),
-      setUserAcceptedAgreement: observableOf(true)
+      setUserAcceptedAgreement: observableOf(true),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']);
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     store = jasmine.createSpyObj('store', ['dispatch']);
     router = jasmine.createSpyObj('router', ['navigate', 'navigateByUrl']);
     route = Object.assign(new ActivatedRouteStub(), {
       queryParams: observableOf({
-        redirect: redirectUrl
-      })
+        redirect: redirectUrl,
+      }),
     }) as any;
   }
 
@@ -56,9 +64,9 @@ describe('EndUserAgreementComponent', () => {
         { provide: AuthService, useValue: authService },
         { provide: Store, useValue: store },
         { provide: Router, useValue: router },
-        { provide: ActivatedRoute, useValue: route }
+        { provide: ActivatedRoute, useValue: route },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index bcb5e0ce9d..d06a5d019c 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -1,20 +1,31 @@
-import { Component, OnInit } from '@angular/core';
-import { AuthService } from '../../core/auth/auth.service';
-import { map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AppState } from '../../app.reducer';
-import { LogOutAction } from '../../core/auth/auth.actions';
-import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
 import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-end-user-agreement',
   templateUrl: './end-user-agreement.component.html',
-  styleUrls: ['./end-user-agreement.component.scss']
+  styleUrls: ['./end-user-agreement.component.scss'],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
@@ -66,7 +77,7 @@ export class EndUserAgreementComponent implements OnInit {
           return observableOf(undefined);
         }
       }),
-      take(1)
+      take(1),
     ).subscribe((redirectUrl) => {
       if (isNotEmpty(redirectUrl)) {
         this.router.navigateByUrl(decodeURIComponent(redirectUrl));
diff --git a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
index 74eb545b8a..6a17aa415e 100644
--- a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
 
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 02745f2580..a5de058854 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -1,45 +1,43 @@
 <div class="row row-offcanvas row-offcanvas-right">
-  <div class="col-xs-12 col-sm-12 col-md-9 main-content">
-    <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
-      <h2>{{ 'info.feedback.head' | translate }}</h2>
-      <p>{{ 'info.feedback.info' | translate }}</p>
-      <fieldset class="col p-0">
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
-            <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
-          </div>
+  <div class="col-xs-12 col-sm-12 col-md-9">
+    <h1>{{ 'info.feedback.head' | translate }}</h1>
+    <p>{{ 'info.feedback.info' | translate }}</p>
+    <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+          <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
         </div>
+      </div>
 
-        <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
-          class="alert">
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
-            <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
-          </div>
+      <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
+        class="alert">
+        <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+        <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+      </ng-container>
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+          <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
         </div>
-        <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
-          class="alert">
-          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
-            <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
-          </div>
+      </div>
+      <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
+        class="alert">
+        <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+      </ng-container>
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+          <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
-        <div class="row py-2">
-          <div class="control-group col-sm-12 text-right">
-            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
-          </div>
+      </div>
+      <div class="row py-2">
+        <div class="control-group col-sm-12 text-right">
+          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
-      </fieldset>
+      </div>
     </form>
   </div>
 </div>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index c3d38a2876..48f32d7277 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -1,23 +1,31 @@
-import { EPersonMock } from '../../../shared/testing/eperson.mock';
-import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FeedbackFormComponent } from './feedback-form.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { UntypedFormBuilder } from '@angular/forms';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import { of } from 'rxjs';
-import { Feedback } from '../../../core/feedback/models/feedback.model';
+import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-import { RouterMock } from '../../../shared/mocks/router.mock';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { Feedback } from '../../../core/feedback/models/feedback.model';
+import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import { RouterMock } from '../../../shared/mocks/router.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { FeedbackFormComponent } from './feedback-form.component';
 
 
 describe('FeedbackFormComponent', () => {
@@ -26,12 +34,12 @@ describe('FeedbackFormComponent', () => {
   let de: DebugElement;
   const notificationService = new NotificationsServiceStub();
   const feedbackDataServiceStub = jasmine.createSpyObj('feedbackDataService', {
-    create: of(new Feedback())
+    create: of(new Feedback()),
   });
   const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), {
     getAuthenticatedUserFromStore: () => {
       return of(EPersonMock);
-    }
+    },
   });
   const routerStub = new RouterMock();
 
@@ -48,7 +56,7 @@ describe('FeedbackFormComponent', () => {
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: routerStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index 684f974701..c1631d1d42 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,24 +1,35 @@
-import { RemoteData } from '../../../core/data/remote-data';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
-import { Component, Inject, OnInit } from '@angular/core';
-import { RouteService } from '../../../core/services/route.service';
-import { UntypedFormBuilder, Validators } from '@angular/forms';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { AuthService } from '../../../core/auth/auth.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  Validators,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { getHomePageRoute } from '../../../app-routing-paths';
+import { TranslateService } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+
+import { getHomePageRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-feedback-form',
   templateUrl: './feedback-form.component.html',
-  styleUrls: ['./feedback-form.component.scss']
+  styleUrls: ['./feedback-form.component.scss'],
 })
 /**
  * Component displaying the contents of the Feedback Statement
@@ -51,7 +62,7 @@ export class FeedbackFormComponent implements OnInit {
   ngOnInit() {
 
     this.authService.getAuthenticatedUserFromStore().pipe(take(1)).subscribe((user: EPerson) => {
-      if (!!user) {
+      if (user) {
         this.feedbackForm.patchValue({ email: user.email });
       }
     });
diff --git a/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
index 9b42db629f..9ecbc9d1ac 100644
--- a/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../../shared/theme-support/themed.component';
 import { FeedbackFormComponent } from './feedback-form.component';
 
diff --git a/src/app/info/feedback/feedback.component.spec.ts b/src/app/info/feedback/feedback.component.spec.ts
index 810c3b703f..a16ed1f6bb 100644
--- a/src/app/info/feedback/feedback.component.spec.ts
+++ b/src/app/info/feedback/feedback.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FeedbackComponent } from './feedback.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { FeedbackComponent } from './feedback.component';
 
 describe('FeedbackComponent', () => {
   let component: FeedbackComponent;
@@ -11,7 +16,7 @@ describe('FeedbackComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [FeedbackComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/feedback/feedback.component.ts b/src/app/info/feedback/feedback.component.ts
index 3c0924b4de..bb4a6884c7 100644
--- a/src/app/info/feedback/feedback.component.ts
+++ b/src/app/info/feedback/feedback.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-feedback',
   templateUrl: './feedback.component.html',
-  styleUrls: ['./feedback.component.scss']
+  styleUrls: ['./feedback.component.scss'],
 })
 /**
  * Component displaying the Feedback Statement
diff --git a/src/app/info/feedback/themed-feedback.component.ts b/src/app/info/feedback/themed-feedback.component.ts
index 68581c32fd..afb3057a6a 100644
--- a/src/app/info/feedback/themed-feedback.component.ts
+++ b/src/app/info/feedback/themed-feedback.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { FeedbackComponent } from './feedback.component';
 
diff --git a/src/app/info/info-routing-paths.ts b/src/app/info/info-routing-paths.ts
index a18de2c611..a7fba45a6c 100644
--- a/src/app/info/info-routing-paths.ts
+++ b/src/app/info/info-routing-paths.ts
@@ -5,17 +5,17 @@ export const PRIVACY_PATH = 'privacy';
 export const FEEDBACK_PATH = 'feedback';
 
 export function getEndUserAgreementPath() {
-    return getSubPath(END_USER_AGREEMENT_PATH);
+  return getSubPath(END_USER_AGREEMENT_PATH);
 }
 
 export function getPrivacyPath() {
-    return getSubPath(PRIVACY_PATH);
+  return getSubPath(PRIVACY_PATH);
 }
 
 export function getFeedbackPath() {
-    return getSubPath(FEEDBACK_PATH);
+  return getSubPath(FEEDBACK_PATH);
 }
 
 function getSubPath(path: string) {
-    return `${getInfoModulePath()}/${path}`;
+  return `${getInfoModulePath()}/${path}`;
 }
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
index 4c497461e7..b43682d319 100644
--- a/src/app/info/info-routing.module.ts
+++ b/src/app/info/info-routing.module.ts
@@ -1,13 +1,20 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { PRIVACY_PATH, END_USER_AGREEMENT_PATH, FEEDBACK_PATH } from './info-routing-paths';
-import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
-import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
-import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
-import { FeedbackGuard } from '../core/feedback/feedback.guard';
-import { environment } from '../../environments/environment';
 
+import { environment } from '../../environments/environment';
+import { COAR_NOTIFY_SUPPORT } from '../app-routing-paths';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NotifyInfoComponent } from '../core/coar-notify/notify-info/notify-info.component';
+import { NotifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.guard';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
+import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
+import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
+import {
+  END_USER_AGREEMENT_PATH,
+  FEEDBACK_PATH,
+  PRIVACY_PATH,
+} from './info-routing-paths';
+import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
 const imports = [
   RouterModule.forChild([
@@ -16,38 +23,47 @@ const imports = [
       component: ThemedFeedbackComponent,
       resolve: { breadcrumb: I18nBreadcrumbResolver },
       data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' },
-      canActivate: [FeedbackGuard]
-    }
-  ])
+      canActivate: [FeedbackGuard],
+    },
+  ]),
+  RouterModule.forChild([
+    {
+      path: COAR_NOTIFY_SUPPORT,
+      component: NotifyInfoComponent,
+      resolve: { breadcrumb: I18nBreadcrumbResolver },
+      data: { title: 'info.coar-notify-support.title', breadcrumbKey: 'info.coar-notify' },
+      canActivate: [NotifyInfoGuard],
+    },
+  ]),
 ];
 
-  if (environment.info.enableEndUserAgreement) {
-    imports.push(
-      RouterModule.forChild([
-        {
-          path: END_USER_AGREEMENT_PATH,
-          component: ThemedEndUserAgreementComponent,
-          resolve: { breadcrumb: I18nBreadcrumbResolver },
-          data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }
-        }
-      ]));
-  }
-  if (environment.info.enablePrivacyStatement) {
-    imports.push(
-      RouterModule.forChild([
-        {
-          path: PRIVACY_PATH,
-          component: ThemedPrivacyComponent,
-          resolve: { breadcrumb: I18nBreadcrumbResolver },
-          data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
-        }
-      ]));
-  }
+if (environment.info.enableEndUserAgreement) {
+  imports.push(
+    RouterModule.forChild([
+      {
+        path: END_USER_AGREEMENT_PATH,
+        component: ThemedEndUserAgreementComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' },
+      },
+    ]));
+}
+if (environment.info.enablePrivacyStatement) {
+  imports.push(
+    RouterModule.forChild([
+      {
+        path: PRIVACY_PATH,
+        component: ThemedPrivacyComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' },
+      },
+    ]));
+}
 
 @NgModule({
   imports: [
-    ...imports
-  ]
+    ...imports,
+  ],
 })
 /**
  * Module for navigating to components within the info module
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index ccc4af0a7d..fe7d76f6ed 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -1,19 +1,20 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { NotifyInfoComponent } from '../core/coar-notify/notify-info/notify-info.component';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
 import { SharedModule } from '../shared/shared.module';
 import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
-import { InfoRoutingModule } from './info-routing.module';
 import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
-import { PrivacyComponent } from './privacy/privacy.component';
-import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
-import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 import { FeedbackComponent } from './feedback/feedback.component';
 import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
 import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-feedback-form.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
-import { FeedbackGuard } from '../core/feedback/feedback.guard';
-
+import { InfoRoutingModule } from './info-routing.module';
+import { PrivacyComponent } from './privacy/privacy.component';
+import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
+import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
 const DECLARATIONS = [
   EndUserAgreementComponent,
@@ -25,7 +26,8 @@ const DECLARATIONS = [
   FeedbackComponent,
   FeedbackFormComponent,
   ThemedFeedbackFormComponent,
-  ThemedFeedbackComponent
+  ThemedFeedbackComponent,
+  NotifyInfoComponent,
 ];
 
 @NgModule({
@@ -35,12 +37,12 @@ const DECLARATIONS = [
     InfoRoutingModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
-  providers: [FeedbackGuard]
+  providers: [FeedbackGuard],
 })
 export class InfoModule {
 }
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index f29a786e8b..003e6b0d51 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -22,7 +22,7 @@
 <h2>Information we collect about you and how we collect it</h2>
 <p>We collect several types of information from and about users of our Website, including information:</p>
 <ul>
-  <li>by which you may be personally identified, such as name, e-mail address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
+  <li>by which you may be personally identified, such as name, email address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
   <li>about your internet connection, the equipment you use to access our Website and usage details.</li>
 </ul>
 <p>We collect this information:</p>
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
index 682e30273a..d9266f317d 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PrivacyContentComponent } from './privacy-content.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PrivacyContentComponent } from './privacy-content.component';
 
 describe('PrivacyContentComponent', () => {
   let component: PrivacyContentComponent;
@@ -11,7 +16,7 @@ describe('PrivacyContentComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [PrivacyContentComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.ts b/src/app/info/privacy/privacy-content/privacy-content.component.ts
index 6a7b394cf4..4bc5661e31 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.ts
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-privacy-content',
   templateUrl: './privacy-content.component.html',
-  styleUrls: ['./privacy-content.component.scss']
+  styleUrls: ['./privacy-content.component.scss'],
 })
 /**
  * Component displaying the contents of the Privacy Statement
diff --git a/src/app/info/privacy/privacy.component.spec.ts b/src/app/info/privacy/privacy.component.spec.ts
index 6f93adec12..888021c15e 100644
--- a/src/app/info/privacy/privacy.component.spec.ts
+++ b/src/app/info/privacy/privacy.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PrivacyComponent } from './privacy.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PrivacyComponent } from './privacy.component';
 
 describe('PrivacyComponent', () => {
   let component: PrivacyComponent;
@@ -11,7 +16,7 @@ describe('PrivacyComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [PrivacyComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/privacy/privacy.component.ts b/src/app/info/privacy/privacy.component.ts
index dc9d3d69dc..99464d4cc9 100644
--- a/src/app/info/privacy/privacy.component.ts
+++ b/src/app/info/privacy/privacy.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-privacy',
   templateUrl: './privacy.component.html',
-  styleUrls: ['./privacy.component.scss']
+  styleUrls: ['./privacy.component.scss'],
 })
 /**
  * Component displaying the Privacy Statement
diff --git a/src/app/info/privacy/themed-privacy.component.ts b/src/app/info/privacy/themed-privacy.component.ts
index 7f2ee80ffc..682a035abe 100644
--- a/src/app/info/privacy/themed-privacy.component.ts
+++ b/src/app/info/privacy/themed-privacy.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { PrivacyComponent } from './privacy.component';
 
diff --git a/src/app/init.service.spec.ts b/src/app/init.service.spec.ts
index a05f06c78f..9cb27e0075 100644
--- a/src/app/init.service.spec.ts
+++ b/src/app/init.service.spec.ts
@@ -1,32 +1,49 @@
-import { InitService } from './init.service';
-import { APP_CONFIG } from 'src/config/app-config.interface';
-import { APP_INITIALIZER, Injectable } from '@angular/core';
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { MetadataService } from './core/metadata/metadata.service';
-import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
 import { CommonModule } from '@angular/common';
-import { Store, StoreModule } from '@ngrx/store';
-import { authReducer } from './core/auth/auth.reducer';
-import { storeModuleConfig } from './app.reducer';
-import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { AuthService } from './core/auth/auth.service';
-import { AuthServiceMock } from './shared/mocks/auth.service.mock';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from './shared/mocks/router.mock';
-import { MockActivatedRoute } from './shared/mocks/active-router.mock';
-import { MenuService } from './shared/menu/menu.service';
-import { LocaleService } from './core/locale/locale.service';
-import { environment } from '../environments/environment';
+import {
+  APP_INITIALIZER,
+  Injectable,
+} from '@angular/core';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+
+import { environment } from '../environments/environment';
 import { AppComponent } from './app.component';
-import { RouteService } from './core/services/route.service';
 import { getMockLocaleService } from './app.component.spec';
+import { storeModuleConfig } from './app.reducer';
+import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import { authReducer } from './core/auth/auth.reducer';
+import { AuthService } from './core/auth/auth.service';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { RouteService } from './core/services/route.service';
 import { CorrelationIdService } from './correlation-id/correlation-id.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { InitService } from './init.service';
+import { MenuService } from './shared/menu/menu.service';
+import { MockActivatedRoute } from './shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from './shared/mocks/auth.service.mock';
+import { RouterMock } from './shared/mocks/router.mock';
+import { getMockThemeService } from './shared/mocks/theme-service.mock';
 import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
 import { ThemeService } from './shared/theme-support/theme.service';
-import { getMockThemeService } from './shared/mocks/theme-service.mock';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import objectContaining = jasmine.objectContaining;
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
@@ -51,8 +68,8 @@ const initialState = {
     auth: {
       loading: false,
       blocking: true,
-    }
-  }
+    },
+  },
 };
 
 
@@ -74,7 +91,7 @@ describe('InitService', () => {
 
       expect(providers).toContain(objectContaining({
         provide: InitService,
-        useClass: ConcreteInitServiceMock
+        useClass: ConcreteInitServiceMock,
       }));
 
       expect(providers).toContain(objectContaining({
@@ -91,7 +108,7 @@ describe('InitService', () => {
     it('should call resolveAppConfig() in APP_CONFIG factory', () => {
       const factory = (
         ConcreteInitServiceMock.providers()
-                               .find((p: any) => p.provide === APP_CONFIG) as any
+          .find((p: any) => p.provide === APP_CONFIG) as any
       ).useFactory;
 
       // this factory is called _before_ InitService is instantiated
@@ -103,7 +120,7 @@ describe('InitService', () => {
     it('should defer to init() in APP_INITIALIZER factory', () => {
       const factory = (
         ConcreteInitServiceMock.providers()
-                               .find((p: any) => p.provide === APP_INITIALIZER) as any
+          .find((p: any) => p.provide === APP_INITIALIZER) as any
       ).useFactory;
 
       // we don't care about the dependencies here
@@ -142,7 +159,7 @@ describe('InitService', () => {
         'transfer',
       ]);
       transferStateSpy = jasmine.createSpyObj('dspaceTransferStateSpy', [
-        'get', 'hasKey'
+        'get', 'hasKey',
       ]);
       breadcrumbsServiceSpy = jasmine.createSpyObj('breadcrumbsServiceSpy', [
         'listenForRouteChanges',
@@ -163,8 +180,8 @@ describe('InitService', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
         ],
         providers: [
@@ -183,7 +200,7 @@ describe('InitService', () => {
           provideMockStore({ initialState }),
           AppComponent,
           RouteService,
-        ]
+        ],
       });
     }));
 
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index 9fef2ca4ed..cc2928f456 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -5,25 +5,43 @@
  *
  * http://www.dspace.org/license/
  */
-import { select, Store } from '@ngrx/store';
-import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
-import { CorrelationIdService } from './correlation-id/correlation-id.service';
-import { APP_INITIALIZER, Inject, Provider, Type } from '@angular/core';
-import { makeStateKey, TransferState } from '@angular/platform-browser';
-import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
+import {
+  APP_INITIALIZER,
+  Inject,
+  Provider,
+  Type,
+} from '@angular/core';
+import {
+  makeStateKey,
+  TransferState,
+} from '@angular/platform-browser';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import isEqual from 'lodash/isEqual';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  find,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../config/app-config.interface';
 import { environment } from '../environments/environment';
 import { AppState } from './app.reducer';
-import isEqual from 'lodash/isEqual';
-import { TranslateService } from '@ngx-translate/core';
-import { LocaleService } from './core/locale/locale.service';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { MetadataService } from './core/metadata/metadata.service';
 import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
-import { ThemeService } from './shared/theme-support/theme.service';
+import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
 import { isAuthenticationBlocking } from './core/auth/selectors';
-import { distinctUntilChanged, find } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { CorrelationIdService } from './correlation-id/correlation-id.service';
 import { MenuService } from './shared/menu/menu.service';
+import { ThemeService } from './shared/theme-support/theme.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 /**
  * Performs the initialization of the app.
@@ -68,7 +86,7 @@ export abstract class InitService {
   public static providers(): Provider[] {
     if (!InitService.isPrototypeOf(this)) {
       throw new Error(
-        'Initalization providers should only be generated from concrete subclasses of InitService'
+        'Initalization providers should only be generated from concrete subclasses of InitService',
       );
     }
     return [
@@ -82,7 +100,7 @@ export abstract class InitService {
           this.resolveAppConfig(transferState);
           return environment;
         },
-        deps: [ TransferState ]
+        deps: [ TransferState ],
       },
       {
         provide: APP_INITIALIZER,
@@ -103,7 +121,7 @@ export abstract class InitService {
    * @protected
    */
   protected static resolveAppConfig(
-    transferState: TransferState
+    transferState: TransferState,
   ): void {
     // overriden in subclasses if applicable
   }
@@ -158,8 +176,8 @@ export abstract class InitService {
     // Load all the languages that are defined as active from the config file
     this.translate.addLangs(
       environment.languages
-                 .filter((LangConfig) => LangConfig.active === true)
-                 .map((a) => a.code)
+        .filter((LangConfig) => LangConfig.active === true)
+        .map((a) => a.code),
     );
 
     // Load the default language from the config file
@@ -198,7 +216,7 @@ export abstract class InitService {
     return this.store.pipe(
       select(isAuthenticationBlocking),
       distinctUntilChanged(),
-      find((b: boolean) => b === false)
+      find((b: boolean) => b === false),
     );
   }
 }
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index cd71d23a91..f6304340f3 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -6,7 +6,10 @@
         <ds-alert [type]="AlertTypeEnum.Warning">
             <div class="d-flex justify-content-between flex-wrap">
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
-                <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+                <div class="gap-2 d-flex">
+                  <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+                  <a *ngIf="showReinstateButton$() | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+                </div>
             </div>
         </ds-alert>
     </div>
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
index a933eb6a58..13a45f0626 100644
--- a/src/app/item-page/alerts/item-alerts.component.spec.ts
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -1,34 +1,72 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemAlertsComponent } from './item-alerts.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../core/shared/item.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../core/shared/item.model';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
+import { CorrectionType } from '../../core/submission/models/correctiontype.model';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+} from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ItemAlertsComponent } from './item-alerts.component';
 
 describe('ItemAlertsComponent', () => {
   let component: ItemAlertsComponent;
   let fixture: ComponentFixture<ItemAlertsComponent>;
   let item: Item;
+  let authorizationService;
+  let dsoWithdrawnReinstateModalService;
+  let correctionTypeDataService;
+  let testScheduler: TestScheduler;
+
+  const itemMock = Object.assign(new Item(), {
+    uuid: 'item-uuid',
+    id: 'item-uuid',
+  });
 
   beforeEach(waitForAsync(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+    dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', ['openCreateWithdrawnReinstateModal']);
+    correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService',  ['findByItem']);
     TestBed.configureTestingModule({
       declarations: [ItemAlertsComponent],
       imports: [TranslateModule.forRoot()],
-      schemas: [NO_ERRORS_SCHEMA]
+      providers: [
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService },
+        { provide: CorrectionTypeDataService, useValue: correctionTypeDataService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ItemAlertsComponent);
+
     component = fixture.componentInstance;
+    component.item = itemMock;
     fixture.detectChanges();
   });
 
   describe('when the item is discoverable', () => {
     beforeEach(() => {
       item = Object.assign(new Item(), {
-        isDiscoverable: true
+        isDiscoverable: true,
       });
       component.item = item;
       fixture.detectChanges();
@@ -43,7 +81,7 @@ describe('ItemAlertsComponent', () => {
   describe('when the item is not discoverable', () => {
     beforeEach(() => {
       item = Object.assign(new Item(), {
-        isDiscoverable: false
+        isDiscoverable: false,
       });
       component.item = item;
       fixture.detectChanges();
@@ -58,9 +96,10 @@ describe('ItemAlertsComponent', () => {
   describe('when the item is withdrawn', () => {
     beforeEach(() => {
       item = Object.assign(new Item(), {
-        isWithdrawn: true
+        isWithdrawn: true,
       });
       component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
       fixture.detectChanges();
     });
 
@@ -73,9 +112,10 @@ describe('ItemAlertsComponent', () => {
   describe('when the item is not withdrawn', () => {
     beforeEach(() => {
       item = Object.assign(new Item(), {
-        isWithdrawn: false
+        isWithdrawn: false,
       });
       component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
       fixture.detectChanges();
     });
 
@@ -84,4 +124,43 @@ describe('ItemAlertsComponent', () => {
       expect(privateWarning).toBeNull();
     });
   });
+
+  describe('when the item is reinstated', () => {
+    const correctionType = Object.assign(new CorrectionType(), {
+      topic: REQUEST_REINSTATE,
+    });
+    const correctionRD = createSuccessfulRemoteDataObject(createPaginatedList([correctionType]));
+
+    beforeEach(() => {
+      item =  itemMock;
+      component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(of(correctionRD));
+
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
+      fixture.detectChanges();
+    });
+
+    it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const isAdminMarble = 'a';
+        const correctionMarble = 'b';
+        const expectedMarble = 'c';
+
+        const isAdminValues = { a: false };
+        const correctionValues = { b: correctionRD };
+        const expectedValues = { c: true };
+
+        const isAdmin$ = cold(isAdminMarble, isAdminValues);
+        const correction$ = cold(correctionMarble, correctionValues);
+
+        (authorizationService.isAuthorized).and.returnValue(isAdmin$);
+        (correctionTypeDataService.findByItem).and.returnValue(correction$);
+
+        expectObservable(component.showReinstateButton$()).toBe(expectedMarble, expectedValues);
+      });
+    });
+
+  });
 });
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index d7a84db015..a0ccb7406f 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,11 +1,32 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  combineLatest,
+  map,
+  Observable,
+} from 'rxjs';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from 'src/app/core/shared/operators';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+} from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
 
 @Component({
   selector: 'ds-item-alerts',
   templateUrl: './item-alerts.component.html',
-  styleUrls: ['./item-alerts.component.scss']
+  styleUrls: ['./item-alerts.component.scss'],
 })
 /**
  * Component displaying alerts for an item
@@ -21,4 +42,37 @@ export class ItemAlertsComponent {
    * @type {AlertType}
    */
   public AlertTypeEnum = AlertType;
+
+  constructor(
+    private authService: AuthorizationDataService,
+    private dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    private correctionTypeDataService: CorrectionTypeDataService,
+  ) {
+  }
+
+  /**
+   * Determines whether to show the reinstate button.
+   * The button is shown if the user is not an admin and the item has a reinstate request.
+   * @returns An Observable that emits a boolean value indicating whether to show the reinstate button.
+   */
+  showReinstateButton$(): Observable<boolean>  {
+    const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+    );
+    const isAdmin$ = this.authService.isAuthorized(FeatureID.AdministratorOf);
+    return combineLatest([isAdmin$, correction$]).pipe(
+      map(([isAdmin, correction]) => {
+        return !isAdmin && correction.some((correctionType) => correctionType.topic === REQUEST_REINSTATE);
+      },
+      ));
+  }
+
+  /**
+   * Opens the reinstate modal for the item.
+   */
+  openReinstateModal() {
+    this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(this.item, 'request-reinstate', this.item.isArchived);
+  }
 }
diff --git a/src/app/item-page/alerts/themed-item-alerts.component.ts b/src/app/item-page/alerts/themed-item-alerts.component.ts
index 9ed9b51404..c8b4c5df90 100644
--- a/src/app/item-page/alerts/themed-item-alerts.component.ts
+++ b/src/app/item-page/alerts/themed-item-alerts.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Item } from '../../core/shared/item.model';
-import { ItemAlertsComponent } from './item-alerts.component';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { ItemAlertsComponent } from './item-alerts.component';
 
 /**
  * Themed wrapper for {@link ItemAlertsComponent}
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 1fae737fdb..3c08c2fb65 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,12 +1,12 @@
 <div class="container">
-    <h3 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h3>
+    <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
     <div *ngIf="canDownload$|async" class="alert alert-success">
         <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
         <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
     </div>
     <div>
         <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
-        <p *ngIf="bitstream != undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
+        <p *ngIf="bitstream !== undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
         <p *ngIf="allfiles.value === 'true'">{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
     </div>
     <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
index cbfbdf361f..b9eef37f04 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
@@ -1,30 +1,43 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AuthService } from '../../../core/auth/auth.service';
+import {
+  CommonModule,
+  Location,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../../core/shared/bitstream.model';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Item } from '../../../core/shared/item.model';
+import { ItemRequest } from '../../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { CommonModule } from '@angular/common';
-import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page.component';
-import { By } from '@angular/platform-browser';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
-import { Item } from '../../../core/shared/item.model';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { ItemRequest } from '../../../core/shared/item-request.model';
-import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page.component';
 
 
 describe('BitstreamRequestACopyPageComponent', () => {
@@ -48,51 +61,51 @@ describe('BitstreamRequestACopyPageComponent', () => {
     eperson = Object.assign(new EPerson(), {
       email: 'test@mail.org',
       metadata: {
-        'eperson.firstname': [{value: 'Test'}],
-        'eperson.lastname': [{value: 'User'}],
-      }
+        'eperson.firstname': [{ value: 'Test' }],
+        'eperson.lastname': [{ value: 'User' }],
+      },
     });
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(false),
-      getAuthenticatedUserFromStore: observableOf(eperson)
+      getAuthenticatedUserFromStore: observableOf(eperson),
     });
     authorizationService = jasmine.createSpyObj('authorizationSerivice', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     itemRequestDataService = jasmine.createSpyObj('itemRequestDataService', {
-      requestACopy: createSuccessfulRemoteDataObject$({})
+      requestACopy: createSuccessfulRemoteDataObject$({}),
     });
 
     location = jasmine.createSpyObj('location', {
-      back: {}
+      back: {},
     });
 
     notificationsService = new NotificationsServiceStub();
 
-    item = Object.assign(new Item(), {uuid: 'item-uuid'});
+    item = Object.assign(new Item(), { uuid: 'item-uuid' });
 
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
-        content: {href: 'bitstream-content-link'},
-        self: {href: 'bitstream-self-link'},
-      }
+        content: { href: 'bitstream-content-link' },
+        self: { href: 'bitstream-self-link' },
+      },
     });
 
     activatedRoute = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(
-          item
-        )
+          item,
+        ),
       }),
       queryParams: observableOf({
-        bitstream : bitstream.uuid
-      })
+        bitstream : bitstream.uuid,
+      }),
     };
 
     bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-      findById: createSuccessfulRemoteDataObject$(bitstream)
+      findById: createSuccessfulRemoteDataObject$(bitstream),
     });
 
     router = new RouterStub();
@@ -103,16 +116,16 @@ describe('BitstreamRequestACopyPageComponent', () => {
       imports: [CommonModule, TranslateModule.forRoot(), FormsModule, ReactiveFormsModule],
       declarations: [BitstreamRequestACopyPageComponent],
       providers: [
-        {provide: Location, useValue: location},
-        {provide: ActivatedRoute, useValue: activatedRoute},
-        {provide: Router, useValue: router},
-        {provide: AuthorizationDataService, useValue: authorizationService},
-        {provide: AuthService, useValue: authService},
-        {provide: ItemRequestDataService, useValue: itemRequestDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: DSONameService, useValue: new DSONameServiceMock()},
-        {provide: BitstreamDataService, useValue: bitstreamDataService},
-      ]
+        { provide: Location, useValue: location },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: AuthService, useValue: authService },
+        { provide: ItemRequestDataService, useValue: itemRequestDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: BitstreamDataService, useValue: bitstreamDataService },
+      ],
     })
       .compileComponents();
   }
@@ -176,11 +189,11 @@ describe('BitstreamRequestACopyPageComponent', () => {
         activatedRoute = {
           data: observableOf({
             dso: createSuccessfulRemoteDataObject(
-              item
-            )
+              item,
+            ),
           }),
           queryParams: observableOf({
-          })
+          }),
         };
         initTestbed();
       }));
@@ -243,7 +256,7 @@ describe('BitstreamRequestACopyPageComponent', () => {
             allfiles: 'false',
             requestEmail: 'user@name.org',
             requestName: 'User Name',
-            requestMessage: 'I would like to request a copy'
+            requestMessage: 'I would like to request a copy',
           });
 
         expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest);
@@ -277,7 +290,7 @@ describe('BitstreamRequestACopyPageComponent', () => {
             allfiles: 'false',
             requestEmail: 'user@name.org',
             requestName: 'User Name',
-            requestMessage: 'I would like to request a copy'
+            requestMessage: 'I would like to request a copy',
           });
 
         expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest);
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 77e1049d87..dec28d4fd7 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,29 +1,61 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  getBitstreamDownloadRoute,
+  getForbiddenRoute,
+} from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../../core/auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { getBitstreamDownloadRoute, getForbiddenRoute } from '../../../app-routing-paths';
-import { TranslateService } from '@ngx-translate/core';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
-import { ItemRequest } from '../../../core/shared/item-request.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Item } from '../../../core/shared/item.model';
+import { ItemRequest } from '../../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-bitstream-request-a-copy-page',
-  templateUrl: './bitstream-request-a-copy-page.component.html'
+  templateUrl: './bitstream-request-a-copy-page.component.html',
 })
 /**
  * Page component for requesting a copy for a bitstream
@@ -64,7 +96,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
       }),
       email: new UntypedFormControl('', {
         validators: [Validators.required,
-        Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')]
+          Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')],
       }),
       allfiles: new UntypedFormControl(''),
       message: new UntypedFormControl(''),
@@ -73,7 +105,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
 
     this.item$ = this.route.data.pipe(
       map((data) => data.dso),
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
 
     this.subs.push(this.item$.subscribe((item) => {
@@ -84,7 +116,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     this.bitstream$ = this.route.queryParams.pipe(
       filter((params) => hasValue(params) && hasValue(params.bitstream)),
       switchMap((params) => this.bitstreamService.findById(params.bitstream)),
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
 
     this.subs.push(this.bitstream$.subscribe((bitstream) => {
@@ -93,7 +125,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     }));
 
     this.canDownload$ = this.bitstream$.pipe(
-      switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined))
+      switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined)),
     );
     const canRequestCopy$ = this.bitstream$.pipe(
       switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(bitstream) ? bitstream.self : undefined)),
@@ -101,7 +133,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
 
     this.subs.push(observableCombineLatest([this.canDownload$, canRequestCopy$]).subscribe(([canDownload, canRequestCopy]) => {
       if (!canDownload && !canRequestCopy) {
-        this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+        this.router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
       }
     }));
     this.initValues();
@@ -128,13 +160,13 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
    */
   private initValues() {
     this.getCurrentUser().pipe(take(1)).subscribe((user) => {
-      this.requestCopyForm.patchValue({allfiles: 'true'});
+      this.requestCopyForm.patchValue({ allfiles: 'true' });
       if (hasValue(user)) {
-        this.requestCopyForm.patchValue({name: user.name, email: user.email});
+        this.requestCopyForm.patchValue({ name: user.name, email: user.email });
       }
     });
     this.bitstream$.pipe(take(1)).subscribe((bitstream) => {
-      this.requestCopyForm.patchValue({allfiles: 'false'});
+      this.requestCopyForm.patchValue({ allfiles: 'false' });
     });
   }
 
@@ -149,7 +181,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
         } else {
           return observableOf(undefined);
         }
-      })
+      }),
     );
 
   }
@@ -171,7 +203,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     itemRequest.requestMessage = this.message.value;
 
     this.itemRequestDataService.requestACopy(itemRequest).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('bitstream-request-a-copy.submit.success'));
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index 1732da1235..530471135c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="bundles">
     <div class="row">
       <div class="col-12 mb-2">
-        <h2>{{'item.bitstreams.upload.title' | translate}}</h2>
+        <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
           <div *ngIf="item">
             <span class="font-weight-bold">{{'item.bitstreams.upload.item' | translate}}</span>
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
index e85dca2a98..2304546d0f 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
@@ -1,29 +1,40 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { UploadBitstreamComponent } from './upload-bitstream.component';
-import { AuthService } from '../../../core/auth/auth.service';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+
 import { environment } from '../../../../environments/environment';
+import { AuthService } from '../../../core/auth/auth.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { UploadBitstreamComponent } from './upload-bitstream.component';
 
 describe('UploadBitstreamComponent', () => {
   let comp: UploadBitstreamComponent;
@@ -38,13 +49,13 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           value: customName,
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      self: { href: 'bundle-selflink' }
-    }
+      self: { href: 'bundle-selflink' },
+    },
   });
   const customCreatedName = 'customCreatedBundleName';
   const createdBundle = Object.assign(new Bundle(), {
@@ -55,13 +66,13 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           value: customCreatedName,
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      self: { href: 'created-bundle-selflink' }
-    }
+      self: { href: 'created-bundle-selflink' },
+    },
   });
   const itemName = 'fake-name';
   const mockItem = Object.assign(new Item(), {
@@ -71,11 +82,11 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           language: null,
-          value: itemName
-        }
-      ]
+          value: itemName,
+        },
+      ],
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
   });
   const standardBundleSuggestions = environment.bundle.standardBundles;
   let routeStub;
@@ -88,16 +99,16 @@ describe('UploadBitstreamComponent', () => {
   });
   const bundleService = jasmine.createSpyObj('bundleService', {
     getBitstreamsEndpoint: observableOf(restEndpoint),
-    findById: createSuccessfulRemoteDataObject$(bundle)
+    findById: createSuccessfulRemoteDataObject$(bundle),
   });
   const authToken = 'fake-auth-token';
   const authServiceStub = Object.assign(new AuthServiceStub(), {
-    buildAuthHeader: () => authToken
+    buildAuthHeader: () => authToken,
   });
   const notificationsServiceStub = new NotificationsServiceStub();
   const uploaderComponent = jasmine.createSpyObj('uploaderComponent', ['ngOnInit', 'ngAfterViewInit']);
   const requestService = jasmine.createSpyObj('requestService', {
-    removeByHrefSubstring: {}
+    removeByHrefSubstring: {},
   });
 
   describe('when a file is uploaded', () => {
@@ -121,7 +132,7 @@ describe('UploadBitstreamComponent', () => {
 
     describe('and it succeeds, calling onCompleteItem', () => {
       const createdBitstream = Object.assign(new Bitstream(), {
-        id: 'fake-bitstream'
+        id: 'fake-bitstream',
       });
 
       beforeEach(() => {
@@ -137,7 +148,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when a bundle url parameter is present', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
     }));
 
@@ -208,7 +219,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when item has no bundles yet', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])));
@@ -227,7 +238,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when item has a custom bundle', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [bundle])));
@@ -251,7 +262,7 @@ describe('UploadBitstreamComponent', () => {
       expect(standardBundleSuggestions.length).toBeGreaterThan(0);
       clonedBundle.name = standardBundleSuggestions[0];
       createUploadBitstreamTestingModule({
-        bundle: clonedBundle.id
+        bundle: clonedBundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [clonedBundle])));
@@ -275,15 +286,15 @@ describe('UploadBitstreamComponent', () => {
   function createUploadBitstreamTestingModule(queryParams) {
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
+        dso: createSuccessfulRemoteDataObject(mockItem),
       }),
       queryParams: observableOf(queryParams),
       snapshot: {
         queryParams: queryParams,
         params: {
-          id: mockItem.id
-        }
-      }
+          id: mockItem.id,
+        },
+      },
     };
 
     TestBed.configureTestingModule({
@@ -296,10 +307,10 @@ describe('UploadBitstreamComponent', () => {
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: AuthService, useValue: authServiceStub },
         { provide: BundleDataService, useValue: bundleService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }
 
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index 56b88806ed..aa26ca8f88 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -1,29 +1,53 @@
-import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Observable, Subscription, of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { map, take, switchMap } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { getFirstSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { UploaderComponent } from '../../../shared/upload/uploader/uploader.component';
-import { RequestService } from '../../../core/data/request.service';
-import { getBitstreamModuleRoute } from '../../../app-routing-paths';
-import { getEntityEditRoute } from '../../item-page-routing-paths';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../environments/environment';
+import { getBitstreamModuleRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { UploaderComponent } from '../../../shared/upload/uploader/uploader.component';
+import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
+import { getEntityEditRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-upload-bitstream',
-  templateUrl: './upload-bitstream.component.html'
+  templateUrl: './upload-bitstream.component.html',
 })
 /**
  * Page component for uploading a bitstream to an item
@@ -74,7 +98,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
     url: 'placeholder',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
   /**
@@ -128,15 +152,15 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
               if (check) {
                 this.bundles.push(Object.assign(new Bundle(), {
                   _name: defaultBundle,
-                  type: 'bundle'
+                  type: 'bundle',
                 }));
               }
             }
           } else {
             this.bundles = environment.bundle.standardBundles.map((defaultBundle: string) => Object.assign(new Bundle(), {
-                _name: defaultBundle,
-                type: 'bundle'
-              })
+              _name: defaultBundle,
+              type: 'bundle',
+            }),
             );
           }
           return observableOf(remoteData.payload.page);
@@ -145,7 +169,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
     this.selectedBundleId = this.route.snapshot.queryParams.bundle;
     if (isNotEmpty(this.selectedBundleId)) {
       this.subs.push(this.bundleService.findById(this.selectedBundleId).pipe(
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       ).subscribe((bundle: Bundle) => {
         this.selectedBundleName = bundle.name;
       }));
@@ -159,12 +183,12 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
    */
   createBundle() {
     this.itemService.createBundle(this.itemId, this.selectedBundleName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((bundle: Bundle) => {
       this.selectedBundleId = bundle.id;
       this.notificationsService.success(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.content'),
       );
       this.setUploadUrl();
     });
diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 80002f614b..5e409446a7 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -1,25 +1,44 @@
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Item } from '../../../core/shared/item.model';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router, Data } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { first, map, switchMap, tap } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../environments/environment';
-import { getItemPageRoute } from '../../item-page-routing-paths';
-import { getAllSucceededRemoteData } from '../../../core/shared/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getAllSucceededRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-abstract-item-update',
-  template: ''
+  template: '',
 })
 /**
  * Abstract component for managing object updates of an item
@@ -52,7 +71,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     public router: Router,
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
-    public route: ActivatedRoute
+    public route: ActivatedRoute,
   ) {
     super(objectUpdatesService, notificationsService, translateService);
   }
@@ -74,7 +93,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
         switchMap((rd: RemoteData<Item>) => {
           return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...ITEM_PAGE_LINKS_TO_FOLLOW);
         }),
-        getAllSucceededRemoteData()
+        getAllSucceededRemoteData(),
       ).subscribe((rd: RemoteData<Item>) => {
         this.setItem(rd.payload);
       });
@@ -176,7 +195,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));
           this.initializeOriginalFields();
         }
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
index e7bd5b98ce..777c09813d 100644
--- a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
+++ b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
@@ -1,12 +1,13 @@
-import {RemoteData} from '../../core/data/remote-data';
-import {hot} from 'jasmine-marbles';
-import {Item} from '../../core/shared/item.model';
-import {findSuccessfulAccordingTo} from './edit-item-operators';
+import { hot } from 'jasmine-marbles';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { isNotEmpty } from '../../shared/empty.util';
 import {
   createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject
+  createSuccessfulRemoteDataObject,
 } from '../../shared/remote-data.utils';
-import { isNotEmpty } from '../../shared/empty.util';
+import { findSuccessfulAccordingTo } from './edit-item-operators';
 
 describe('findSuccessfulAccordingTo', () => {
   let mockItem1;
@@ -18,7 +19,7 @@ describe('findSuccessfulAccordingTo', () => {
     mockItem1.isWithdrawn = true;
 
     mockItem2 = new Item();
-    mockItem1.isWithdrawn = false;
+    mockItem2.isWithdrawn = false;
 
     predicate = (rd: RemoteData<Item>) => isNotEmpty(rd.payload) ? rd.payload.isWithdrawn : false;
   });
@@ -34,7 +35,7 @@ describe('findSuccessfulAccordingTo', () => {
     const source = hot('abcde', testRD);
     const result = source.pipe(findSuccessfulAccordingTo(predicate));
 
-    result.subscribe((value) => expect(value).toEqual(testRD.d));
+    expect(result).toBeObservable(hot('---(d|)', { d: testRD.d }));
   });
 
 });
diff --git a/src/app/item-page/edit-item-page/edit-item-operators.ts b/src/app/item-page/edit-item-page/edit-item-operators.ts
index 26c593cac6..dea90d90f1 100644
--- a/src/app/item-page/edit-item-page/edit-item-operators.ts
+++ b/src/app/item-page/edit-item-page/edit-item-operators.ts
@@ -1,7 +1,8 @@
-import {RemoteData} from '../../core/data/remote-data';
-import {Observable} from 'rxjs';
-import {first} from 'rxjs/operators';
-import {getAllSucceededRemoteData} from '../../core/shared/operators';
+import { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
 
 /**
  * Return first Observable of a RemoteData object that complies to the provided predicate
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index c370fe4f20..cac114ef28 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,18 +1,21 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
+            <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
             <div class="pt-2">
-                <ul class="nav nav-tabs justify-content-start" role="tablist">
-                    <li *ngFor="let page of pages" class="nav-item" [attr.aria-selected]="page.page === currentPage" role="tab">
+              <ul *ngIf="pages.length > 0" class="nav nav-tabs justify-content-start" role="tablist">
+                    <li *ngFor="let page of pages" class="nav-item" role="presentation">
                         <a *ngIf="(page.enabled | async)"
+                           [attr.aria-selected]="page.page === currentPage"
                            class="nav-link"
                            [ngClass]="{'active' : page.page === currentPage}"
-                           [routerLink]="['./' + page.page]">
+                           [routerLink]="['./' + page.page]"
+                           [attr.data-test]="page.page"
+                           role="tab">
                             {{'item.edit.tabs.' + page.page + '.head' | translate}}
                         </a>
                         <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
-                            <button *ngIf="!(page.enabled | async)"
+                            <button *ngIf="(page.enabled | async) !== true"
                                  class="nav-link disabled">
                                 {{'item.edit.tabs.' + page.page + '.head' | translate}}
                             </button>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
index 2521f7e67d..e6277385c6 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
@@ -1,14 +1,36 @@
 /* eslint-disable max-classes-per-file */
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { EditItemPageComponent } from './edit-item-page.component';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { EditItemPageComponent } from './edit-item-page.component';
 
 describe('ItemPageComponent', () => {
   let comp: EditItemPageComponent;
@@ -32,35 +54,35 @@ describe('ItemPageComponent', () => {
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: accesiblePages[0]
-        }
+          path: accesiblePages[0],
+        },
       },
       routerState: {
-        snapshot: undefined
-      }
+        snapshot: undefined,
+      },
     },
     routeConfig: {
       children: [
         {
           path: accesiblePages[0],
-          canActivate: [AcceptAllGuard]
+          canActivate: [AcceptAllGuard],
         }, {
           path: inaccesiblePages[0],
-          canActivate: [AcceptNoneGuard]
+          canActivate: [AcceptNoneGuard],
         }, {
           path: inaccesiblePages[1],
-          canActivate: [AcceptAllGuard, AcceptNoneGuard]
+          canActivate: [AcceptAllGuard, AcceptNoneGuard],
         },
-      ]
+      ],
     },
-    data: observableOf({dso: createSuccessfulRemoteDataObject(new Item())})
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(new Item()) }),
   };
 
   const mockRouter = {
     routerState: {
-      snapshot: undefined
+      snapshot: undefined,
     },
-    events: observableOf(undefined)
+    events: observableOf(undefined),
   };
 
   beforeEach(waitForAsync(() => {
@@ -68,8 +90,8 @@ describe('ItemPageComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [EditItemPageComponent],
       providers: [
@@ -79,9 +101,9 @@ describe('ItemPageComponent', () => {
         AcceptNoneGuard,
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(EditItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index 652b85916e..673c7d2381 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,13 +1,31 @@
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
-import { ActivatedRoute, CanActivate, Route, Router } from '@angular/router';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  CanActivate,
+  Route,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { Item } from '../../core/shared/item.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
 import { isNotEmpty } from '../../shared/empty.util';
 import { getItemPageRoute } from '../item-page-routing-paths';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
 
 @Component({
   selector: 'ds-edit-item-page',
@@ -15,8 +33,8 @@ import { GenericConstructor } from '../../core/shared/generic-constructor';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Page component for editing an item
@@ -50,11 +68,11 @@ export class EditItemPageComponent implements OnInit {
         let enabled = observableOf(true);
         if (isNotEmpty(child.canActivate)) {
           enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<CanActivate>) => {
-              const guard: CanActivate = this.injector.get<CanActivate>(guardConstructor);
-              return guard.canActivate(this.route.snapshot, this.router.routerState.snapshot);
-            })
+            const guard: CanActivate = this.injector.get<CanActivate>(guardConstructor);
+            return guard.canActivate(this.route.snapshot, this.router.routerState.snapshot);
+          }),
           ).pipe(
-            map((canActivateOutcomes: any[]) => canActivateOutcomes.every((e) => e === true))
+            map((canActivateOutcomes: any[]) => canActivateOutcomes.every((e) => e === true)),
           );
         }
         return { page: child.path, enabled: enabled };
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 0a75394ddd..54080c3e4d 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -1,51 +1,50 @@
-import { NgModule } from '@angular/core';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import {
+  NgbModule,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
 
-import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
+import { BundleDataService } from '../../core/data/bundle-data.service';
+import { IdentifierDataService } from '../../core/data/identifier-data.service';
+import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
+import { SearchPageModule } from '../../search-page/search-page.module';
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
+import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
+import { ItemVersionsModule } from '../versions/item-versions.module';
+import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
 import { EditItemPageComponent } from './edit-item-page.component';
-import { ItemStatusComponent } from './item-status/item-status.component';
-import { ItemOperationComponent } from './item-operation/item-operation.component';
-import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
-import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
-import { AbstractSimpleItemActionComponent } from './simple-item-action/abstract-simple-item-action.component';
-import { ItemPrivateComponent } from './item-private/item-private.component';
-import { ItemPublicComponent } from './item-public/item-public.component';
-import { ItemDeleteComponent } from './item-delete/item-delete.component';
+import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
+import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
-import { SearchPageModule } from '../../search-page/search-page.module';
+import { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
+import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
+import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
-import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ItemDeleteComponent } from './item-delete/item-delete.component';
+import { ItemMoveComponent } from './item-move/item-move.component';
+import { ItemOperationComponent } from './item-operation/item-operation.component';
+import { ItemPrivateComponent } from './item-private/item-private.component';
+import { ItemPublicComponent } from './item-public/item-public.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
+import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
 import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
 import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component';
-import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
-import { ItemMoveComponent } from './item-move/item-move.component';
-import { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
-import { BundleDataService } from '../../core/data/bundle-data.service';
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
-import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
-import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
-import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
-import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-import { ItemVersionsModule } from '../versions/item-versions.module';
-import { IdentifierDataService } from '../../core/data/identifier-data.service';
-import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component';
-import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
-import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
-import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ItemStatusComponent } from './item-status/item-status.component';
 import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
-
-import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import {
-  AccessControlFormModule
-} from '../../shared/access-control-form-container/access-control-form.module';
+import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
+import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
+import { AbstractSimpleItemActionComponent } from './simple-item-action/abstract-simple-item-action.component';
+import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -98,11 +97,11 @@ import {
   providers: [
     BundleDataService,
     IdentifierDataService,
-    ObjectValuesPipe
+    ObjectValuesPipe,
   ],
   exports: [
     ItemOperationComponent,
-  ]
+  ],
 })
 export class EditItemPageModule {
 
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index f22027916f..6257bbc2f1 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -1,48 +1,51 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { EditItemPageComponent } from './edit-item-page.component';
-import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
-import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
-import { ItemPrivateComponent } from './item-private/item-private.component';
-import { ItemPublicComponent } from './item-public/item-public.component';
-import { ItemDeleteComponent } from './item-delete/item-delete.component';
-import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
-import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
-import { ItemMoveComponent } from './item-move/item-move.component';
-import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
-import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
-import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
 import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ItemPageAdministratorGuard } from '../item-page-administrator.guard';
+import { EditItemPageComponent } from './edit-item-page.component';
 import {
   ITEM_EDIT_AUTHORIZATIONS_PATH,
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REGISTER_DOI_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH,
-  ITEM_EDIT_REGISTER_DOI_PATH
 } from './edit-item-page.routing-paths';
-import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
-import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
-import { ItemPageMetadataGuard } from './item-page-metadata.guard';
-import { ItemPageAdministratorGuard } from '../item-page-administrator.guard';
-import { ItemPageStatusGuard } from './item-page-status.guard';
-import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard';
-import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
-import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
-import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
-import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
-import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
-import { ItemCurateComponent } from './item-curate/item-curate.component';
-import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
 import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
+import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
+import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
+import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ItemDeleteComponent } from './item-delete/item-delete.component';
+import { ItemMoveComponent } from './item-move/item-move.component';
+import { ItemPageAccessControlGuard } from './item-page-access-control.guard';
+import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard';
+import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
+import { ItemPageCurateGuard } from './item-page-curate.guard';
+import { ItemPageMetadataGuard } from './item-page-metadata.guard';
+import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
+import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
+import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
+import { ItemPageStatusGuard } from './item-page-status.guard';
+import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
+import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
+import { ItemPrivateComponent } from './item-private/item-private.component';
+import { ItemPublicComponent } from './item-public/item-public.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
+import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
+import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
+import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
+import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -53,7 +56,7 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'item.edit' },
         children: [
@@ -64,36 +67,37 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
               {
                 path: '',
                 redirectTo: 'status',
-                pathMatch: 'full'
+                pathMatch: 'full',
               },
               {
                 path: 'status',
                 component: ThemedItemStatusComponent,
                 data: { title: 'item.edit.tabs.status.title', showBreadcrumbs: true },
-                canActivate: [ItemPageStatusGuard]
+                canActivate: [ItemPageStatusGuard],
               },
               {
                 path: 'bitstreams',
                 component: ItemBitstreamsComponent,
                 data: { title: 'item.edit.tabs.bitstreams.title', showBreadcrumbs: true },
-                canActivate: [ItemPageBitstreamsGuard]
+                canActivate: [ItemPageBitstreamsGuard],
               },
               {
                 path: 'metadata',
                 component: ThemedDsoEditMetadataComponent,
                 data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true },
-                canActivate: [ItemPageMetadataGuard]
+                canActivate: [ItemPageMetadataGuard],
               },
               {
                 path: 'curate',
                 component: ItemCurateComponent,
-                data: { title: 'item.edit.tabs.curate.title', showBreadcrumbs: true }
+                data: { title: 'item.edit.tabs.curate.title', showBreadcrumbs: true },
+                canActivate: [ItemPageCurateGuard],
               },
               {
                 path: 'relationships',
                 component: ItemRelationshipsComponent,
                 data: { title: 'item.edit.tabs.relationships.title', showBreadcrumbs: true },
-                canActivate: [ItemPageRelationshipsGuard]
+                canActivate: [ItemPageRelationshipsGuard],
               },
               /* TODO - uncomment & fix when view page exists
               {
@@ -111,20 +115,21 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
                 path: 'versionhistory',
                 component: ItemVersionHistoryComponent,
                 data: { title: 'item.edit.tabs.versionhistory.title', showBreadcrumbs: true },
-                canActivate: [ItemPageVersionHistoryGuard]
+                canActivate: [ItemPageVersionHistoryGuard],
               },
               {
                 path: 'access-control',
                 component: ItemAccessControlComponent,
-                data: { title: 'item.edit.tabs.access-control.title', showBreadcrumbs: true }
+                data: { title: 'item.edit.tabs.access-control.title', showBreadcrumbs: true },
+                canActivate: [ItemPageAccessControlGuard],
               },
               {
                 path: 'mapper',
                 component: ItemCollectionMapperComponent,
                 data: { title: 'item.edit.tabs.item-mapper.title', showBreadcrumbs: true },
-                canActivate: [ItemPageCollectionMapperGuard]
-              }
-            ]
+                canActivate: [ItemPageCollectionMapperGuard],
+              },
+            ],
           },
           {
             path: 'mapper',
@@ -133,12 +138,12 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
           {
             path: ITEM_EDIT_WITHDRAW_PATH,
             component: ItemWithdrawComponent,
-            canActivate: [ItemPageWithdrawGuard]
+            canActivate: [ItemPageWithdrawGuard],
           },
           {
             path: ITEM_EDIT_REINSTATE_PATH,
             component: ItemReinstateComponent,
-            canActivate: [ItemPageReinstateGuard]
+            canActivate: [ItemPageReinstateGuard],
           },
           {
             path: ITEM_EDIT_PRIVATE_PATH,
@@ -169,29 +174,29 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: ItemAuthorizationsComponent,
-                data: { title: 'item.edit.authorizations.title' }
-              }
-            ]
-          }
-        ]
-      }
-    ])
+                data: { title: 'item.edit.authorizations.title' },
+              },
+            ],
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
@@ -202,13 +207,15 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
     ItemPageWithdrawGuard,
     ItemPageAdministratorGuard,
     ItemPageMetadataGuard,
+    ItemPageCurateGuard,
     ItemPageStatusGuard,
     ItemPageBitstreamsGuard,
     ItemPageRelationshipsGuard,
     ItemPageVersionHistoryGuard,
     ItemPageCollectionMapperGuard,
+    ItemPageAccessControlGuard,
     ItemPageRegisterDoiGuard,
-  ]
+  ],
 })
 export class EditItemPageRoutingModule {
 
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts
index d841b97e2a..58f03accbf 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts
@@ -1,4 +1,7 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 
 import { ItemAccessControlComponent } from './item-access-control.component';
 
@@ -8,9 +11,9 @@ xdescribe('ItemAccessControlComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ ItemAccessControlComponent ]
+      declarations: [ ItemAccessControlComponent ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
index 874b624494..9d9e481b4b 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -1,10 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { ActivatedRoute } from '@angular/router';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-item-access-control',
@@ -19,7 +23,7 @@ export class ItemAccessControlComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.parent.data.pipe(
-      map((data) => data.dso)
+      map((data) => data.dso),
     ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
   }
 
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
index 5d2afbaf4c..5fe45c735a 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
@@ -1,18 +1,33 @@
-import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { of as observableOf } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { ItemAuthorizationsComponent } from './item-authorizations.component';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { Item } from '../../../core/shared/item.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { ItemAuthorizationsComponent } from './item-authorizations.component';
 
 describe('ItemAuthorizationsComponent test suite', () => {
   let comp: ItemAuthorizationsComponent;
@@ -24,35 +39,35 @@ describe('ItemAuthorizationsComponent test suite', () => {
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'bitstream1',
-    uuid: 'bitstream1'
+    uuid: 'bitstream1',
   });
   const bitstream2 = Object.assign(new Bitstream(), {
     id: 'bitstream2',
-    uuid: 'bitstream2'
+    uuid: 'bitstream2',
   });
   const bitstream3 = Object.assign(new Bitstream(), {
     id: 'bitstream3',
-    uuid: 'bitstream3'
+    uuid: 'bitstream3',
   });
   const bitstream4 = Object.assign(new Bitstream(), {
     id: 'bitstream4',
-    uuid: 'bitstream4'
+    uuid: 'bitstream4',
   });
   const bundle1 = Object.assign(new Bundle(), {
     id: 'bundle1',
     uuid: 'bundle1',
     _links: {
-      self: { href: 'bundle1-selflink' }
+      self: { href: 'bundle1-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
   });
   const bundle2 = Object.assign(new Bundle(), {
     id: 'bundle2',
     uuid: 'bundle2',
     _links: {
-      self: { href: 'bundle2-selflink' }
+      self: { href: 'bundle2-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4])),
   });
   const bundles = [bundle1, bundle2];
 
@@ -60,35 +75,35 @@ describe('ItemAuthorizationsComponent test suite', () => {
     uuid: 'item',
     id: 'item',
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2])),
   });
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(item)
-    })
+      dso: createSuccessfulRemoteDataObject(item),
+    }),
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ItemAuthorizationsComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
-        ItemAuthorizationsComponent
+        ItemAuthorizationsComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -139,18 +154,18 @@ describe('ItemAuthorizationsComponent test suite', () => {
       expect(compAsAny.bundleBitstreamsMap.has('bundle2')).toBeTruthy();
       let bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle1');
       expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
-        a : [bitstream1, bitstream2]
+        a : [bitstream1, bitstream2],
       }));
       bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle2');
       expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
-        a: [bitstream3, bitstream4]
+        a: [bitstream3, bitstream4],
       }));
     });
 
     it('should get the item UUID', () => {
 
       expect(comp.getItemUUID()).toBeObservable(cold('(a|)', {
-        a: item.id
+        a: item.id,
       }));
 
     });
@@ -158,7 +173,7 @@ describe('ItemAuthorizationsComponent test suite', () => {
     it('should get the item\'s bundle', () => {
 
       expect(comp.getItemBundles()).toBeObservable(cold('a', {
-        a: bundles
+        a: bundles,
       }));
 
     });
@@ -168,7 +183,7 @@ describe('ItemAuthorizationsComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 635cf455b5..ce68524a0a 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -1,22 +1,43 @@
-import isEqual from 'lodash/isEqual';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import isEqual from 'lodash/isEqual';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  first,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators';
-
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataWithNotEmptyPayload,
 } from '../../../core/shared/operators';
-import { Item } from '../../../core/shared/item.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 
 /**
  * Interface for a bundle's bitstream map entry
@@ -29,7 +50,7 @@ interface BundleBitstreamsMapEntry {
 @Component({
   selector: 'ds-item-authorizations',
   templateUrl: './item-authorizations.component.html',
-  styleUrls:['./item-authorizations.component.scss']
+  styleUrls:['./item-authorizations.component.scss'],
 })
 /**
  * Component that handles the item Authorizations
@@ -101,7 +122,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   constructor(
     private linkService: LinkService,
     private route: ActivatedRoute,
-    public nameService: DSONameService
+    public nameService: DSONameService,
   ) {
   }
 
@@ -109,7 +130,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    * Initialize the component, setting up the bundle and bitstream within the item
    */
   ngOnInit(): void {
-   this.getBundlesPerItem();
+    this.getBundlesPerItem();
   }
 
   /**
@@ -118,7 +139,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   getItemUUID(): Observable<string> {
     return this.item$.pipe(
       map((item: Item) => item.id),
-      first((UUID: string) => isNotEmpty(UUID))
+      first((UUID: string) => isNotEmpty(UUID)),
     );
   }
 
@@ -127,7 +148,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
  */
   getItemName(): Observable<string> {
     return this.item$.pipe(
-      map((item: Item) => this.nameService.getName(item))
+      map((item: Item) => this.nameService.getName(item)),
     );
   }
 
@@ -151,24 +172,24 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
       map((item: Item) => this.linkService.resolveLink(
         item,
-        followLink('bundles', {findListOptions: {currentPage : page, elementsPerPage: this.bundlesPerPage}}, followLink('bitstreams'))
-      ))
+        followLink('bundles', { findListOptions: { currentPage : page, elementsPerPage: this.bundlesPerPage } }, followLink('bitstreams')),
+      )),
     ) as Observable<Item>;
 
     const bundles$: Observable<PaginatedList<Bundle>> =  this.item$.pipe(
       filter((item: Item) => isNotEmpty(item.bundles)),
       mergeMap((item: Item) => item.bundles),
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
-      catchError((error) => {
+      catchError((error: unknown) => {
         console.error(error);
         return observableOf(buildPaginatedList(null, []));
-      })
+      }),
     );
 
     this.subs.push(
       bundles$.pipe(
         take(1),
-        map((list: PaginatedList<Bundle>) => list.page)
+        map((list: PaginatedList<Bundle>) => list.page),
       ).subscribe((bundles: Bundle[]) => {
         if (isEqual(bundles.length,0) || bundles.length < this.bundlesPerPage) {
           this.allBundlesLoaded = true;
@@ -182,21 +203,21 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
       bundles$.pipe(
         take(1),
         mergeMap((list: PaginatedList<Bundle>) => list.page),
-        map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) }))
+        map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) })),
       ).subscribe((entry: BundleBitstreamsMapEntry) => {
-        let bitstreamMapValues: BitstreamMapValue = {
+        const bitstreamMapValues: BitstreamMapValue = {
           isCollapsed: true,
           allBitstreamsLoaded: false,
-          bitstreams: null
+          bitstreams: null,
         };
         bitstreamMapValues.bitstreams = entry.bitstreams.pipe(
           map((b: PaginatedList<Bitstream>) => {
             bitstreamMapValues.allBitstreamsLoaded = b?.page.length < this.bitstreamSize;
             return [...b.page.slice(0, this.bitstreamSize)];
-          })
+          }),
         );
         this.bundleBitstreamsMap.set(entry.id, bitstreamMapValues);
-      })
+      }),
     );
   }
 
@@ -208,10 +229,10 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   private getBundleBitstreams(bundle: Bundle): Observable<PaginatedList<Bitstream>> {
     return bundle.bitstreams.pipe(
       getFirstSucceededRemoteDataPayload(),
-      catchError((error) => {
+      catchError((error: unknown) => {
         console.error(error);
         return observableOf(buildPaginatedList(null, []));
-      })
+      }),
     );
   }
 
@@ -239,17 +260,17 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    */
   onBitstreamsLoad(bundle: Bundle) {
     return this.getBundleBitstreams(bundle).subscribe((res: PaginatedList<Bitstream>) => {
-      let nextBitstreams = res?.page.slice(this.bitstreamPageSize, this.bitstreamPageSize + this.bitstreamSize);
-      let bitstreamsToShow = this.bundleBitstreamsMap.get(bundle.id).bitstreams.pipe(
+      const nextBitstreams = res?.page.slice(this.bitstreamPageSize, this.bitstreamPageSize + this.bitstreamSize);
+      const bitstreamsToShow = this.bundleBitstreamsMap.get(bundle.id).bitstreams.pipe(
         map((existingBits: Bitstream[])=> {
           return [... existingBits, ...nextBitstreams];
-        })
+        }),
       );
       this.bitstreamPageSize = this.bitstreamPageSize + this.bitstreamSize;
-      let bitstreamMapValues: BitstreamMapValue = {
+      const bitstreamMapValues: BitstreamMapValue = {
         bitstreams: bitstreamsToShow ,
         isCollapsed: this.bundleBitstreamsMap.get(bundle.id).isCollapsed,
-        allBitstreamsLoaded: res?.page.length <= this.bitstreamPageSize
+        allBitstreamsLoaded: res?.page.length <= this.bitstreamPageSize,
       };
       this.bundleBitstreamsMap.set(bundle.id, bitstreamMapValues);
     });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..48635a50f6 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,22 +1,26 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
   <div class="button-row top d-flex mt-2 space-children-mr">
     <button class="mr-auto btn btn-success"
+            [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
             [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
             class="fas fa-upload"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
     </button>
     <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+            [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
             (click)="reinstate()"><i
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true || submitting"
+            [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
     </button>
-    <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+            [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+            [disabled]="(hasChanges() | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -49,17 +53,20 @@
   <div class="button-row bottom">
     <div class="mt-4 float-right space-children-mr ml-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+              [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
               (click)="reinstate()"><i
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true || submitting"
+              [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
       </button>
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+              [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+              [disabled]="(hasChanges() | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 10e1812131..be89fcd558 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -1,31 +1,48 @@
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { of as observableOf } from 'rxjs';
-import { Item } from '../../../core/shared/item.model';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemBitstreamsComponent } from './item-bitstreams.component';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { of as observableOf } from 'rxjs';
+
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { RestResponse } from '../../../core/cache/response.models';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { ItemBitstreamsComponent } from './item-bitstreams.component';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -35,34 +52,34 @@ const warningNotification: INotification = new Notification('id', NotificationTy
 const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
 const bitstream1 = Object.assign(new Bitstream(), {
   id: 'bitstream1',
-  uuid: 'bitstream1'
+  uuid: 'bitstream1',
 });
 const bitstream2 = Object.assign(new Bitstream(), {
   id: 'bitstream2',
-  uuid: 'bitstream2'
+  uuid: 'bitstream2',
 });
 const fieldUpdate1 = {
   field: bitstream1,
-  changeType: undefined
+  changeType: undefined,
 };
 const fieldUpdate2 = {
   field: bitstream2,
-  changeType: FieldChangeType.REMOVE
+  changeType: FieldChangeType.REMOVE,
 };
 const bundle = Object.assign(new Bundle(), {
   id: 'bundle1',
   uuid: 'bundle1',
   _links: {
-    self: { href: 'bundle1-selflink' }
+    self: { href: 'bundle1-selflink' },
   },
-  bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+  bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
 });
 const moveOperations = [
   {
     op: 'move',
     from: '/0',
-    path: '/1'
-  }
+    path: '/1',
+  },
 ];
 const date = new Date();
 const url = 'thisUrl';
@@ -100,52 +117,52 @@ describe('ItemBitstreamsComponent', () => {
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
         isValidPage: observableOf(true),
-        getMoveOperations: observableOf(moveOperations)
-      }
+        getMoveOperations: observableOf(moveOperations),
+      },
     );
     router = Object.assign(new RouterStub(), {
-      url: url
+      url: url,
     });
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
     bitstreamService = new BitstreamDataServiceStub();
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     requestService = getMockRequestService();
     searchConfig = Object.assign({
-      paginatedSearchOptions: observableOf({})
+      paginatedSearchOptions: observableOf({}),
     });
 
     item = Object.assign(new Item(), {
       uuid: 'item',
       id: 'item',
       _links: {
-        self: { href: 'item-selflink' }
+        self: { href: 'item-selflink' },
       },
       bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
-      lastModified: date
+      lastModified: date,
     });
     itemService = Object.assign({
       getBitstreams: () => createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
       findByHref: () => createSuccessfulRemoteDataObject$(item),
       findById: () => createSuccessfulRemoteDataObject$(item),
-      getBundles: () => createSuccessfulRemoteDataObject$(createPaginatedList([bundle]))
+      getBundles: () => createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
     });
     route = Object.assign({
       parent: {
-        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
       },
       data: observableOf({}),
-      url: url
+      url: url,
     });
     bundleService = jasmine.createSpyObj('bundleService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: observableOf(new RestResponse(true, 200, 'OK')),
     });
 
     TestBed.configureTestingModule({
@@ -162,10 +179,10 @@ describe('ItemBitstreamsComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: SearchConfigurationService, useValue: searchConfig },
         { provide: BundleDataService, useValue: bundleService },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -191,20 +208,6 @@ describe('ItemBitstreamsComponent', () => {
     });
   });
 
-  describe('when dropBitstream is called', () => {
-    const event = {
-      fromIndex: 0,
-      toIndex: 50,
-      // eslint-disable-next-line no-empty,@typescript-eslint/no-empty-function
-      finish: () => {
-      }
-    };
-
-    beforeEach(() => {
-      comp.dropBitstream(bundle, event);
-    });
-  });
-
   describe('when dropBitstream is called', () => {
     beforeEach((done) => {
       comp.dropBitstream(bundle, {
@@ -212,7 +215,7 @@ describe('ItemBitstreamsComponent', () => {
         toIndex: 50,
         finish: () => {
           done();
-        }
+        },
       });
     });
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index ee53bd919c..191ba89845 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,30 +1,54 @@
-import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
-import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { Observable, Subscription, zip as observableZip } from 'rxjs';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  ChangeDetectorRef,
+  Component,
+  NgZone,
+  OnDestroy,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { NoContent } from '../../../core/shared/NoContent.model';
 import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  Subscription,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -47,7 +71,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   bundlesOptions = {
     id: 'bundles-pagination-options',
     currentPage: 1,
-    pageSize: 9999
+    pageSize: 9999,
   } as any;
 
   /**
@@ -61,7 +85,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // Format column
     new ResponsiveColumnSizes(2, 2, 2, 2, 2),
     // Actions column
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
   ]);
 
   /**
@@ -88,7 +112,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService,
-    public zone: NgZone
+    public zone: NgZone,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -97,10 +121,10 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
+    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
     );
   }
 
@@ -124,12 +148,12 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // Fetch all removed bitstreams from the object update service
     const removedBitstreams$ = bundlesOnce$.pipe(
       switchMap((bundles: Bundle[]) => observableZip(
-        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true))
+        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true)),
       )),
       map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
-        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE))
+        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)),
       )),
-      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
+      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field)),
     );
 
     // Send out delete requests for all deleted bitstreams
@@ -137,7 +161,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
       take(1),
       switchMap((removedBitstreams: Bitstream[]) => {
         return this.bitstreamService.removeMultiple(removedBitstreams);
-      })
+      }),
     );
 
     // Perform the setup actions from above in order and display notifications
@@ -160,7 +184,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
         const moveOperation = {
           op: 'move',
           from: `/_links/bitstreams/${event.fromIndex}/href`,
-          path: `/_links/bitstreams/${event.toIndex}/href`
+          path: `/_links/bitstreams/${event.toIndex}/href`,
         } as Operation;
         this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
           this.zone.run(() => {
@@ -168,7 +192,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
             // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
             this.requestService.removeByHrefSubstring(bundle.self).pipe(
               filter((isCached) => isCached),
-              take(1)
+              take(1),
             ).subscribe(() => event.finish());
           });
         });
@@ -202,7 +226,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Shows a notification to remind the user that they can undo this
    */
   discard() {
-    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), {timeOut: this.discardTimeOut});
+    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), { timeOut: this.discardTimeOut });
     this.objectUpdatesService.discardAllFieldUpdates(this.url, undoNotification);
   }
 
@@ -223,7 +247,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   isReinstatable(): Observable<boolean> {
     return this.bundles$.pipe(
       switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.isReinstatable(bundle.self)))),
-      map((reinstatable: boolean[]) => reinstatable.includes(true))
+      map((reinstatable: boolean[]) => reinstatable.includes(true)),
     );
   }
 
@@ -233,7 +257,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   hasChanges(): Observable<boolean> {
     return this.bundles$.pipe(
       switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.hasUpdates(bundle.self)))),
-      map((hasChanges: boolean[]) => hasChanges.includes(true))
+      map((hasChanges: boolean[]) => hasChanges.includes(true)),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 62170235a3..42b9b9eb64 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -10,6 +10,7 @@
       <div class="btn-group bundle-action-buttons">
         <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                 [queryParams]="{bundle: bundle.id}"
+                [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
                 class="btn btn-outline-success btn-sm"
                 title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
           <i class="fas fa-upload fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index c26f99eb8f..810a262b9b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -1,11 +1,19 @@
-import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
+
 import { Bundle } from '../../../../core/shared/bundle.model';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle.component';
 
 describe('ItemEditBitstreamBundleComponent', () => {
   let comp: ItemEditBitstreamBundleComponent;
@@ -16,19 +24,19 @@ describe('ItemEditBitstreamBundleComponent', () => {
     new ResponsiveColumnSizes(2, 2, 3, 4, 4),
     new ResponsiveColumnSizes(2, 3, 3, 3, 3),
     new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
   ]);
 
   const item = Object.assign(new Item(), {
     id: 'item-1',
-    uuid: 'item-1'
+    uuid: 'item-1',
   });
   const bundle = Object.assign(new Bundle(), {
     id: 'bundle-1',
     uuid: 'bundle-1',
     _links: {
-      self: { href: 'bundle-1-selflink' }
-    }
+      self: { href: 'bundle-1-selflink' },
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -36,8 +44,8 @@ describe('ItemEditBitstreamBundleComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ItemEditBitstreamBundleComponent],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 70f4b63217..52d8e8e0f7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,10 +1,20 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-item-edit-bitstream-bundle',
@@ -16,12 +26,12 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
  * Creates an embedded view of the contents. This is to ensure the table structure won't break.
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-bundle element)
  */
-export class ItemEditBitstreamBundleComponent implements OnInit {
+export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
 
   /**
    * The view on the bundle information and bitstreams
    */
-  @ViewChild('bundleView', {static: true}) bundleView;
+  @ViewChild('bundleView', { static: true }) bundleView;
 
   /**
    * The bundle to display bitstreams for
@@ -67,4 +77,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
   }
+
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
index f54aa73597..e43c504858 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
@@ -5,7 +5,7 @@
                [paginationOptions]="options"
                [pageInfoState]="(objectsRD$ | async)?.payload"
                [collectionSize]="(objectsRD$ | async)?.payload?.totalElements">
-  <ng-container *ngIf="!(loading$ | async)">
+  <ng-container *ngIf="(loading$ | async) !== true">
     <div [id]="bundle.id" class="bundle-bitstreams-list"
          [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
          *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
index 7317eb93be..d817d3a96d 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
@@ -1,23 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
-import { VarDirective } from '../../../../../shared/utils/var.directive';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../../shared/testing/utils.test';
+
+import { BundleDataService } from '../../../../../core/data/bundle-data.service';
+import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../../../core/data/request.service';
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
+import { Bundle } from '../../../../../core/shared/bundle.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../../../shared/testing/utils.test';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
+import { VarDirective } from '../../../../../shared/utils/var.directive';
+import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
 
 describe('PaginatedDragAndDropBitstreamListComponent', () => {
   let comp: PaginatedDragAndDropBitstreamListComponent;
@@ -32,41 +37,41 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     new ResponsiveColumnSizes(2, 2, 3, 4, 4),
     new ResponsiveColumnSizes(2, 3, 3, 3, 3),
     new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
   ]);
 
   const bundle = Object.assign(new Bundle(), {
     id: 'bundle-1',
     uuid: 'bundle-1',
     _links: {
-      self: { href: 'bundle-1-selflink' }
-    }
+      self: { href: 'bundle-1-selflink' },
+    },
   });
   const date = new Date();
   const format = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'PDF'
+    shortDescription: 'PDF',
   });
   const bitstream1 = Object.assign(new Bitstream(), {
     uuid: 'bitstreamUUID1',
     name: 'Fake Bitstream 1',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
+    format: createSuccessfulRemoteDataObject$(format),
   });
   const fieldUpdate1 = {
     field: bitstream1,
-    changeType: undefined
+    changeType: undefined,
   };
   const bitstream2 = Object.assign(new Bitstream(), {
     uuid: 'bitstreamUUID2',
     name: 'Fake Bitstream 2',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
+    format: createSuccessfulRemoteDataObject$(format),
   });
   const fieldUpdate2 = {
     field: bitstream2,
-    changeType: undefined
+    changeType: undefined,
   };
 
   beforeEach(waitForAsync(() => {
@@ -97,19 +102,19 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
         isReinstatable: observableOf(false),
         isValidPage: observableOf(true),
         initializeWithCustomOrder: {},
-        addPageToCustomOrder: {}
-      }
+        addPageToCustomOrder: {},
+      },
     );
 
     bundleService = jasmine.createSpyObj('bundleService', {
       getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
-      getBitstreamsEndpoint: observableOf('')
+      getBitstreamsEndpoint: observableOf(''),
     });
 
     objectValuesPipe = new ObjectValuesPipe();
 
     requestService = jasmine.createSpyObj('requestService', {
-      hasByHref$: observableOf(true)
+      hasByHref$: observableOf(true),
     });
 
     paginationService = new PaginationServiceStub();
@@ -122,10 +127,10 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
         { provide: BundleDataService, useValue: bundleService },
         { provide: ObjectValuesPipe, useValue: objectValuesPipe },
         { provide: RequestService, useValue: requestService },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
index 2c81a4e2cb..bdd64c5376 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
@@ -1,17 +1,23 @@
-import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
-import { Component, ElementRef, Input, OnInit } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
+import {
+  Component,
+  ElementRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
+
+import { BundleDataService } from '../../../../../core/data/bundle-data.service';
+import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../../../core/data/request.service';
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../../core/shared/bitstream.model';
+import { Bundle } from '../../../../../core/shared/bundle.model';
 import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
+import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
+import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
 
 @Component({
   selector: 'ds-paginated-drag-and-drop-bitstream-list',
@@ -54,16 +60,16 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
   initializeObjectsRD(): void {
     this.objectsRD$ = this.currentPage$.pipe(
       switchMap((page: PaginationComponentOptions) => {
-        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, page)});
+        const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
         return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
           switchMap((href) => this.requestService.hasByHref$(href)),
           switchMap(() => this.bundleService.getBitstreams(
             this.bundle.id,
             paginatedOptions,
-            followLink('format')
-          ))
+            followLink('format'),
+          )),
         );
-      })
+      }),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
index e5cb9ba403..8e3524dffb 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
@@ -1,4 +1,10 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-item-edit-bitstream-drag-handle',
@@ -10,11 +16,11 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
  * Creates an embedded view of the contents
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-drag-handle element)
  */
-export class ItemEditBitstreamDragHandleComponent implements OnInit {
+export class ItemEditBitstreamDragHandleComponent implements OnInit, OnDestroy {
   /**
    * The view on the drag-handle
    */
-  @ViewChild('handleView', {static: true}) handleView;
+  @ViewChild('handleView', { static: true }) handleView;
 
   constructor(private viewContainerRef: ViewContainerRef) {
   }
@@ -23,4 +29,8 @@ export class ItemEditBitstreamDragHandleComponent implements OnInit {
     this.viewContainerRef.createEmbeddedView(this.handleView);
   }
 
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 0f0fad2199..7d52ab220f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -25,22 +25,26 @@
   <div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
     <div class="text-center w-100">
       <div class="btn-group relationship-action-buttons">
-        <a *ngIf="bitstreamDownloadUrl != null" [href]="bitstreamDownloadUrl"
-                class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-                [attr.data-test]="'download-button' | dsBrowserOnly">
+        <a *ngIf="bitstreamDownloadUrl !== null" [routerLink]="bitstreamDownloadUrl"
+           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
+           class="btn btn-outline-primary btn-sm"
+           title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+           [attr.data-test]="'download-button' | dsBrowserOnly">
           <i class="fas fa-download fa-fw"></i>
         </a>
         <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
         <button [disabled]="!canRemove()" (click)="remove()"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
         <button [disabled]="!canUndo()" (click)="undo()"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
           <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
index aafa5a4fe4..04cbd4e931 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
@@ -1,18 +1,24 @@
-import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../../shared/utils/var.directive';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
 
 let comp: ItemEditBitstreamComponent;
 let fixture: ComponentFixture<ItemEditBitstreamComponent>;
@@ -21,11 +27,11 @@ const columnSizes = new ResponsiveTableSizes([
   new ResponsiveColumnSizes(2, 2, 3, 4, 4),
   new ResponsiveColumnSizes(2, 3, 3, 3, 3),
   new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-  new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+  new ResponsiveColumnSizes(6, 5, 4, 3, 3),
 ]);
 
 const format = Object.assign(new BitstreamFormat(), {
-  shortDescription: 'PDF'
+  shortDescription: 'PDF',
 });
 const bitstream = Object.assign(new Bitstream(), {
   uuid: 'bitstreamUUID',
@@ -33,14 +39,14 @@ const bitstream = Object.assign(new Bitstream(), {
   bundleName: 'ORIGINAL',
   description: 'Description',
   _links: {
-    content: { href: 'content-link' }
+    content: { href: 'content-link' },
   },
 
-  format: createSuccessfulRemoteDataObject$(format)
+  format: createSuccessfulRemoteDataObject$(format),
 });
 const fieldUpdate = {
   field: bitstream,
-  changeType: undefined
+  changeType: undefined,
 };
 const date = new Date();
 const url = 'thisUrl';
@@ -67,22 +73,25 @@ describe('ItemEditBitstreamComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [
+        RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot(),
+      ],
       declarations: [
         ItemEditBitstreamComponent,
         VarDirective,
         BrowserOnlyMockPipe,
       ],
       providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService }
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index fcb5c706ac..b4e86d010d 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -1,15 +1,28 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild, ViewContainerRef } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
 import cloneDeep from 'lodash/cloneDeep';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { Observable } from 'rxjs';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../core/shared/operators';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+
 import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 
 @Component({
   selector: 'ds-item-edit-bitstream',
@@ -21,12 +34,12 @@ import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
  * Creates an embedded view of the contents
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream element)
  */
-export class ItemEditBitstreamComponent implements OnChanges, OnInit {
+export class ItemEditBitstreamComponent implements OnChanges, OnDestroy, OnInit {
 
   /**
    * The view on the bitstream
    */
-  @ViewChild('bitstreamView', {static: true}) bitstreamView;
+  @ViewChild('bitstreamView', { static: true }) bitstreamView;
 
   /**
    * The current field, value and state of the bitstream
@@ -72,6 +85,10 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
     this.viewContainerRef.createEmbeddedView(this.bitstreamView);
   }
 
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
   /**
    * Update the current bitstream and its format on changes
    * @param changes
@@ -82,7 +99,7 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
     this.bitstreamDownloadUrl = getBitstreamDownloadRoute(this.bitstream);
     this.format$ = this.bitstream.format.pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index c522b8a9c5..57287fdfe2 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'item.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -22,7 +22,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
index f9962643f8..36066802bd 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
@@ -1,46 +1,60 @@
 import { CommonModule } from '@angular/common';
 import { EventEmitter } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { LoadingComponent } from '../../../shared/loading/loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CollectionSelectComponent } from '../../../shared/object-select/collection-select/collection-select.component';
 import { ObjectSelectService } from '../../../shared/object-select/object-select.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { SearchFormComponent } from '../../../shared/search-form/search-form.component';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchFormComponent } from '../../../shared/search-form/search-form.component';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ObjectSelectServiceStub } from '../../../shared/testing/object-select-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { SearchServiceStub } from '../../../shared/testing/search-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ItemCollectionMapperComponent } from './item-collection-mapper.component';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 
 describe('ItemCollectionMapperComponent', () => {
   let comp: ItemCollectionMapperComponent;
@@ -57,26 +71,26 @@ describe('ItemCollectionMapperComponent', () => {
   const mockItem: Item = Object.assign(new Item(), {
     id: '932c7d50-d85a-44cb-b9dc-b427b12877bd',
     uuid: '932c7d50-d85a-44cb-b9dc-b427b12877bd',
-    name: 'test-item'
+    name: 'test-item',
   });
   const mockItemRD: RemoteData<Item> = createSuccessfulRemoteDataObject(mockItem);
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
-    sort: new SortOptions('dc.title', SortDirection.ASC)
+    sort: new SortOptions('dc.title', SortDirection.ASC),
   }));
   const url = 'http://test.url';
   const urlWithParam = url + '?param=value';
   const routerStub = Object.assign(new RouterStub(), {
     url: urlWithParam,
     navigateByUrl: {},
-    navigate: {}
+    navigate: {},
   });
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const mockCollectionsRD = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
@@ -85,7 +99,7 @@ describe('ItemCollectionMapperComponent', () => {
     getMappedCollectionsEndpoint: () => observableOf('rest/api/mappedCollectionsEndpoint'),
     getMappedCollections: () => observableOf(mockCollectionsRD),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearMappedCollectionsRequests: () => {}
+    clearMappedCollectionsRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   };
   const collectionDataServiceStub = {
@@ -94,25 +108,25 @@ describe('ItemCollectionMapperComponent', () => {
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(mockCollectionsRD),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   });
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockItemRD
-      })
-    }
+        dso: mockItemRD,
+      }),
+    },
   };
   const translateServiceStub = {
     get: () => observableOf('test-message of item ' + mockItem.name),
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
-    onDefaultLangChange: new EventEmitter()
+    onDefaultLangChange: new EventEmitter(),
   };
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   beforeEach(waitForAsync(() => {
@@ -130,8 +144,8 @@ describe('ItemCollectionMapperComponent', () => {
         { provide: TranslateService, useValue: translateServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: CollectionDataService, useValue: collectionDataServiceStub },
-        { provide: AuthorizationDataService, useValue: authorizationDataService }
-      ]
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index d94abfaa9f..7c9148c9cc 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,32 +1,56 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
-import { RemoteData } from '../../../core/data/remote-data';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../core/shared/item.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
-  toDSpaceObjectListRD
+  toDSpaceObjectListRD,
 } from '../../../core/shared/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
@@ -36,8 +60,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component for mapping collections to an item
@@ -106,7 +130,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       filter((rd: RemoteData<Item>) => hasValue(rd)),
       map((rd: RemoteData<Item>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadCollectionLists();
@@ -127,9 +151,9 @@ export class ItemCollectionMapperComponent implements OnInit {
           this.itemDataService.getMappedCollectionsEndpoint(item.id),
           undefined,
           !shouldUpdate,
-          false
+          false,
         ).pipe(
-          getAllSucceededRemoteData()
+          getAllSucceededRemoteData(),
         );
       }),
     );
@@ -142,18 +166,18 @@ export class ItemCollectionMapperComponent implements OnInit {
     const itemCollectionsAndOptions$ = observableCombineLatest(
       this.itemCollectionsRD$,
       owningCollectionRD$,
-      this.searchOptions$
+      this.searchOptions$,
     );
     this.mappedCollectionsRD$ = itemCollectionsAndOptions$.pipe(
       switchMap(([itemCollectionsRD, owningCollectionRD, searchOptions]) => {
         return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
           query: this.buildQuery([...itemCollectionsRD.payload.page, owningCollectionRD.payload], searchOptions.query),
-          dsoTypes: [DSpaceObjectType.COLLECTION]
+          dsoTypes: [DSpaceObjectType.COLLECTION],
         }), 10000).pipe(
           toDSpaceObjectListRD(),
-          startWith(undefined)
+          startWith(undefined),
         );
-      })
+      }),
     ) as Observable<RemoteData<PaginatedList<Collection>>>;
   }
 
@@ -166,13 +190,13 @@ export class ItemCollectionMapperComponent implements OnInit {
       this.itemRD$.pipe(
         getFirstSucceededRemoteData(),
         map((rd: RemoteData<Item>) => rd.payload),
-        map((item: Item) => item.id)
+        map((item: Item) => item.id),
       ),
       this.itemCollectionsRD$.pipe(
         getFirstSucceededRemoteData(),
         map((rd: RemoteData<PaginatedList<Collection>>) => rd.payload.page),
-        map((collections: Collection[]) => collections.map((collection: Collection) => collection.id))
-      )
+        map((collections: Collection[]) => collections.map((collection: Collection) => collection.id)),
+      ),
     ]);
 
     // Map the item to the collections found in ids, excluding the collections the item is already mapped to
@@ -180,9 +204,9 @@ export class ItemCollectionMapperComponent implements OnInit {
       switchMap(([itemId, excludingIds]) =>
         observableCombineLatest(
           this.filterIds(ids, excludingIds).map((id: string) =>
-            this.itemDataService.mapToCollection(itemId, id).pipe(getFirstCompletedRemoteData())
-        ))
-      )
+            this.itemDataService.mapToCollection(itemId, id).pipe(getFirstCompletedRemoteData()),
+          )),
+      ),
     );
 
     this.showNotifications(responses$, 'item.edit.item-mapper.notifications.add');
@@ -198,9 +222,9 @@ export class ItemCollectionMapperComponent implements OnInit {
       map((itemRD: RemoteData<Item>) => itemRD.payload.id),
       switchMap((itemId: string) => observableCombineLatest(
         ids.map((id: string) =>
-          this.itemDataService.removeMappingFromCollection(itemId, id).pipe(getFirstCompletedRemoteData())
-        ))
-      )
+          this.itemDataService.removeMappingFromCollection(itemId, id).pipe(getFirstCompletedRemoteData()),
+        )),
+      ),
     );
 
     this.showNotifications(responses$, 'item.edit.item-mapper.notifications.remove');
@@ -228,7 +252,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       if (successful.length > 0) {
         const successMessages = observableCombineLatest([
           this.translateService.get(`${messagePrefix}.success.head`),
-          this.translateService.get(`${messagePrefix}.success.content`, { amount: successful.length })
+          this.translateService.get(`${messagePrefix}.success.content`, { amount: successful.length }),
         ]);
 
         successMessages.subscribe(([head, content]) => {
@@ -239,7 +263,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       if (unsuccessful.length > 0) {
         const unsuccessMessages = observableCombineLatest([
           this.translateService.get(`${messagePrefix}.error.head`),
-          this.translateService.get(`${messagePrefix}.error.content`, { amount: unsuccessful.length })
+          this.translateService.get(`${messagePrefix}.error.content`, { amount: unsuccessful.length }),
         ]);
 
         unsuccessMessages.subscribe(([head, content]) => {
@@ -311,7 +335,7 @@ export class ItemCollectionMapperComponent implements OnInit {
     this.itemRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((item: Item) => {
       this.router.navigate([getItemPageRoute(item)]);
     });
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 7c7ed41bd9..22b10b28b6 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container mt-3">
-    <h3>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h3>
+    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
     <ds-curation-form
       *ngIf="dsoRD$ | async as dsoRD"
       [dsoHandle]="dsoRD?.payload.handle"
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts
index c104b4400b..a1bc23ee0e 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ItemCurateComponent } from './item-curate.component';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ItemCurateComponent } from './item-curate.component';
 
 describe('ItemCurateComponent', () => {
   let comp: ItemCurateComponent;
@@ -18,30 +26,30 @@ describe('ItemCurateComponent', () => {
 
   const item = Object.assign(new Item(), {
     handle: '123456789/1',
-    metadata: {'dc.title': ['Item Name']}
+    metadata: { 'dc.title': ['Item Name'] },
   });
 
   beforeEach(waitForAsync(() => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(item)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(item),
+        }),
+      },
     };
 
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
-      getName: 'Item Name'
+      getName: 'Item Name',
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemCurateComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: DSONameService, useValue: dsoNameService}
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
index fa1e0287fa..b9a56b6c32 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -1,11 +1,19 @@
-import { Component, OnInit } from '@angular/core';
-import { filter, map, take } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Observable } from 'rxjs';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { hasValue } from '../../../shared/empty.util';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * Component for managing a collection's curation tasks
@@ -33,7 +41,7 @@ export class ItemCurateComponent implements OnInit {
       filter((rd: RemoteData<Item>) => hasValue(rd)),
       map((rd: RemoteData<Item>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 7b1953d892..5191e705d0 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -2,7 +2,7 @@
     <div class="row">
         <div class="col-12">
 
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
index 2a9f7fae52..84c2d15edc 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
@@ -1,31 +1,45 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf, EMPTY } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ItemDeleteComponent } from './item-delete.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { getItemEditRoute } from '../../item-page-routing-paths';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
+import { Item } from '../../../core/shared/item.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { getItemEditRoute } from '../../item-page-routing-paths';
+import { ItemDeleteComponent } from './item-delete.component';
 
 let comp: ItemDeleteComponent;
 let fixture: ComponentFixture<ItemDeleteComponent>;
@@ -58,9 +72,9 @@ describe('ItemDeleteComponent', () => {
       isWithdrawn: true,
       metadata: {
         'dspace.entity.type': [
-          { value: 'Person' }
-        ]
-      }
+          { value: 'Person' },
+        ],
+      },
     });
 
     itemType = Object.assign(new ItemType(), {
@@ -99,17 +113,17 @@ describe('ItemDeleteComponent', () => {
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      delete: createSuccessfulRemoteDataObject$({})
+      delete: createSuccessfulRemoteDataObject$({}),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     typesSelection = {
@@ -121,7 +135,7 @@ describe('ItemDeleteComponent', () => {
       {
         getEntityTypeByLabel: createSuccessfulRemoteDataObject$(itemType),
         getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList(types)),
-      }
+      },
     );
 
     objectUpdatesServiceStub = {
@@ -134,13 +148,13 @@ describe('ItemDeleteComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getItemRelationshipsArray: observableOf(relationships),
-      }
+      },
     );
 
     linkService = jasmine.createSpyObj('linkService',
       {
         resolveLinks: relationships[0],
-      }
+      },
     );
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -159,8 +173,8 @@ describe('ItemDeleteComponent', () => {
         { provide: RelationshipTypeDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -171,7 +185,7 @@ describe('ItemDeleteComponent', () => {
   });
 
   it('should render a page with messages based on the \'delete\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.delete.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.delete.description');
@@ -210,7 +224,7 @@ describe('ItemDeleteComponent', () => {
         (comp as any).entityTypeService = jasmine.createSpyObj('entityTypeService',
           {
             getEntityTypeByLabel: EMPTY,
-          }
+          },
         );
       });
 
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 9012ebe7d7..21d71ab390 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,45 +1,64 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
 import {
-  AbstractSimpleItemActionComponent
-} from '../simple-item-action/abstract-simple-item-action.component';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import {
-  combineLatest as observableCombineLatest,
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
   combineLatest,
+  combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subscription,
-  BehaviorSubject,
 } from 'rxjs';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData
-} from '../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { Item } from '../../../core/shared/item.model';
-import { MetadataValue } from '../../../core/shared/metadata.models';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+  defaultIfEmpty,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getItemEditRoute } from '../../item-page-routing-paths';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
 
 @Component({
   selector: 'ds-item-delete',
-  templateUrl: '../item-delete/item-delete.component.html'
+  templateUrl: '../item-delete/item-delete.component.html',
 })
 /**
  * Component responsible for rendering the item delete page
@@ -143,17 +162,17 @@ export class ItemDeleteComponent
                 } else {
                   return includedTypes;
                 }
-              }, [])
+              }, []),
             ),
           );
-        })
+        }),
       ).subscribe((types: RelationshipType[]) => this.types$.next(types)));
     }
 
     this.subs.push(this.types$.pipe(
       take(1),
     ).subscribe((types) =>
-      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified)
+      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified),
     ));
   }
 
@@ -194,7 +213,7 @@ export class ItemDeleteComponent
       switchMap((relationships) =>
         this.isLeftItem(relationships[0]).pipe(
           map((isLeftItem) => isLeftItem ? relationshipType.leftwardType : relationshipType.rightwardType),
-        )
+        ),
       ),
     );
   }
@@ -212,15 +231,15 @@ export class ItemDeleteComponent
           // filter on type
           switchMap((relationships) =>
             observableCombineLatest(
-              relationships.map((relationship) => this.getRelationshipType(relationship))
+              relationships.map((relationship) => this.getRelationshipType(relationship)),
             ).pipe(
               defaultIfEmpty([]),
               map((types) => relationships.filter(
-                (relationship, index) => relationshipType.id === types[index].id
+                (relationship, index) => relationshipType.id === types[index].id,
               )),
-            )
+            ),
           ),
-        )
+        ),
       );
     }
 
@@ -242,7 +261,7 @@ export class ItemDeleteComponent
     return relationship.relationshipType.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      filter((relationshipType: RelationshipType) => hasValue(relationshipType) && isNotEmpty(relationshipType.uuid))
+      filter((relationshipType: RelationshipType) => hasValue(relationshipType) && isNotEmpty(relationshipType.uuid)),
     );
   }
 
@@ -289,9 +308,9 @@ export class ItemDeleteComponent
                     metadataValue: metadata,
                   };
                 }))
-              .reduce((previous, current) => previous.concat(current))
+              .reduce((previous, current) => previous.concat(current)),
           ),
-        )
+        ),
       );
     }
 
@@ -308,7 +327,7 @@ export class ItemDeleteComponent
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
-      map((leftItem) => leftItem.uuid === this.item.uuid)
+      map((leftItem) => leftItem.uuid === this.item.uuid),
     );
   }
 
@@ -337,22 +356,22 @@ export class ItemDeleteComponent
     this.subs.push(this.types$.pipe(
       switchMap((types) =>
         combineLatest(
-          types.map((type) => this.isSelected(type))
+          types.map((type) => this.isSelected(type)),
         ).pipe(
           defaultIfEmpty([]),
           map((selection) => types.filter(
-            (type, index) => selection[index]
+            (type, index) => selection[index],
           )),
           map((selectedTypes) => selectedTypes.map((type) => type.id)),
-        )
+        ),
       ),
       switchMap((types) =>
-        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData())
-      )
+        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData()),
+      ),
     ).subscribe(
       (rd: RemoteData<NoContent>) => {
         this.notify(rd.hasSucceeded);
-      }
+      },
     ));
   }
 
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 589aac655f..d136f003f4 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h2>
+            <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
             <p>{{'item.edit.move.description' | translate}}</p>
             <div class="row">
                 <div class="col-12">
@@ -21,7 +21,11 @@
                 <div class="col-12">
                     <p>
                       <label for="inheritPoliciesCheckbox">
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox">
+                        <ng-template #tooltipContent>
+                          {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
+                        </ng-template>
+                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
+                        >
                         {{'item.edit.move.inheritpolicies.checkbox' |translate}}
                       </label>
                     </p>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
index 43ac47e37b..f1cf223b25 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -1,28 +1,35 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { RequestService } from '../../../core/data/request.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { ItemMoveComponent } from './item-move.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { ItemMoveComponent } from './item-move.component';
 
 describe('ItemMoveComponent', () => {
   let comp: ItemMoveComponent;
@@ -31,22 +38,22 @@ describe('ItemMoveComponent', () => {
   const mockItem = Object.assign(new Item(), {
     id: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const itemPageUrl = `fake-url/${mockItem.id}`;
   const routerStub = Object.assign(new RouterStub(), {
-    url: `${itemPageUrl}/edit`
+    url: `${itemPageUrl}/edit`,
   });
 
   const collection1 = Object.assign(new Collection(), {
     uuid: 'collection-uuid-1',
-    name: 'Test collection 1'
+    name: 'Test collection 1',
   });
 
   const collection2 = Object.assign(new Collection(), {
     uuid: 'collection-uuid-2',
-    name: 'Test collection 2'
+    name: 'Test collection 2',
   });
 
   let itemDataService;
@@ -67,9 +74,9 @@ describe('ItemMoveComponent', () => {
         id: 'item1',
         owningCollection: createSuccessfulRemoteDataObject$(Object.assign(new Collection(), {
           id: 'originalOwningCollection',
-        }))
-      }))
-    })
+        })),
+      })),
+    }),
   };
 
   const mockSearchService = {
@@ -77,13 +84,13 @@ describe('ItemMoveComponent', () => {
       return createSuccessfulRemoteDataObject$(createPaginatedList([
         {
           indexableObject: collection1,
-          hitHighlights: {}
+          hitHighlights: {},
         }, {
           indexableObject: collection2,
-          hitHighlights: {}
-        }
+          hitHighlights: {},
+        },
       ]));
-    }
+    },
   };
 
   const notificationsServiceStub = new NotificationsServiceStub();
@@ -102,8 +109,8 @@ describe('ItemMoveComponent', () => {
         { provide: SearchService, useValue: mockSearchService },
         { provide: RequestService, useValue: getMockRequestService() },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
     fixture = TestBed.createComponent(ItemMoveComponent);
     comp = fixture.componentInstance;
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 0f9df588a1..b5f382fd3f 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,26 +1,42 @@
-import { Component, OnInit } from '@angular/core';
-import { map, switchMap } from 'rxjs/operators';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
-} from '../../../core/shared/operators';
-import { ItemDataService } from '../../../core/data/item-data.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Collection } from '../../../core/shared/collection.model';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { RequestService } from '../../../core/data/request.service';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-move',
-  templateUrl: './item-move.component.html'
+  templateUrl: './item-move.component.html',
 })
 /**
  * Component that handles the moving of an item to a different collection
@@ -63,15 +79,15 @@ export class ItemMoveComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.dso), getFirstSucceededRemoteData()
+      map((data) => data.dso), getFirstSucceededRemoteData(),
     ) as Observable<RemoteData<Item>>;
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
     this.itemRD$.subscribe((rd) => {
-        this.item = rd.payload;
-      }
+      this.item = rd.payload;
+    },
     );
     this.itemRD$.pipe(
       getFirstSucceededRemoteData(),
@@ -124,9 +140,9 @@ export class ItemMoveComponent implements OnInit {
           this.item.id,
           false,
           true,
-          followLink('owningCollection')
-      )),
-      getFirstCompletedRemoteData()
+          followLink('owningCollection'),
+        )),
+      getFirstCompletedRemoteData(),
     ).subscribe(() => {
       this.processing = false;
       this.router.navigate([getItemEditRoute(this.item)]);
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 7570119b3a..b8dd51282f 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -1,9 +1,13 @@
-import { ItemOperation } from './itemOperation.model';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemOperationComponent } from './item-operation.component';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemOperationComponent } from './item-operation.component';
+import { ItemOperation } from './itemOperation.model';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
@@ -14,7 +18,7 @@ describe('ItemOperationComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
-      declarations: [ItemOperationComponent]
+      declarations: [ItemOperationComponent],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 76d056df95..1ad20d4d12 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -1,9 +1,13 @@
-import {Component, Input} from '@angular/core';
-import {ItemOperation} from './itemOperation.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
-  templateUrl: './item-operation.component.html'
+  templateUrl: './item-operation.component.html',
 })
 /**
  * Operation that can be performed on an item
diff --git a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
index 33302dcba6..a6f08ac95c 100644
--- a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
+++ b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
@@ -28,4 +28,12 @@ export class ItemOperation {
     this.disabled = disabled;
   }
 
+  /**
+   * Set whether this operation is authorized
+   * @param authorized
+   */
+  setAuthorized(authorized: boolean): void {
+    this.authorized = authorized;
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts
new file mode 100644
index 0000000000..3c2cb4486f
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class ItemPageAccessControlGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
index 764c6ac7c8..43eef68fdb 100644
--- a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage bitstreams rights
diff --git a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
index 2380377aea..dcd947c9aa 100644
--- a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ItemPageResolver } from '../item-page.resolver';
-import { Item } from '../../core/shared/item.model';
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage mappings rights
diff --git a/src/app/item-page/edit-item-page/item-page-curate.guard.ts b/src/app/item-page/edit-item-page/item-page-curate.guard.ts
new file mode 100644
index 0000000000..a096caf937
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-curate.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class ItemPageCurateGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
index a6846bec4e..e0c49283f3 100644
--- a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ItemPageResolver } from '../item-page.resolver';
-import { Item } from '../../core/shared/item.model';
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring edit metadata rights
diff --git a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
index 6a20d4d348..7eac0b0499 100644
--- a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring DOI registration rights
diff --git a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
index 88c9c20b12..a160301e44 100644
--- a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring reinstate rights
diff --git a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
index 77da92ae02..c6cc86a198 100644
--- a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ItemPageResolver } from '../item-page.resolver';
-import { Item } from '../../core/shared/item.model';
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage relationships rights
diff --git a/src/app/item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts
index ade565da69..e9d3640bda 100644
--- a/src/app/item-page/edit-item-page/item-page-status.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-status.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
-import { DsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring any of the rights required for
diff --git a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
index dccdd9e641..864cca9c5a 100644
--- a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ItemPageResolver } from '../item-page.resolver';
-import { Item } from '../../core/shared/item.model';
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage versions rights
diff --git a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
index de9b7d0147..8370cbed16 100644
--- a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
@@ -1,15 +1,23 @@
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Item } from '../../core/shared/item.model';
 import { Injectable } from '@angular/core';
-import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring withdraw rights
diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
index 323255e3d7..cf3c4ed822 100644
--- a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
@@ -1,21 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ItemPrivateComponent } from './item-private.component';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemPrivateComponent } from './item-private.component';
 
 let comp: ItemPrivateComponent;
 let fixture: ComponentFixture<ItemPrivateComponent>;
@@ -36,22 +47,22 @@ describe('ItemPrivateComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -65,8 +76,8 @@ describe('ItemPrivateComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -80,7 +91,7 @@ describe('ItemPrivateComponent', () => {
   });
 
   it('should render a page with messages based on the \'private\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.private.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.private.description');
diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.ts
index 937eaad1c4..8e4da073d2 100644
--- a/src/app/item-page/edit-item-page/item-private/item-private.component.ts
+++ b/src/app/item-page/edit-item-page/item-private/item-private.component.ts
@@ -1,18 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-private',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the make item private page
@@ -37,7 +39,7 @@ export class ItemPrivateComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setDiscoverable(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
       (rd: RemoteData<Item>) => {
         this.processRestResponse(rd);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
index 1f741fcc59..5ace76c30b 100644
--- a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemPublicComponent } from './item-public.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemPublicComponent;
 let fixture: ComponentFixture<ItemPublicComponent>;
@@ -33,22 +44,22 @@ describe('ItemPublicComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -62,8 +73,8 @@ describe('ItemPublicComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -74,7 +85,7 @@ describe('ItemPublicComponent', () => {
   });
 
   it('should render a page with messages based on the \'public\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.public.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.public.description');
diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.ts
index 97e7b765eb..b4373d8eff 100644
--- a/src/app/item-page/edit-item-page/item-public/item-public.component.ts
+++ b/src/app/item-page/edit-item-page/item-public/item-public.component.ts
@@ -1,17 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-public',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the make item public page
@@ -36,7 +39,7 @@ export class ItemPublicComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setDiscoverable(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 89f5718fc4..97aa40c7b0 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -4,7 +4,7 @@
       <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
       <p>{{descriptionMessage | translate}}</p>
       <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
-        <div *ngIf="(identifier.identifierType=='doi')">
+        <div *ngIf="(identifier.identifierType === 'doi')">
           <p class="float-left">{{doiToUpdateMessage | translate}}: {{identifier.value}}
             ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
           </p>
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
index af52114642..321d40d0d4 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
@@ -1,21 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ItemRegisterDoiComponent } from './item-register-doi.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemRegisterDoiComponent } from './item-register-doi.component';
 
 let comp: ItemRegisterDoiComponent;
 let fixture: ComponentFixture<ItemRegisterDoiComponent>;
@@ -35,30 +46,30 @@ describe('ItemRegisterDoiComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
-      getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}),
+      getIdentifierDataFor: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
       getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'),
-      registerIdentifier: createSuccessfulRemoteDataObject$({'identifiers': []}),
+      registerIdentifier: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      registerDOI: createSuccessfulRemoteDataObject$(mockItem)
+      registerDOI: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-          id: 'fake-id'
-        }))
-      })
+          id: 'fake-id',
+        })),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -70,11 +81,11 @@ describe('ItemRegisterDoiComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: Router, useValue: routerStub },
         { provide: ItemDataService, useValue: mockItemDataService },
-        { provide: IdentifierDataService, useValue: mockIdentifierDataService},
-        { provide: NotificationsService, useValue: notificationsServiceStub }
+        { provide: IdentifierDataService, useValue: mockIdentifierDataService },
+        { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index 54878c6026..f377aae97f 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -1,23 +1,29 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { first, map } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { Observable } from 'rxjs';
-import { getItemPageRoute } from '../../item-page-routing-paths';
-import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+import { getItemPageRoute } from '../../item-page-routing-paths';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-register-doi',
-  templateUrl: './item-register-doi-component.html'
+  templateUrl: './item-register-doi-component.html',
 })
 /**
  * Component responsible for rendering the Item Register DOI page
@@ -44,22 +50,22 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso),
-      getFirstSucceededRemoteData()
+      getFirstSucceededRemoteData(),
     )as Observable<RemoteData<Item>>;
 
     this.itemRD$.pipe(first()).subscribe((rd) => {
-        this.item = rd.payload;
-        this.itemPageRoute = getItemPageRoute(this.item);
-        this.identifiers$ = this.identifierDataService.getIdentifierDataFor(this.item).pipe(
-          map((identifierRD) => {
-            if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
-              return identifierRD.payload.identifiers;
-            } else {
-              return null;
-            }
-          }),
-        );
-      }
+      this.item = rd.payload;
+      this.itemPageRoute = getItemPageRoute(this.item);
+      this.identifiers$ = this.identifierDataService.getIdentifierDataFor(this.item).pipe(
+        map((identifierRD) => {
+          if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+            return identifierRD.payload.identifiers;
+          } else {
+            return null;
+          }
+        }),
+      );
+    },
     );
 
     this.confirmMessage = 'item.edit.' + this.messageKey + '.confirm';
@@ -88,7 +94,7 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent
           this.processing = false;
           this.processRestResponse(response);
         }
-      }
+      },
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
index 594e7b806a..b7037e2e0b 100644
--- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemReinstateComponent } from './item-reinstate.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemReinstateComponent;
 let fixture: ComponentFixture<ItemReinstateComponent>;
@@ -33,24 +44,24 @@ describe('ItemReinstateComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-          id: 'fake-id'
-        }))
-      })
+          id: 'fake-id',
+        })),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -64,8 +75,8 @@ describe('ItemReinstateComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -76,7 +87,7 @@ describe('ItemReinstateComponent', () => {
   });
 
   it('should render a page with messages based on the \'reinstate\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.reinstate.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.reinstate.description');
diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
index 951585d156..00fa7910aa 100644
--- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
+++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
@@ -1,17 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-reinstate',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the Item Reinstate page
@@ -36,7 +39,7 @@ export class ItemReinstateComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setWithDrawn(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 7cdc903f24..1786f417ed 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,12 +1,12 @@
-<h5>
+<h2 class="h4">
     {{getRelationshipMessageKey() | async | translate}}
     <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
-</h5>
+</h2>
 <ng-container *ngVar="updates$ | async as updates">
-    <ng-container *ngIf="updates && !(loading$ | async)">
+    <ng-container *ngIf="updates && (loading$ | async) !== true">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
           <ds-pagination
             [paginationOptions]="paginationConfig"
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 4cd663f0fb..871cba1d69 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -1,37 +1,45 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../../core/shared/item.model';
-import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { SharedModule } from '../../../../shared/shared.module';
-import { EditRelationshipListComponent } from './edit-relationship-list.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Item } from '../../../../core/shared/item.model';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { HostWindowService } from '../../../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
-import { LinkHeadService } from '../../../../core/services/link-head.service';
-import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
-import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
-import { Router } from '@angular/router';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { EditRelationshipListComponent } from './edit-relationship-list.component';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -103,11 +111,11 @@ describe('EditRelationshipListComponent', () => {
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     relationships = [
@@ -126,16 +134,16 @@ describe('EditRelationshipListComponent', () => {
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
         leftItem: createSuccessfulRemoteDataObject$(item),
         rightItem: createSuccessfulRemoteDataObject$(author2),
-      })
+      }),
     ];
 
     item = Object.assign(new Item(), {
       _links: {
-        self: { href: 'fake-item-url/publication' }
+        self: { href: 'fake-item-url/publication' },
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     });
 
     fieldUpdate1 = {
@@ -144,7 +152,7 @@ describe('EditRelationshipListComponent', () => {
         relationship: relationships[0],
         type: relationshipType,
       },
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: {
@@ -152,16 +160,16 @@ describe('EditRelationshipListComponent', () => {
         relationship: relationships[1],
         type: relationshipType,
       },
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
-        })
-      }
+          [relationships[1].uuid]: fieldUpdate2,
+        }),
+      },
     );
 
     relationshipService = jasmine.createSpyObj('relationshipService',
@@ -169,7 +177,7 @@ describe('EditRelationshipListComponent', () => {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])),
         getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
         isLeftItem: observableOf(true),
-      }
+      },
     );
 
     selectableListService = {};
@@ -184,7 +192,7 @@ describe('EditRelationshipListComponent', () => {
     hostWindowService = new HostWindowServiceStub(1200);
 
     const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-      addTag: ''
+      addTag: '',
     });
 
     const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -197,15 +205,15 @@ describe('EditRelationshipListComponent', () => {
       findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
         name: 'test',
         values: [
-          'org.dspace.ctask.general.ProfileFormats = test'
-        ]
-      }))
+          'org.dspace.ctask.general.ProfileFormats = test',
+        ],
+      })),
     });
 
     const environmentUseThumbs = {
       browseBy: {
-        showThumbnails: true
-      }
+        showThumbnails: true,
+      },
     };
 
     TestBed.configureTestingModule({
@@ -224,10 +232,10 @@ describe('EditRelationshipListComponent', () => {
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
     resetComponent();
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index b8542f5806..335332f183 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,21 +1,52 @@
-import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   from as observableFrom,
   Observable,
-  Subscription
+  Subscription,
 } from 'rxjs';
 import {
-  RelationshipIdentifiable
-} from '../../../../core/data/object-updates/object-updates.reducer';
+  defaultIfEmpty,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+  toArray,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
+import { RelationshipIdentifiable } from '../../../../core/data/object-updates/object-updates.reducer';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../core/shared/collection.model';
 import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
@@ -24,22 +55,17 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+} from '../../../../shared/empty.util';
 import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
 import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
 import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Collection } from '../../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
 
 @Component({
@@ -153,7 +179,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
@@ -213,7 +239,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   openLookup() {
 
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
-      size: 'lg'
+      size: 'lg',
     });
     const modalComp: DsDynamicLookupRelationModalComponent = this.modalRef.componentInstance;
     modalComp.repeatable = true;
@@ -227,7 +253,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.isPending = false;
 
     this.item.owningCollection.pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((collection: Collection) => {
       modalComp.collection = collection;
     });
@@ -284,15 +310,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         const relatedItem = searchResult.indexableObject;
         subscriptions.push(this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
           map((nameVariant) => {
-          const update = {
-            uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
-            nameVariant,
-            type: this.relationshipType,
-            relatedItem,
-          } as RelationshipIdentifiable;
-          this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
-          return update;
-        })
+            const update = {
+              uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
+              nameVariant,
+              type: this.relationshipType,
+              relatedItem,
+            } as RelationshipIdentifiable;
+            this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
+            return update;
+          }),
         ));
       });
 
@@ -309,9 +335,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                 } as RelationshipIdentifiable;
                 this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
                 return update;
-              })
+              }),
             );
-          })
+          }),
         ));
       });
 
@@ -347,7 +373,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             relationshipType: relatedEntityType.label,
             searchConfiguration: relatedEntityType.label.toLowerCase(),
             nameVariants: 'true',
-          }
+          },
         );
       });
 
@@ -361,21 +387,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         let apiCall;
         if (isLeft) {
           apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.leftwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
+            getFirstSucceededRemoteData(),
+            getRemoteDataPayload(),
+          );
         } else {
           apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.rightwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
+            getFirstSucceededRemoteData(),
+            getRemoteDataPayload(),
+          );
         }
 
         return apiCall.pipe(
-          map( (res: PaginatedList<Relationship>) => res.page[0])
+          map( (res: PaginatedList<Relationship>) => res.page[0]),
         );
-      }
-    ));
+      },
+      ));
   }
 
 
@@ -389,21 +415,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       take(1),
       map((updates) => Object.values(updates)
         .map((update) => update.field as RelationshipIdentifiable)
-        .filter((field) => field.relationship)
+        .filter((field) => field.relationship),
       ),
       mergeMap((identifiables) =>
         observableCombineLatest(
-          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
+          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship)),
         ).pipe(
           defaultIfEmpty([]),
           map((relatedItems) => {
             return identifiables.filter( (identifiable, index) => {
-                return relatedItems[index].uuid === relatedItem.uuid;
+              return relatedItems[index].uuid === relatedItem.uuid;
             });
-          }
+          },
           ),
-        )
-      )
+        ),
+      ),
     );
   }
 
@@ -423,7 +449,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.rightwardType );
           return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
         }
-      })
+      }),
     );
   }
 
@@ -452,13 +478,13 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
     this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
       map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 
     this.relatedEntityType$.pipe(
-      take(1)
+      take(1),
     ).subscribe(
-      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
+      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`,
     );
 
     this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
@@ -474,7 +500,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         // should never happen...
         console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
         return undefined;
-      })
+      }),
     );
 
 
@@ -487,13 +513,13 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     // get the pagination params from the route
     const currentPagination$ = this.paginationService.getCurrentPagination(
       this.paginationConfig.id,
-      this.paginationConfig
+      this.paginationConfig,
     ).pipe(
-      tap(() => this.loading$.next(true))
+      tap(() => this.loading$.next(true)),
     );
 
     // this adds thumbnail images when required by configuration
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
+    const linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
 
     this.subs.push(
       observableCombineLatest([
@@ -507,21 +533,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage
+              currentPage: currentPagination.currentPage,
             },
             false,
             true,
-            ...linksToFollow
+            ...linksToFollow,
           )),
       ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
         this.relationshipsRd$.next(rd);
-      })
+      }),
     );
 
     // keep isLastPage$ up to date based on relationshipsRd$
     this.subs.push(this.relationshipsRd$.pipe(
       hasValueOperator(),
-      getAllSucceededRemoteData()
+      getAllSucceededRemoteData(),
     ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
       this.isLastPage$.next(hasNoValue(rd.payload._links.next));
     }));
@@ -537,8 +563,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             this.relationshipService.isLeftItem(relationship, this.item).pipe(
               // emit an array containing both the relationship and whether it's the left item,
               // as we'll need both
-              map((isLeftItem: boolean) => [relationship, isLeftItem])
-            )
+              map((isLeftItem: boolean) => [relationship, isLeftItem]),
+            ),
           ),
           map(([relationship, isLeftItem]: [Relationship, boolean]) => {
             // turn it into a RelationshipIdentifiable, an
@@ -554,8 +580,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           // wait until all relationships have been processed, and emit them all as a single array
           toArray(),
           // if the pipe above completes without emitting anything, emit an empty array instead
-          defaultIfEmpty([])
-      )),
+          defaultIfEmpty([]),
+        )),
       switchMap((nextFields: RelationshipIdentifiable[]) => {
         // Get a list that contains the unsaved changes for the page, as well as the page of
         // RelationshipIdentifiables, as a single list of FieldUpdates
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
index a3062abf7e..f129eea439 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
@@ -1,16 +1,21 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { EditRelationshipComponent } from './edit-relationship.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { EditRelationshipComponent } from './edit-relationship.component';
 
 let objectUpdatesService;
 const url = 'http://test-url.com/test-url';
@@ -37,18 +42,18 @@ describe('EditRelationshipComponent', () => {
       id: '1',
       uuid: '1',
       leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor'
+      rightwardType: 'isPublicationOfAuthor',
     });
 
     item = Object.assign(new Item(), {
       _links: {
         self: {
-          href: 'fake-item-url/publication'
-        }
+          href: 'fake-item-url/publication',
+        },
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     });
 
     relatedItem = Object.assign(new Item(), {
@@ -58,7 +63,7 @@ describe('EditRelationshipComponent', () => {
     relationships = [
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/2' }
+          self: { href: url + '/2' },
         },
         id: '2',
         uuid: '2',
@@ -70,23 +75,23 @@ describe('EditRelationshipComponent', () => {
       }),
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/3' }
+          self: { href: url + '/3' },
         },
         id: '3',
         uuid: '3',
         leftId: 'author2',
         rightId: 'publication',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
-      })
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+      }),
     ];
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     fieldUpdate1 = {
@@ -94,14 +99,14 @@ describe('EditRelationshipComponent', () => {
         uuid: relationships[0].uuid,
         relationship: relationships[0],
       },
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: {
         uuid: relationships[1].uuid,
         relationship: relationships[1],
       },
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     const itemSelection = {};
@@ -124,12 +129,12 @@ describe('EditRelationshipComponent', () => {
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
+            },
           },
         },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 742cc7181c..92023d88a8 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -1,18 +1,41 @@
-import { Component, Input, OnChanges } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+  OnChanges,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import {
   DeleteRelationship,
-  RelationshipIdentifiable
+  RelationshipIdentifiable,
 } from '../../../../core/data/object-updates/object-updates.reducer';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../shared/empty.util';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
@@ -83,20 +106,20 @@ export class EditRelationshipComponent implements OnChanges {
       this.leftItem$ = this.relationship.leftItem.pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       );
       this.rightItem$ = this.relationship.rightItem.pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       );
       this.relatedItem$ = observableCombineLatest(
         this.leftItem$,
         this.rightItem$,
       ).pipe(
         map((items: Item[]) =>
-          items.find((item) => item.uuid !== this.editItem.uuid)
-        )
+          items.find((item) => item.uuid !== this.editItem.uuid),
+        ),
       );
     } else {
       this.relatedItem$ = of(this.update.relatedItem);
@@ -114,7 +137,7 @@ export class EditRelationshipComponent implements OnChanges {
     ).pipe(
       map((items: Item[]) =>
         items.map((item) => this.objectUpdatesService
-          .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid))
+          .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid)),
       ),
       switchMap((selection$) => observableCombineLatest(selection$)),
       map((selection: boolean[]) => {
@@ -123,12 +146,12 @@ export class EditRelationshipComponent implements OnChanges {
           {
             keepLeftVirtualMetadata: selection[0] === true,
             keepRightVirtualMetadata: selection[1] === true,
-          }
+          },
         ) as DeleteRelationship;
       }),
       take(1),
     ).subscribe((deleteRelationship: DeleteRelationship) =>
-      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship)
+      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index c1505deb58..3a0a33d1a0 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -2,8 +2,8 @@
   <ng-container *ngVar="entityType$ | async as entityType">
     <ng-container *ngIf="entityType">
       <div class="button-row top d-flex space-children-mr">
-        <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+        <button class="btn btn-danger ml-auto" *ngIf="(isReinstatable() | async) !== true"
+                [disabled]="(hasChanges() | async) !== true"
                 (click)="discard()"><i
           class="fas fa-times"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -13,7 +13,7 @@
           class="fas fa-undo-alt"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
-        <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+        <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true"
                 (click)="submit()"><i
           class="fas fa-save"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -36,8 +36,8 @@
       </ng-container>
       <div class="button-row bottom">
         <div class="float-right space-children-mr ml-gap">
-          <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                  [disabled]="!(hasChanges() | async)"
+          <button class="btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+                  [disabled]="(hasChanges() | async) !== true"
                   (click)="discard()"><i
             class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -47,7 +47,7 @@
             class="fas fa-undo-alt"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
           </button>
-          <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+          <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true"
                   (click)="submit()"><i
             class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index aa711c8ea3..d6cf0cbd8c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -1,34 +1,55 @@
-import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
-import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RestResponse } from '../../../core/cache/response.models';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../core/shared/item.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SharedModule } from '../../../shared/shared.module';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { ItemRelationshipsComponent } from './item-relationships.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
-import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
-import { ThemeService } from '../../../shared/theme-support/theme.service';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
+import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
+import { ItemRelationshipsComponent } from './item-relationships.component';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -46,8 +67,8 @@ const notificationsService = jasmine.createSpyObj('notificationsService',
   {
     info: infoNotification,
     warning: warningNotification,
-    success: successNotification
-  }
+    success: successNotification,
+  },
 );
 const router = new RouterStub();
 let relationshipTypeService;
@@ -75,36 +96,36 @@ describe('ItemRelationshipsComponent', () => {
       id: '1',
       uuid: '1',
       leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor'
+      rightwardType: 'isPublicationOfAuthor',
     });
 
     relationships = [
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/2' }
+          self: { href: url + '/2' },
         },
         id: '2',
         uuid: '2',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
       }),
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/3' }
+          self: { href: url + '/3' },
         },
         id: '3',
         uuid: '3',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
-      })
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+      }),
     ];
 
     item = Object.assign(new Item(), {
       _links: {
-        self: { href: 'fake-item-url/publication' }
+        self: { href: 'fake-item-url/publication' },
       },
       id: 'publication',
       uuid: 'publication',
       relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
-      lastModified: date
+      lastModified: date,
     });
 
     entityType = Object.assign(new ItemType(), {
@@ -113,11 +134,11 @@ describe('ItemRelationshipsComponent', () => {
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     relationships[0].leftItem = createSuccessfulRemoteDataObject$(author1);
@@ -127,36 +148,36 @@ describe('ItemRelationshipsComponent', () => {
 
     fieldUpdate1 = {
       field: relationships[0],
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: Object.assign(
         relationships[1],
-        {keepLeftVirtualMetadata: true, keepRightVirtualMetadata: false}
+        { keepLeftVirtualMetadata: true, keepRightVirtualMetadata: false },
       ),
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     itemService = jasmine.createSpyObj('itemService', {
       findByHref: createSuccessfulRemoteDataObject$(item),
-      findById: createSuccessfulRemoteDataObject$(item)
+      findById: createSuccessfulRemoteDataObject$(item),
     });
     routeStub = {
       data: observableOf({}),
       parent: {
-        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
-      }
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
+      },
     };
 
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
+          [relationships[1].uuid]: fieldUpdate2,
         }),
         getFieldUpdatesExclusive: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
+          [relationships[1].uuid]: fieldUpdate2,
         }),
         saveAddFieldUpdate: {},
         discardFieldUpdates: {},
@@ -166,8 +187,8 @@ describe('ItemRelationshipsComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     relationshipService = jasmine.createSpyObj('relationshipService',
@@ -179,33 +200,33 @@ describe('ItemRelationshipsComponent', () => {
         deleteRelationship: observableOf(new RestResponse(true, 200, 'OK')),
         getItemResolvedRelatedItemsAndRelationships: observableCombineLatest(observableOf([author1, author2]), observableOf([item, item]), observableOf(relationships)),
         getRelationshipsByRelatedItemIds: observableOf(relationships),
-        getRelationshipTypeLabelsByItem: observableOf([relationshipType.leftwardType])
-      }
+        getRelationshipTypeLabelsByItem: observableOf([relationshipType.leftwardType]),
+      },
     );
 
 
     relationshipTypeService = jasmine.createSpyObj('searchByEntityType',
       {
-        searchByEntityType: observableOf(relationshipTypes)
-      }
+        searchByEntityType: observableOf(relationshipTypes),
+      },
     );
 
     requestService = jasmine.createSpyObj('requestService',
       {
         removeByHrefSubstring: {},
-        hasByHref$: observableOf(false)
-      }
+        hasByHref$: observableOf(false),
+      },
     );
 
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: undefined
+      remove: undefined,
     });
 
     entityTypeService = jasmine.createSpyObj('entityTypeService',
       {
         getEntityTypeByLabel: createSuccessfulRemoteDataObject$(entityType),
         getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList([relationshipType])),
-      }
+      },
     );
 
     scheduler = getTestScheduler();
@@ -224,10 +245,10 @@ describe('ItemRelationshipsComponent', () => {
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
         { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 8f7c43e79f..df5e78565d 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,35 +1,55 @@
-import { ChangeDetectorRef, Component } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectorRef,
+  Component,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 import {
   DeleteRelationship,
   RelationshipIdentifiable,
 } from '../../../core/data/object-updates/object-updates.reducer';
-import { map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip, Observable } from 'rxjs';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RemoteData } from '../../../core/data/remote-data';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
-import { RequestService } from '../../../core/data/request.service';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { hasValue } from '../../../shared/empty.util';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -78,9 +98,9 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     const label = this.item.firstMetadataValue('dspace.entity.type');
     if (label !== undefined) {
       this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks())
-      .pipe(
-        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
-      );
+        .pipe(
+          map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page),
+        );
 
       this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
         getFirstSucceededRemoteData(),
@@ -109,7 +129,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     const removedRelationshipIDs$: Observable<DeleteRelationship[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
       startWith([]),
       map((relationships: Relationship[]) => relationships.map((relationship) =>
-        Object.assign(new Relationship(), relationship, { uuid: relationship.id })
+        Object.assign(new Relationship(), relationship, { uuid: relationship.id }),
       )),
       switchMap((relationships: Relationship[]) => {
         return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable<FieldUpdates>;
@@ -117,7 +137,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
       map((fieldUpdates: FieldUpdates) =>
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship)
+          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship),
       ),
     );
 
@@ -126,7 +146,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable)
+          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable),
       ),
     );
 
@@ -148,25 +168,25 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
             this.displayNotifications(response);
             this.modalService.dismissAll();
           }
-        })
+        }),
       );
     });
   }
 
   deleteRelationships(deleteRelationshipIDs: DeleteRelationship[]): Observable<RemoteData<NoContent>[]> {
     return observableZip(...deleteRelationshipIDs.map((deleteRelationship) => {
-        let copyVirtualMetadata: string;
-        if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'all';
-        } else if (deleteRelationship.keepLeftVirtualMetadata) {
-          copyVirtualMetadata = 'left';
-        } else if (deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'right';
-        } else {
-          copyVirtualMetadata = 'none';
-        }
-        return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
+      let copyVirtualMetadata: string;
+      if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
+        copyVirtualMetadata = 'all';
+      } else if (deleteRelationship.keepLeftVirtualMetadata) {
+        copyVirtualMetadata = 'left';
+      } else if (deleteRelationship.keepRightVirtualMetadata) {
+        copyVirtualMetadata = 'right';
+      } else {
+        copyVirtualMetadata = 'none';
       }
+      return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
+    },
     ));
   }
 
@@ -192,7 +212,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
           }
           return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue);
         }),
-      )
+      ),
     ));
   }
 
@@ -228,7 +248,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   getRelationshipTypeFollowLinks() {
     return [
       followLink('leftType'),
-      followLink('rightType')
+      followLink('rightType'),
     ];
   }
 
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 8d4faaa2ac..faad0e679b 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -10,7 +10,7 @@
   </div>
 
   <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
-    <div *ngIf="(identifier.identifierType=='doi')">
+    <div *ngIf="(identifier.identifierType==='doi')">
       <div class="col-3 float-left status-label">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
@@ -27,7 +27,7 @@
   </div>
 
   <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
-    <ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation>
+    <ds-item-operation [operation]="operation"></ds-item-operation>
   </div>
 
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
index a67de2f435..12e7b2603a 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
@@ -1,21 +1,30 @@
-import { ItemStatusComponent } from './item-status.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { Item } from '../../../core/shared/item.model';
-import { By } from '@angular/platform-browser';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { Item } from '../../../core/shared/item.model';
+import { HostWindowService } from '../../../shared/host-window.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { ItemStatusComponent } from './item-status.component';
 
 let mockIdentifierDataService: IdentifierDataService;
 let mockConfigurationDataService: ConfigurationDataService;
@@ -30,37 +39,43 @@ describe('ItemStatusComponent', () => {
     handle: 'fake/handle',
     lastModified: '2018',
     _links: {
-      self: { href: 'test-item-selflink' }
-    }
+      self: { href: 'test-item-selflink' },
+    },
   });
 
   mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
-    getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}),
-    getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true')
+    getIdentifierDataFor: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
+    getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'),
   });
 
   mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'identifiers.item-status.register-doi',
       values: [
-        'true'
-      ]
-    }))
+        'true',
+      ],
+    })),
   });
 
   const itemPageUrl = `/items/${mockItem.uuid}`;
 
   const routeStub = {
     parent: {
-      data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
-    }
+      data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }),
+    },
   };
 
   let authorizationService: AuthorizationDataService;
+  let orcidAuthService: any;
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
+    });
+
+    orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+      onlyAdminCanDisconnectProfileFromOrcid: observableOf ( true ),
+      isLinkedToOrcid: true,
     });
 
     TestBed.configureTestingModule({
@@ -71,8 +86,9 @@ describe('ItemStatusComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: IdentifierDataService, useValue: mockIdentifierDataService },
-        { provide: ConfigurationDataService, useValue: mockConfigurationDataService }
-      ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        { provide: ConfigurationDataService, useValue: mockConfigurationDataService },
+        { provide: OrcidAuthService, useValue: orcidAuthService },
+      ], schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 828f8d7439..1bd39c5215 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,23 +1,50 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { ItemOperation } from '../item-operation/itemOperation.model';
-import { distinctUntilChanged, map, mergeMap, switchMap, toArray } from 'rxjs/operators';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  concatMap,
+  distinctUntilChanged,
+  first,
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
-} from '../../../core/shared/operators';
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
-import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../../../core/shared/operators';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../shared/animations/fade';
+import { hasValue } from '../../../shared/empty.util';
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
 import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
+import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-item-status',
@@ -25,8 +52,8 @@ import { IdentifierData } from '../../../shared/object-list/identifier-data/iden
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component for displaying an item's status
@@ -73,6 +100,7 @@ export class ItemStatusComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private identifierDataService: IdentifierDataService,
               private configurationService: ConfigurationDataService,
+              private orcidAuthService: OrcidAuthService,
   ) {
   }
 
@@ -82,126 +110,149 @@ export class ItemStatusComponent implements OnInit {
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso));
     this.itemRD$.pipe(
-      map((data: RemoteData<Item>) => data.payload)
-    ).subscribe((item: Item) => {
-      this.statusData = Object.assign({
-        id: item.id,
-        handle: item.handle,
-        lastModified: item.lastModified
-      });
-      this.statusDataKeys = Object.keys(this.statusData);
+      first(),
+      map((data: RemoteData<Item>) => data.payload),
+    ).pipe(
+      switchMap((item: Item) => {
+        this.statusData = Object.assign({
+          id: item.id,
+          handle: item.handle,
+          lastModified: item.lastModified,
+        });
+        this.statusDataKeys = Object.keys(this.statusData);
 
-      // Observable for item identifiers (retrieved from embedded link)
-      this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
-        map((identifierRD) => {
-          if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
-            return identifierRD.payload.identifiers;
-          } else {
-            return null;
-          }
-        }),
-      );
-
-      // Observable for configuration determining whether the Register DOI feature is enabled
-      let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
-        getFirstCompletedRemoteData(),
-        map((rd: RemoteData<ConfigurationProperty>) => {
-          // If the config property is exposed via rest and has a value set, return it
-          if (rd.hasSucceeded && hasValue(rd.payload) && isNotEmpty(rd.payload.values)) {
-            return rd.payload.values[0] === 'true';
-          }
-          // Otherwise, return false
-          return false;
-        })
-      );
-
-      /*
-      Construct a base list of operations.
-        The key is used to build messages
-          i18n example: 'item.edit.tabs.status.buttons.<key>.label'
-        The value is supposed to be a href for the button
-      */
-      const operations: ItemOperation[] = [];
-      operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations', FeatureID.CanManagePolicies, true));
-      operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper', FeatureID.CanManageMappings, true));
-      if (item.isWithdrawn) {
-        operations.push(new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate', FeatureID.ReinstateItem, true));
-      } else {
-        operations.push(new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw', FeatureID.WithdrawItem, true));
-      }
-      if (item.isDiscoverable) {
-        operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private', FeatureID.CanMakePrivate, true));
-      } else {
-        operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public', FeatureID.CanMakePrivate, true));
-      }
-      operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete', FeatureID.CanDelete, true));
-      operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true));
-      this.operations$.next(operations);
-
-      /*
-       When the identifier data stream changes, determine whether the register DOI button should be shown or not.
-       This is based on whether the DOI is in the right state (minted or pending, not already queued for registration
-       or registered) and whether the configuration property identifiers.item-status.register-doi is true
-       */
-      this.identifierDataService.getIdentifierDataFor(item).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        mergeMap((data: IdentifierData) => {
-          let identifiers = data.identifiers;
-          let no_doi = true;
-          let pending = false;
-          if (identifiers !== undefined && identifiers !== null) {
-            identifiers.forEach((identifier: Identifier) => {
-              if (hasValue(identifier) && identifier.identifierType === 'doi') {
-                // The item has some kind of DOI
-                no_doi = false;
-                if (identifier.identifierStatus === 'PENDING' || identifier.identifierStatus === 'MINTED'
-                  || identifier.identifierStatus == null) {
-                  // The item's DOI is pending, minted or null.
-                  // It isn't registered, reserved, queued for registration or reservation or update, deleted
-                  // or queued for deletion.
-                  pending = true;
-                }
-              }
-            });
-          }
-          // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true
-          return registerConfigEnabled$.pipe(
-            map((enabled: boolean) => {
-              return enabled && (pending || no_doi);
+        // Observable for item identifiers (retrieved from embedded link)
+        this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
+          map((identifierRD) => {
+            if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+              return identifierRD.payload.identifiers;
+            } else {
+              return null;
+            }
+          }),
+        );
+
+        // Observable for configuration determining whether the Register DOI feature is enabled
+        const registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
+          getFirstCompletedRemoteData(),
+          map((response: RemoteData<ConfigurationProperty>) => {
+          // Return true if a successful response with a 'true' value was retrieved, otherwise return false
+            if (response.hasSucceeded) {
+              const payload = response.payload;
+              if (payload.values.length > 0 && hasValue(payload.values[0])) {
+                return payload.values[0] === 'true';
+              } else {
+                return false;
+              }
+            } else {
+              return false;
+            }
+          }),
+        );
+
+        /**
+         * Construct a base list of operations.
+         * The key is used to build messages
+         * i18n example: 'item.edit.tabs.status.buttons.<key>.label'
+         * The value is supposed to be a href for the button
+         */
+        const currentUrl = this.getCurrentUrl(item);
+        const initialOperations: ItemOperation[] = [
+          new ItemOperation('authorizations', `${currentUrl}/authorizations`, FeatureID.CanManagePolicies, true),
+          new ItemOperation('mappedCollections', `${currentUrl}/mapper`, FeatureID.CanManageMappings, true),
+          item.isWithdrawn
+            ? new ItemOperation('reinstate', `${currentUrl}/reinstate`, FeatureID.ReinstateItem, true)
+            : new ItemOperation('withdraw', `${currentUrl}/withdraw`, FeatureID.WithdrawItem, true),
+          item.isDiscoverable
+            ? new ItemOperation('private', `${currentUrl}/private`, FeatureID.CanMakePrivate, true)
+            : new ItemOperation('public', `${currentUrl}/public`, FeatureID.CanMakePrivate, true),
+          new ItemOperation('move', `${currentUrl}/move`, FeatureID.CanMove, true),
+          new ItemOperation('delete', `${currentUrl}/delete`, FeatureID.CanDelete, true),
+        ];
+
+        this.operations$.next(initialOperations);
+
+        /**
+         *  When the identifier data stream changes, determine whether the register DOI button should be shown or not.
+         *  This is based on whether the DOI is in the right state (minted or pending, not already queued for registration
+         *  or registered) and whether the configuration property identifiers.item-status.register-doi is true
+         */
+        const ops$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
+          getFirstCompletedRemoteData(),
+          mergeMap((dataRD: RemoteData<IdentifierData>) => {
+            if (dataRD.hasSucceeded) {
+              const identifiers = dataRD.payload.identifiers;
+              let no_doi = true;
+              let pending = false;
+              if (identifiers !== undefined && identifiers !== null) {
+                identifiers.forEach((identifier: Identifier) => {
+                  if (hasValue(identifier) && identifier.identifierType === 'doi') {
+                    // The item has some kind of DOI
+                    no_doi = false;
+                    if (['PENDING', 'MINTED', null].includes(identifier.identifierStatus)) {
+                      // The item's DOI is pending, minted or null.
+                      // It isn't registered, reserved, queued for registration or reservation or update, deleted
+                      // or queued for deletion.
+                      pending = true;
+                    }
+                  }
+                });
+              }
+              // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true
+              return registerConfigEnabled$.pipe(
+                map((enabled: boolean) => {
+                  return enabled && (pending || no_doi);
+                }),
+              );
+            } else {
+              return of(false);
+            }
+          }),
+          // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
+          switchMap((showDoi: boolean) => {
+            const ops = [...initialOperations];
+            if (showDoi) {
+              const op = new ItemOperation('register-doi', `${currentUrl}/register-doi`, FeatureID.CanRegisterDOI, true);
+              ops.splice(ops.length - 1, 0, op); // Add item before last
+            }
+            return ops;
+          }),
+          concatMap((op: ItemOperation) => {
+            if (hasValue(op.featureID)) {
+              return this.authorizationService.isAuthorized(op.featureID, item.self).pipe(
+                distinctUntilChanged(),
+                map((authorized) => {
+                  op.setDisabled(!authorized);
+                  op.setAuthorized(authorized);
+                  return op;
+                }),
+              );
             }
-          ));
-        }),
-        // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
-        switchMap((showDoi: boolean) => {
-          let ops = [...operations];
-          if (showDoi) {
-            ops.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI, true));
-          }
-          return ops;
-        }),
-        // Merge map checks and transforms each operation in the array based on whether it is authorized or not (disabled)
-        mergeMap((op: ItemOperation) => {
-          if (hasValue(op.featureID)) {
-            return this.authorizationService.isAuthorized(op.featureID, item.self).pipe(
-              distinctUntilChanged(),
-              map((authorized) => new ItemOperation(op.operationKey, op.operationUrl, op.featureID, !authorized, authorized))
-            );
-          } else {
             return [op];
-          }
-        }),
-        // Wait for all operations to be emitted and return as an array
-        toArray(),
-      ).subscribe((data) => {
-        // Update the operations$ subject that draws the administrative buttons on the status page
-        this.operations$.next(data);
-      });
-    });
+          }),
+          toArray(),
+        );
+
+        let orcidOps$ = of([]);
+        if (this.orcidAuthService.isLinkedToOrcid(item)) {
+          orcidOps$ = this.orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid().pipe(
+            map((canDisconnect) => {
+              if (canDisconnect) {
+                return [new ItemOperation('unlinkOrcid', `${currentUrl}/unlink-orcid`)];
+              }
+              return [];
+            }),
+          );
+        }
+
+        return combineLatest([ops$, orcidOps$]);
+      }),
+      map(([ops, orcidOps]: [ItemOperation[], ItemOperation[]]) => [...ops, ...orcidOps]),
+    ).subscribe((ops) => this.operations$.next(ops));
 
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
 
   }
diff --git a/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts b/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts
index eac5a53702..331206053a 100644
--- a/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../../shared/theme-support/themed.component';
 import { ItemStatusComponent } from './item-status.component';
 
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
index f4ed04c2c8..6c997784a8 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
@@ -1,13 +1,18 @@
-import { ItemVersionHistoryComponent } from './item-version-history.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { ActivatedRoute } from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { ItemVersionHistoryComponent } from './item-version-history.component';
 
 describe('ItemVersionHistoryComponent', () => {
   let component: ItemVersionHistoryComponent;
@@ -21,9 +26,9 @@ describe('ItemVersionHistoryComponent', () => {
   const activatedRoute = {
     parent: {
       parent: {
-        data: observableOf({dso: createSuccessfulRemoteDataObject(item)})
-      }
-    }
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -31,9 +36,9 @@ describe('ItemVersionHistoryComponent', () => {
       declarations: [ItemVersionHistoryComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ActivatedRoute, useValue: activatedRoute }
+        { provide: ActivatedRoute, useValue: activatedRoute },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index 18878109c2..869375dcf0 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -1,15 +1,16 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { map } from 'rxjs/operators';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { ActivatedRoute } from '@angular/router';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-item-version-history',
-  templateUrl: './item-version-history.component.html'
+  templateUrl: './item-version-history.component.html',
 })
 /**
  * Component for listing and managing an item's version history
diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
index 3397742f5b..52d565e610 100644
--- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ItemWithdrawComponent } from './item-withdraw.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemWithdrawComponent } from './item-withdraw.component';
 
 let comp: ItemWithdrawComponent;
 let fixture: ComponentFixture<ItemWithdrawComponent>;
@@ -33,28 +44,28 @@ describe('ItemWithdrawComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
 
     TestBed.configureTestingModule({
-      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule,],
+      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [ItemWithdrawComponent],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
@@ -62,8 +73,8 @@ describe('ItemWithdrawComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -74,7 +85,7 @@ describe('ItemWithdrawComponent', () => {
   });
 
   it('should render a page with messages based on the \'withdraw\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.withdraw.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.withdraw.description');
diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
index cbd710ba1c..45aee5a1a2 100644
--- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
+++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
@@ -1,18 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-withdraw',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the Item Withdraw page
@@ -37,7 +39,7 @@ export class ItemWithdrawComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setWithDrawn(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
index 748231be1c..9c59a293ff 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
@@ -1,8 +1,13 @@
-import {Item} from '../../../core/shared/item.model';
-import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
-import {ModifyItemOverviewComponent} from './modify-item-overview.component';
-import {By} from '@angular/platform-browser';
-import {TranslateModule} from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Item } from '../../../core/shared/item.model';
+import { ModifyItemOverviewComponent } from './modify-item-overview.component';
 
 let comp: ModifyItemOverviewComponent;
 let fixture: ComponentFixture<ModifyItemOverviewComponent>;
@@ -13,12 +18,12 @@ const mockItem = Object.assign(new Item(), {
   lastModified: '2018',
   metadata: {
     'dc.title': [
-      { value: 'Mock item title', language: 'en' }
+      { value: 'Mock item title', language: 'en' },
     ],
     'dc.contributor.author': [
-      { value: 'Mayer, Ed', language: '' }
-    ]
-  }
+      { value: 'Mayer, Ed', language: '' },
+    ],
+  },
 });
 
 describe('ModifyItemOverviewComponent', () => {
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index 974bc8d37f..4dcea7188b 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,10 +1,15 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {Item} from '../../../core/shared/item.model';
-import {MetadataMap} from '../../../core/shared/metadata.models';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
+import { Item } from '../../../core/shared/item.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
 
 @Component({
   selector: 'ds-modify-item-overview',
-  templateUrl: './modify-item-overview.component.html'
+  templateUrl: './modify-item-overview.component.html',
 })
 /**
  * Component responsible for rendering a table containing the metadatavalues from the to be edited item
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
index b5757d1859..67249b085a 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
           <div class="space-children-mr">
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
index 9a19837665..47d0c6d980 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
@@ -1,26 +1,37 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
-import { By } from '@angular/platform-browser';
-import { of as observableOf } from 'rxjs';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { getItemEditRoute } from '../../item-page-routing-paths';
+import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
 
 /**
  * Test component that implements the AbstractSimpleItemActionComponent used to test the
@@ -28,7 +39,7 @@ import { getItemEditRoute } from '../../item-page-routing-paths';
  */
 @Component({
   selector: 'ds-simple-action',
-  templateUrl: './abstract-simple-item-action.component.html'
+  templateUrl: './abstract-simple-item-action.component.html',
 })
 export class MySimpleItemActionComponent extends AbstractSimpleItemActionComponent {
 
@@ -60,24 +71,24 @@ describe('AbstractSimpleItemActionComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj({
-      findById: createSuccessfulRemoteDataObject$(mockItem)
+      findById: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-          id: 'fake-id'
-        }))
-      })
+          id: 'fake-id',
+        })),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -91,8 +102,8 @@ describe('AbstractSimpleItemActionComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -111,7 +122,7 @@ describe('AbstractSimpleItemActionComponent', () => {
   });
 
   it('should render a page with messages based on the provided messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.myEditAction.header');
 
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
index f4028354de..5c0b1de1b3 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
@@ -1,15 +1,29 @@
-import { Component, OnInit, Predicate } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import {
+  Component,
+  OnInit,
+  Predicate,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Item } from '../../../core/shared/item.model';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { first, map } from 'rxjs/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
 import { findSuccessfulAccordingTo } from '../edit-item-operators';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 
 /**
  * Component to render and handle simple item edit actions such as withdrawal and reinstatement.
@@ -17,7 +31,7 @@ import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-path
  */
 @Component({
   selector: 'ds-simple-action',
-  templateUrl: './abstract-simple-item-action.component.html'
+  templateUrl: './abstract-simple-item-action.component.html',
 })
 export class AbstractSimpleItemActionComponent implements OnInit {
 
@@ -47,13 +61,13 @@ export class AbstractSimpleItemActionComponent implements OnInit {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso),
-      getFirstSucceededRemoteData()
+      getFirstSucceededRemoteData(),
     )as Observable<RemoteData<Item>>;
 
     this.itemRD$.pipe(first()).subscribe((rd) => {
-        this.item = rd.payload;
-        this.itemPageRoute = getItemPageRoute(this.item);
-      }
+      this.item = rd.payload;
+      this.itemPageRoute = getItemPageRoute(this.item);
+    },
     );
 
     this.confirmMessage = 'item.edit.' + this.messageKey + '.confirm';
@@ -75,7 +89,8 @@ export class AbstractSimpleItemActionComponent implements OnInit {
   processRestResponse(response: RemoteData<any>) {
     if (response.hasSucceeded) {
       this.itemDataService.findById(this.item.id).pipe(
-        findSuccessfulAccordingTo(this.predicate)).subscribe(() => {
+        findSuccessfulAccordingTo((itemRd: RemoteData<Item>) => this.predicate(itemRd)),
+      ).subscribe(() => {
         this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success'));
         this.router.navigate([getItemEditRoute(this.item)]);
       });
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
index 9391df4755..9e07db3be6 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
@@ -1,14 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { VirtualMetadataComponent } from './virtual-metadata.component';
-import { Item } from '../../../core/shared/item.model';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { Item } from '../../../core/shared/item.model';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { VirtualMetadataComponent } from './virtual-metadata.component';
 
 describe('VirtualMetadataComponent', () => {
 
@@ -48,10 +55,10 @@ describe('VirtualMetadataComponent', () => {
       declarations: [VirtualMetadataComponent, VarDirective],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(VirtualMetadataComponent);
@@ -98,7 +105,7 @@ describe('VirtualMetadataComponent', () => {
         url,
         relationshipId,
         item.uuid,
-        true
+        true,
       );
     });
   });
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index 6f8991dc73..48c01eae98 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,13 +1,24 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import {Observable} from 'rxjs';
-import {Item} from '../../../core/shared/item.model';
-import {MetadataValue} from '../../../core/shared/metadata.models';
-import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
 
 @Component({
   selector: 'ds-virtual-metadata',
-  templateUrl: './virtual-metadata.component.html'
+  templateUrl: './virtual-metadata.component.html',
 })
 /**
  * Component that lists both items of a relationship, along with their virtual metadata of the relationship.
@@ -84,7 +95,7 @@ export class VirtualMetadataComponent implements OnInit {
               metadataField: key,
               metadataValue: metadata,
             };
-          })
+          }),
       )
       .reduce((previous, current) => previous.concat(current), []);
   }
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 27ebb41d61..7c08ce5c1c 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -10,7 +10,7 @@
     </div>
 
     <a
-        *ngIf="!(isLoading$ | async) && (hasMore$ | async)"
+        *ngIf="(isLoading$ | async) !== true && (hasMore$ | async)"
         (click)="$event.preventDefault(); handleLoadMore()"
         class="load-more-btn btn btn-sm btn-outline-secondary"
         role="button"
diff --git a/src/app/item-page/field-components/collections/collections.component.spec.ts b/src/app/item-page/field-components/collections/collections.component.spec.ts
index 8ea5219308..c7e13811cf 100644
--- a/src/app/item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/item-page/field-components/collections/collections.component.spec.ts
@@ -1,19 +1,33 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { CollectionsComponent } from './collections.component';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { CollectionsComponent } from './collections.component';
 
 const createMockCollection = (id: string) => Object.assign(new Collection(), {
   id: id,
@@ -49,13 +63,13 @@ describe('CollectionsComponent', () => {
       declarations: [ CollectionsComponent ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService()},
+        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService() },
         { provide: CollectionDataService, useValue: collectionDataService },
       ],
 
-      schemas: [ NO_ERRORS_SCHEMA ]
+      schemas: [ NO_ERRORS_SCHEMA ],
     }).overrideComponent(CollectionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index 78d7c985a3..2878b1c7d5 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -1,20 +1,36 @@
-import { Component, Input, OnInit, ChangeDetectorRef } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import {map, scan, startWith, switchMap, tap, withLatestFrom} from 'rxjs/operators';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  scan,
+  startWith,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { hasValue } from '../../../shared/empty.util';
 import {
   getAllCompletedRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataPayload,
   getPaginatedListPayload,
 } from '../../../core/shared/operators';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component renders the parent collections section of the item
@@ -23,7 +39,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-item-page-collections',
-  templateUrl: './collections.component.html'
+  templateUrl: './collections.component.html',
 })
 export class CollectionsComponent implements OnInit {
 
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 9091beb6c7..4cef0a1592 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value">
+    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
        {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
index f869ab8aaf..81d3ae2d27 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
@@ -1,13 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataUriValuesComponent } from './metadata-uri-values.component';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { MetadataValue } from '../../../core/shared/metadata.models';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { isNotEmpty } from '../../../shared/empty.util';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { MetadataUriValuesComponent } from './metadata-uri-values.component';
 
 let comp: MetadataUriValuesComponent;
 let fixture: ComponentFixture<MetadataUriValuesComponent>;
@@ -15,12 +27,12 @@ let fixture: ComponentFixture<MetadataUriValuesComponent>;
 const mockMetadata = [
   {
     language: 'en_US',
-    value: 'http://fakelink.org'
+    value: 'http://fakelink.org',
   },
   {
     language: 'en_US',
-    value: 'http://another.fakelink.org'
-  }
+    value: 'http://another.fakelink.org',
+  },
 ] as MetadataValue[];
 const mockSeperator = '<br/>';
 const mockLabel = 'fake.message';
@@ -32,16 +44,16 @@ describe('MetadataUriValuesComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
       ],
       declarations: [MetadataUriValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataUriValuesComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index e070eccf2d..96608a693b 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { MetadataValuesComponent } from '../metadata-values/metadata-values.component';
 import { MetadataValue } from '../../../core/shared/metadata.models';
+import { MetadataValuesComponent } from '../metadata-values/metadata-values.component';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component as a link.
@@ -13,7 +16,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 @Component({
   selector: 'ds-metadata-uri-values',
   styleUrls: ['./metadata-uri-values.component.scss'],
-  templateUrl: './metadata-uri-values.component.html'
+  templateUrl: './metadata-uri-values.component.html',
 })
 export class MetadataUriValuesComponent extends MetadataValuesComponent {
 
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 61088edd16..17eb4e42e3 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -3,8 +3,8 @@
       <!--
       Choose a template. Priority: markdown, link, browse link.
       -->
-      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? link : (hasBrowseDefinition() ? browselink : simple)));
-        context: {value: mdValue.value}">
+      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (hasValue(img) ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple)));
+        context: {value: mdValue.value, img}">
       </ng-container>
       <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
     </ng-container>
@@ -23,6 +23,17 @@
     </a>
 </ng-template>
 
+<!-- Render value as a link with icon -->
+<ng-template #linkImg let-img="img" let-value="value">
+  <a [href]="value" class="link-anchor dont-break-out ds-simple-metadata-link" target="_blank">
+    <img class="link-logo"
+      [alt]="img.alt | translate"
+      [style.height]="'var(' + img.heightVar + ', --ds-item-page-img-field-default-inline-height)'"
+      [src]="img.URI"/>
+    {{value}}
+  </a>
+</ng-template>
+
 <!-- Render simple value in a span  -->
 <ng-template #simple let-value="value">
   <span class="dont-break-out preserve-line-breaks">{{value}}</span>
@@ -32,7 +43,5 @@
 <ng-template #browselink let-value="value">
   <a class="dont-break-out preserve-line-breaks ds-browse-link"
      [routerLink]="['/browse', browseDefinition.id]"
-     [queryParams]="getQueryParams(value)">
-    {{value}}
-  </a>
+     [queryParams]="getQueryParams(value)">{{value}}</a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 23f8098207..eb076d2c8c 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -1,12 +1,23 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { MetadataValuesComponent } from './metadata-values.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataValue } from '../../../core/shared/metadata.models';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { MetadataValuesComponent } from './metadata-values.component';
 
 let comp: MetadataValuesComponent;
 let fixture: ComponentFixture<MetadataValuesComponent>;
@@ -14,15 +25,15 @@ let fixture: ComponentFixture<MetadataValuesComponent>;
 const mockMetadata = [
   {
     language: 'en_US',
-    value: '1234'
+    value: '1234',
   },
   {
     language: 'en_US',
-    value: 'a publisher'
+    value: 'a publisher',
   },
   {
     language: 'en_US',
-    value: 'desc'
+    value: 'desc',
   }] as MetadataValue[];
 const mockSeperator = '<br/>';
 const mockLabel = 'fake.message';
@@ -33,16 +44,16 @@ describe('MetadataValuesComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
+          useClass: TranslateLoaderMock,
         },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
       ],
       declarations: [MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataValuesComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -69,7 +80,7 @@ describe('MetadataValuesComponent', () => {
   });
 
   it('should correctly detect a pattern on string containing "test"', () => {
-    const mdValue = {value: 'This is a test value'} as MetadataValue;
+    const mdValue = { value: 'This is a test value' } as MetadataValue;
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index cbbae9006d..e8834879ab 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,9 +1,21 @@
-import { Component, Inject, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { MetadataValue } from '../../../core/shared/metadata.models';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import {
+  Component,
+  Inject,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
-import { hasValue } from '../../../shared/empty.util';
+import { MetadataValue } from '../../../core/shared/metadata.models';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
+import { hasValue } from '../../../shared/empty.util';
+import { ImageField } from '../../simple/field-components/specific-field/item-page-field.component';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -12,7 +24,7 @@ import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-br
 @Component({
   selector: 'ds-metadata-values',
   styleUrls: ['./metadata-values.component.scss'],
-  templateUrl: './metadata-values.component.html'
+  templateUrl: './metadata-values.component.html',
 })
 export class MetadataValuesComponent implements OnChanges {
 
@@ -53,8 +65,16 @@ export class MetadataValuesComponent implements OnChanges {
    */
   renderMarkdown;
 
+
   @Input() browseDefinition?: BrowseDefinition;
 
+  /**
+   * Optional {@code ImageField} reference that represents an image to be displayed inline.
+   */
+  @Input() img?: ImageField;
+
+  hasValue = hasValue;
+
   ngOnChanges(changes: SimpleChanges): void {
     this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
   }
@@ -84,10 +104,20 @@ export class MetadataValuesComponent implements OnChanges {
    * @param value the specific metadata value being linked
    */
   getQueryParams(value) {
-    let queryParams = {startsWith: value};
+    const queryParams = { startsWith: value };
     if (this.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
-      return {value: value};
+      return { value: value };
     }
     return queryParams;
   }
+
+
+  /**
+   * Checks if the given link value is an internal link.
+   * @param linkValue - The link value to check.
+   * @returns True if the link value starts with the base URL defined in the environment configuration, false otherwise.
+   */
+  hasInternalLink(linkValue: string): boolean {
+    return linkValue.startsWith(environment.ui.baseUrl);
+  }
 }
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8b8603011d..7774754079 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,7 +1,7 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <div *ngVar="(originals$ | async)?.payload as originals">
         <div *ngIf="hasValuesInBundle(originals)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
             <ds-pagination *ngIf="originals?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
@@ -44,7 +44,7 @@
     </div>
     <div *ngVar="(licenses$ | async)?.payload as licenses">
         <div *ngIf="hasValuesInBundle(licenses)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
             <ds-pagination *ngIf="licenses?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
index f8a8a83f29..046f34531f 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
@@ -1,26 +1,34 @@
-import { FullFileSectionComponent } from './full-file-section.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../../../shared/utils/var.directive';
-import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
-import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { of as observableOf } from 'rxjs';
-import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment';
 
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { FullFileSectionComponent } from './full-file-section.component';
+
 describe('FullFileSectionComponent', () => {
   let comp: FullFileSectionComponent;
   let fixture: ComponentFixture<FullFileSectionComponent>;
@@ -33,11 +41,11 @@ describe('FullFileSectionComponent', () => {
       bundleName: 'ORIGINAL',
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
         },
         content: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
-        }
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+        },
       },
       id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
       uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -46,14 +54,14 @@ describe('FullFileSectionComponent', () => {
         'dc.title': [
           {
             language: null,
-            value: 'test_word.docx'
-          }
-        ]
-      }
+            value: 'test_word.docx',
+          },
+        ],
+      },
     });
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream]))
+    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream])),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -64,8 +72,8 @@ describe('FullFileSectionComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [FullFileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
@@ -75,7 +83,7 @@ describe('FullFileSectionComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index d34edeb025..bd3ff97278 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,21 +1,36 @@
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import {
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { Item } from '../../../../core/shared/item.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { switchMap, tap } from 'rxjs/operators';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Item } from '../../../../core/shared/item.model';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
 
 /**
  * This component renders the file section of the item
@@ -25,7 +40,7 @@ import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
 @Component({
   selector: 'ds-item-page-full-file-section',
   styleUrls: ['./full-file-section.component.scss'],
-  templateUrl: './full-file-section.component.html'
+  templateUrl: './full-file-section.component.html',
 })
 export class FullFileSectionComponent extends FileSectionComponent implements OnDestroy, OnInit {
 
@@ -39,13 +54,13 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
   originalOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'obo',
     currentPage: 1,
-    pageSize: this.appConfig.item.bitstream.pageSize
+    pageSize: this.appConfig.item.bitstream.pageSize,
   });
 
   licenseOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'lbo',
     currentPage: 1,
-    pageSize: this.appConfig.item.bitstream.pageSize
+    pageSize: this.appConfig.item.bitstream.pageSize,
   });
 
   constructor(
@@ -54,7 +69,7 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
     protected translateService: TranslateService,
     protected paginationService: PaginationService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(bitstreamDataService, notificationsService, translateService, dsoNameService, appConfig);
   }
@@ -68,36 +83,36 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
       switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
         this.item,
         'ORIGINAL',
-        {elementsPerPage: options.pageSize, currentPage: options.currentPage},
+        { elementsPerPage: options.pageSize, currentPage: options.currentPage },
         true,
         true,
         followLink('format'),
         followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
-          if (hasValue(rd.errorMessage)) {
-            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
-          }
+        if (hasValue(rd.errorMessage)) {
+          this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
         }
-      )
+      },
+      ),
     );
 
     this.licenses$ = this.paginationService.getCurrentPagination(this.licenseOptions.id, this.licenseOptions).pipe(
       switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
         this.item,
         'LICENSE',
-        {elementsPerPage: options.pageSize, currentPage: options.currentPage},
+        { elementsPerPage: options.pageSize, currentPage: options.currentPage },
         true,
         true,
         followLink('format'),
         followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
-          if (hasValue(rd.errorMessage)) {
-            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
-          }
+        if (hasValue(rd.errorMessage)) {
+          this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
         }
-      )
+      },
+      ),
     );
 
   }
diff --git a/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts
index 015eec285c..de03cd07c8 100644
--- a/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { FullFileSectionComponent } from './full-file-section.component';
-import { Item } from '../../../../core/shared/item.model';
 
 /**
  * Themed wrapper for {@link FullFileSectionComponent}
diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts
index 9fc078c2cd..516f2e94cd 100644
--- a/src/app/item-page/full/full-item-page.component.spec.ts
+++ b/src/app/item-page/full/full-item-page.component.spec.ts
@@ -1,28 +1,48 @@
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
-import { TruncatePipe } from '../../shared/utils/truncate.pipe';
-import { FullItemPageComponent } from './full-item-page.component';
-import { MetadataService } from '../../core/metadata/metadata.service';
-import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Item } from '../../core/shared/item.model';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
-import { ServerResponseService } from '../../core/services/server-response.service';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { MetadataService } from '../../core/metadata/metadata.service';
 import { LinkHeadService } from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { TruncatePipe } from '../../shared/utils/truncate.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { FullItemPageComponent } from './full-item-page.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -30,23 +50,23 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'test item'
-      }
-    ]
-  }
+        value: 'test item',
+      },
+    ],
+  },
 });
 
 const mockWithdrawnItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable(),
-  isWithdrawn: true
+  isWithdrawn: true,
 });
 
 const metadataServiceStub = {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   processRemoteData: () => {
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
 
@@ -61,23 +81,24 @@ describe('FullItemPageComponent', () => {
   let serverResponseService: jasmine.SpyObj<ServerResponseService>;
   let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
   let linkHeadService: jasmine.SpyObj<LinkHeadService>;
+  let notifyInfoService: jasmine.SpyObj<NotifyInfoService>;
 
   const mocklink = {
     href: 'http://test.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   const mocklink2 = {
     href: 'http://test2.org',
     rel: 'test',
-    type: 'test'
+    type: 'test',
   };
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     routeData = {
@@ -85,7 +106,7 @@ describe('FullItemPageComponent', () => {
     };
 
     routeStub = Object.assign(new ActivatedRouteStub(), {
-      data: observableOf(routeData)
+      data: observableOf(routeData),
     });
 
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
@@ -105,12 +126,18 @@ describe('FullItemPageComponent', () => {
       removeTag: jasmine.createSpy('removeTag'),
     });
 
+    notifyInfoService = jasmine.createSpyObj('NotifyInfoService', {
+      isCoarConfigEnabled: observableOf(true),
+      getCoarLdnLocalInboxUrls: observableOf(['http://test.org']),
+      getInboxRelationLink: observableOf('http://test.org'),
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), RouterTestingModule.withRoutes([]), BrowserAnimationsModule],
       declarations: [FullItemPageComponent, TruncatePipe, VarDirective],
       providers: [
@@ -122,11 +149,12 @@ describe('FullItemPageComponent', () => {
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
-        { provide: PLATFORM_ID, useValue: 'server' }
+        { provide: NotifyInfoService, useValue: notifyInfoService },
+        { provide: PLATFORM_ID, useValue: 'server' },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(FullItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -154,7 +182,7 @@ describe('FullItemPageComponent', () => {
   });
 
   it('should not show simple view button when originated from workflow', fakeAsync(() => {
-    routeData.wfi = createSuccessfulRemoteDataObject$({ id: 'wfiId'});
+    routeData.wfi = createSuccessfulRemoteDataObject$({ id: 'wfiId' });
     comp.ngOnInit();
     fixture.detectChanges();
     fixture.whenStable().then(() => {
@@ -178,7 +206,7 @@ describe('FullItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
   describe('when the item is withdrawn and the user is not an admin', () => {
@@ -207,7 +235,7 @@ describe('FullItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
 
@@ -224,7 +252,7 @@ describe('FullItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
 });
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 31dd2c5fc2..7a2520f072 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -1,24 +1,39 @@
-import { filter, map } from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute, Data, Router } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-
-import { ItemPageComponent } from '../simple/item-page.component';
-import { MetadataMap } from '../../core/shared/metadata.models';
-import { ItemDataService } from '../../core/data/item-data.service';
-
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-
-import { fadeInOut } from '../../shared/animations/fade';
-import { hasValue } from '../../shared/empty.util';
-import { AuthService } from '../../core/auth/auth.service';
 import { Location } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ServerResponseService } from '../../core/services/server-response.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
 import { LinkHeadService } from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Item } from '../../core/shared/item.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { fadeInOut } from '../../shared/animations/fade';
+import { hasValue } from '../../shared/empty.util';
+import { ItemPageComponent } from '../simple/item-page.component';
 
 /**
  * This component renders a full item page.
@@ -30,7 +45,7 @@ import { LinkHeadService } from '../../core/services/link-head.service';
   styleUrls: ['./full-item-page.component.scss'],
   templateUrl: './full-item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit, OnDestroy {
 
@@ -55,9 +70,10 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     protected responseService: ServerResponseService,
     protected signpostingDataService: SignpostingDataService,
     protected linkHeadService: LinkHeadService,
+    protected notifyInfoService: NotifyInfoService,
     @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-    super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
+    super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, notifyInfoService, platformId);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
@@ -66,11 +82,11 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     this.metadata$ = this.itemRD$.pipe(
       map((rd: RemoteData<Item>) => rd.payload),
       filter((item: Item) => hasValue(item)),
-      map((item: Item) => item.metadata),);
+      map((item: Item) => item.metadata));
 
     this.subs.push(this.route.data.subscribe((data: Data) => {
-        this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
-      })
+      this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
+    }),
     );
   }
 
diff --git a/src/app/item-page/full/themed-full-item-page.component.ts b/src/app/item-page/full/themed-full-item-page.component.ts
index a3b19e6f93..4b8e08a495 100644
--- a/src/app/item-page/full/themed-full-item-page.component.ts
+++ b/src/app/item-page/full/themed-full-item-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { FullItemPageComponent } from './full-item-page.component';
 
diff --git a/src/app/item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts
index 5d3464aa75..905516195d 100644
--- a/src/app/item-page/item-page-administrator.guard.ts
+++ b/src/app/item-page/item-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { ItemPageResolver } from './item-page.resolver';
-import { Item } from '../core/shared/item.model';
-import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../core/auth/auth.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { Item } from '../core/shared/item.model';
+import { ItemPageResolver } from './item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts
index 90a4a54b1e..cded1dd74e 100644
--- a/src/app/item-page/item-page-routing-paths.ts
+++ b/src/app/item-page/item-page-routing-paths.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { Item } from '../core/shared/item.model';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { isNotEmpty } from '../shared/empty.util';
 
 export const ITEM_MODULE_PATH = 'items';
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index 0c855ab34d..ed86ba4082 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -1,24 +1,29 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ItemPageResolver } from './item-page.resolver';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
-import { VersionResolver } from './version-page/version.resolver';
-import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { LinkService } from '../core/cache/builders/link.service';
-import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-import { ITEM_EDIT_PATH, ORCID_PATH, UPLOAD_BITSTREAM_PATH } from './item-page-routing-paths';
-import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
-import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { ThemedItemPageComponent } from './simple/themed-item-page.component';
-import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
-import { MenuItemType } from '../shared/menu/menu-item-type.model';
-import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+
 import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
+import { LinkService } from '../core/cache/builders/link.service';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
+import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
+import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
+import { ItemPageResolver } from './item-page.resolver';
+import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
+import {
+  ITEM_EDIT_PATH,
+  ORCID_PATH,
+  UPLOAD_BITSTREAM_PATH,
+} from './item-page-routing-paths';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
-import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { VersionResolver } from './version-page/version.resolver';
+import { VersionPageComponent } from './version-page/version-page/version-page.component';
 
 @NgModule({
   imports: [
@@ -28,7 +33,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         resolve: {
           dso: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver,
-          menu: DSOEditMenuResolver
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -49,7 +54,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
           {
             path: UPLOAD_BITSTREAM_PATH,
             component: UploadBitstreamComponent,
-            canActivate: [AuthenticatedGuard]
+            canActivate: [AuthenticatedGuard],
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
@@ -58,8 +63,8 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
           {
             path: ORCID_PATH,
             component: OrcidPageComponent,
-            canActivate: [AuthenticatedGuard, OrcidPageGuard]
-          }
+            canActivate: [AuthenticatedGuard, OrcidPageGuard],
+          },
         ],
         data: {
           menu: {
@@ -86,10 +91,10 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             resolve: {
               dso: VersionResolver,
             },
-          }
+          },
         ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
     ItemPageResolver,
@@ -98,8 +103,8 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     ItemPageAdministratorGuard,
     VersionResolver,
-    OrcidPageGuard
-  ]
+    OrcidPageGuard,
+  ],
 
 })
 export class ItemPageRoutingModule {
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index a8d41d1535..397cf76993 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -1,70 +1,62 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { SharedModule } from '../shared/shared.module';
-
-import { ItemPageComponent } from './simple/item-page.component';
-import { ItemPageRoutingModule } from './item-page-routing.module';
-import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
-import {
-  ItemPageAuthorFieldComponent
-} from './simple/field-components/specific-field/author/item-page-author-field.component';
-import {
-  ItemPageDateFieldComponent
-} from './simple/field-components/specific-field/date/item-page-date-field.component';
-import {
-  ItemPageAbstractFieldComponent
-} from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
-import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
-import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
-import { CollectionsComponent } from './field-components/collections/collections.component';
-import { FullItemPageComponent } from './full/full-item-page.component';
-import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
-import { PublicationComponent } from './simple/item-types/publication/publication.component';
-import { ItemComponent } from './simple/item-types/shared/item.component';
-import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
-import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import {
-  AbstractIncrementalListComponent
-} from './simple/abstract-incremental-list/abstract-incremental-list.component';
-import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
+import { SharedModule } from '../shared/shared.module';
+import { UploadModule } from '../shared/upload/upload.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { ItemAlertsComponent } from './alerts/item-alerts.component';
+import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
+import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
+import { CollectionsComponent } from './field-components/collections/collections.component';
+import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
+import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
+import { ThemedFullFileSectionComponent } from './full/field-components/file-section/themed-full-file-section.component';
+import { FullItemPageComponent } from './full/full-item-page.component';
 import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
+import { ItemPageRoutingModule } from './item-page-routing.module';
+import { ItemSharedModule } from './item-shared.module';
 import { MediaViewerComponent } from './media-viewer/media-viewer.component';
-import { ThemedMediaViewerComponent } from './media-viewer/themed-media-viewer.component';
-import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
-import { ThemedMediaViewerVideoComponent } from './media-viewer/media-viewer-video/themed-media-viewer-video.component';
 import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component';
 import { ThemedMediaViewerImageComponent } from './media-viewer/media-viewer-image/themed-media-viewer-image.component';
-import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
+import { ThemedMediaViewerVideoComponent } from './media-viewer/media-viewer-video/themed-media-viewer-video.component';
+import { ThemedMediaViewerComponent } from './media-viewer/themed-media-viewer.component';
 import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
-import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
 import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
-import { UploadModule } from '../shared/upload/upload.module';
-import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
-import { ItemAlertsComponent } from './alerts/item-alerts.component';
-import { ItemVersionsModule } from './versions/item-versions.module';
-import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
+import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
 import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
-import { ItemSharedModule } from './item-shared.module';
-import { DsoPageModule } from '../shared/dso-page/dso-page.module';
-import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
-import {
-  ThemedFullFileSectionComponent
-} from './full/field-components/file-section/themed-full-file-section.component';
+import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
+import { ItemPageAbstractFieldComponent } from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
+import { ItemPageAuthorFieldComponent } from './simple/field-components/specific-field/author/item-page-author-field.component';
+import { ItemPageDateFieldComponent } from './simple/field-components/specific-field/date/item-page-date-field.component';
+import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
+import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
+import { ItemPageComponent } from './simple/item-page.component';
+import { PublicationComponent } from './simple/item-types/publication/publication.component';
+import { ItemComponent } from './simple/item-types/shared/item.component';
+import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
+import { NotifyRequestsStatusComponent } from './simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component';
+import { RequestStatusAlertBoxComponent } from './simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component';
+import { QaEventNotificationComponent } from './simple/qa-event-notification/qa-event-notification.component';
+import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { VersionPageComponent } from './version-page/version-page/version-page.component';
+import { ItemVersionsModule } from './versions/item-versions.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   PublicationComponent,
-  UntypedItemComponent
+  UntypedItemComponent,
 ];
 
 const DECLARATIONS = [
@@ -103,6 +95,9 @@ const DECLARATIONS = [
   ItemAlertsComponent,
   ThemedItemAlertsComponent,
   BitstreamRequestACopyPageComponent,
+  QaEventNotificationComponent,
+  NotifyRequestsStatusComponent,
+  RequestStatusAlertBoxComponent,
 ];
 
 @NgModule({
@@ -128,7 +123,7 @@ const DECLARATIONS = [
   ],
   exports: [
     ...DECLARATIONS,
-  ]
+  ],
 })
 export class ItemPageModule {
   /**
@@ -138,7 +133,7 @@ export class ItemPageModule {
   static withEntryComponents() {
     return {
       ngModule: ItemPageModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts
index 533f97d0c0..76b7dae774 100644
--- a/src/app/item-page/item-page.resolver.spec.ts
+++ b/src/app/item-page/item-page.resolver.spec.ts
@@ -1,19 +1,20 @@
-import { ItemPageResolver } from './item-page.resolver';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { first } from 'rxjs/operators';
+
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { MetadataValueFilter } from '../core/shared/metadata.models';
-import { first } from 'rxjs/operators';
-import { Router } from '@angular/router';
-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ItemPageResolver } from './item-page.resolver';
 
 describe('ItemPageResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule.withRoutes([{
         path: 'entities/:entity-type/:id',
-        component: {} as any
-      }])]
+        component: {} as any,
+      }])],
     });
   });
 
@@ -33,10 +34,10 @@ describe('ItemPageResolver', () => {
           uuid: uuid,
           firstMetadataValue(_keyOrKeys: string | string[], _valueFilter?: MetadataValueFilter): string {
             return entityType;
-          }
+          },
         });
         itemService = {
-          findById: (_id: string) => createSuccessfulRemoteDataObject$(item)
+          findById: (_id: string) => createSuccessfulRemoteDataObject$(item),
         };
         store = jasmine.createSpyObj('store', {
           dispatch: {},
@@ -54,7 +55,7 @@ describe('ItemPageResolver', () => {
             () => {
               expect(router.navigateByUrl).toHaveBeenCalledWith(router.parseUrl(`/entities/${entityType}/${uuid}`).toString());
               done();
-            }
+            },
           );
       });
 
@@ -68,7 +69,7 @@ describe('ItemPageResolver', () => {
             () => {
               expect(router.navigateByUrl).not.toHaveBeenCalled();
               done();
-            }
+            },
           );
       });
     }
diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index e9b287406e..cfdb9b74d1 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -1,14 +1,19 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { ItemDataService } from '../core/data/item-data.service';
-import { Item } from '../core/shared/item.model';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
+import { ItemDataService } from '../core/data/item-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { Item } from '../core/shared/item.model';
 import { hasValue } from '../shared/empty.util';
-import { getItemPageRoute } from './item-page-routing-paths';
 import { ItemResolver } from './item.resolver';
+import { getItemPageRoute } from './item-page-routing-paths';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
@@ -19,7 +24,7 @@ export class ItemPageResolver extends ItemResolver {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
     super(itemService, store, router);
   }
@@ -50,7 +55,7 @@ export class ItemPageResolver extends ItemResolver {
           }
         }
         return rd;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index 9c2bbba619..36fe6ac3bd 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -1,25 +1,30 @@
-import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
+import {
+  CommonModule,
+  NgOptimizedImage,
+} from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemWithdrawnReinstateModalComponent } from '../shared/correction-suggestion/withdrawn-reinstate-modal.component';
+import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
-import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
-import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
-import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
-import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
 import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component';
 import { GenericItemPageFieldComponent } from './simple/field-components/specific-field/generic/generic-item-page-field.component';
+import { ItemPageImgFieldComponent } from './simple/field-components/specific-field/img/item-page-img-field.component';
 import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component';
+import { ThemedMetadataRepresentationListComponent } from './simple/metadata-representation-list/themed-metadata-representation-list.component';
+import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
+import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
 import { RelatedItemsComponent } from './simple/related-items/related-items-component';
-import {
-  ThemedMetadataRepresentationListComponent
-} from './simple/metadata-representation-list/themed-metadata-representation-list.component';
+import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
+import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
 
 const ENTRY_COMPONENTS = [
   ItemVersionsDeleteModalComponent,
   ItemVersionsSummaryModalComponent,
+  ItemWithdrawnReinstateModalComponent,
 
 ];
 
@@ -32,27 +37,29 @@ const COMPONENTS = [
   MetadataRepresentationListComponent,
   ThemedMetadataRepresentationListComponent,
   RelatedItemsComponent,
+  ItemPageImgFieldComponent,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     SearchModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
+    NgOptimizedImage,
   ],
   exports: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   providers: [
     {
       provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-      useValue: dsDynamicFormControlMapFn
+      useValue: dsDynamicFormControlMapFn,
     },
     ...ENTRY_COMPONENTS,
-  ]
+  ],
 })
 export class ItemSharedModule { }
diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts
index ca6a6c5958..009adbea69 100644
--- a/src/app/item-page/item.resolver.ts
+++ b/src/app/item-page/item.resolver.ts
@@ -1,13 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { ItemDataService } from '../core/data/item-data.service';
-import { Item } from '../core/shared/item.model';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { ItemDataService } from '../core/data/item-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Item } from '../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -16,11 +25,11 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
 export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
   followLink('owningCollection', {},
     followLink('parentCommunity', {},
-      followLink('parentCommunity'))
+      followLink('parentCommunity')),
   ),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
-  followLink('thumbnail')
+  followLink('thumbnail'),
 ];
 
 /**
@@ -31,7 +40,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
   }
 
@@ -46,7 +55,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
       true,
       false,
-      ...ITEM_PAGE_LINKS_TO_FOLLOW
+      ...ITEM_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
index 98d0ac08a6..c824a729cd 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
@@ -1,21 +1,24 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NgxGalleryOptions } from '@kolkov/ngx-gallery';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
-
 import { MediaViewerImageComponent } from './media-viewer-image.component';
 
-import { of as observableOf } from 'rxjs';
-import { AuthService } from '../../../core/auth/auth.service';
-
 describe('MediaViewerImageComponent', () => {
   let component: MediaViewerImageComponent;
   let fixture: ComponentFixture<MediaViewerImageComponent>;
 
   const authService = jasmine.createSpyObj('authService', {
-    isAuthenticated: observableOf(false)
+    isAuthenticated: observableOf(false),
   });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(), {
@@ -52,7 +55,7 @@ describe('MediaViewerImageComponent', () => {
     [
       { bitstream: mockBitstream, format: 'image', thumbnail: null },
       { bitstream: mockBitstream, format: 'image', thumbnail: null },
-    ]
+    ],
   );
 
   beforeEach(waitForAsync(() => {
@@ -71,7 +74,7 @@ describe('MediaViewerImageComponent', () => {
     component = fixture.componentInstance;
     component.galleryOptions = [new NgxGalleryOptions({})];
     component.galleryImages = component.convertToGalleryImage(
-      mockMediaViewerItems
+      mockMediaViewerItems,
     );
   });
 
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
index 2ad43f6883..7f611180d6 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -1,9 +1,18 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
-import { NgxGalleryImage, NgxGalleryOptions } from '@kolkov/ngx-gallery';
-import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { NgxGalleryAnimation } from '@kolkov/ngx-gallery';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnInit,
+} from '@angular/core';
+import {
+  NgxGalleryAnimation,
+  NgxGalleryImage,
+  NgxGalleryOptions,
+} from '@kolkov/ngx-gallery';
 import { Observable } from 'rxjs';
+
 import { AuthService } from '../../../core/auth/auth.service';
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 
 /**
  * This componenet render an image gallery for the image viewer
diff --git a/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts
index 85ac779817..2229b7c71e 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 import { ThemedComponent } from '../../../shared/theme-support/themed.component';
 import { MediaViewerImageComponent } from './media-viewer-image.component';
-import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 
 /**
  * Themed wrapper for {@link MediaViewerImageComponent}.
diff --git a/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
index b27ab9983f..0f0c65c985 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
@@ -2,188 +2,188 @@ export const languageHelper = {
   ab: 'Abkhazian',
   aa: 'Afar',
   af: 'Afrikaans',
-	ak: 'Akan',
-	sq: 'Albanian',
-	am: 'Amharic',
-	ar: 'Arabic',
-	an: 'Aragonese',
-	hy: 'Armenian',
-	as: 'Assamese',
+  ak: 'Akan',
+  sq: 'Albanian',
+  am: 'Amharic',
+  ar: 'Arabic',
+  an: 'Aragonese',
+  hy: 'Armenian',
+  as: 'Assamese',
   av: 'Avaric',
-	ae: 'Avestan',
-	ay: 'Aymara',
-	az: 'Azerbaijani',
-	bm: 'Bambara',
-	ba: 'Bashkir',
-	eu: 'Basque',
-	be: 'Belarusian',
-	bn: 'Bengali (Bangla)',
-	bh: 'Bihari',
-	bi: 'Bislama',
-	bs: 'Bosnian',
-	br: 'Breton',
-	bg: 'Bulgarian',
-	my: 'Burmese',
-	ca: 'Catalan',
-	ch: 'Chamorro',
-	ce: 'Chechen',
-	ny: 'Chichewa, Chewa, Nyanja',
-	zh: 'Chinese',
-	cv: 'Chuvash',
-	kw: 'Cornish',
-	co: 'Corsican',
-	cr: 'Cree',
-	hr: 'Croatian',
-	cs: 'Czech',
-	da: 'Danish',
+  ae: 'Avestan',
+  ay: 'Aymara',
+  az: 'Azerbaijani',
+  bm: 'Bambara',
+  ba: 'Bashkir',
+  eu: 'Basque',
+  be: 'Belarusian',
+  bn: 'Bengali (Bangla)',
+  bh: 'Bihari',
+  bi: 'Bislama',
+  bs: 'Bosnian',
+  br: 'Breton',
+  bg: 'Bulgarian',
+  my: 'Burmese',
+  ca: 'Catalan',
+  ch: 'Chamorro',
+  ce: 'Chechen',
+  ny: 'Chichewa, Chewa, Nyanja',
+  zh: 'Chinese',
+  cv: 'Chuvash',
+  kw: 'Cornish',
+  co: 'Corsican',
+  cr: 'Cree',
+  hr: 'Croatian',
+  cs: 'Czech',
+  da: 'Danish',
   dv: 'Divehi, Dhivehi, Maldivian',
-	nl: 'Dutch',
-	dz: 'Dzongkha',
-	en: 'English',
-	eo: 'Esperanto',
-	et: 'Estonian',
-	ee: 'Ewe',
-	fo: 'Faroese',
-	fj: 'Fijian',
-	fi: 'Finnish',
-	fr: 'French',
-	ff: 'Fula, Fulah, Pulaar, Pular',
-	gl: 'Galician',
-	gd: 'Gaelic (Scottish)',
-	gv: 'Gaelic (Manx)',
-	ka: 'Georgian',
-	de: 'German',
-	el: 'Greek',
+  nl: 'Dutch',
+  dz: 'Dzongkha',
+  en: 'English',
+  eo: 'Esperanto',
+  et: 'Estonian',
+  ee: 'Ewe',
+  fo: 'Faroese',
+  fj: 'Fijian',
+  fi: 'Finnish',
+  fr: 'French',
+  ff: 'Fula, Fulah, Pulaar, Pular',
+  gl: 'Galician',
+  gd: 'Gaelic (Scottish)',
+  gv: 'Gaelic (Manx)',
+  ka: 'Georgian',
+  de: 'German',
+  el: 'Greek',
   gn: 'Guarani',
-	gu: 'Gujarati',
-	ht: 'Haitian Creole',
-	ha: 'Hausa',
-	he: 'Hebrew',
-	hz: 'Herero',
-	hi: 'Hindi',
-	ho: 'Hiri Motu',
-	hu: 'Hungarian',
-	is: 'Icelandic',
-	io: 'Ido',
-	ig: 'Igbo',
+  gu: 'Gujarati',
+  ht: 'Haitian Creole',
+  ha: 'Hausa',
+  he: 'Hebrew',
+  hz: 'Herero',
+  hi: 'Hindi',
+  ho: 'Hiri Motu',
+  hu: 'Hungarian',
+  is: 'Icelandic',
+  io: 'Ido',
+  ig: 'Igbo',
   in: 'Indonesian',
-	ia: 'Interlingua',
-	ie: 'Interlingue',
-	iu: 'Inuktitut',
-	ik: 'Inupiak',
-	ga: 'Irish',
-	it: 'Italian',
-	ja: 'Japanese',
-	jv: 'Javanese',
-	kl: 'Kalaallisut, Greenlandic',
-	kn: 'Kannada',
-	kr: 'Kanuri',
-	ks: 'Kashmiri',
-	kk: 'Kazakh',
-	km: 'Khmer',
-	ki: 'Kikuyu',
-	rw: 'Kinyarwanda (Rwanda)',
-	rn: 'Kirundi',
-	ky: 'Kyrgyz',
-	kv: 'Komi',
-	kg: 'Kongo',
-	ko: 'Korean',
-	ku: 'Kurdish',
-	kj: 'Kwanyama',
-	lo: 'Lao',
-	la: 'Latin',
-	lv: 'Latvian (Lettish)',
-	li: 'Limburgish ( Limburger)',
-	ln: 'Lingala',
-	lt: 'Lithuanian',
-	lu: 'Luga-Katanga',
-	lg: 'Luganda, Ganda',
-	lb: 'Luxembourgish',
-	mk: 'Macedonian',
-	mg: 'Malagasy',
-	ms: 'Malay',
-	ml: 'Malayalam',
-	mt: 'Maltese',
-	mi: 'Maori',
-	mr: 'Marathi',
-	mh: 'Marshallese',
-	mo: 'Moldavian',
-	mn: 'Mongolian',
-	na: 'Nauru',
-	nv: 'Navajo',
-	ng: 'Ndonga',
-	nd: 'Northern Ndebele',
-	ne: 'Nepali',
-	no: 'Norwegian',
-	nb: 'Norwegian bokmål',
-	nn: 'Norwegian nynorsk',
-	oc: 'Occitan',
-	oj: 'Ojibwe',
-	cu: 'Old Church Slavonic, Old Bulgarian',
-	or: 'Oriya',
-	om: 'Oromo (Afaan Oromo)',
-	os: 'Ossetian',
-	pi: 'Pāli',
-	ps: 'Pashto, Pushto',
-	fa: 'Persian (Farsi)',
-	pl: 'Polish',
-	pt: 'Portuguese',
-	pa: 'Punjabi (Eastern)',
-	qu: 'Quechua',
-	rm: 'Romansh',
-	ro: 'Romanian',
-	ru: 'Russian',
-	se: 'Sami',
-	sm: 'Samoan',
-	sg: 'Sango',
-	sa: 'Sanskrit',
-	sr: 'Serbian',
-	sh: 'Serbo-Croatian',
-	st: 'Sesotho',
-	tn: 'Setswana',
-	sn: 'Shona',
-	ii: 'Sichuan Yi, Nuosu',
-	sd: 'Sindhi',
-	si: 'Sinhalese',
-	ss: 'Siswati (Swati)',
-	sk: 'Slovak',
-	sl: 'Slovenian',
-	so: 'Somali',
-	nr: 'Southern Ndebele',
-	es: 'Spanish',
-	su: 'Sundanese',
-	sw: 'Swahili (Kiswahili)',
-	sv: 'Swedish',
-	tl: 'Tagalog',
-	ty: 'Tahitian',
-	tg: 'Tajik',
-	ta: 'Tamil',
-	tt: 'Tatar',
-	te: 'Telugu',
-	th: 'Thai',
-	bo: 'Tibetan',
-	ti: 'Tigrinya',
-	to: 'Tonga',
-	ts: 'Tsonga',
-	tr: 'Turkish',
-	tk: 'Turkmen',
-	tw: 'Twi',
-	ug: 'Uyghur',
-	uk: 'Ukrainian',
-	ur: 'Urdu',
-	uz: 'Uzbek',
-	ve: 'Venda',
-	vi: 'Vietnamese',
-	vo: 'Volapük',
-	wa: 'Wallon',
-	cy: 'Welsh',
-	wo: 'Wolof',
-	fy: 'Western Frisian',
-	xh: 'Xhosa',
+  ia: 'Interlingua',
+  ie: 'Interlingue',
+  iu: 'Inuktitut',
+  ik: 'Inupiak',
+  ga: 'Irish',
+  it: 'Italian',
+  ja: 'Japanese',
+  jv: 'Javanese',
+  kl: 'Kalaallisut, Greenlandic',
+  kn: 'Kannada',
+  kr: 'Kanuri',
+  ks: 'Kashmiri',
+  kk: 'Kazakh',
+  km: 'Khmer',
+  ki: 'Kikuyu',
+  rw: 'Kinyarwanda (Rwanda)',
+  rn: 'Kirundi',
+  ky: 'Kyrgyz',
+  kv: 'Komi',
+  kg: 'Kongo',
+  ko: 'Korean',
+  ku: 'Kurdish',
+  kj: 'Kwanyama',
+  lo: 'Lao',
+  la: 'Latin',
+  lv: 'Latvian (Lettish)',
+  li: 'Limburgish ( Limburger)',
+  ln: 'Lingala',
+  lt: 'Lithuanian',
+  lu: 'Luga-Katanga',
+  lg: 'Luganda, Ganda',
+  lb: 'Luxembourgish',
+  mk: 'Macedonian',
+  mg: 'Malagasy',
+  ms: 'Malay',
+  ml: 'Malayalam',
+  mt: 'Maltese',
+  mi: 'Maori',
+  mr: 'Marathi',
+  mh: 'Marshallese',
+  mo: 'Moldavian',
+  mn: 'Mongolian',
+  na: 'Nauru',
+  nv: 'Navajo',
+  ng: 'Ndonga',
+  nd: 'Northern Ndebele',
+  ne: 'Nepali',
+  no: 'Norwegian',
+  nb: 'Norwegian bokmål',
+  nn: 'Norwegian nynorsk',
+  oc: 'Occitan',
+  oj: 'Ojibwe',
+  cu: 'Old Church Slavonic, Old Bulgarian',
+  or: 'Oriya',
+  om: 'Oromo (Afaan Oromo)',
+  os: 'Ossetian',
+  pi: 'Pāli',
+  ps: 'Pashto, Pushto',
+  fa: 'Persian (Farsi)',
+  pl: 'Polish',
+  pt: 'Portuguese',
+  pa: 'Punjabi (Eastern)',
+  qu: 'Quechua',
+  rm: 'Romansh',
+  ro: 'Romanian',
+  ru: 'Russian',
+  se: 'Sami',
+  sm: 'Samoan',
+  sg: 'Sango',
+  sa: 'Sanskrit',
+  sr: 'Serbian',
+  sh: 'Serbo-Croatian',
+  st: 'Sesotho',
+  tn: 'Setswana',
+  sn: 'Shona',
+  ii: 'Sichuan Yi, Nuosu',
+  sd: 'Sindhi',
+  si: 'Sinhalese',
+  ss: 'Siswati (Swati)',
+  sk: 'Slovak',
+  sl: 'Slovenian',
+  so: 'Somali',
+  nr: 'Southern Ndebele',
+  es: 'Spanish',
+  su: 'Sundanese',
+  sw: 'Swahili (Kiswahili)',
+  sv: 'Swedish',
+  tl: 'Tagalog',
+  ty: 'Tahitian',
+  tg: 'Tajik',
+  ta: 'Tamil',
+  tt: 'Tatar',
+  te: 'Telugu',
+  th: 'Thai',
+  bo: 'Tibetan',
+  ti: 'Tigrinya',
+  to: 'Tonga',
+  ts: 'Tsonga',
+  tr: 'Turkish',
+  tk: 'Turkmen',
+  tw: 'Twi',
+  ug: 'Uyghur',
+  uk: 'Ukrainian',
+  ur: 'Urdu',
+  uz: 'Uzbek',
+  ve: 'Venda',
+  vi: 'Vietnamese',
+  vo: 'Volapük',
+  wa: 'Wallon',
+  cy: 'Welsh',
+  wo: 'Wolof',
+  fy: 'Western Frisian',
+  xh: 'Xhosa',
   yi: 'Yiddish',
-	yo: 'Yoruba',
-	za: 'Zhuang, Chuang',
-	zu: 'Zulu'
+  yo: 'Yoruba',
+  za: 'Zhuang, Chuang',
+  zu: 'Zulu',
 };
 
 
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
index 92aa229b01..0a5cf1a96c 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
@@ -1,17 +1,25 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { FileSizePipe } from '../../../shared/utils/file-size-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
-import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
 import { MediaViewerVideoComponent } from './media-viewer-video.component';
-import { By } from '@angular/platform-browser';
 
 describe('MediaViewerVideoComponent', () => {
   let component: MediaViewerVideoComponent;
@@ -72,11 +80,11 @@ describe('MediaViewerVideoComponent', () => {
     [
       { bitstream: mockBitstream, format: 'video', thumbnail: null },
       { bitstream: mockBitstream, format: 'video', thumbnail: null },
-    ]
+    ],
   );
   const mockMediaViewerItem: MediaViewerItem[] = Object.assign(
     new Array<MediaViewerItem>(),
-    [{ bitstream: mockBitstream, format: 'video', thumbnail: null }]
+    [{ bitstream: mockBitstream, format: 'video', thumbnail: null }],
   );
 
   beforeEach(() => {
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 52cd3cac34..6fdbfc85cf 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,10 +1,14 @@
-import { Component, Input } from '@angular/core';
-import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { languageHelper } from './language-helper';
-import { CaptionInfo } from './caption-info';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { CaptionInfo } from './caption-info';
+import { languageHelper } from './language-helper';
+
 /**
  * This component renders a video viewer and playlist for the media viewer
  */
@@ -48,7 +52,7 @@ export class MediaViewerVideoComponent {
       .filter((media: Bitstream) => media.name.substring(0, (media.name.length - 7)).toLowerCase() === name.toLowerCase());
 
     for (const media of filteredCapMedias) {
-      let srclang: string = media.name.slice(-6, -4).toLowerCase();
+      const srclang: string = media.name.slice(-6, -4).toLowerCase();
       capInfos.push(new CaptionInfo(
         media._links.content.href,
         srclang,
diff --git a/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts
index 8ae45b2dd3..7dca0c99df 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts
@@ -1,8 +1,12 @@
-import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../../shared/theme-support/themed.component';
-import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { MediaViewerVideoComponent } from './media-viewer-video.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Bitstream } from '../../../core/shared/bitstream.model';
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MediaViewerVideoComponent } from './media-viewer-video.component';
 
 /**
  * Themed wrapper for {@link MediaViewerVideoComponent}.
diff --git a/src/app/item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
index 0c170ac8cf..a91c5ab17b 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
+import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
+import { MetadataFieldWrapperComponent } from '../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { of as observableOf } from 'rxjs';
-import { By } from '@angular/platform-browser';
-import { MediaViewerComponent } from './media-viewer.component';
-import { MockBitstreamFormat1 } from '../../shared/mocks/item.mock';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { MediaViewerComponent } from './media-viewer.component';
 
 describe('MediaViewerComponent', () => {
   let comp: MediaViewerComponent;
@@ -51,13 +59,13 @@ describe('MediaViewerComponent', () => {
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
     findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(
-      createPaginatedList([mockBitstream])
+      createPaginatedList([mockBitstream]),
     ),
   });
 
   const mockMediaViewerItem: MediaViewerItem = Object.assign(
     new MediaViewerItem(),
-    { bitstream: mockBitstream, format: 'image', thumbnail: null }
+    { bitstream: mockBitstream, format: 'image', thumbnail: null },
   );
 
   beforeEach(waitForAsync(() => {
@@ -106,7 +114,7 @@ describe('MediaViewerComponent', () => {
       const mediaItem = comp.createMediaViewerItem(
         mockBitstream,
         MockBitstreamFormat1,
-        undefined
+        undefined,
       );
       expect(mediaItem).toBeTruthy();
       expect(mediaItem.thumbnail).toBe(null);
@@ -133,7 +141,7 @@ describe('MediaViewerComponent', () => {
       const mediaItem = comp.createMediaViewerItem(
         mockBitstream,
         MockBitstreamFormat1,
-        undefined
+        undefined,
       );
       expect(mediaItem).toBeTruthy();
       expect(mediaItem.thumbnail).toBe(null);
@@ -141,7 +149,7 @@ describe('MediaViewerComponent', () => {
 
     it('should display a default, thumbnail', () => {
       const defaultThumbnail = fixture.debugElement.query(
-        By.css('ds-themed-media-viewer-image')
+        By.css('ds-themed-media-viewer-image'),
       );
       expect(defaultThumbnail.nativeElement).toBeDefined();
     });
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 242e50646e..9540775eb4 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,19 +1,32 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
+
+import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
+import { environment } from '../../../environments/environment';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { Bitstream } from '../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { Item } from '../../core/shared/item.model';
 import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { hasValue } from '../../shared/empty.util';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
-import { environment } from '../../../environments/environment';
-import { Subscription } from 'rxjs/internal/Subscription';
 
 /**
  * This component renders the media viewers
@@ -42,6 +55,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
 
   constructor(
     protected bitstreamDataService: BitstreamDataService,
+    protected changeDetectorRef: ChangeDetectorRef,
   ) {
   }
 
@@ -75,7 +89,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
                 const mediaItem = this.createMediaViewerItem(
                   bitstreamsRD.payload.page[index],
                   format,
-                  thumbnailsRD.payload && thumbnailsRD.payload.page[index]
+                  thumbnailsRD.payload && thumbnailsRD.payload.page[index],
                 );
                 if (types.includes(mediaItem.format)) {
                   this.mediaList$.next([...this.mediaList$.getValue(), mediaItem]);
@@ -85,6 +99,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
               }));
           }
           this.isLoading = false;
+          this.changeDetectorRef.detectChanges();
         }));
       }
     }));
@@ -95,7 +110,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
    * @param bundleName Bundle name
    */
   loadRemoteData(
-    bundleName: string
+    bundleName: string,
   ): Observable<RemoteData<PaginatedList<Bitstream>>> {
     return this.bitstreamDataService
       .findAllByItemAndBundleName(
@@ -104,15 +119,15 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
         {},
         true,
         true,
-        followLink('format')
+        followLink('format'),
       )
       .pipe(
         filter(
           (bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) =>
             hasValue(bitstreamsRD) &&
-            (hasValue(bitstreamsRD.errorMessage) || hasValue(bitstreamsRD.payload))
+            (hasValue(bitstreamsRD.errorMessage) || hasValue(bitstreamsRD.payload)),
         ),
-        take(1)
+        take(1),
       );
   }
 
diff --git a/src/app/item-page/media-viewer/themed-media-viewer.component.ts b/src/app/item-page/media-viewer/themed-media-viewer.component.ts
index 6acf948616..e8b9f8799c 100644
--- a/src/app/item-page/media-viewer/themed-media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/themed-media-viewer.component.ts
@@ -1,8 +1,12 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
+import { Item } from '../../core/shared/item.model';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { MediaViewerComponent } from './media-viewer.component';
-import { Item } from '../../core/shared/item.model';
-import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
 
 /**
  * Themed wrapper for {@link MediaViewerComponent}.
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
index 2727391dff..bff2dd4ddd 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
@@ -1,25 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { MiradorViewerComponent } from './mirador-viewer.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MetadataMap } from '../../core/shared/metadata.models';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../core/data/bundle-data.service';
 import { Item } from '../../core/shared/item.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { HostWindowService } from '../../shared/host-window.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { of as observableOf } from 'rxjs';
+import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { MiradorViewerComponent } from './mirador-viewer.component';
 import { MiradorViewerService } from './mirador-viewer.service';
-import { HostWindowService } from '../../shared/host-window.service';
-import { BundleDataService } from '../../core/data/bundle-data.service';
 
 
 function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -41,22 +49,22 @@ describe('MiradorViewerComponent with search', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService }
+        { provide: HostWindowService, useValue: mockHostWindowService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-        ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
   describe('searchable item', () => {
@@ -104,22 +112,22 @@ describe('MiradorViewerComponent with multiple images', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService  }
+        { provide: HostWindowService, useValue: mockHostWindowService  },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-          ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -164,22 +172,22 @@ describe('MiradorViewerComponent with a single image', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService }
+        { provide: HostWindowService, useValue: mockHostWindowService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-        ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -217,22 +225,22 @@ describe('MiradorViewerComponent in development mode', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
-        { provide: BitstreamDataService, useValue: {} }
+        { provide: BitstreamDataService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
           { provide: MiradorViewerService, useValue: viewerService },
           { provide: BundleDataService, useValue: {} },
-          { provide: HostWindowService, useValue: mockHostWindowService  }
-        ]
-      }
+          { provide: HostWindowService, useValue: mockHostWindowService  },
+        ],
+      },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index fee8046272..8011b589e7 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,21 +1,41 @@
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit, PLATFORM_ID } from '@angular/core';
-import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { Item } from '../../core/shared/item.model';
+import { isPlatformBrowser } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  Input,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  DomSanitizer,
+  SafeResourceUrl,
+} from '@angular/platform-browser';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../environments/environment';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { Observable, of } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { isPlatformBrowser } from '@angular/common';
-import { MiradorViewerService } from './mirador-viewer.service';
-import { HostWindowService, WidthCategory } from '../../shared/host-window.service';
 import { BundleDataService } from '../../core/data/bundle-data.service';
+import { Item } from '../../core/shared/item.model';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../../shared/host-window.service';
+import { MiradorViewerService } from './mirador-viewer.service';
 
 @Component({
   selector: 'ds-mirador-viewer',
   styleUrls: ['./mirador-viewer.component.scss'],
   templateUrl: './mirador-viewer.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [ MiradorViewerService ]
+  providers: [ MiradorViewerService ],
 })
 export class MiradorViewerComponent implements OnInit {
 
@@ -70,7 +90,8 @@ export class MiradorViewerComponent implements OnInit {
     const manifestApiEndpoint = encodeURIComponent(environment.rest.baseUrl + '/iiif/'
       + this.object.id + '/manifest');
     // The Express path to Mirador viewer.
-    let viewerPath = '/iiif/mirador/index.html?manifest=' + manifestApiEndpoint;
+    let viewerPath = `${environment.ui.nameSpace}${environment.ui.nameSpace.length > 1 ? '/' : ''}`
+      + `iiif/mirador/index.html?manifest=${manifestApiEndpoint}`;
     if (this.searchable) {
       // Tell the viewer add search to menu.
       viewerPath += '&searchable=' + this.searchable;
@@ -104,10 +125,10 @@ export class MiradorViewerComponent implements OnInit {
       // menu by hiding it for smaller viewports. This will not be
       // responsive to resizing.
       this.hostWindowService.widthCategory
-          .pipe(take(1))
-          .subscribe((category: WidthCategory) => {
-            this.notMobile = !(category === WidthCategory.XS || category === WidthCategory.SM);
-          });
+        .pipe(take(1))
+        .subscribe((category: WidthCategory) => {
+          this.notMobile = !(category === WidthCategory.XS || category === WidthCategory.SM);
+        });
 
       // Set the multi property. The default mirador configuration adds a right
       // thumbnail navigation panel to the viewer when multi is 'true'.
@@ -119,7 +140,7 @@ export class MiradorViewerComponent implements OnInit {
         this.iframeViewerUrl = observable.pipe(
           map((val) => {
             return this.setURL();
-          })
+          }),
         );
       } else {
         // Set the multi property based on the image count in IIIF-eligible bundles.
@@ -133,7 +154,7 @@ export class MiradorViewerComponent implements OnInit {
               this.multi = true;
             }
             return this.setURL();
-          })
+          }),
         );
       }
     }
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
index c7a0affd53..6e502a8143 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
@@ -1,18 +1,29 @@
-import { Injectable, isDevMode } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Item } from '../../core/shared/item.model';
 import {
-    getFirstCompletedRemoteData,
-} from '../../core/shared/operators';
-import { filter, last, map, mergeMap, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  Injectable,
+  isDevMode,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  last,
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../core/data/bundle-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bundle } from '../../core/shared/bundle.model';
-import { BundleDataService } from '../../core/data/bundle-data.service';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 
 @Injectable()
 export class MiradorViewerService {
@@ -39,43 +50,43 @@ export class MiradorViewerService {
    */
   getImageCount(item: Item, bitstreamDataService: BitstreamDataService, bundleDataService: BundleDataService):
       Observable<number> {
-      let count = 0;
-      return bundleDataService.findAllByItem(item).pipe(
+    let count = 0;
+    return bundleDataService.findAllByItem(item).pipe(
+      getFirstCompletedRemoteData(),
+      map((bundlesRD: RemoteData<PaginatedList<Bundle>>) => {
+        return bundlesRD.payload;
+      }),
+      map((paginatedList: PaginatedList<Bundle>) => paginatedList.page),
+      switchMap((bundles: Bundle[]) => bundles),
+      filter((b: Bundle) => this.isIiifBundle(b.name)),
+      mergeMap((bundle: Bundle) => {
+        return bitstreamDataService.findAllByItemAndBundleName(item, bundle.name, {
+          currentPage: 1,
+          elementsPerPage: 5,
+        }, true, true, ...this.LINKS_TO_FOLLOW).pipe(
           getFirstCompletedRemoteData(),
-          map((bundlesRD: RemoteData<PaginatedList<Bundle>>) => {
-              return bundlesRD.payload;
+          map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
+            return bitstreamsRD.payload;
           }),
-          map((paginatedList: PaginatedList<Bundle>) => paginatedList.page),
-          switchMap((bundles: Bundle[]) => bundles),
-          filter((b: Bundle) => this.isIiifBundle(b.name)),
-          mergeMap((bundle: Bundle) => {
-              return bitstreamDataService.findAllByItemAndBundleName(item, bundle.name, {
-                  currentPage: 1,
-                  elementsPerPage: 5
-              }, true, true, ...this.LINKS_TO_FOLLOW).pipe(
-                  getFirstCompletedRemoteData(),
-                  map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
-                      return bitstreamsRD.payload;
-                  }),
-                  map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
-                  switchMap((bitstreams: Bitstream[]) => bitstreams),
-                  switchMap((bitstream: Bitstream) => bitstream.format.pipe(
-                          getFirstCompletedRemoteData(),
-                          map((formatRD: RemoteData<BitstreamFormat>) => {
-                              return formatRD.payload;
-                          }),
-                          map((format: BitstreamFormat) => {
-                              if (format.mimetype.includes('image')) {
-                                  count++;
-                              }
-                              return count;
-                          }),
-                      )
-                  )
-              );
-          }),
-          last()
-      );
+          map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
+          switchMap((bitstreams: Bitstream[]) => bitstreams),
+          switchMap((bitstream: Bitstream) => bitstream.format.pipe(
+            getFirstCompletedRemoteData(),
+            map((formatRD: RemoteData<BitstreamFormat>) => {
+              return formatRD.payload;
+            }),
+            map((format: BitstreamFormat) => {
+              if (format.mimetype.includes('image')) {
+                count++;
+              }
+              return count;
+            }),
+          ),
+          ),
+        );
+      }),
+      last(),
+    );
   }
 
   isIiifBundle(bundleName: string): boolean {
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index e57ce33008..b53c400385 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,5 +1,5 @@
 <div class="container mb-5">
-  <h2>{{'person.orcid.registry.auth' | translate}}</h2>
+  <h1>{{'person.orcid.registry.auth' | translate}}</h1>
   <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
 </div>
 
@@ -25,7 +25,7 @@
           <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container">
-              <ds-alert *ngIf="!(hasMissingOrcidAuthorizations() | async)" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
                 {{'person.page.orcid.no-missing-authorizations-message' | translate}}
               </ds-alert>
               <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
@@ -41,7 +41,7 @@
         </div>
       </div>
     </div>
-    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && !(ownerCanDisconnectProfileFromOrcid() | async)"
+    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true"
               [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
       {{ 'person.page.orcid.remove-orcid-message' | translate}}
     </ds-alert>
@@ -49,7 +49,7 @@
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
                 [disabled]="(unlinkProcessing | async)">
-          <span *ngIf="!(unlinkProcessing | async)"><i
+          <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
             class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
index e96e5996fb..e8cabfc390 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
@@ -1,25 +1,38 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { getTestScheduler } from 'jasmine-marbles';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { Item } from '../../../core/shared/item.model';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { OrcidAuthComponent } from './orcid-auth.component';
-import { NativeWindowService } from '../../../core/services/window.service';
-import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { NativeWindowService } from '../../../core/services/window.service';
+import { Item } from '../../../core/shared/item.model';
+import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { OrcidAuthComponent } from './orcid-auth.component';
 
 describe('OrcidAuthComponent test suite', () => {
   let comp: OrcidAuthComponent;
@@ -33,7 +46,7 @@ describe('OrcidAuthComponent test suite', () => {
     '/authenticate',
     '/read-limited',
     '/activities/update',
-    '/person/update'
+    '/person/update',
   ];
 
   const partialOrcidScopes = [
@@ -45,70 +58,70 @@ describe('OrcidAuthComponent test suite', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
-      }]
-    }
+        'value': 'Person',
+      }],
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -119,7 +132,7 @@ describe('OrcidAuthComponent test suite', () => {
       isLinkedToOrcid: jasmine.createSpy('isLinkedToOrcid'),
       onlyAdminCanDisconnectProfileFromOrcid: jasmine.createSpy('onlyAdminCanDisconnectProfileFromOrcid'),
       ownerCanDisconnectProfileFromOrcid: jasmine.createSpy('ownerCanDisconnectProfileFromOrcid'),
-      unlinkOrcidByItem: jasmine.createSpy('unlinkOrcidByItem')
+      unlinkOrcidByItem: jasmine.createSpy('unlinkOrcidByItem'),
     });
 
     void TestBed.configureTestingModule({
@@ -128,20 +141,20 @@ describe('OrcidAuthComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidAuthComponent],
       providers: [
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: OrcidAuthService, useValue: orcidAuthService }
+        { provide: OrcidAuthService, useValue: orcidAuthService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrcidAuthComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index ea970e7d31..00ddda541c 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,20 +1,35 @@
-import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
-import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+
 import { RemoteData } from '../../../core/data/remote-data';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-orcid-auth',
   templateUrl: './orcid-auth.component.html',
-  styleUrls: ['./orcid-auth.component.scss']
+  styleUrls: ['./orcid-auth.component.scss'],
 })
 export class OrcidAuthComponent implements OnInit, OnChanges {
 
@@ -89,7 +104,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    */
   hasOrcidAuthorizations(): Observable<boolean> {
     return this.profileAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0)
+      map((scopes: string[]) => scopes.length > 0),
     );
   }
 
@@ -105,7 +120,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    */
   hasMissingOrcidAuthorizations(): Observable<boolean> {
     return this.missingAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0)
+      map((scopes: string[]) => scopes.length > 0),
     );
   }
 
@@ -170,7 +185,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   unlinkOrcid(): void {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
       if (remoteData.isSuccess) {
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 33c3125d67..585feed4c9 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,4 +1,14 @@
-<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
+<ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
+<div class="container" *ngIf="(processingConnection | async) !== true && (connectionStatus | async) !== true" data-test="error-box">
+  <ds-alert [type]="'alert-danger'">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
+</div>
+<ng-container *ngIf="(processingConnection | async) !== true && (item | async) && (connectionStatus | async)" >
+  <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
+  <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
+  <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
+</ng-container>
+
+<div *ngIf="(processingConnection | async) !== true && (item | async)" class="container">
   <div class="button-row bottom mb-3">
     <div class="text-right">
       <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
@@ -7,13 +17,3 @@
     </div>
   </div>
 </div>
-
-<ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
-<div class="container" *ngIf="!(processingConnection | async) && !(connectionStatus | async)" data-test="error-box">
-  <ds-alert [type]="'alert-danger'">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
-</div>
-<ng-container *ngIf="!(processingConnection | async) && (item | async) && (connectionStatus | async)" >
-  <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
-  <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
-  <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
-</ng-container>
diff --git a/src/app/item-page/orcid-page/orcid-page.component.spec.ts b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
index 1ed237943e..4d4964d913 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
@@ -1,28 +1,38 @@
-import { NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TestScheduler } from 'rxjs/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { AuthService } from '../../core/auth/auth.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { OrcidPageComponent } from './orcid-page.component';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { Item } from '../../core/shared/item.model';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+import { OrcidPageComponent } from './orcid-page.component';
 
 describe('OrcidPageComponent test suite', () => {
   let comp: OrcidPageComponent;
@@ -40,12 +50,12 @@ describe('OrcidPageComponent test suite', () => {
     type: 'profile',
     _links: {
       item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
+        href: 'https://rest.api/rest/api/profiles/test-id/item',
       },
       self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
+        href: 'https://rest.api/rest/api/profiles/test-id',
       },
-    }
+    },
   });
   const mockItem: Item = Object.assign(new Item(), {
     id: 'test-id',
@@ -54,10 +64,10 @@ describe('OrcidPageComponent test suite', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'test item'
-        }
-      ]
-    }
+          value: 'test item',
+        },
+      ],
+    },
   });
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     id: 'test-id',
@@ -65,21 +75,21 @@ describe('OrcidPageComponent test suite', () => {
     metadata: {
       'dc.title': [
         {
-          value: 'test item'
-        }
+          value: 'test item',
+        },
       ],
       'dspace.orcid.authenticated': [
         {
-          value: 'true'
-        }
-      ]
-    }
+          value: 'true',
+        },
+      ],
+    },
   });
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: jasmine.createSpy('isAuthenticated'),
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
 
     routeData = {
@@ -94,7 +104,7 @@ describe('OrcidPageComponent test suite', () => {
     });
 
     itemDataService = jasmine.createSpyObj('ItemDataService', {
-      findById: jasmine.createSpy('findById')
+      findById: jasmine.createSpy('findById'),
     });
 
     void TestBed.configureTestingModule({
@@ -102,10 +112,10 @@ describe('OrcidPageComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidPageComponent],
       providers: [
@@ -116,7 +126,7 @@ describe('OrcidPageComponent test suite', () => {
         { provide: PLATFORM_ID, useValue: 'browser' },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -162,7 +172,7 @@ describe('OrcidPageComponent test suite', () => {
     beforeEach(waitForAsync(() => {
       spyOn(comp, 'updateItem').and.callThrough();
       routeStub.testParams = {
-        code: 'orcid-code'
+        code: 'orcid-code',
       };
     }));
 
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index f3dbb569d9..baee8cdb48 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,20 +1,37 @@
-import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ParamMap,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-
-import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { getItemPageRoute } from '../item-page-routing-paths';
 import { AuthService } from '../../core/auth/auth.service';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { isNotEmpty } from '../../shared/empty.util';
+import { RemoteData } from '../../core/data/remote-data';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { getItemPageRoute } from '../item-page-routing-paths';
 
 /**
  * A component that represents the orcid settings page
@@ -22,7 +39,7 @@ import { ResearcherProfile } from '../../core/profile/model/researcher-profile.m
 @Component({
   selector: 'ds-orcid-page',
   templateUrl: './orcid-page.component.html',
-  styleUrls: ['./orcid-page.component.scss']
+  styleUrls: ['./orcid-page.component.scss'],
 })
 export class OrcidPageComponent implements OnInit {
 
@@ -52,7 +69,7 @@ export class OrcidPageComponent implements OnInit {
     private itemService: ItemDataService,
     private orcidAuthService: OrcidAuthService,
     private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
   ) {
   }
 
@@ -69,7 +86,7 @@ export class OrcidPageComponent implements OnInit {
       const item$ = this.route.data.pipe(
         map((data) => data.dso as RemoteData<Item>),
         redirectOn4xx(this.router, this.authService),
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       );
 
       combineLatest([codeParam$, item$]).subscribe(([codeParam, item]) => {
@@ -111,7 +128,7 @@ export class OrcidPageComponent implements OnInit {
   updateItem(): void {
     this.clearRouteParams();
     this.itemService.findById(this.itemId, false).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((itemRD: RemoteData<Item>) => {
       if (itemRD.hasSucceeded) {
         this.item.next(itemRD.payload);
@@ -127,7 +144,7 @@ export class OrcidPageComponent implements OnInit {
    */
   private linkProfileToOrcid(person: Item, code: string) {
     this.orcidAuthService.linkOrcidByItem(person, code).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((profileRD: RemoteData<ResearcherProfile>) => {
       this.processingConnection.next(false);
       if (profileRD.hasSucceeded) {
diff --git a/src/app/item-page/orcid-page/orcid-page.guard.ts b/src/app/item-page/orcid-page/orcid-page.guard.ts
index 97c528e9ae..ee08ac918e 100644
--- a/src/app/item-page/orcid-page/orcid-page.guard.ts
+++ b/src/app/item-page/orcid-page/orcid-page.guard.ts
@@ -1,6 +1,14 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
@@ -9,7 +17,7 @@ import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index 6ba318f7fd..e9d9ec035b 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -3,11 +3,11 @@
   <div class="container">
     <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-    <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+    <ds-alert *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0"
               [type]="AlertTypeEnum.Info">
       {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
     </ds-alert>
-    <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
+    <ds-pagination *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0"
                    [paginationOptions]="paginationOptions"
                    [collectionSize]="(getList() | async)?.payload?.totalElements"
                    [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index d0f52531d4..336802af65 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -1,22 +1,33 @@
-import { OrcidQueueComponent } from './orcid-queue.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
-import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { By } from '@angular/platform-browser';
 import { Item } from '../../../core/shared/item.model';
-import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { OrcidQueueComponent } from './orcid-queue.component';
 
 describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
@@ -31,58 +42,58 @@ describe('OrcidQueueComponent test suite', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   function orcidQueueElement(id: number) {
@@ -104,7 +115,7 @@ describe('OrcidQueueComponent test suite', () => {
 
   beforeEach(waitForAsync(() => {
     orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
-      getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl')
+      getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl'),
     });
 
     void TestBed.configureTestingModule({
@@ -112,10 +123,10 @@ describe('OrcidQueueComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidQueueComponent],
       providers: [
@@ -125,7 +136,7 @@ describe('OrcidQueueComponent test suite', () => {
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     orcidQueueService = TestBed.inject(OrcidQueueDataService);
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 6079287f71..713d1bc22a 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -1,28 +1,43 @@
-import { Component, Input, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { Item } from '../../../core/shared/item.model';
-import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 @Component({
   selector: 'ds-orcid-queue',
   templateUrl: './orcid-queue.component.html',
-  styleUrls: ['./orcid-queue.component.scss']
+  styleUrls: ['./orcid-queue.component.scss'],
 })
 export class OrcidQueueComponent implements OnInit, OnDestroy {
 
@@ -36,7 +51,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
    */
   public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'oqp',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -90,12 +105,12 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
         distinctUntilChanged(),
         tap(() => this.processing$.next(true)),
         switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByProfileItemId(this.item.id, config, false)),
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
         this.processing$.next(false);
         this.list$.next(result);
         this.orcidQueueService.clearFindByProfileItemRequests();
-      })
+      }),
     );
   }
 
@@ -191,7 +206,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   discardEntry(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidQueueService.deleteById(orcidQueue.id).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -211,7 +226,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   send(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidHistoryService.sendToORCID(orcidQueue).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -233,8 +248,8 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     return this.orcidAuthService.getOrcidAuthorizeUrl(this.item).pipe(
       switchMap((authorizeUrl) => this.translateService.get(
         'person.page.orcid.sync-queue.send.unauthorized-error.content',
-        { orcid: authorizeUrl }
-      ))
+        { orcid: authorizeUrl },
+      )),
     );
   }
 
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index f2fa9d2440..51f262d849 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -1,24 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
-import { getTestScheduler } from 'jasmine-marbles';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { OrcidSyncSettingsComponent } from './orcid-sync-settings.component';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
 describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
@@ -34,97 +51,97 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     type: 'profile',
     _links: {
       item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
+        href: 'https://rest.api/rest/api/profiles/test-id/item',
       },
       self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
+        href: 'https://rest.api/rest/api/profiles/test-id',
       },
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'dspace.orcid.sync-mode': [{
         'value': 'MANUAL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.sync-profile': [{
         'value': 'BIOGRAPHICAL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': 'IDENTIFIERS',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }],
       'dspace.orcid.sync-publications': [{
         'value': 'ALL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -141,19 +158,19 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidSyncSettingsComponent],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: ResearcherProfileDataService, useValue: researcherProfileService }
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrcidSyncSettingsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -203,20 +220,20 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         {
           path: '/orcid/mode',
           op: 'replace',
-          value: 'MANUAL'
+          value: 'MANUAL',
         }, {
           path: '/orcid/publications',
           op: 'replace',
-          value: 'ALL'
+          value: 'ALL',
         }, {
           path: '/orcid/fundings',
           op: 'replace',
-          value: 'ALL'
+          value: 'ALL',
         }, {
           path: '/orcid/profile',
           op: 'replace',
-          value: 'BIOGRAPHICAL,IDENTIFIERS'
-        }
+          value: 'BIOGRAPHICAL,IDENTIFIERS',
+        },
       ];
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 0bcbc295ac..a468710e5c 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,22 +1,27 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
 import { TranslateService } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import { of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
   templateUrl: './orcid-sync-settings.component.html',
-  styleUrls: ['./orcid-sync-settings.component.scss']
+  styleUrls: ['./orcid-sync-settings.component.scss'],
 })
 export class OrcidSyncSettingsComponent implements OnInit {
 
@@ -82,12 +87,12 @@ export class OrcidSyncSettingsComponent implements OnInit {
     this.syncModes = [
       {
         label: this.messagePrefix + '.synchronization-mode.batch',
-        value: 'BATCH'
+        value: 'BATCH',
       },
       {
         label: this.messagePrefix + '.synchronization-mode.manual',
-        value: 'MANUAL'
-      }
+        value: 'MANUAL',
+      },
     ];
 
     this.syncPublicationOptions = ['DISABLED', 'ALL']
@@ -113,7 +118,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
         return {
           label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
           value: value,
-          checked: syncProfilePreferences.includes(value)
+          checked: syncProfilePreferences.includes(value),
         };
       });
 
@@ -189,7 +194,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
     operations.push({
       path: path,
       op: 'replace',
-      value: currentValue
+      value: currentValue,
     });
   }
 
diff --git a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
index e788e6e575..78919509fb 100644
--- a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
+++ b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
@@ -1,6 +1,14 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Subscription } from 'rxjs';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 
 @Component({
   selector: 'ds-abstract-incremental-list',
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index cd708510e8..e1748e8bcf 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -2,7 +2,10 @@
   <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
     <div class="file-section">
       <ds-themed-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
-        <span>{{ dsoNameService.getName(file) }}</span>
+        <span>
+          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">{{ 'item.page.bitstreams.primary' | translate }}</span> 
+          {{ dsoNameService.getName(file) }}
+        </span>
         <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
       </ds-themed-file-download-link>
@@ -10,7 +13,7 @@
       <div *ngIf="!isLastPage" class="mt-1" id="view-more">
         <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
       </div>
-      <div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
+      <div *ngIf="isLastPage && currentPage !== 1" class="mt-1" id="collapse">
         <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
       </div>
     </div>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
index 8acf405b55..1db82d3fb7 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -1,31 +1,40 @@
-import { FileSectionComponent } from './file-section.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../../../shared/utils/var.directive';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
-import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment';
 
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { FileSectionComponent } from './file-section.component';
+
 describe('FileSectionComponent', () => {
   let comp: FileSectionComponent;
   let fixture: ComponentFixture<FileSectionComponent>;
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findPrimaryBitstreamByItemAndName: observableOf(null),
   });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(),
@@ -36,11 +45,11 @@ describe('FileSectionComponent', () => {
       bundleName: 'ORIGINAL',
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
         },
         content: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
-        }
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+        },
       },
       id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
       uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -49,10 +58,10 @@ describe('FileSectionComponent', () => {
         'dc.title': [
           {
             language: null,
-            value: 'test_word.docx'
-          }
-        ]
-      }
+            value: 'test_word.docx',
+          },
+        ],
+      },
     });
 
   beforeEach(waitForAsync(() => {
@@ -61,17 +70,17 @@ describe('FileSectionComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -81,6 +90,20 @@ describe('FileSectionComponent', () => {
     fixture.detectChanges();
   }));
 
+  it('should set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(mockBitstream));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBe(mockBitstream.id);
+  });
+
+  it('should not set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(null));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBeUndefined();
+  });
+
   describe('when the bitstreams are loading', () => {
     beforeEach(() => {
       comp.bitstreams$.next([mockBitstream]);
@@ -157,11 +180,11 @@ describe('FileSectionComponent', () => {
         currentPage: 1,
         _links: {
           self: { href: 'https://rest.api/core/bitstreams/' },
-          next: { href: 'https://rest.api/core/bitstreams?page=2' }
-        }
+          next: { href: 'https://rest.api/core/bitstreams?page=2' },
+        },
       });
       const PaginatedList = Object.assign(createPaginatedList([mockBitstream]), {
-        pageInfo: pageInfo
+        pageInfo: pageInfo,
       });
       bitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(PaginatedList));
       const viewLess = fixture.debugElement.query(By.css('.bitstream-collapse'));
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
index 3c41731c5f..28b21c0e55 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
@@ -1,17 +1,25 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { hasValue } from '../../../../shared/empty.util';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 
 /**
  * This component renders the file section of the item
@@ -19,7 +27,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
  */
 @Component({
   selector: 'ds-item-page-file-section',
-  templateUrl: './file-section.component.html'
+  templateUrl: './file-section.component.html',
 })
 export class FileSectionComponent implements OnInit {
 
@@ -39,20 +47,32 @@ export class FileSectionComponent implements OnInit {
 
   pageSize: number;
 
+  primaryBitsreamId: string;
+
   constructor(
     protected bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     this.pageSize = this.appConfig.item.bitstream.pageSize;
   }
 
   ngOnInit(): void {
+    this.getPrimaryBitstreamId();
     this.getNextPage();
   }
 
+  private getPrimaryBitstreamId() {
+    this.bitstreamDataService.findPrimaryBitstreamByItemAndName(this.item, 'ORIGINAL', true, true).subscribe((primaryBitstream: Bitstream | null) => {
+      if (!primaryBitstream) {
+        return;
+      }
+      this.primaryBitsreamId = primaryBitstream?.id;
+    });
+  }
+
   /**
    * This method will retrieve the next page of Bitstreams from the external BitstreamDataService call.
    * It'll retrieve the currentPage from the class variables and it'll add the next page of bitstreams with the
@@ -69,7 +89,7 @@ export class FileSectionComponent implements OnInit {
     }
     this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', {
       currentPage: this.currentPage,
-      elementsPerPage: this.pageSize
+      elementsPerPage: this.pageSize,
     }).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
diff --git a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
index ba5a9e87c0..afff29b4b7 100644
--- a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
+++ b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
@@ -1,11 +1,15 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { FileSectionComponent } from './file-section.component';
-import {Component, Input} from '@angular/core';
-import {Item} from '../../../../core/shared/item.model';
 
 @Component({
-    selector: 'ds-themed-item-page-file-section',
-    templateUrl: '../../../../shared/theme-support/themed.component.html',
+  selector: 'ds-themed-item-page-file-section',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedFileSectionComponent extends ThemedComponent<FileSectionComponent> {
 
@@ -14,15 +18,15 @@ export class ThemedFileSectionComponent extends ThemedComponent<FileSectionCompo
     protected inAndOutputNames: (keyof FileSectionComponent & keyof this)[] = ['item'];
 
     protected getComponentName(): string {
-        return 'FileSectionComponent';
+      return 'FileSectionComponent';
     }
 
     protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/item-page/simple/field-components/file-section/file-section.component`);
+      return import(`../../../../../themes/${themeName}/app/item-page/simple/field-components/file-section/file-section.component`);
     }
 
     protected importUnthemedComponent(): Promise<any> {
-        return import(`./file-section.component`);
+      return import(`./file-section.component`);
     }
 
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 4fb8889440..1366a43e85 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -1,14 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { SharedModule } from '../../../../../shared/shared.module';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
-import { By } from '@angular/platform-browser';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { SharedModule } from '../../../../../shared/shared.module';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
 
 let comp: ItemPageAbstractFieldComponent;
 let fixture: ComponentFixture<ItemPageAbstractFieldComponent>;
@@ -20,19 +31,19 @@ describe('ItemPageAbstractFieldComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         SharedModule,
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageAbstractFieldComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAbstractFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
index f29bef31a7..f2c2142591 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
-    selector: 'ds-item-page-abstract-field',
-    templateUrl: '../item-page-field.component.html'
+  selector: 'ds-item-page-abstract-field',
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the abstract (dc.description.abstract) of an item
@@ -28,7 +31,7 @@ export class ItemPageAbstractFieldComponent extends ItemPageFieldComponent {
      * In this component, we want to display values for metadata 'dc.description.abstract'
      */
     fields: string[] = [
-        'dc.description.abstract'
+      'dc.description.abstract',
     ];
 
     /**
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 855a995142..4c9f67f168 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -1,14 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
-import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
 
 let comp: ItemPageAuthorFieldComponent;
 let fixture: ComponentFixture<ItemPageAuthorFieldComponent>;
@@ -22,17 +33,17 @@ describe('ItemPageAuthorFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAuthorFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
index 2da0dc154b..9d4230468c 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-item-page-author-field',
-  templateUrl: '../item-page-field.component.html'
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the author (dc.contributor.author, dc.creator and
@@ -34,7 +37,7 @@ export class ItemPageAuthorFieldComponent extends ItemPageFieldComponent {
   fields: string[] = [
     'dc.contributor.author',
     'dc.creator',
-    'dc.contributor'
+    'dc.contributor',
   ];
 
   /**
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index be124dab82..950ee0ec0f 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -1,14 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
-import { ItemPageDateFieldComponent } from './item-page-date-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 
 let comp: ItemPageDateFieldComponent;
 let fixture: ComponentFixture<ItemPageDateFieldComponent>;
@@ -22,17 +33,17 @@ describe('ItemPageDateFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageDateFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageDateFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
index 5a7d56b7da..6744649912 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
-    selector: 'ds-item-page-date-field',
-    templateUrl: '../item-page-field.component.html'
+  selector: 'ds-item-page-date-field',
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the issue date (dc.date.issued) metadata of an item
@@ -28,7 +31,7 @@ export class ItemPageDateFieldComponent extends ItemPageFieldComponent {
      * In this component, we want to display values for metadata 'dc.date.issued'
      */
     fields: string[] = [
-        'dc.date.issued'
+      'dc.date.issued',
     ];
 
     /**
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index fdf5ac1bb5..1656283fd6 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -1,14 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
-import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
 
 let comp: GenericItemPageFieldComponent;
 let fixture: ComponentFixture<GenericItemPageFieldComponent>;
@@ -24,17 +35,17 @@ describe('GenericItemPageFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [GenericItemPageFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(GenericItemPageFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
index 53d2f6aa20..785269337f 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-generic-item-page-field',
-  templateUrl: '../item-page-field.component.html'
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component can be used to represent metadata on a simple item page.
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
new file mode 100644
index 0000000000..00c029f838
--- /dev/null
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
@@ -0,0 +1,94 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { GenericItemPageFieldComponent } from '../generic/generic-item-page-field.component';
+import { ImageField } from '../item-page-field.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageImgFieldComponent } from './item-page-img-field.component';
+
+let component: ItemPageImgFieldComponent;
+let fixture: ComponentFixture<ItemPageImgFieldComponent>;
+
+const mockField = 'organization.identifier.ror';
+const mockValue = 'http://ror.org/awesome-identifier';
+const mockLabel = 'ROR label';
+const mockUrlRegex = '(.*)ror.org';
+const mockImg = {
+  URI: './assets/images/ror-icon.svg',
+  alt: 'item.page.image.alt.ROR',
+  heightVar: '--ds-item-page-img-field-ror-inline-height',
+} as ImageField;
+
+describe('ItemPageImgFieldComponent', () => {
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      })],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+      ],
+      declarations: [ItemPageImgFieldComponent, GenericItemPageFieldComponent, MetadataValuesComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(GenericItemPageFieldComponent, {
+        set: { changeDetection: ChangeDetectionStrategy.Default },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(ItemPageImgFieldComponent);
+    component = fixture.componentInstance;
+    component.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
+    component.fields = [mockField];
+    component.label = mockLabel;
+    component.urlRegex = mockUrlRegex;
+    component.img = mockImg;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display display img tag', () => {
+    const image = fixture.debugElement.query(By.css('img.link-logo'));
+    expect(image).not.toBeNull();
+  });
+
+  it('should have right attributes', () => {
+    const image = fixture.debugElement.query(By.css('img.link-logo'));
+    expect(image.attributes.src).toEqual(mockImg.URI);
+    expect(image.attributes.alt).toEqual(mockImg.alt);
+
+    const imageEl = image.nativeElement;
+    expect(imageEl.style.height).toContain(mockImg.heightVar);
+  });
+
+  it('should have the right value', () => {
+    const imageAnchor = fixture.debugElement.query(By.css('a.link-anchor'));
+    const anchorEl = imageAnchor.nativeElement;
+    expect(anchorEl.innerHTML).toContain(mockValue);
+  });
+});
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
new file mode 100644
index 0000000000..891c5d70c8
--- /dev/null
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
@@ -0,0 +1,53 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
+import {
+  ImageField,
+  ItemPageFieldComponent,
+} from '../item-page-field.component';
+
+@Component({
+  selector: 'ds-item-page-img-field',
+  templateUrl: '../item-page-field.component.html',
+})
+/**
+ * Component that renders an inline image for a given field.
+ * This component uses a given {@code ImageField} configuration to correctly render the img.
+ */
+export class ItemPageImgFieldComponent extends ItemPageFieldComponent {
+
+  /**
+   * The item to display metadata for
+   */
+  @Input() item: Item;
+
+  /**
+   * Separator string between multiple values of the metadata fields defined
+   * @type {string}
+   */
+  @Input() separator: string;
+
+  /**
+   * Fields (schema.element.qualifier) used to render their values.
+   */
+  @Input() fields: string[];
+
+  /**
+   * Label i18n key for the rendered metadata
+   */
+  @Input() label: string;
+
+  /**
+   * Image Configuration
+   */
+  @Input() img: ImageField;
+
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?: string;
+
+}
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
index 91d40b0ad7..f45d4657a4 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
@@ -6,5 +6,6 @@
     [enableMarkdown]="enableMarkdown"
     [urlRegex]="urlRegex"
     [browseDefinition]="browseDefinition|async"
+    [img]="img"
   ></ds-metadata-values>
 </div>
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 15b7a9df21..ad617d73b5 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -1,21 +1,35 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../../core/shared/item.model';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { ItemPageFieldComponent } from './item-page-field.component';
-import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
-import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { environment } from '../../../../../environments/environment';
-import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
-import { SharedModule } from '../../../../shared/shared.module';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { Item } from '../../../../core/shared/item.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../core/shared/metadata.models';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
+import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
+import { ItemPageFieldComponent } from './item-page-field.component';
 
 let comp: ItemPageFieldComponent;
 let fixture: ComponentFixture<ItemPageFieldComponent>;
@@ -34,29 +48,29 @@ describe('ItemPageFieldComponent', () => {
     markdown: {
       enabled: false,
       mathjax: false,
-    }
+    },
   });
 
-  const buildTestEnvironment = async () => {
-    await TestBed.configureTestingModule({
+  beforeEach(waitForAsync(() => {
+    void TestBed.configureTestingModule({
       imports: [
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         SharedModule,
       ],
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
     markdownSpy = spyOn(MarkdownPipe.prototype, 'transform');
     fixture = TestBed.createComponent(ItemPageFieldComponent);
@@ -65,19 +79,16 @@ describe('ItemPageFieldComponent', () => {
     comp.fields = mockFields;
     comp.label = mockLabel;
     fixture.detectChanges();
-  };
-
-  it('should display display the correct metadata value', waitForAsync(async () => {
-    await buildTestEnvironment();
-    expect(fixture.nativeElement.innerHTML).toContain(mockValue);
   }));
 
-  describe('when markdown is disabled in the environment config', () => {
+  it('should display display the correct metadata value', () => {
+    expect(fixture.nativeElement.innerHTML).toContain(mockValue);
+  });
 
-    beforeEach(waitForAsync(async () => {
+  describe('when markdown is disabled in the environment config', () => {
+    beforeEach( () => {
       appConfig.markdown.enabled = false;
-      await buildTestEnvironment();
-    }));
+    });
 
     describe('and markdown is disabled in this component', () => {
 
@@ -105,11 +116,9 @@ describe('ItemPageFieldComponent', () => {
   });
 
   describe('when markdown is enabled in the environment config', () => {
-
-    beforeEach(waitForAsync(async () => {
+    beforeEach(() => {
       appConfig.markdown.enabled = true;
-      await buildTestEnvironment();
-    }));
+    });
 
     describe('and markdown is disabled in this component', () => {
 
@@ -139,12 +148,13 @@ describe('ItemPageFieldComponent', () => {
 
   describe('test rendering of configured browse links', () => {
     beforeEach(() => {
+      appConfig.markdown.enabled = false;
+      comp.enableMarkdown = true;
       fixture.detectChanges();
     });
-    waitForAsync(() => {
-      it('should have a browse link', () => {
-        expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockValue);
-      });
+
+    it('should have a browse link', async () => {
+      expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockValue);
     });
   });
 
@@ -153,10 +163,9 @@ describe('ItemPageFieldComponent', () => {
       comp.urlRegex = '^test';
       fixture.detectChanges();
     });
-    waitForAsync(() => {
-      it('should have a rendered (non-browse) link since the value matches ^test', () => {
-        expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link')).nativeElement.innerHTML).toContain(mockValue);
-      });
+
+    it('should have a rendered (non-browse) link since the value matches ^test', () => {
+      expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link')).nativeElement.innerHTML).toContain(mockValue);
     });
   });
 
@@ -165,25 +174,22 @@ describe('ItemPageFieldComponent', () => {
       comp.urlRegex = '^nope';
       fixture.detectChanges();
     });
-    beforeEach(waitForAsync(() => {
-      it('should NOT have a rendered (non-browse) link since the value matches ^test', () => {
-        expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull();
-      });
-    }));
+
+    it('should NOT have a rendered (non-browse) link since the value matches ^test', () => {
+      expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull();
+    });
   });
-
-
 });
 
 export function mockItemWithMetadataFieldsAndValue(fields: string[], value: string): Item {
   const item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    metadata: new MetadataMap()
+    metadata: new MetadataMap(),
   });
   fields.forEach((field: string) => {
     item.metadata[field] = [{
       language: 'en_US',
-      value: value
+      value: value,
     }] as MetadataValue[];
   });
   return item;
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index fc526dabcc..423eb8c018 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -1,11 +1,34 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
-import { map } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+import { map } from 'rxjs/operators';
+
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+import { Item } from '../../../../core/shared/item.model';
 import { getRemoteDataPayload } from '../../../../core/shared/operators';
 
+/**
+ * Interface that encapsulate Image configuration for this component.
+ */
+export interface ImageField {
+  /**
+   * URI that is used to retrieve the image.
+   */
+  URI: string;
+  /**
+   * i18n Key that represents the alt text to display
+   */
+  alt: string;
+  /**
+   * CSS variable that contains the height of the inline image.
+   */
+  heightVar: string;
+}
+
+
 /**
  * This component can be used to represent metadata on a simple item page.
  * It expects one input parameter of type Item to which the metadata belongs.
@@ -13,12 +36,12 @@ import { getRemoteDataPayload } from '../../../../core/shared/operators';
  */
 
 @Component({
-    templateUrl: './item-page-field.component.html'
+  templateUrl: './item-page-field.component.html',
 })
 export class ItemPageFieldComponent {
 
-    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
-    }
+  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+  }
 
     /**
      * The item to display metadata for
@@ -51,6 +74,11 @@ export class ItemPageFieldComponent {
      */
     urlRegex?: string;
 
+    /**
+     * Image Configuration
+     */
+    img: ImageField;
+
     /**
      * Return browse definition that matches any field used in this component if it is configured as a browse
      * link in dspace.cfg (webui.browse.link.<n>)
@@ -58,7 +86,7 @@ export class ItemPageFieldComponent {
     get browseDefinition(): Observable<BrowseDefinition> {
       return this.browseDefinitionDataService.findByFields(this.fields).pipe(
         getRemoteDataPayload(),
-        map((def) => def)
+        map((def) => def),
       );
     }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 15960bdc9d..85975d4533 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,6 @@
-<h2 class="item-page-title-field">
+<h1 class="item-page-title-field">
   <div *ngIf="item.firstMetadataValue('dspace.entity.type') as type" class="d-inline">
     {{ type.toLowerCase() + '.page.titleprefix' | translate }}
   </div>
   <span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
-</h2>
+</h1>
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
index 316e08e564..c271b1fa53 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
@@ -1,6 +1,17 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -18,13 +29,13 @@ describe('ItemPageTitleFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [ItemPageTitleFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageTitleFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index a8d9e8ad8e..f1f44d672a 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { Item } from '../../../../../core/shared/item.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-item-page-title-field',
-  templateUrl: './item-page-title-field.component.html'
+  templateUrl: './item-page-title-field.component.html',
 })
 /**
  * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
diff --git a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
index 7007b8fed3..9ba9720f12 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
 import { ThemedComponent } from '../../../../../shared/theme-support/themed.component';
 import { ItemPageTitleFieldComponent } from './item-page-title-field.component';
-import { Item } from '../../../../../core/shared/item.model';
 
 /**
  * Themed wrapper for {@link ItemPageTitleFieldComponent}
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index cc55b76e3e..a87e0c76f1 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -1,14 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
-import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
-import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
-import { environment } from '../../../../../../environments/environment';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
 
 let comp: ItemPageUriFieldComponent;
 let fixture: ComponentFixture<ItemPageUriFieldComponent>;
@@ -23,17 +34,17 @@ describe('ItemPageUriFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageUriFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
index b70cbbd5e8..8c2d2cc2fa 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-item-page-uri-field',
-  templateUrl: './item-page-uri-field.component.html'
+  templateUrl: './item-page-uri-field.component.html',
 })
 /**
  * This component can be used to represent any uri on a simple item page.
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index cc9983bb35..dc8ed87a86 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -2,6 +2,8 @@
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
       <ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
+      <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
+      <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
       <ds-view-tracker [object]="item"></ds-view-tracker>
       <ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
index b3202108f4..2e3ce5321b 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -1,55 +1,74 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
-import { ItemPageComponent } from './item-page.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { MetadataService } from '../../core/metadata/metadata.service';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { Item } from '../../core/shared/item.model';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { SignpostingLink } from '../../core/data/signposting-links.model';
+import { MetadataService } from '../../core/metadata/metadata.service';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import {
   createFailedRemoteDataObject$,
   createPendingRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ServerResponseService } from '../../core/services/server-response.service';
-import { SignpostingDataService } from '../../core/data/signposting-data.service';
-import { LinkDefinition, LinkHeadService } from '../../core/services/link-head.service';
-import { SignpostingLink } from '../../core/data/signposting-links.model';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ItemPageComponent } from './item-page.component';
+import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 const mockWithdrawnItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable(),
-  isWithdrawn: true
+  isWithdrawn: true,
 });
 
 const mocklink = {
   href: 'http://test.org',
   rel: 'rel1',
-  type: 'type1'
+  type: 'type1',
 };
 
 const mocklink2 = {
   href: 'http://test2.org',
   rel: 'rel2',
-  type: undefined
+  type: undefined,
 };
 
 const mockSignpostingLinks: SignpostingLink[] = [mocklink, mocklink2];
@@ -62,21 +81,24 @@ describe('ItemPageComponent', () => {
   let serverResponseService: jasmine.SpyObj<ServerResponseService>;
   let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
   let linkHeadService: jasmine.SpyObj<LinkHeadService>;
+  let notifyInfoService: jasmine.SpyObj<NotifyInfoService>;
 
   const mockMetadataService = {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     processRemoteData: () => {
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }),
   });
 
+  const getCoarLdnLocalInboxUrls = ['http://InboxUrls.org', 'http://InboxUrls2.org'];
+
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
       isAuthorized: observableOf(false),
@@ -94,12 +116,18 @@ describe('ItemPageComponent', () => {
       removeTag: jasmine.createSpy('removeTag'),
     });
 
+    notifyInfoService = jasmine.createSpyObj('NotifyInfoService', {
+      getInboxRelationLink: 'http://www.w3.org/ns/ldp#inbox',
+      isCoarConfigEnabled: observableOf(true),
+      getCoarLdnLocalInboxUrls: observableOf(getCoarLdnLocalInboxUrls),
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [ItemPageComponent, VarDirective],
       providers: [
@@ -112,12 +140,13 @@ describe('ItemPageComponent', () => {
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: NotifyInfoService, useValue: notifyInfoService },
         { provide: PLATFORM_ID, useValue: 'server' },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -166,7 +195,7 @@ describe('ItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
     });
 
 
@@ -175,19 +204,18 @@ describe('ItemPageComponent', () => {
       expect(comp.signpostingLinks).toEqual([mocklink, mocklink2]);
 
       // Check if linkHeadService.addTag() was called with the correct arguments
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(mockSignpostingLinks.length);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(mockSignpostingLinks.length + getCoarLdnLocalInboxUrls.length);
       let expected: LinkDefinition = mockSignpostingLinks[0] as LinkDefinition;
       expect(linkHeadService.addTag).toHaveBeenCalledWith(expected);
       expected = {
         href: 'http://test2.org',
-        rel: 'rel2'
+        rel: 'rel2',
       };
       expect(linkHeadService.addTag).toHaveBeenCalledWith(expected);
     });
 
     it('should set Link header on the server', () => {
-
-      expect(serverResponseService.setHeader).toHaveBeenCalledWith('Link', '<http://test.org> ; rel="rel1" ; type="type1" , <http://test2.org> ; rel="rel2" ');
+      expect(serverResponseService.setHeader).toHaveBeenCalledWith('Link', '<http://test.org> ; rel="rel1" ; type="type1" , <http://test2.org> ; rel="rel2" , <http://InboxUrls.org> ; rel="http://www.w3.org/ns/ldp#inbox", <http://InboxUrls2.org> ; rel="http://www.w3.org/ns/ldp#inbox"');
     });
 
   });
@@ -217,7 +245,7 @@ describe('ItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
     });
   });
 
@@ -234,7 +262,7 @@ describe('ItemPageComponent', () => {
 
     it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
-      expect(linkHeadService.addTag).toHaveBeenCalledTimes(2);
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
     });
   });
 
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index b9be6bebfb..dbd9742d39 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,26 +1,47 @@
-import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { isPlatformServer } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { NotifyInfoService } from 'src/app/core/coar-notify/notify-info/notify-info.service';
 
-import { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-
-import { ItemDataService } from '../../core/data/item-data.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { fadeInOut } from '../../shared/animations/fade';
-import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { ViewMode } from '../../core/shared/view-mode.model';
 import { AuthService } from '../../core/auth/auth.service';
-import { getItemPageRoute } from '../item-page-routing-paths';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { ServerResponseService } from '../../core/services/server-response.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
 import { SignpostingLink } from '../../core/data/signposting-links.model';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeInOut } from '../../shared/animations/fade';
 import { isNotEmpty } from '../../shared/empty.util';
-import { LinkDefinition, LinkHeadService } from '../../core/services/link-head.service';
+import { getItemPageRoute } from '../item-page-routing-paths';
 
 /**
  * This component renders a simple item page.
@@ -32,7 +53,7 @@ import { LinkDefinition, LinkHeadService } from '../../core/services/link-head.s
   styleUrls: ['./item-page.component.scss'],
   templateUrl: './item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemPageComponent implements OnInit, OnDestroy {
 
@@ -68,6 +89,13 @@ export class ItemPageComponent implements OnInit, OnDestroy {
    */
   signpostingLinks: SignpostingLink[] = [];
 
+  /**
+   * An array of LinkDefinition objects representing inbox links for the item page.
+   */
+  inboxTags: LinkDefinition[] = [];
+
+  coarRestApiUrls: string[] = [];
+
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
@@ -77,7 +105,8 @@ export class ItemPageComponent implements OnInit, OnDestroy {
     protected responseService: ServerResponseService,
     protected signpostingDataService: SignpostingDataService,
     protected linkHeadService: LinkHeadService,
-    @Inject(PLATFORM_ID) protected platformId: string
+    protected notifyInfoService: NotifyInfoService,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
     this.initPageLinks();
   }
@@ -88,11 +117,11 @@ export class ItemPageComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Item>),
-      redirectOn4xx(this.router, this.authService)
+      redirectOn4xx(this.router, this.authService),
     );
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
 
     this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
@@ -106,34 +135,82 @@ export class ItemPageComponent implements OnInit, OnDestroy {
    */
   private initPageLinks(): void {
     this.route.params.subscribe(params => {
-      this.signpostingDataService.getLinks(params.id).pipe(take(1)).subscribe((signpostingLinks: SignpostingLink[]) => {
-        let links = '';
-        this.signpostingLinks = signpostingLinks;
+      combineLatest([this.signpostingDataService.getLinks(params.id).pipe(take(1)), this.getCoarLdnLocalInboxUrls()])
+        .subscribe(([signpostingLinks, coarRestApiUrls]) => {
+          let links = '';
+          this.signpostingLinks = signpostingLinks;
 
-        signpostingLinks.forEach((link: SignpostingLink) => {
-          links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
-          let tag: LinkDefinition = {
-            href: link.href,
-            rel: link.rel
-          };
-          if (isNotEmpty(link.type)) {
-            tag = Object.assign(tag, {
-              type: link.type
-            });
+          signpostingLinks.forEach((link: SignpostingLink) => {
+            links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
+            let tag: LinkDefinition = {
+              href: link.href,
+              rel: link.rel,
+            };
+            if (isNotEmpty(link.type)) {
+              tag = Object.assign(tag, {
+                type: link.type,
+              });
+            }
+            this.linkHeadService.addTag(tag);
+          });
+
+          if (coarRestApiUrls.length > 0) {
+            const inboxLinks = this.initPageInboxLinks(coarRestApiUrls);
+            links = links + (isNotEmpty(links) ? ', ' : '') + inboxLinks;
           }
-          this.linkHeadService.addTag(tag);
-        });
 
-        if (isPlatformServer(this.platformId)) {
-          this.responseService.setHeader('Link', links);
-        }
-      });
+          if (isPlatformServer(this.platformId)) {
+            this.responseService.setHeader('Link', links);
+          }
+        });
     });
   }
 
+  /**
+   * Sets the COAR LDN local inbox URL if COAR configuration is enabled.
+   * If the COAR LDN local inbox URL is retrieved successfully, initializes the page inbox links.
+   */
+  private getCoarLdnLocalInboxUrls(): Observable<string[]> {
+    return this.notifyInfoService.isCoarConfigEnabled().pipe(
+      switchMap((coarLdnEnabled: boolean) => {
+        if (coarLdnEnabled) {
+          return this.notifyInfoService.getCoarLdnLocalInboxUrls();
+        } else {
+          return of([]);
+        }
+      }),
+    );
+  }
+
+  /**
+   * Initializes the page inbox links.
+   * @param coarRestApiUrls - An array of COAR REST API URLs.
+   */
+  private initPageInboxLinks(coarRestApiUrls: string[]): string {
+    const rel = this.notifyInfoService.getInboxRelationLink();
+    let links = '';
+
+    coarRestApiUrls.forEach((coarRestApiUrl: string) => {
+      // Add link to head
+      const tag: LinkDefinition = {
+        href: coarRestApiUrl,
+        rel: rel,
+      };
+      this.inboxTags.push(tag);
+      this.linkHeadService.addTag(tag);
+
+      links = links + (isNotEmpty(links) ? ', ' : '') + `<${coarRestApiUrl}> ; rel="${rel}"`;
+    });
+
+    return links;
+  }
+
   ngOnDestroy(): void {
     this.signpostingLinks.forEach((link: SignpostingLink) => {
       this.linkHeadService.removeTag(`href='${link.href}'`);
     });
+    this.inboxTags.forEach((link: LinkDefinition) => {
+      this.linkHeadService.removeTag(`href='${link.href}'`);
+    });
   }
 }
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 3749f63964..d09b560042 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
@@ -84,6 +84,22 @@
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['notify.relation.endorsedBy']"
+      [label]="'item.page.endorsement'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReviewedBy']"
+      [label]="'item.page.review'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isSupplementedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReferencedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
     <div>
       <a class="btn btn-outline-primary" role="button" [routerLink]="[itemPageRoute + '/full']">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index 211ec102bc..5d3640f833 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -1,10 +1,28 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -14,32 +32,31 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataMap  } from '../../../../core/shared/metadata.models';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import {
-  createRelationshipsObservable, getIIIFEnabled, getIIIFSearchEnabled, mockRouteService
+  createRelationshipsObservable,
+  getIIIFEnabled,
+  getIIIFSearchEnabled,
+  mockRouteService,
 } from '../shared/item.component.spec';
 import { PublicationComponent } from './publication.component';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { RouteService } from '../../../../core/services/route.service';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import {
-  BrowseDefinitionDataServiceStub
-} from '../../../../shared/testing/browse-definition-data-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -47,7 +64,7 @@ function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -59,15 +76,15 @@ describe('PublicationComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -95,9 +112,9 @@ describe('PublicationComponent', () => {
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PublicationComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     });
   }));
 
@@ -171,14 +188,14 @@ describe('PublicationComponent', () => {
     const localMockRouteService = {
       getPreviousUrl(): Observable<string> {
         return of('/search?query=test%20query&fakeParam=true');
-      }
+      },
     };
     beforeEach(waitForAsync(() => {
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(PublicationComponent);
       comp = fixture.componentInstance;
@@ -201,14 +218,14 @@ describe('PublicationComponent', () => {
     const localMockRouteService = {
       getPreviousUrl(): Observable<string> {
         return of('/item');
-      }
+      },
     };
     beforeEach(waitForAsync(() => {
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(PublicationComponent);
       comp = fixture.componentInstance;
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index bd0d371183..b4882ff2f6 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemComponent } from '../shared/item.component';
diff --git a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
index fe1070400e..a39b345bf0 100644
--- a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
+++ b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
@@ -1,8 +1,16 @@
-import { Item } from '../../../../core/shared/item.model';
+import {
+  DefaultUrlSerializer,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { RouteService } from '../../../../core/services/route.service';
-import { DefaultUrlSerializer, UrlTree } from '@angular/router';
+import { Item } from '../../../../core/shared/item.model';
 
 export const isIiifEnabled = (item: Item) => {
   return !!item.firstMetadataValue('dspace.iiif.enabled');
@@ -31,6 +39,6 @@ export const getDSpaceQuery = (item: Item, routeService: RouteService): Observab
       const url: UrlTree = new DefaultUrlSerializer().parse(r);
       return url.queryParamMap.get('query');
     }),
-    take(1)
+    take(1),
   );
 };
diff --git a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
index b4c3da2cdc..112884303b 100644
--- a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
+++ b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
@@ -1,19 +1,26 @@
-import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs';
-import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
+import { InjectionToken } from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteData
-} from '../../../../core/shared/operators';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { hasValue } from '../../../../shared/empty.util';
-import { InjectionToken } from '@angular/core';
 
 export const PAGINATED_RELATIONS_TO_ITEMS_OPERATOR = new InjectionToken<(thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>>('paginatedRelationsToItems', {
   providedIn: 'root',
-  factory: () => paginatedRelationsToItems
+  factory: () => paginatedRelationsToItems,
 });
 
 /**
@@ -53,8 +60,8 @@ export const relationsToItems = (thisId: string) =>
     source.pipe(
       mergeMap((rels: Relationship[]) =>
         observableZip(
-          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem))
-        )
+          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem)),
+        ),
       ),
       map((arr) =>
         arr
@@ -66,7 +73,7 @@ export const relationsToItems = (thisId: string) =>
               return leftItem.payload;
             }
           })
-          .filter((item: Item) => hasValue(item))
+          .filter((item: Item) => hasValue(item)),
       ),
       distinctUntilChanged(compareArraysUsingIds()),
     );
@@ -77,33 +84,51 @@ export const relationsToItems = (thisId: string) =>
  * @param {string} thisId       The item's id of which the relations belong to
  * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const paginatedRelationsToItems = (thisId: string) =>
-  (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
-    source.pipe(
-      getFirstSucceededRemoteData(),
-      switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
-        return observableCombineLatest(
-          relationshipsRD.payload.page.map((rel: Relationship) =>
-            observableCombineLatest([
-              rel.leftItem.pipe(getFirstSucceededRemoteDataPayload()),
-              rel.rightItem.pipe(getFirstSucceededRemoteDataPayload())]
-            )
-          )).pipe(
-          map((arr) =>
-            arr
-              .map(([leftItem, rightItem]) => {
-                if (leftItem.id === thisId) {
-                  return rightItem;
-                } else if (rightItem.id === thisId) {
-                  return leftItem;
+export const paginatedRelationsToItems = (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
+  source.pipe(
+    getFirstCompletedRemoteData(),
+    switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
+      return observableCombineLatest(
+        relationshipsRD.payload.page.map((rel: Relationship) =>
+          observableCombineLatest([
+            rel.leftItem.pipe(
+              getFirstCompletedRemoteData(),
+              map((rd: RemoteData<Item>) => {
+                if (rd.hasSucceeded) {
+                  return rd.payload;
+                } else {
+                  return null;
                 }
-              })
-              .filter((item: Item) => hasValue(item))
+              }),
+            ),
+            rel.rightItem.pipe(
+              getFirstCompletedRemoteData(),
+              map((rd: RemoteData<Item>) => {
+                if (rd.hasSucceeded) {
+                  return rd.payload;
+                } else {
+                  return null;
+                }
+              }),
+            ),
+          ],
           ),
-          distinctUntilChanged(compareArraysUsingIds()),
-          map((relatedItems: Item[]) =>
-            Object.assign(relationshipsRD, { payload: Object.assign(relationshipsRD.payload, { page: relatedItems } )})
-          )
-        );
-      })
-    );
+        ),
+      ).pipe(
+        map((arr) =>
+          arr.map(([leftItem, rightItem]) => {
+            if (hasValue(leftItem) && leftItem.id === thisId) {
+              return rightItem;
+            } else if (hasValue(rightItem) && rightItem.id === thisId) {
+              return leftItem;
+            }
+          })
+            .filter((item: Item) => hasValue(item)),
+        ),
+        distinctUntilChanged(compareArraysUsingIds()),
+        map((relatedItems: Item[]) =>
+          Object.assign(relationshipsRD, { payload: Object.assign(relationshipsRD.payload, { page: relatedItems } ) }),
+        ),
+      );
+    }),
+  );
diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
index 5bf08fc004..0ff54b6a9d 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
@@ -1,54 +1,67 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import {
-  createSuccessfulRemoteDataObject$
-} from '../../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
-import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { RouteService } from '../../../../core/services/route.service';
-import { MetadataValue } from '../../../../core/shared/metadata.models';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
-import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import {
-  BrowseDefinitionDataServiceStub
-} from '../../../../shared/testing/browse-definition-data-service.stub';
-
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { Router } from '@angular/router';
 import { ItemComponent } from './item.component';
+import {
+  compareArraysUsing,
+  compareArraysUsingIds,
+} from './item-relationships-utils';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -56,7 +69,7 @@ export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
     'language': null,
     'authority': null,
     'confidence': -1,
-    'place': 0
+    'place': 0,
   });
 }
 
@@ -66,14 +79,14 @@ export function getIIIFEnabled(enabled: boolean): MetadataValue {
     'language': null,
     'authority': null,
     'confidence': -1,
-    'place': 0
+    'place': 0,
   });
 }
 
 export const mockRouteService = {
   getPreviousUrl(): Observable<string> {
     return observableOf('');
-  }
+  },
 };
 
 /**
@@ -92,22 +105,22 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
       const mockBitstreamDataService = {
         getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
           return createSuccessfulRemoteDataObject$(new Bitstream());
-        }
+        },
       };
 
       const authorizationService = jasmine.createSpyObj('authorizationService', {
-        isAuthorized: observableOf(true)
+        isAuthorized: observableOf(true),
       });
 
       TestBed.configureTestingModule({
         imports: [
-            TranslateModule.forRoot({
-              loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-              }
-            }),
-            RouterTestingModule,
+          TranslateModule.forRoot({
+            loader: {
+              provide: TranslateLoader,
+              useClass: TranslateLoaderMock,
+            },
+          }),
+          RouterTestingModule,
         ],
         declarations: [component, GenericItemPageFieldComponent, TruncatePipe],
         providers: [
@@ -135,9 +148,9 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
         ],
 
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).overrideComponent(component, {
-        set: { changeDetection: ChangeDetectionStrategy.Default }
+        set: { changeDetection: ChangeDetectionStrategy.Default },
       }).compileComponents();
     }));
 
@@ -181,8 +194,8 @@ export function createRelationshipsObservable() {
     Object.assign(new Relationship(), {
       relationshipType: createSuccessfulRemoteDataObject$(new RelationshipType()),
       leftItem: createSuccessfulRemoteDataObject$(new Item()),
-      rightItem: createSuccessfulRemoteDataObject$(new Item())
-    })
+      rightItem: createSuccessfulRemoteDataObject$(new Item()),
+    }),
   ]));
 }
 
@@ -190,66 +203,66 @@ describe('ItemComponent', () => {
   const arr1 = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 2,
-      name: 'another test'
+      name: 'another test',
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithWrongId = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 5,  // Wrong id on purpose
-      name: 'another test'
+      name: 'another test',
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithWrongName = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 2,
-      name: 'wrong test'  // Wrong name on purpose
+      name: 'wrong test',  // Wrong name on purpose
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithDifferentOrder = [arr1[0], arr1[2], arr1[1]];
   const arrWithOneMore = [...arr1, {
     id: 4,
-    name: 'fourth test'
+    name: 'fourth test',
   }];
   const arrWithAddedProperties = [
     {
       id: 1,
       name: 'test',
-      extra: 'extra property'
+      extra: 'extra property',
     },
     {
       id: 2,
       name: 'another test',
-      extra: 'extra property'
+      extra: 'extra property',
     },
     {
       id: 3,
       name: 'one last test',
-      extra: 'extra property'
-    }
+      extra: 'extra property',
+    },
   ];
   const arrOfPrimitiveTypes = [1, 2, 3, 4];
   const arrOfPrimitiveTypesWithOneWrong = [1, 5, 3, 4];
@@ -398,15 +411,15 @@ describe('ItemComponent', () => {
       'publicationissue.issueNumber': [
         {
           language: 'en_US',
-          value: '1234'
-        }
+          value: '1234',
+        },
       ],
       'dc.description': [
         {
           language: 'en_US',
-          value: 'desc'
-        }
-      ]
+          value: 'desc',
+        },
+      ],
     },
   });
   describe('back to results', () => {
@@ -424,8 +437,8 @@ describe('ItemComponent', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
           RouterTestingModule,
         ],
@@ -453,9 +466,9 @@ describe('ItemComponent', () => {
           { provide: AuthorizationDataService, useValue: {} },
           { provide: ResearcherProfileDataService, useValue: {} },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).overrideComponent(ItemComponent, {
-        set: {changeDetection: ChangeDetectionStrategy.Default}
+        set: { changeDetection: ChangeDetectionStrategy.Default },
       });
     }));
 
@@ -469,30 +482,31 @@ describe('ItemComponent', () => {
       fixture.detectChanges();
     }));
 
-    it('should hide back button',() => {
+    it('should hide back button', () => {
       spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('/item'));
-      comp.showBackButton.subscribe((val) => {
+      comp.ngOnInit();
+      comp.showBackButton$.subscribe((val) => {
         expect(val).toBeFalse();
       });
     });
     it('should show back button for search', () => {
       spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
       comp.ngOnInit();
-      comp.showBackButton.subscribe((val) => {
+      comp.showBackButton$.subscribe((val) => {
         expect(val).toBeTrue();
       });
     });
     it('should show back button for browse', () => {
       spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl));
       comp.ngOnInit();
-      comp.showBackButton.subscribe((val) => {
+      comp.showBackButton$.subscribe((val) => {
         expect(val).toBeTrue();
       });
     });
     it('should show back button for recent submissions', () => {
       spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl));
       comp.ngOnInit();
-      comp.showBackButton.subscribe((val) => {
+      comp.showBackButton$.subscribe((val) => {
         expect(val).toBeTrue();
       });
     });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 93e6a0b346..90b4c7b4c9 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -1,16 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../../environments/environment';
+import { RouteService } from '../../../../core/services/route.service';
 import { Item } from '../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
-import { RouteService } from '../../../../core/services/route.service';
-import { Observable } from 'rxjs';
-import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
-import { filter, map, take } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import {
+  getDSpaceQuery,
+  isIiifEnabled,
+  isIiifSearchEnabled,
+} from './item-iiif-utils';
 
 @Component({
   selector: 'ds-item',
-  template: ''
+  template: '',
 })
 /**
  * A generic component for displaying metadata and relations of an item
@@ -27,7 +39,7 @@ export class ItemComponent implements OnInit {
   /**
    * Used to show or hide the back to results button in the view.
    */
-  showBackButton: Observable<boolean>;
+  showBackButton$: Observable<boolean>;
 
   /**
    * Route to the item page
@@ -61,22 +73,21 @@ export class ItemComponent implements OnInit {
    */
   back = () => {
     this.routeService.getPreviousUrl().pipe(
-          take(1)
-        ).subscribe(
-          (url => {
-            this.router.navigateByUrl(url);
-          })
-        );
+      take(1),
+    ).subscribe(
+      (url => {
+        this.router.navigateByUrl(url);
+      }),
+    );
   };
 
   ngOnInit(): void {
 
     this.itemPageRoute = getItemPageRoute(this.object);
     // hide/show the back button
-    this.showBackButton = this.routeService.getPreviousUrl().pipe(
-      filter(url => this.previousRoute.test(url)),
+    this.showBackButton$ = this.routeService.getPreviousUrl().pipe(
+      map((url: string) => this.previousRoute.test(url)),
       take(1),
-      map(() => true)
     );
     // check to see if iiif viewer is required.
     this.iiifEnabled = isIiifEnabled(this.object);
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 904b7e039c..35a00dc7b7 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
@@ -70,6 +70,22 @@
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['notify.relation.endorsedBy']"
+      [label]="'item.page.endorsement'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReviewedBy']"
+      [label]="'item.page.review'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isSupplementedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReferencedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
     <div>
       <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index 4b7da40abe..667c2a58d0 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -1,10 +1,28 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -14,33 +32,32 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataMap } from '../../../../core/shared/metadata.models';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import {
-  createRelationshipsObservable, getIIIFEnabled, getIIIFSearchEnabled, mockRouteService
+  createRelationshipsObservable,
+  getIIIFEnabled,
+  getIIIFSearchEnabled,
+  mockRouteService,
 } from '../shared/item.component.spec';
 import { UntypedItemComponent } from './untyped-item.component';
-import { RouteService } from '../../../../core/services/route.service';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
-import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import {
-  BrowseDefinitionDataServiceStub
-} from '../../../../shared/testing/browse-definition-data-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -48,7 +65,7 @@ function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -60,15 +77,15 @@ describe('UntypedItemComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -97,9 +114,9 @@ describe('UntypedItemComponent', () => {
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(UntypedItemComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     });
   }));
 
@@ -177,14 +194,14 @@ describe('UntypedItemComponent', () => {
     const localMockRouteService = {
       getPreviousUrl(): Observable<string> {
         return of('/search?query=test%20query&fakeParam=true');
-      }
+      },
     };
     beforeEach(waitForAsync(() => {
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
       spyOn(localMockRouteService, 'getPreviousUrl').and.callThrough();
@@ -208,14 +225,14 @@ describe('UntypedItemComponent', () => {
     const localMockRouteService = {
       getPreviousUrl(): Observable<string> {
         return of('/item');
-      }
+      },
     };
     beforeEach(waitForAsync(() => {
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
 
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index ead62008de..96ef42510c 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index 180eaaa2be..749915beac 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -1,18 +1,26 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { Item } from '../../../core/shared/item.model';
 import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
-import { MetadataValue } from '../../../core/shared/metadata.models';
+
+import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
-import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../shared/testing/browse-definition-data-service.stub';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
 
 const itemType = 'Person';
 const metadataFields = ['dc.contributor.author', 'dc.creator'];
@@ -24,13 +32,13 @@ const parentItem: Item = Object.assign(new Item(), {
         language: null,
         value: 'Related Author with authority',
         authority: 'virtual::related-author',
-        place: 2
+        place: 2,
       },
       {
         language: null,
         value: 'Author without authority',
-        place: 1
-      }
+        place: 1,
+      },
     ],
     'dc.creator': [
       {
@@ -49,10 +57,10 @@ const parentItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Parent Item'
-      }
-    ]
-  }
+        value: 'Parent Item',
+      },
+    ],
+  },
 });
 const relatedAuthor: Item = Object.assign(new Item(), {
   id: 'related-author',
@@ -60,10 +68,10 @@ const relatedAuthor: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Related Author'
-      }
-    ]
-  }
+        value: 'Related Author',
+      },
+    ],
+  },
 });
 const relatedCreator: Item = Object.assign(new Item(), {
   id: 'related-creator',
@@ -71,11 +79,11 @@ const relatedCreator: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Related Creator'
-      }
+        value: 'Related Creator',
+      },
     ],
     'dspace.entity.type': 'Person',
-  }
+  },
 });
 
 describe('MetadataRepresentationListComponent', () => {
@@ -107,11 +115,11 @@ describe('MetadataRepresentationListComponent', () => {
       declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataRepresentationListComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 59a5377f77..d5900918a2 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,24 +1,26 @@
-import { Component, Input } from '@angular/core';
-import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import {
   Observable,
-  zip as observableZip
+  zip as observableZip,
 } from 'rxjs';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { MetadataValue } from '../../../core/shared/metadata.models';
-import { Item } from '../../../core/shared/item.model';
-import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { map } from 'rxjs/operators';
-import { getRemoteDataPayload } from '../../../core/shared/operators';
-import {
-  MetadatumRepresentation
-} from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+
 import { BrowseService } from '../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { getRemoteDataPayload } from '../../../core/shared/operators';
+import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-metadata-representation-list',
-  templateUrl: './metadata-representation-list.component.html'
+  templateUrl: './metadata-representation-list.component.html',
 })
 /**
  * This component is used for displaying metadata
@@ -97,7 +99,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
             });
             return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
               getRemoteDataPayload(),
-              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum))
+              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)),
             );
           }
         }),
diff --git a/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts
index a290b82dd9..5e875e1398 100644
--- a/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts
@@ -1,7 +1,11 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../core/shared/item.model';
 import { ThemedComponent } from '../../../shared/theme-support/themed.component';
 import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-themed-metadata-representation-list',
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
new file mode 100644
index 0000000000..c68255f2ed
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
@@ -0,0 +1,5 @@
+<ng-container *ngIf="(requestMap$ | async)?.size > 0">
+  <ng-container *ngFor="let entry of (requestMap$ | async) | keyvalue ">
+    <ds-request-status-alert-box [status]="entry.key" [data]="entry.value"></ds-request-status-alert-box>
+  </ng-container>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
rename to src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.scss
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts
new file mode 100644
index 0000000000..5a92fe2782
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts
@@ -0,0 +1,94 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NotifyRequestsStatusDataService } from 'src/app/core/data/notify-services-status-data.service';
+
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotifyRequestsStatus } from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+import { NotifyRequestsStatusComponent } from './notify-requests-status.component';
+
+describe('NotifyRequestsStatusComponent', () => {
+  let component: NotifyRequestsStatusComponent;
+  let fixture: ComponentFixture<NotifyRequestsStatusComponent>;
+  let notifyInfoServiceSpy;
+
+  const mock: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+    notifyStatus: [],
+    itemuuid: 'testUuid',
+  });
+
+  beforeEach(() => {
+    notifyInfoServiceSpy = {
+      getNotifyRequestsStatus:() => createSuccessfulRemoteDataObject$(mock),
+    };
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [NotifyRequestsStatusComponent],
+      providers: [
+        { provide: NotifyRequestsStatusDataService, useValue: notifyInfoServiceSpy },
+      ],
+    });
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotifyRequestsStatusComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should fetch data from the service on initialization', fakeAsync(() => {
+    const mockData: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+      notifyStatus: [],
+      itemuuid: 'testUuid',
+    });
+    component.itemUuid = mockData.itemuuid;
+    spyOn(notifyInfoServiceSpy, 'getNotifyRequestsStatus').and.callThrough();
+    component.ngOnInit();
+    fixture.detectChanges();
+    tick();
+
+    expect(notifyInfoServiceSpy.getNotifyRequestsStatus).toHaveBeenCalledWith('testUuid');
+    component.requestMap$.subscribe((map) => {
+      expect(map.size).toBe(0);
+    });
+  }));
+
+  it('should group data by status', () => {
+    const mockData: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+      notifyStatus: [
+        {
+          serviceName: 'test1',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.ACCEPTED,
+        },
+        {
+          serviceName: 'test2',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.REJECTED,
+        },
+        {
+          serviceName: 'test3',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.ACCEPTED,
+        },
+      ],
+      itemUuid: 'testUuid',
+    });
+    spyOn(notifyInfoServiceSpy, 'getNotifyRequestsStatus').and.returnValue(createSuccessfulRemoteDataObject$(mockData));
+    fixture.detectChanges();
+    (component as any).groupDataByStatus(mockData);
+    component.requestMap$.subscribe((map) => {
+      expect(map.size).toBe(2);
+      expect(map.get(RequestStatusEnum.ACCEPTED)?.length).toBe(2);
+      expect(map.get(RequestStatusEnum.REJECTED)?.length).toBe(1);
+    });
+  });
+});
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
new file mode 100644
index 0000000000..5df5b3b950
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -0,0 +1,84 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  filter,
+  map,
+  Observable,
+} from 'rxjs';
+
+import { NotifyRequestsStatusDataService } from '../../../../core/data/notify-services-status-data.service';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+import { hasValue } from '../../../../shared/empty.util';
+import {
+  NotifyRequestsStatus,
+  NotifyStatuses,
+} from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+
+@Component({
+  selector: 'ds-notify-requests-status',
+  templateUrl: './notify-requests-status.component.html',
+  styleUrls: ['./notify-requests-status.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+/**
+ * Component to show an alert box for each update in th Notify feature (e.g. COAR updates)
+ */
+
+export class NotifyRequestsStatusComponent implements OnInit {
+  /**
+   * The UUID of the item.
+   */
+  @Input() itemUuid: string;
+
+  /**
+   * Observable representing the request map.
+   * The map contains request status enums as keys and arrays of notify statuses as values.
+   */
+  requestMap$: Observable<Map<RequestStatusEnum, NotifyStatuses[]>>;
+
+  constructor(private notifyInfoService: NotifyRequestsStatusDataService) { }
+
+  ngOnInit(): void {
+    this.requestMap$ = this.notifyInfoService
+      .getNotifyRequestsStatus(this.itemUuid)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        filter((data) => hasValue(data)),
+        getRemoteDataPayload(),
+        filter((data: NotifyRequestsStatus) => hasValue(data)),
+        map((data: NotifyRequestsStatus) => {
+          return this.groupDataByStatus(data);
+        }),
+      );
+  }
+
+  /**
+   * Groups the notify requests status data by status.
+   * @param notifyRequestsStatus The notify requests status data.
+   */
+  private groupDataByStatus(notifyRequestsStatus: NotifyRequestsStatus) {
+    const statusMap: Map<RequestStatusEnum, NotifyStatuses[]> = new Map();
+    notifyRequestsStatus.notifyStatus?.forEach(
+      (notifyStatus: NotifyStatuses) => {
+        const status = notifyStatus.status;
+
+        if (!statusMap.has(status)) {
+          statusMap.set(status, []);
+        }
+
+        statusMap.get(status)?.push(notifyStatus);
+      },
+    );
+
+    return statusMap;
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts
new file mode 100644
index 0000000000..4685d609a5
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts
@@ -0,0 +1,77 @@
+// eslint-disable-next-line max-classes-per-file
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { NOTIFYREQUEST } from './notify-requests-status.resource-type';
+import { RequestStatusEnum } from './notify-status.enum';
+
+/**
+ * Represents the status of notify requests for an item.
+ */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class NotifyRequestsStatus implements CacheableObject {
+  static type = NOTIFYREQUEST;
+
+  /**
+   * The object type.
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The notify statuses.
+   */
+  @autoserialize
+    notifyStatus: NotifyStatuses[];
+
+  /**
+   * The UUID of the item.
+   */
+  @autoserialize
+    itemuuid: string;
+
+  /**
+   * The links associated with the notify requests status.
+   */
+  @deserialize
+    _links: {
+    self: HALLink;
+    [k: string]: HALLink | HALLink[];
+  };
+}
+
+/**
+ * Represents the status of a notification request.
+ */
+export class NotifyStatuses {
+  /**
+   * The name of the service.
+   */
+  serviceName: string;
+
+  /**
+   * The URL of the service.
+   */
+  serviceUrl: string;
+
+  /**
+   * The status of the notification request.
+   */
+  status: RequestStatusEnum;
+  /**
+   * Type of request.
+   */
+  offerType: string;
+}
+
+
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts
new file mode 100644
index 0000000000..a450b0462b
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for the root endpoint
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const NOTIFYREQUEST = new ResourceType('notifyrequests');
diff --git a/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts b/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
new file mode 100644
index 0000000000..e44c614130
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
@@ -0,0 +1,5 @@
+export enum RequestStatusEnum {
+  ACCEPTED = 'ACCEPTED',
+  REJECTED = 'REJECTED',
+  REQUESTED = 'REQUESTED',
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
new file mode 100644
index 0000000000..95c01e2501
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
@@ -0,0 +1,33 @@
+<ng-container *ngIf="data?.length > 0 && displayOptions">
+  <div
+    [ngClass]="{'align-items-center': data.length === 1}"
+    class="alert d-flex flex-row sections-gap {{
+      displayOptions.alertType
+    }}"
+  >
+    <img
+      class="source-logo"
+      src="assets/images/qa-coar-notify-logo.png"
+      alt="notify logo"
+    />
+    <ds-truncatable [id]="status">
+      <ds-truncatable-part [id]="status" [minLines]="1">
+        <div class="w-100 d-flex flex-column">
+          <ng-container *ngFor="let request of data">
+            <div
+              [innerHTML]="
+                displayOptions.text
+                 | translate
+                    : {
+                        serviceName: request.serviceName,
+                        serviceUrl: request.serviceUrl,
+                        offerType: request.offerType
+                      }
+              "
+            ></div>
+          </ng-container>
+        </div>
+      </ds-truncatable-part>
+    </ds-truncatable>
+  </div>
+</ng-container>
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss
new file mode 100644
index 0000000000..f852bb8454
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss
@@ -0,0 +1,7 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts
new file mode 100644
index 0000000000..d3ed0f59be
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts
@@ -0,0 +1,58 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RequestStatusEnum } from '../notify-status.enum';
+import { RequestStatusAlertBoxComponent } from './request-status-alert-box.component';
+
+describe('RequestStatusAlertBoxComponent', () => {
+  let component: RequestStatusAlertBoxComponent;
+  let componentAsAny: any;
+  let fixture: ComponentFixture<RequestStatusAlertBoxComponent>;
+
+  const mockData = [
+    {
+      serviceName: 'test',
+      serviceUrl: 'test',
+      status: RequestStatusEnum.ACCEPTED,
+      offerType: 'test',
+    },
+    {
+      serviceName: 'test1',
+      serviceUrl: 'test',
+      status: RequestStatusEnum.REJECTED,
+      offerType: 'test',
+    },
+  ];
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [RequestStatusAlertBoxComponent],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RequestStatusAlertBoxComponent);
+    component = fixture.componentInstance;
+    component.data = mockData;
+    component.displayOptions = {
+      alertType: 'alert-danger',
+      text: 'request-status-alert-box.rejected',
+    };
+    componentAsAny = component;
+    fixture.detectChanges();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display the alert box when data is available', fakeAsync(() => {
+    const alertBoxElement = fixture.nativeElement.querySelector('.alert');
+    expect(alertBoxElement).toBeTruthy();
+  }));
+});
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
new file mode 100644
index 0000000000..2a2dd03a86
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -0,0 +1,83 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  type OnInit,
+} from '@angular/core';
+
+import { NotifyStatuses } from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+
+@Component({
+  selector: 'ds-request-status-alert-box',
+  templateUrl: './request-status-alert-box.component.html',
+  styleUrls: ['./request-status-alert-box.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+/**
+ * Represents a component that displays the status of a request.
+ */
+export class RequestStatusAlertBoxComponent implements OnInit {
+  /**
+   * The status of the request.
+   */
+  @Input() status: RequestStatusEnum;
+
+  /**
+   * The input data for the request status alert box component.
+   * @type {NotifyStatuses[]}
+   */
+  @Input() data: NotifyStatuses[] = [];
+
+  /**
+   * The display options for the request status alert box.
+   */
+  displayOptions: NotifyRequestDisplayOptions;
+
+  ngOnInit(): void {
+    this.prepareDataToDisplay();
+  }
+
+  /**
+   * Prepares the data to be displayed based on the current status.
+   */
+  private prepareDataToDisplay() {
+    switch (this.status) {
+      case RequestStatusEnum.ACCEPTED:
+        this.displayOptions = {
+          alertType: 'alert-info',
+          text: 'request-status-alert-box.accepted',
+        };
+        break;
+
+      case RequestStatusEnum.REJECTED:
+        this.displayOptions = {
+          alertType: 'alert-danger',
+          text: 'request-status-alert-box.rejected',
+        };
+        break;
+
+      case RequestStatusEnum.REQUESTED:
+        this.displayOptions = {
+          alertType: 'alert-warning',
+          text: 'request-status-alert-box.requested',
+        };
+        break;
+    }
+  }
+}
+
+/**
+ * Represents the display options for a notification request.
+ */
+export interface NotifyRequestDisplayOptions {
+  /**
+   * The type of alert to display.
+   * Possible values are 'alert-danger', 'alert-warning', or 'alert-info'.
+   */
+  alertType: 'alert-danger' | 'alert-warning' | 'alert-info';
+  /**
+   * The text to display in the notification.
+   */
+  text: string;
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
new file mode 100644
index 0000000000..77370f462d
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -0,0 +1,22 @@
+<ng-container *ngIf="(sources$ | async) as sources">
+  <ng-container *ngFor="let source of sources">
+    <div class="alert alert-info d-flex flex-row" *ngIf="source.totalEvents > 0">
+      <div class="source-logo-container">
+        <img class="source-logo"
+             src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
+             alt="{{source.id}} logo"
+             onerror="this.src='assets/images/dspace-logo.svg'">
+      </div>
+      <div class="w-100 d-flex justify-content-between">
+        <div class="pl-4 align-self-center">
+          {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+        </div>
+        <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
+                [queryParams]="{ forward: true }"
+                class="btn btn-primary align-self-center">
+                {{'item.qa-event-notification-info.check.button' | translate}}
+        </button>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss
new file mode 100644
index 0000000000..2a62342b7c
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss
@@ -0,0 +1,13 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.source-logo-container {
+  width: var(--ds-qa-logo-width);
+  display: flex;
+  justify-content: center;
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts
new file mode 100644
index 0000000000..05ad804207
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts
@@ -0,0 +1,77 @@
+import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { SplitPipe } from 'src/app/shared/utils/split.pipe';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { QaEventNotificationComponent } from './qa-event-notification.component';
+
+describe('QaEventNotificationComponent', () => {
+  let component: QaEventNotificationComponent;
+  let fixture: ComponentFixture<QaEventNotificationComponent>;
+  let qualityAssuranceSourceDataServiceStub: any;
+
+  const obj = Object.assign(new QualityAssuranceSourceObject(), {
+    id: 'sourceName:target',
+    source: 'sourceName',
+    target: 'target',
+    totalEvents: 1,
+  });
+
+  const objPL = createSuccessfulRemoteDataObject$(createPaginatedList([obj]));
+  const item = Object.assign({ uuid: '1234' });
+  beforeEach(async () => {
+
+    qualityAssuranceSourceDataServiceStub = {
+      getSourcesByTarget: () => objPL,
+    };
+    await TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot()],
+      declarations: [QaEventNotificationComponent, SplitPipe],
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub },
+        { provide: RequestService, useValue: {} },
+        { provide: NotificationsService, useValue: {} },
+        { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test') },
+        ObjectCacheService,
+        RemoteDataBuildService,
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+    fixture = TestBed.createComponent(QaEventNotificationComponent);
+    component = fixture.componentInstance;
+    component.item = item;
+    component.sources$ = of([obj]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display sources if present', () => {
+    const alertElements = fixture.debugElement.queryAll(By.css('.alert'));
+    expect(alertElements.length).toBe(1);
+  });
+
+  it('should return the quality assurance route when getQualityAssuranceRoute is called', () => {
+    const route = component.getQualityAssuranceRoute();
+    expect(route).toBe('/notifications/quality-assurance');
+  });
+});
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
new file mode 100644
index 0000000000..06f81d232e
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -0,0 +1,86 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+
+import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-qa-event-notification',
+  templateUrl: './qa-event-notification.component.html',
+  styleUrls: ['./qa-event-notification.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [QualityAssuranceSourceDataService],
+})
+/**
+ * Component for displaying quality assurance event notifications for an item.
+ */
+export class QaEventNotificationComponent implements OnChanges {
+  /**
+   * The item to display quality assurance event notifications for.
+   */
+  @Input() item: Item;
+
+  /**
+   * An observable that emits an array of QualityAssuranceSourceObject.
+   */
+  sources$: Observable<QualityAssuranceSourceObject[]>;
+
+  constructor(
+    private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService,
+  ) {}
+
+  /**
+    * Detect changes to the item input and update the sources$ observable.
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item && changes.item.currentValue.uuid !== changes.item.previousValue?.uuid) {
+      this.sources$ = this.getQualityAssuranceSources$();
+    }
+  }
+  /**
+   * Returns an Observable of QualityAssuranceSourceObject[] for the current item.
+   * @returns An Observable of QualityAssuranceSourceObject[] for the current item.
+   * Note: sourceId is composed as: id: "sourceName:<target>"
+   */
+  getQualityAssuranceSources$(): Observable<QualityAssuranceSourceObject[]> {
+    const findListTopicOptions: FindListOptions = {
+      searchParams: [new RequestParam('target', this.item.uuid)],
+    };
+    return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions, false)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        map((data: RemoteData<PaginatedList<QualityAssuranceSourceObject>>) => {
+          if (data.hasSucceeded) {
+            return data.payload.page;
+          }
+          return [];
+        }),
+        catchError(() => []),
+      );
+  }
+
+  /**
+   * Returns the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+}
diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
index 2a08efeb2c..36340bebfa 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
@@ -2,5 +2,6 @@
   [fixedFilterQuery]="fixedFilter"
   [configuration]="configuration"
   [searchEnabled]="searchEnabled"
-  [sideBarWidth]="sideBarWidth">
+  [sideBarWidth]="sideBarWidth"
+  [showCsvExport]="true">
 </ds-configuration-search-page>
diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
index a9fd11b9ee..5e8c33ccee 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
@@ -1,17 +1,22 @@
-import { RelatedEntitiesSearchComponent } from './related-entities-search.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+
 import { Item } from '../../../../core/shared/item.model';
+import { RelatedEntitiesSearchComponent } from './related-entities-search.component';
 
 describe('RelatedEntitiesSearchComponent', () => {
   let comp: RelatedEntitiesSearchComponent;
   let fixture: ComponentFixture<RelatedEntitiesSearchComponent>;
 
   const mockItem = Object.assign(new Item(), {
-    id: 'id1'
+    id: 'id1',
   });
   const mockRelationType = 'publicationsOfAuthor';
   const mockConfiguration = 'publication';
@@ -21,7 +26,7 @@ describe('RelatedEntitiesSearchComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
       declarations: [RelatedEntitiesSearchComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
index a3f76c12d7..dd831190d4 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
@@ -1,11 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { Item } from '../../../../core/shared/item.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { getFilterByRelation } from '../../../../shared/utils/relation-query.utils';
 
 @Component({
   selector: 'ds-related-entities-search',
-  templateUrl: './related-entities-search.component.html'
+  templateUrl: './related-entities-search.component.html',
 })
 /**
  * A component to show related items as search results.
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 223d4a6ed0..1b6cc273df 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="relationTypes.length > 1">
   <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter">
+    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" rel="presentation">
       <a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
       <ng-template ngbNavContent>
         <div class="mt-4">
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
index f7b9fb68e8..cb9e78999b 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
@@ -1,28 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../../core/shared/item.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TabbedRelatedEntitiesSearchComponent } from './tabbed-related-entities-search.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { VarDirective } from '../../../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { Item } from '../../../../core/shared/item.model';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { TabbedRelatedEntitiesSearchComponent } from './tabbed-related-entities-search.component';
+
 describe('TabbedRelatedEntitiesSearchComponent', () => {
   let comp: TabbedRelatedEntitiesSearchComponent;
   let fixture: ComponentFixture<TabbedRelatedEntitiesSearchComponent>;
 
   const mockItem = Object.assign(new Item(), {
-    id: 'id1'
+    id: 'id1',
   });
   const mockRelationType = 'publications';
   const relationTypes = [
     {
       label: mockRelationType,
-      filter: mockRelationType
-    }
+      filter: mockRelationType,
+    },
   ];
 
   const router = new RouterMock();
@@ -35,12 +43,12 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
         {
           provide: ActivatedRoute,
           useValue: {
-            queryParams: observableOf({ tab: mockRelationType })
+            queryParams: observableOf({ tab: mockRelationType }),
           },
         },
-        { provide: Router, useValue: router }
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -61,7 +69,7 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
   describe('onTabChange', () => {
     const event = {
       currentId: mockRelationType,
-      nextId: 'nextTab'
+      nextId: 'nextTab',
     };
 
     beforeEach(() => {
@@ -72,9 +80,9 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
       expect(router.navigate).toHaveBeenCalledWith([], {
         relativeTo: (comp as any).route,
         queryParams: {
-          tab: event.nextId
+          tab: event.nextId,
         },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
   });
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
index 116c8c2d79..14db03ec0a 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -1,12 +1,20 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { Item } from '../../../../core/shared/item.model';
+
 @Component({
   selector: 'ds-tabbed-related-entities-search',
-  templateUrl: './tabbed-related-entities-search.component.html'
+  templateUrl: './tabbed-related-entities-search.component.html',
 })
 /**
  * A component to show related items as search results, split into tabs by relationship-type
@@ -55,7 +63,7 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit {
    */
   ngOnInit(): void {
     this.activeTab$ = this.route.queryParams.pipe(
-      map((params) => params.tab)
+      map((params) => params.tab),
     );
   }
 
@@ -67,9 +75,9 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit {
     this.router.navigate([], {
       relativeTo: this.route,
       queryParams: {
-        tab: event.nextId
+        tab: event.nextId,
       },
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
   }
 
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 2746670abe..73bda5f6cd 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,20 +1,30 @@
-import { Component, ElementRef, Inject, Input, PLATFORM_ID } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
-import { setPlaceHolderAttributes } from '../../../shared/utils/object-list-utils';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  Inject,
+  Input,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { setPlaceHolderAttributes } from '../../../shared/utils/object-list-utils';
+import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-related-items',
   styleUrls: ['./related-items.component.scss'],
-  templateUrl: './related-items.component.html'
+  templateUrl: './related-items.component.html',
 })
 /**
  * This component is used for displaying relations between items
@@ -65,8 +75,8 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
   constructor(public relationshipService: RelationshipDataService,
               protected elementRef: ElementRef,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
-              @Inject(PLATFORM_ID) private platformId: Object
-              ) {
+              @Inject(PLATFORM_ID) private platformId: any,
+  ) {
     super();
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts
index 4307c1aaa2..7c3781366e 100644
--- a/src/app/item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts
@@ -1,31 +1,39 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RelatedItemsComponent } from './related-items-component';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
+import { RelatedItemsComponent } from './related-items-component';
 
 const parentItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItem1: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItem2: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItems = [mockItem1, mockItem2];
 const relationType = 'isItemOfItem';
@@ -33,14 +41,14 @@ let relationshipService: RelationshipDataService;
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('RelatedItemsComponent', () => {
@@ -51,7 +59,7 @@ describe('RelatedItemsComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
-      }
+      },
     );
 
     TestBed.configureTestingModule({
@@ -59,11 +67,11 @@ describe('RelatedItemsComponent', () => {
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(RelatedItemsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -97,7 +105,7 @@ describe('RelatedItemsComponent', () => {
       expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
         elementsPerPage: comp.incrementBy,
         currentPage: 2,
-        fetchThumbnail: true
+        fetchThumbnail: true,
       }));
     });
 
@@ -124,19 +132,19 @@ describe('RelatedItemsComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
-      }
+      },
     );
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
-        {provide: RelationshipDataService, useValue: relationshipService},
-        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(RelatedItemsComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -151,7 +159,7 @@ describe('RelatedItemsComponent', () => {
     expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
       elementsPerPage: comp.incrementBy,
       currentPage: 2,
-      fetchThumbnail: false
+      fetchThumbnail: false,
     }));
   });
 });
diff --git a/src/app/item-page/simple/themed-item-page.component.ts b/src/app/item-page/simple/themed-item-page.component.ts
index 5bb26fafc9..c51f7a1656 100644
--- a/src/app/item-page/simple/themed-item-page.component.ts
+++ b/src/app/item-page/simple/themed-item-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ItemPageComponent } from './item-page.component';
 
diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts
index b1dd8bc161..b472187385 100644
--- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts
+++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts
@@ -1,17 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VersionPageComponent } from './version-page.component';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { VersionDataService } from '../../../core/data/version-data.service';
 import { Item } from '../../../core/shared/item.model';
+import { Version } from '../../../core/shared/version.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { createRelationshipsObservable } from '../../simple/item-types/shared/item.component.spec';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { Version } from '../../../core/shared/version.model';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Component } from '@angular/core';
+import { VersionPageComponent } from './version-page.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -35,13 +43,13 @@ describe('VersionPageComponent', () => {
   let authService: AuthService;
 
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({dso: createSuccessfulRemoteDataObject(mockVersion)})
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockVersion) }),
   });
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     TestBed.configureTestingModule({
       declarations: [VersionPageComponent, DummyComponent],
diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts
index 7f25034351..85156e1b55 100644
--- a/src/app/item-page/version-page/version-page/version-page.component.ts
+++ b/src/app/item-page/version-page/version-page/version-page.component.ts
@@ -1,21 +1,34 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../../core/auth/auth.service';
-import { map, switchMap } from 'rxjs/operators';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { Version } from '../../../core/shared/version.model';
-import { Item } from '../../../core/shared/item.model';
-import { getItemPageRoute } from '../../item-page-routing-paths';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { getPageNotFoundRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { VersionDataService } from '../../../core/data/version-data.service';
 import { redirectOn4xx } from '../../../core/shared/authorized.operators';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { Version } from '../../../core/shared/version.model';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-version-page',
   templateUrl: './version-page.component.html',
-  styleUrls: ['./version-page.component.scss']
+  styleUrls: ['./version-page.component.scss'],
 })
 export class VersionPageComponent implements OnInit {
 
diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts
index 8341052468..6ab5bb12ba 100644
--- a/src/app/item-page/version-page/version.resolver.ts
+++ b/src/app/item-page/version-page/version.resolver.ts
@@ -1,13 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { ResolvedAction } from '../../core/resolving/resolver.actions';
-import { Version } from '../../core/shared/version.model';
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
 import { VersionDataService } from '../../core/data/version-data.service';
+import { ResolvedAction } from '../../core/resolving/resolver.actions';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { Version } from '../../core/shared/version.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -25,7 +34,7 @@ export class VersionResolver implements Resolve<RemoteData<Version>> {
   constructor(
     protected versionService: VersionDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
   }
 
@@ -40,7 +49,7 @@ export class VersionResolver implements Resolve<RemoteData<Version>> {
     const versionRD$ = this.versionService.findById(route.params.id,
       true,
       false,
-      ...VERSION_PAGE_LINKS_TO_FOLLOW
+      ...VERSION_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
index 8a0d4a58d9..2ec454ed35 100644
--- a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component';
 
 describe('ItemVersionsDeleteModalComponent', () => {
   let component: ItemVersionsDeleteModalComponent;
@@ -15,7 +18,7 @@ describe('ItemVersionsDeleteModalComponent', () => {
       imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ],
       providers: [
         { provide: NgbActiveModal },
-      ]
+      ],
     }).compileComponents();
   });
 
diff --git a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
index 3aa1bbd49f..159011c173 100644
--- a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
@@ -1,22 +1,26 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'ds-item-versions-delete-modal',
   templateUrl: './item-versions-delete-modal.component.html',
-  styleUrls: ['./item-versions-delete-modal.component.scss']
+  styleUrls: ['./item-versions-delete-modal.component.scss'],
 })
 export class ItemVersionsDeleteModalComponent {
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
   versionNumber: number;
 
   constructor(
-    protected activeModal: NgbActiveModal,) {
+    protected activeModal: NgbActiveModal) {
   }
 
   onModalClose() {
diff --git a/src/app/item-page/versions/item-versions-shared.service.spec.ts b/src/app/item-page/versions/item-versions-shared.service.spec.ts
index d4adbf681f..15ead8f6b5 100644
--- a/src/app/item-page/versions/item-versions-shared.service.spec.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.spec.ts
@@ -1,16 +1,19 @@
 import { TestBed } from '@angular/core/testing';
-
-import { ItemVersionsSharedService } from './item-versions-shared.service';
 import { ActivatedRoute } from '@angular/router';
-import { VersionDataService } from '../../core/data/version-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { VersionDataService } from '../../core/data/version-data.service';
 import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Version } from '../../core/shared/version.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
+import { ItemVersionsSharedService } from './item-versions-shared.service';
 
 describe('ItemVersionsSharedService', () => {
   let service: ItemVersionsSharedService;
@@ -29,7 +32,7 @@ describe('ItemVersionsSharedService', () => {
         { provide: VersionHistoryDataService, useValue: {} },
         { provide: AuthService, useValue: {} },
         { provide: NotificationsService, useValue: notificationsServiceSpy },
-        { provide: TranslateService, useValue: { get: () => undefined, } },
+        { provide: TranslateService, useValue: { get: () => undefined } },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: WorkflowItemDataService, useValue: {} },
       ],
diff --git a/src/app/item-page/versions/item-versions-shared.service.ts b/src/app/item-page/versions/item-versions-shared.service.ts
index 09104f5ddc..dd35434d62 100644
--- a/src/app/item-page/versions/item-versions-shared.service.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.ts
@@ -1,11 +1,12 @@
 import { Injectable } from '@angular/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+
 import { RemoteData } from '../../core/data/remote-data';
 import { Version } from '../../core/shared/version.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ItemVersionsSharedService {
 
@@ -28,7 +29,7 @@ export class ItemVersionsSharedService {
   public notifyCreateNewVersion(newVersionRD: RemoteData<Version>): void {
     const newVersionNumber = newVersionRD?.payload?.version;
     newVersionRD.hasSucceeded ?
-      this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), {version: newVersionNumber})) :
+      this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), { version: newVersionNumber })) :
       this.notificationsService.error(null, this.translateService.get(ItemVersionsSharedService.msg(newVersionRD?.statusCode === 422 ? 'inProgress' : 'failure')));
   }
 
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index 0aa22f80cf..c0e5e83b33 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="!(this.submitted$ | async); else waiting">
+<div *ngIf="(this.submitted$ | async) !== true; else waiting">
   <div class="modal-header">{{'item.version.create.modal.header' | translate}}
     <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
       <span aria-hidden="true">×</span>
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
index 657e8c0e75..c74b8337a2 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
+
+import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component';
 
 describe('ItemVersionsSummaryModalComponent', () => {
   let component: ItemVersionsSummaryModalComponent;
@@ -15,7 +18,7 @@ describe('ItemVersionsSummaryModalComponent', () => {
       imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ],
       providers: [
         { provide: NgbActiveModal },
-      ]
+      ],
     }).compileComponents();
   });
 
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 8f2c7bd62e..341d94cbfc 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,12 +1,18 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BehaviorSubject } from 'rxjs';
+
 import { ModalBeforeDismiss } from '../../../shared/interfaces/modal-before-dismiss.interface';
 
 @Component({
   selector: 'ds-item-versions-summary-modal',
   templateUrl: './item-versions-summary-modal.component.html',
-  styleUrls: ['./item-versions-summary-modal.component.scss']
+  styleUrls: ['./item-versions-summary-modal.component.scss'],
 })
 export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..b3c34aaf70 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,7 +1,7 @@
 <div *ngVar="(versionsRD$ | async)?.payload as versions">
   <div *ngVar="(versionRD$ | async)?.payload as itemVersion">
     <div class="mb-2" *ngIf="versions?.page?.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
+      <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}</h2>
       <ds-alert [type]="AlertTypeEnum.Info" *ngIf="itemVersion">
         {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
       </ds-alert>
@@ -75,7 +75,7 @@
                         <button class="btn btn-sm version-row-element-delete"
                                 [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
                                 [disabled]="isAnyBeingEdited()"
-                                (click)="deleteVersion(version, version.id==itemVersion.id)"
+                                (click)="deleteVersion(version, version.id===itemVersion.id)"
                                 title="{{'item.version.history.table.action.deleteVersion' | translate}}">
                           <i class="fas fa-trash fa-fw"></i>
                         </button>
@@ -98,8 +98,9 @@
                 <ng-container *ngIf="isThisBeingEdited(version); then editSummary else showSummary"></ng-container>
                 <ng-template #showSummary>{{version?.summary}}</ng-template>
                 <ng-template #editSummary>
-                  <input class="form-control" type="text" [(ngModel)]="versionBeingEditedSummary"
-                         (keyup.enter)="onSummarySubmit()"/>
+                  <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                         [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                         class="form-control" type="text"/>
                 </ng-template>
               </div>
 
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index e46f1585d7..be003c049e 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -1,34 +1,51 @@
-import { ItemVersionsComponent } from './item-versions.component';
+import { CommonModule } from '@angular/common';
 import {
-  ComponentFixture, TestBed, waitForAsync
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  EMPTY,
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { Item } from '../../core/shared/item.model';
 import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
-import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { EMPTY, of, of as observableOf } from 'rxjs';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { VersionDataService } from '../../core/data/version-data.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { Router } from '@angular/router';
-import { CommonModule } from '@angular/common';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { ItemSharedModule } from '../item-shared.module';
+import { ItemVersionsComponent } from './item-versions.component';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -80,9 +97,9 @@ describe('ItemVersionsComponent', () => {
     version: createSuccessfulRemoteDataObject$(version1),
     _links: {
       self: {
-        href: '/items/item-identifier-1'
-      }
-    }
+        href: '/items/item-identifier-1',
+      },
+    },
   });
   const item2 = Object.assign(new Item(), {
     id: 'item-identifier-2',
@@ -91,9 +108,9 @@ describe('ItemVersionsComponent', () => {
     version: createSuccessfulRemoteDataObject$(version2),
     _links: {
       self: {
-        href: '/items/item-identifier-2'
-      }
-    }
+        href: '/items/item-identifier-2',
+      },
+    },
   });
   const items = [item1, item2];
   version1.item = createSuccessfulRemoteDataObject$(item1);
@@ -106,10 +123,10 @@ describe('ItemVersionsComponent', () => {
   });
   const authenticationServiceSpy = jasmine.createSpyObj('authenticationService', {
     isAuthenticated: observableOf(true),
-    setRedirectUrl: {}
+    setRedirectUrl: {},
   });
   const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
   const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', {
     findByItem: EMPTY,
@@ -139,20 +156,20 @@ describe('ItemVersionsComponent', () => {
       declarations: [ItemVersionsComponent, VarDirective],
       imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
-        {provide: PaginationService, useValue: new PaginationServiceStub()},
-        {provide: UntypedFormBuilder, useValue: new UntypedFormBuilder()},
-        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
-        {provide: AuthService, useValue: authenticationServiceSpy},
-        {provide: AuthorizationDataService, useValue: authorizationServiceSpy},
-        {provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy},
-        {provide: ItemDataService, useValue: itemDataServiceSpy},
-        {provide: VersionDataService, useValue: versionServiceSpy},
-        {provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy},
-        {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy},
-        {provide: ConfigurationDataService, useValue: configurationServiceSpy},
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: AuthService, useValue: authenticationServiceSpy },
+        { provide: AuthorizationDataService, useValue: authorizationServiceSpy },
+        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
+        { provide: ItemDataService, useValue: itemDataServiceSpy },
+        { provide: VersionDataService, useValue: versionServiceSpy },
+        { provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy },
+        { provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy },
+        { provide: ConfigurationDataService, useValue: configurationServiceSpy },
         { provide: Router, useValue: routerSpy },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     versionHistoryService = TestBed.inject(VersionHistoryDataService);
@@ -220,20 +237,21 @@ describe('ItemVersionsComponent', () => {
       authorizationServiceSpy.isAuthorized.and.callFake(canDelete);
     }));
     it('should not disable the delete button', () => {
-      const deleteButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-delete`));
-      deleteButtons.forEach((btn) => {
+      const deleteButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-delete'));
+      expect(deleteButtons.length).not.toBe(0);
+      deleteButtons.forEach((btn: DebugElement) => {
         expect(btn.nativeElement.disabled).toBe(false);
       });
     });
-    it('should disable other buttons', () => {
-      const createButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
-      createButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
-      });
-      const editButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
-      editButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
-      });
+
+    it('should hide the create buttons', () => {
+      const createButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-create'));
+      expect(createButtons.length).toBe(0);
+    });
+
+    it('should hide the edit buttons', () => {
+      const editButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-edit'));
+      expect(editButtons.length).toBe(0);
     });
   });
 
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 700a35552c..8710d3e6a6 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -1,7 +1,13 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Item } from '../../core/shared/item.model';
-import { Version } from '../../core/shared/version.model';
-import { RemoteData } from '../../core/data/remote-data';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   combineLatest,
@@ -9,50 +15,60 @@ import {
   of,
   Subscription,
 } from 'rxjs';
-import { VersionHistory } from '../../core/shared/version-history.model';
+import {
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Item } from '../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../core/shared/operators';
-import { map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
-import { PaginatedList } from '../../core/data/paginated-list.model';
+import { Version } from '../../core/shared/version.model';
+import { VersionHistory } from '../../core/shared/version-history.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { AlertType } from '../../shared/alert/aletr-type';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { hasValue, hasValueOperator } from '../../shared/empty.util';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import {
   getItemEditVersionhistoryRoute,
   getItemPageRoute,
-  getItemVersionRoute
+  getItemVersionRoute,
 } from '../item-page-routing-paths';
-import { UntypedFormBuilder } from '@angular/forms';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component';
-import { VersionDataService } from '../../core/data/version-data.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { Router } from '@angular/router';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemVersionsSharedService } from './item-versions-shared.service';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component';
 
 @Component({
   selector: 'ds-item-versions',
   templateUrl: './item-versions.component.html',
-  styleUrls: ['./item-versions.component.scss']
+  styleUrls: ['./item-versions.component.scss'],
 })
 
 /**
@@ -137,7 +153,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
   options = Object.assign(new PaginationComponentOptions(), {
     id: 'ivo',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.pageSize,
   });
 
   /**
@@ -238,19 +254,19 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
       getFirstSucceededRemoteData(),
       switchMap((findRes: RemoteData<Version>) => {
         const payload = findRes.payload;
-        const summary = {summary: this.versionBeingEditedSummary,};
+        const summary = { summary: this.versionBeingEditedSummary };
         const updatedVersion = Object.assign({}, payload, summary);
         return this.versionService.update(updatedVersion).pipe(getFirstCompletedRemoteData<Version>());
       }),
     ).subscribe((updatedVersionRD: RemoteData<Version>) => {
-        if (updatedVersionRD.hasSucceeded) {
-          this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': this.versionBeingEditedNumber}));
-          this.getAllVersions(this.versionHistory$);
-        } else {
-          this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber}));
-        }
-        this.disableVersionEditing();
+      if (updatedVersionRD.hasSucceeded) {
+        this.notificationsService.success(null, this.translateService.get(successMessageKey, { 'version': this.versionBeingEditedNumber }));
+        this.getAllVersions(this.versionHistory$);
+      } else {
+        this.notificationsService.warning(null, this.translateService.get(failureMessageKey, { 'version': this.versionBeingEditedNumber }));
       }
+      this.disableVersionEditing();
+    },
     );
   }
 
@@ -290,12 +306,12 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
           // Retrieve version history
           mergeMap((item: Item) => combineLatest([
             of(item),
-            this.versionHistoryService.getVersionHistoryFromVersion$(version)
+            this.versionHistoryService.getVersionHistoryFromVersion$(version),
           ])),
           // Delete item
           mergeMap(([item, versionHistory]: [Item, VersionHistory]) => combineLatest([
             this.deleteItemAndGetResult$(item),
-            of(versionHistory)
+            of(versionHistory),
           ])),
           // Retrieve new latest version
           mergeMap(([deleteItemResult, versionHistory]: [boolean, VersionHistory]) => combineLatest([
@@ -304,14 +320,14 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
               tap(() => {
                 this.getAllVersions(of(versionHistory));
               }),
-            )
+            ),
           ])),
         ).subscribe(([deleteHasSucceeded, newLatestVersionItem]: [boolean, Item]) => {
           // Notify operation result and redirect to latest item
           if (deleteHasSucceeded) {
-            this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber}));
+            this.notificationsService.success(null, this.translateService.get(successMessageKey, { 'version': versionNumber }));
           } else {
-            this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber}));
+            this.notificationsService.error(null, this.translateService.get(failureMessageKey, { 'version': versionNumber }));
           }
           if (redirectToLatest) {
             const path = getItemEditVersionhistoryRoute(newLatestVersionItem);
@@ -337,7 +353,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
     activeModal.componentInstance.createVersionEvent.pipe(
       mergeMap((summary: string) => combineLatest([
         of(summary),
-        version.item.pipe(getFirstSucceededRemoteDataPayload())
+        version.item.pipe(getFirstSucceededRemoteDataPayload()),
       ])),
       mergeMap(([summary, item]: [string, Item]) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
       getFirstCompletedRemoteData(),
@@ -402,7 +418,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
     return combineLatest([includeSubmitter$, isAdmin$]).pipe(
       map(([includeSubmitter, isAdmin]) => {
         return includeSubmitter && isAdmin;
-      })
+      }),
     );
 
   }
@@ -424,7 +440,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
     combineLatest([versionHistory$, currentPagination]).pipe(
       switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => {
         return this.versionHistoryService.getVersions(versionHistory.id,
-          new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}),
+          new PaginatedSearchOptions({ pagination: Object.assign({}, options, { currentPage: options.currentPage }) }),
           false, true, followLink('item'), followLink('eperson'));
       }),
       getFirstCompletedRemoteData(),
@@ -505,7 +521,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
 
       this.createVersionTitle$ = this.hasDraftVersion$.pipe(
         take(1),
-        switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion'))
+        switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion')),
       );
 
       this.getAllVersions(this.versionHistory$);
@@ -514,7 +530,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
         getRemoteDataPayload(),
         hasValueOperator(),
         map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
-        startWith(false)
+        startWith(false),
       );
       this.itemPageRoutes$ = this.versionsRD$.pipe(
         getAllSucceededRemoteDataPayload(),
@@ -523,7 +539,7 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
           const itemPageRoutes = {};
           versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
           return itemPageRoutes;
-        })
+        }),
       );
     }
   }
diff --git a/src/app/item-page/versions/item-versions.module.ts b/src/app/item-page/versions/item-versions.module.ts
index 577844488d..4fee5cde39 100644
--- a/src/app/item-page/versions/item-versions.module.ts
+++ b/src/app/item-page/versions/item-versions.module.ts
@@ -7,6 +7,7 @@
  */
 
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../../shared/shared.module';
 import { ItemVersionsComponent } from './item-versions.component';
 import { ItemVersionsNoticeComponent } from './notice/item-versions-notice.component';
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
index fb29e54a21..db1756b8c8 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
@@ -1,39 +1,44 @@
-import { ItemVersionsNoticeComponent } from './item-versions-notice.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VersionHistory } from '../../../core/shared/version-history.model';
-import { Version } from '../../../core/shared/version.model';
-import { Item } from '../../../core/shared/item.model';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { Version } from '../../../core/shared/version.model';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { ItemVersionsNoticeComponent } from './item-versions-notice.component';
+
 describe('ItemVersionsNoticeComponent', () => {
   let component: ItemVersionsNoticeComponent;
   let fixture: ComponentFixture<ItemVersionsNoticeComponent>;
   let versionHistoryService: VersionHistoryDataService;
 
   const versionHistory = Object.assign(new VersionHistory(), {
-    id: '1'
+    id: '1',
   });
   const firstVersion = Object.assign(new Version(), {
     id: '1',
     version: 1,
     created: new Date(2020, 1, 1),
     summary: 'first version',
-    versionhistory: createSuccessfulRemoteDataObject$(versionHistory)
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
   });
   const latestVersion = Object.assign(new Version(), {
     id: '2',
     version: 2,
     summary: 'latest version',
     created: new Date(2020, 1, 2),
-    versionhistory: createSuccessfulRemoteDataObject$(versionHistory)
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
   });
   const versions = [latestVersion, firstVersion];
   versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions));
@@ -41,19 +46,19 @@ describe('ItemVersionsNoticeComponent', () => {
     id: 'first_item_id',
     uuid: 'first_item_id',
     handle: '123456789/1',
-    version: createSuccessfulRemoteDataObject$(firstVersion)
+    version: createSuccessfulRemoteDataObject$(firstVersion),
   });
   const latestItem = Object.assign(new Item(), {
     id: 'latest_item_id',
     uuid: 'latest_item_id',
     handle: '123456789/2',
-    version: createSuccessfulRemoteDataObject$(latestVersion)
+    version: createSuccessfulRemoteDataObject$(latestVersion),
   });
   firstVersion.item = createSuccessfulRemoteDataObject$(firstItem);
   latestVersion.item = createSuccessfulRemoteDataObject$(latestItem);
 
   const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
-    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ]
+    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$' ],
   );
 
   beforeEach(waitForAsync(() => {
@@ -62,9 +67,9 @@ describe('ItemVersionsNoticeComponent', () => {
       declarations: [ItemVersionsNoticeComponent],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy }
+        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     versionHistoryService = TestBed.inject(VersionHistoryDataService);
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index 8a8f5ff76f..c4af76707d 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,23 +1,35 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
-import { VersionHistory } from '../../../core/shared/version-history.model';
-import { Version } from '../../../core/shared/version.model';
-import { hasValue, hasValueOperator } from '../../../shared/empty.util';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { map, startWith, switchMap } from 'rxjs/operators';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { Version } from '../../../core/shared/version.model';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../../shared/empty.util';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions-notice',
-  templateUrl: './item-versions-notice.component.html'
+  templateUrl: './item-versions-notice.component.html',
 })
 /**
  * Component for displaying a warning notice when the item is not the latest version within its version history
@@ -73,12 +85,12 @@ export class ItemVersionsNoticeComponent implements OnInit {
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
         hasValueOperator(),
-        switchMap((version: Version) => version.versionhistory)
+        switchMap((version: Version) => version.versionhistory),
       );
 
       this.latestVersion$ = this.versionHistoryRD$.pipe(
         getFirstSucceededRemoteDataPayload(),
-        switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh))
+        switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)),
       );
 
       this.showLatestVersionNotice$ = this.versionRD$.pipe(
diff --git a/src/app/login-page/login-page-routing.module.ts b/src/app/login-page/login-page-routing.module.ts
index 3a48852625..5a6a1c9b0b 100644
--- a/src/app/login-page/login-page-routing.module.ts
+++ b/src/app/login-page/login-page-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 import { ThemedLoginPageComponent } from './themed-login-page.component';
@@ -7,13 +8,13 @@ import { ThemedLoginPageComponent } from './themed-login-page.component';
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', pathMatch: 'full', component: ThemedLoginPageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'login', title: 'login.title' } }
-    ])
+      { path: '', pathMatch: 'full', component: ThemedLoginPageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'login', title: 'login.title' } },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class LoginPageRoutingModule {
 }
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index 2a95e0ce1c..c38444bec8 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -3,8 +3,8 @@
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.png" alt="{{'repository.image.logo' | translate}}">
       <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
+      <ds-themed-log-in
+      [isStandalonePage]="true"></ds-themed-log-in>
     </div>
   </div>
 </div>
diff --git a/src/app/login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts
index baaa3430ac..326e4736c9 100644
--- a/src/app/login-page/login-page.component.spec.ts
+++ b/src/app/login-page/login-page.component.spec.ts
@@ -1,39 +1,42 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { LoginPageComponent } from './login-page.component';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
+import { LoginPageComponent } from './login-page.component';
 
 describe('LoginPageComponent', () => {
   let comp: LoginPageComponent;
   let fixture: ComponentFixture<LoginPageComponent>;
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({})
+    params: observableOf({}),
   });
 
   const store: Store<LoginPageComponent> = jasmine.createSpyObj('store', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [LoginPageComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Store, useValue: store }
+        { provide: Store, useValue: store },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts
index f618f5329e..e149a5f8d6 100644
--- a/src/app/login-page/login-page.component.ts
+++ b/src/app/login-page/login-page.component.ts
@@ -1,20 +1,32 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
-import { combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
 
 import { AppState } from '../app.reducer';
 import {
   AddAuthenticationMessageAction,
   AuthenticatedAction,
   AuthenticationSuccessAction,
-  ResetAuthenticationMessagesAction
+  ResetAuthenticationMessagesAction,
 } from '../core/auth/auth.actions';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
 import { isAuthenticated } from '../core/auth/selectors';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
 
 /**
  * This component represents the login page
@@ -22,7 +34,7 @@ import { isAuthenticated } from '../core/auth/selectors';
 @Component({
   selector: 'ds-login-page',
   styleUrls: ['./login-page.component.scss'],
-  templateUrl: './login-page.component.html'
+  templateUrl: './login-page.component.html',
 })
 export class LoginPageComponent implements OnDestroy, OnInit {
 
@@ -49,7 +61,7 @@ export class LoginPageComponent implements OnDestroy, OnInit {
     const authenticated = this.store.select(isAuthenticated);
     this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe(
       filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)),
-      take(1)
+      take(1),
     ).subscribe(([params, auth]) => {
       const token = params.token;
       let authToken: AuthTokenInfo;
diff --git a/src/app/login-page/login-page.module.ts b/src/app/login-page/login-page.module.ts
index 4facc82df1..995acade87 100644
--- a/src/app/login-page/login-page.module.ts
+++ b/src/app/login-page/login-page.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { LoginPageComponent } from './login-page.component';
 import { LoginPageRoutingModule } from './login-page-routing.module';
@@ -13,8 +14,8 @@ import { ThemedLoginPageComponent } from './themed-login-page.component';
   ],
   declarations: [
     LoginPageComponent,
-    ThemedLoginPageComponent
-  ]
+    ThemedLoginPageComponent,
+  ],
 })
 export class LoginPageModule {
 
diff --git a/src/app/login-page/themed-login-page.component.ts b/src/app/login-page/themed-login-page.component.ts
index e314b4a3f7..5ff498018f 100644
--- a/src/app/login-page/themed-login-page.component.ts
+++ b/src/app/login-page/themed-login-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { LoginPageComponent } from './login-page.component';
 
@@ -8,7 +9,7 @@ import { LoginPageComponent } from './login-page.component';
 @Component({
   selector: 'ds-themed-login-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedLoginPageComponent extends ThemedComponent<LoginPageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/logout-page/logout-page-routing.module.ts b/src/app/logout-page/logout-page-routing.module.ts
index a5df0fe580..38c55410d2 100644
--- a/src/app/logout-page/logout-page-routing.module.ts
+++ b/src/app/logout-page/logout-page-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ThemedLogoutPageComponent } from './themed-logout-page.component';
 
@@ -10,9 +11,9 @@ import { ThemedLogoutPageComponent } from './themed-logout-page.component';
         canActivate: [AuthenticatedGuard],
         path: '',
         component: ThemedLogoutPageComponent,
-        data: { title: 'logout.title' }
-      }
-    ])
-  ]
+        data: { title: 'logout.title' },
+      },
+    ]),
+  ],
 })
 export class LogoutPageRoutingModule { }
diff --git a/src/app/logout-page/logout-page.component.spec.ts b/src/app/logout-page/logout-page.component.spec.ts
index 327e64b756..054f0c5102 100644
--- a/src/app/logout-page/logout-page.component.spec.ts
+++ b/src/app/logout-page/logout-page.component.spec.ts
@@ -1,5 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { LogoutPageComponent } from './logout-page.component';
@@ -11,10 +15,10 @@ describe('LogoutPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [LogoutPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/logout-page/logout-page.component.ts b/src/app/logout-page/logout-page.component.ts
index 4fa4b9900a..dff5320c5c 100644
--- a/src/app/logout-page/logout-page.component.ts
+++ b/src/app/logout-page/logout-page.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-logout-page',
   styleUrls: ['./logout-page.component.scss'],
-  templateUrl: './logout-page.component.html'
+  templateUrl: './logout-page.component.html',
 })
 export class LogoutPageComponent {
 
diff --git a/src/app/logout-page/logout-page.module.ts b/src/app/logout-page/logout-page.module.ts
index 59a5459e7f..508f3f5909 100644
--- a/src/app/logout-page/logout-page.module.ts
+++ b/src/app/logout-page/logout-page.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { LogoutPageComponent } from './logout-page.component';
 import { LogoutPageRoutingModule } from './logout-page-routing.module';
@@ -13,8 +14,8 @@ import { ThemedLogoutPageComponent } from './themed-logout-page.component';
   ],
   declarations: [
     LogoutPageComponent,
-    ThemedLogoutPageComponent
-  ]
+    ThemedLogoutPageComponent,
+  ],
 })
 export class LogoutPageModule {
 
diff --git a/src/app/logout-page/themed-logout-page.component.ts b/src/app/logout-page/themed-logout-page.component.ts
index 8d4adfd243..535fa10d28 100644
--- a/src/app/logout-page/themed-logout-page.component.ts
+++ b/src/app/logout-page/themed-logout-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { LogoutPageComponent } from './logout-page.component';
 
@@ -8,7 +9,7 @@ import { LogoutPageComponent } from './logout-page.component';
 @Component({
   selector: 'ds-themed-logout-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedLogoutPageComponent extends ThemedComponent<LogoutPageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/lookup-by-id/lookup-by-id-routing.module.ts b/src/app/lookup-by-id/lookup-by-id-routing.module.ts
index 52a7c8a358..12d5874118 100644
--- a/src/app/lookup-by-id/lookup-by-id-routing.module.ts
+++ b/src/app/lookup-by-id/lookup-by-id-routing.module.ts
@@ -1,7 +1,11 @@
-import { LookupGuard } from './lookup-guard';
 import { NgModule } from '@angular/core';
-import { RouterModule, UrlSegment } from '@angular/router';
+import {
+  RouterModule,
+  UrlSegment,
+} from '@angular/router';
+
 import { isNotEmpty } from '../shared/empty.util';
+import { LookupGuard } from './lookup-guard';
 import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component';
 
 @NgModule({
@@ -10,12 +14,12 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
       {
         matcher: urlMatcher,
         canActivate: [LookupGuard],
-        component: ThemedObjectNotFoundComponent  }
-    ])
+        component: ThemedObjectNotFoundComponent  },
+    ]),
   ],
   providers: [
-    LookupGuard
-  ]
+    LookupGuard,
+  ],
 })
 
 export class LookupRoutingModule {
@@ -35,8 +39,8 @@ export function urlMatcher(url) {
       consumed: url,
       posParams: {
         idType: new UrlSegment(idType, {}),
-        id: new UrlSegment(id, {})
-      }
+        id: new UrlSegment(id, {}),
+      },
     };
   }
   return null;
diff --git a/src/app/lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts
index 8a09d369e8..83177b9c57 100644
--- a/src/app/lookup-by-id/lookup-by-id.module.ts
+++ b/src/app/lookup-by-id/lookup-by-id.module.ts
@@ -1,9 +1,10 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { SharedModule } from '../shared/shared.module';
 import { LookupRoutingModule } from './lookup-by-id-routing.module';
 import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component';
-import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component';
 
 @NgModule({
@@ -14,11 +15,11 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
   ],
   declarations: [
     ObjectNotFoundComponent,
-    ThemedObjectNotFoundComponent
+    ThemedObjectNotFoundComponent,
   ],
   providers: [
     DsoRedirectService,
-  ]
+  ],
 })
 export class LookupIdModule {
 
diff --git a/src/app/lookup-by-id/lookup-guard.spec.ts b/src/app/lookup-by-id/lookup-guard.spec.ts
index 63bb68884e..1380f0c689 100644
--- a/src/app/lookup-by-id/lookup-guard.spec.ts
+++ b/src/app/lookup-by-id/lookup-guard.spec.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { IdentifierType } from '../core/data/request.models';
 import { LookupGuard } from './lookup-guard';
 
@@ -9,7 +10,7 @@ describe('LookupGuard', () => {
   beforeEach(() => {
     dsoService = {
       findByIdAndIDType: jasmine.createSpy('findByIdAndIDType').and.returnValue(observableOf({ hasFailed: false,
-        hasSucceeded: true }))
+        hasSucceeded: true })),
     };
     guard = new LookupGuard(dsoService);
   });
@@ -18,8 +19,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '1234',
-        idType: '123456789'
-      }
+        idType: '123456789',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('hdl:123456789/1234', IdentifierType.HANDLE);
@@ -29,8 +30,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '123456789%2F1234',
-        idType: 'handle'
-      }
+        idType: 'handle',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('hdl:123456789%2F1234', IdentifierType.HANDLE);
@@ -40,8 +41,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
-        idType: 'uuid'
-      }
+        idType: 'uuid',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('34cfed7c-f597-49ef-9cbe-ea351f0023c2', IdentifierType.UUID);
diff --git a/src/app/lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts
index 299eb3cda9..ed69d47521 100644
--- a/src/app/lookup-by-id/lookup-guard.ts
+++ b/src/app/lookup-by-id/lookup-guard.ts
@@ -1,10 +1,15 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { IdentifierType } from '../core/data/request.models';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { RemoteData } from '../core/data/remote-data';
+
 import { DsoRedirectService } from '../core/data/dso-redirect.service';
+import { RemoteData } from '../core/data/remote-data';
+import { IdentifierType } from '../core/data/request.models';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 
 interface LookupParams {
@@ -21,7 +26,7 @@ export class LookupGuard implements CanActivate {
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>  {
     const params = this.getLookupParams(route);
     return this.dsoService.findByIdAndIDType(params.id, params.type).pipe(
-      map((response: RemoteData<DSpaceObject>) => response.hasFailed)
+      map((response: RemoteData<DSpaceObject>) => response.hasFailed),
     );
   }
 
@@ -47,7 +52,7 @@ export class LookupGuard implements CanActivate {
     }
     return {
       type: type,
-      id: id
+      id: id,
     };
   }
 }
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
index f0139e9251..da8d5a069b 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
@@ -1,11 +1,15 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { ObjectNotFoundComponent } from './objectnotfound.component';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { ObjectNotFoundComponent } from './objectnotfound.component';
 
 describe('ObjectNotFoundComponent', () => {
   let comp: ObjectNotFoundComponent;
@@ -15,21 +19,21 @@ describe('ObjectNotFoundComponent', () => {
   const handlePrefix = '123456789';
   const handleId = '22';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({id: testUUID, idType: uuidType})
+    params: observableOf({ id: testUUID, idType: uuidType }),
   });
   const activatedRouteStubHandle = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({id: handleId, idType: handlePrefix})
+    params: observableOf({ id: handleId, idType: handlePrefix }),
   });
   describe('uuid request', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ], providers: [
-          {provide: ActivatedRoute, useValue: activatedRouteStub}
+          { provide: ActivatedRoute, useValue: activatedRouteStub },
         ],
         declarations: [ObjectNotFoundComponent],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
@@ -54,12 +58,12 @@ describe('ObjectNotFoundComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ], providers: [
-          {provide: ActivatedRoute, useValue: activatedRouteStubHandle}
+          { provide: ActivatedRoute, useValue: activatedRouteStubHandle },
         ],
         declarations: [ObjectNotFoundComponent],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index bbab90f39d..dda5e3fcae 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,5 +1,9 @@
 
-import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 /**
@@ -9,7 +13,7 @@ import { ActivatedRoute } from '@angular/router';
   selector: 'ds-objnotfound',
   styleUrls: ['./objectnotfound.component.scss'],
   templateUrl: './objectnotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class ObjectNotFoundComponent implements OnInit {
 
diff --git a/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
index e2338d5f07..f9910df12c 100644
--- a/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ObjectNotFoundComponent } from './objectnotfound.component';
 
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 838d5a53c5..cfe35ef2ca 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -1,28 +1,33 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MenuResolver } from './menu.resolver';
-import { of as observableOf } from 'rxjs';
-import { FeatureID } from './core/data/feature-authorization/feature-id';
-import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuService } from './shared/menu/menu.service';
-import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
-import { ScriptDataService } from './core/data/processes/script-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
-import { MenuID } from './shared/menu/menu-id.model';
-import { BrowseService } from './core/browse/browse.service';
+import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import createSpy = jasmine.createSpy;
+import { of as observableOf } from 'rxjs';
+
+import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
+import { BrowseService } from './core/browse/browse.service';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from './core/data/feature-authorization/feature-id';
+import { ScriptDataService } from './core/data/processes/script-data.service';
+import { MenuResolver } from './menu.resolver';
+import { MenuService } from './shared/menu/menu.service';
+import { MenuID } from './shared/menu/menu-id.model';
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
+import { ConfigurationDataServiceStub } from './shared/testing/configuration-data.service.stub';
+import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { createPaginatedList } from './shared/testing/utils.test';
+import createSpy = jasmine.createSpy;
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
-  id: 'some menu'
+  id: 'some menu',
 };
 const BROWSE_DEFINITIONS = [
   { id: 'definition1' },
@@ -37,6 +42,7 @@ describe('MenuResolver', () => {
   let browseService;
   let authorizationService;
   let scriptService;
+  let configurationDataService;
 
   beforeEach(waitForAsync(() => {
     menuService = new MenuServiceStub();
@@ -44,15 +50,18 @@ describe('MenuResolver', () => {
     spyOn(menuService, 'addSection');
 
     browseService = jasmine.createSpyObj('browseService', {
-      getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS))
+      getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS)),
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     scriptService = jasmine.createSpyObj('scriptService', {
-      scriptWithNameExistsAndCanExecute: observableOf(true)
+      scriptWithNameExistsAndCanExecute: observableOf(true),
     });
 
+    configurationDataService = new ConfigurationDataServiceStub();
+    spyOn(configurationDataService, 'findByPropertyName').and.returnValue(observableOf(true));
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
       declarations: [AdminSidebarComponent],
@@ -61,14 +70,15 @@ describe('MenuResolver', () => {
         { provide: BrowseService, useValue: browseService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
-          }
-        }
+            },
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     });
     resolver = TestBed.inject(MenuResolver);
   }));
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index cad6a6ec57..ea20e29498 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -1,58 +1,59 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest as observableCombineLatest, combineLatest, Observable } from 'rxjs';
-import { MenuID } from './shared/menu/menu-id.model';
-import { MenuState } from './shared/menu/menu-state.model';
-import { MenuItemType } from './shared/menu/menu-item-type.model';
-import { LinkMenuItemModel } from './shared/menu/menu-item/models/link.model';
-import { getFirstCompletedRemoteData } from './core/shared/operators';
-import { PaginatedList } from './core/data/paginated-list.model';
-import { BrowseDefinition } from './core/shared/browse-definition.model';
-import { RemoteData } from './core/data/remote-data';
-import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
-import { BrowseService } from './core/browse/browse.service';
-import { MenuService } from './shared/menu/menu.service';
-import { filter, find, map, take } from 'rxjs/operators';
-import { hasValue } from './shared/empty.util';
-import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
-  ThemedCreateCommunityParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
-import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model';
-import {
-  ThemedCreateCollectionParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
-import {
-  ThemedCreateItemParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import {
-  ThemedEditCommunitySelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
-import {
-  ThemedEditCollectionSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
-import {
-  ThemedEditItemSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
-import {
-  ExportMetadataSelectorComponent
-} from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { BrowseService } from './core/browse/browse.service';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from './core/data/feature-authorization/feature-id';
+import { PaginatedList } from './core/data/paginated-list.model';
 import {
   METADATA_EXPORT_SCRIPT_NAME,
   METADATA_IMPORT_SCRIPT_NAME,
-  ScriptDataService
+  ScriptDataService,
 } from './core/data/processes/script-data.service';
-import {
-  ExportBatchSelectorComponent
-} from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { RemoteData } from './core/data/remote-data';
+import { BrowseDefinition } from './core/shared/browse-definition.model';
+import { ConfigurationProperty } from './core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from './core/shared/operators';
+import { ThemedCreateCollectionParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
+import { ThemedCreateCommunityParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
+import { ThemedCreateItemParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
+import { ThemedEditCollectionSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
+import { ThemedEditCommunitySelectorComponent } from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
+import { ThemedEditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
+import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { ExportMetadataSelectorComponent } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import { hasValue } from './shared/empty.util';
+import { MenuService } from './shared/menu/menu.service';
+import { MenuID } from './shared/menu/menu-id.model';
+import { LinkMenuItemModel } from './shared/menu/menu-item/models/link.model';
+import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model';
+import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
+import { MenuItemType } from './shared/menu/menu-item-type.model';
+import { MenuState } from './shared/menu/menu-state.model';
 
 /**
  * Creates all of the app's menus
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class MenuResolver implements Resolve<boolean> {
   constructor(
@@ -61,6 +62,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected authorizationService: AuthorizationDataService,
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
+    protected configurationDataService: ConfigurationDataService,
   ) {
   }
 
@@ -102,9 +104,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: `menu.section.browse_global_communities_and_collections`,
-          link: `/community-list`
-        } as LinkMenuItemModel
-      }
+          link: `/community-list`,
+        } as LinkMenuItemModel,
+      },
     ];
     // Read the different Browse-By types from config and add them to the browse menu
     this.browseService.getBrowseDefinitions()
@@ -120,8 +122,8 @@ export class MenuResolver implements Resolve<boolean> {
               model: {
                 type: MenuItemType.LINK,
                 text: `menu.section.browse_global_by_${browseDef.id}`,
-                link: `/browse/${browseDef.id}`
-              } as LinkMenuItemModel
+                link: `/browse/${browseDef.id}`,
+              } as LinkMenuItemModel,
             });
           });
           menuList.push(
@@ -133,13 +135,13 @@ export class MenuResolver implements Resolve<boolean> {
               index: 1,
               model: {
                 type: MenuItemType.TEXT,
-                text: 'menu.section.browse_global'
+                text: 'menu.section.browse_global',
               } as TextMenuItemModel,
-            }
+            },
           );
         }
         menuList.forEach((menuSection) => this.menuService.addSection(MenuID.PUBLIC, Object.assign(menuSection, {
-          shouldPersistOnRouteChange: true
+          shouldPersistOnRouteChange: true,
         })));
       });
 
@@ -155,6 +157,7 @@ export class MenuResolver implements Resolve<boolean> {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
+    this.createReportMenuSections();
 
     return this.waitForMenu$(MenuID.ADMIN);
   }
@@ -170,7 +173,9 @@ export class MenuResolver implements Resolve<boolean> {
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
       this.authorizationService.isAuthorized(FeatureID.CanSubmit),
       this.authorizationService.isAuthorized(FeatureID.CanEditItem),
-    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem]) => {
+      this.authorizationService.isAuthorized(FeatureID.CanSeeQA),
+      this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled),
+    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem, canSeeQa, isCoarNotifyEnabled]) => {
       const newSubMenuList = [
         {
           id: 'new_community',
@@ -182,7 +187,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.new_community',
             function: () => {
               this.modalService.open(ThemedCreateCommunityParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -195,7 +200,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.new_collection',
             function: () => {
               this.modalService.open(ThemedCreateCollectionParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -208,7 +213,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.new_item',
             function: () => {
               this.modalService.open(ThemedCreateItemParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -219,8 +224,20 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.new_process',
-            link: '/processes/new'
+            link: '/processes/new',
           } as LinkMenuItemModel,
+        },/*  ldn_services */
+        {
+          id: 'ldn_services_new',
+          parentID: 'new',
+          active: false,
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.services_new',
+            link: '/admin/ldn/services/new',
+          } as LinkMenuItemModel,
+          icon: '',
         },
       ];
       const editSubMenuList = [
@@ -235,7 +252,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.edit_community',
             function: () => {
               this.modalService.open(ThemedEditCommunitySelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -248,7 +265,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.edit_collection',
             function: () => {
               this.modalService.open(ThemedEditCollectionSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -261,7 +278,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.edit_item',
             function: () => {
               this.modalService.open(ThemedEditItemSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
       ];
@@ -271,10 +288,10 @@ export class MenuResolver implements Resolve<boolean> {
         visible: newSubMenuList.some(subMenu => subMenu.visible),
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.new'
+          text: 'menu.section.new',
         } as TextMenuItemModel,
         icon: 'plus',
-        index: 0
+        index: 0,
       };
       const editSubMenu = {
         id: 'edit',
@@ -282,10 +299,10 @@ export class MenuResolver implements Resolve<boolean> {
         visible: editSubMenuList.some(subMenu => subMenu.visible),
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.edit'
+          text: 'menu.section.edit',
         } as TextMenuItemModel,
         icon: 'pencil-alt',
-        index: 1
+        index: 1,
       };
 
       const menuList = [
@@ -344,10 +361,45 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.processes',
-            link: '/processes'
+            link: '/processes',
           } as LinkMenuItemModel,
           icon: 'terminal',
-          index: 10
+          index: 10,
+        },
+        /* COAR Notify section */
+        {
+          id: 'coar_notify',
+          active: false,
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.coar_notify',
+          } as TextMenuItemModel,
+          icon: 'inbox',
+          index: 13,
+        },
+        {
+          id: 'notify_dashboard',
+          active: false,
+          parentID: 'coar_notify',
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.notify_dashboard',
+            link: '/admin/notify-dashboard',
+          } as LinkMenuItemModel,
+        },
+        /* LDN Services */
+        {
+          id: 'ldn_services',
+          active: false,
+          parentID: 'coar_notify',
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.services',
+            link: '/admin/ldn/services',
+          } as LinkMenuItemModel,
         },
         {
           id: 'health',
@@ -356,14 +408,49 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.health',
-            link: '/health'
+            link: '/health',
           } as LinkMenuItemModel,
           icon: 'heartbeat',
-          index: 11
+          index: 11,
         },
+        /* Notifications */
+        {
+          id: 'notifications',
+          active: false,
+          visible: canSeeQa || isSiteAdmin,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.notifications',
+          } as TextMenuItemModel,
+          icon: 'bell',
+          index: 4,
+        },
+        {
+          id: 'notifications_quality-assurance',
+          parentID: 'notifications',
+          active: false,
+          visible: canSeeQa,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.quality-assurance',
+            link: '/notifications/quality-assurance',
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'notifications_publication-claim',
+          parentID: 'notifications',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.notifications_publication-claim',
+            link: '/admin/notifications/' + PUBLICATION_CLAIMS_PATH,
+          } as LinkMenuItemModel,
+        },
+        /*  Admin Search */
       ];
       menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       })));
     });
   }
@@ -418,10 +505,10 @@ export class MenuResolver implements Resolve<boolean> {
 
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)
+      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME),
     ]).pipe(
       filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists),
-      take(1)
+      take(1),
     ).subscribe(() => {
       // Hides the export menu for unauthorised people
       // If in the future more sub-menus are added,
@@ -432,11 +519,11 @@ export class MenuResolver implements Resolve<boolean> {
         visible: true,
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.export'
+          text: 'menu.section.export',
         } as TextMenuItemModel,
         icon: 'file-export',
         index: 3,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'export_metadata',
@@ -448,9 +535,9 @@ export class MenuResolver implements Resolve<boolean> {
           text: 'menu.section.export_metadata',
           function: () => {
             this.modalService.open(ExportMetadataSelectorComponent);
-          }
+          },
         } as OnClickMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'export_batch',
@@ -462,9 +549,9 @@ export class MenuResolver implements Resolve<boolean> {
           text: 'menu.section.export_batch',
           function: () => {
             this.modalService.open(ExportBatchSelectorComponent);
-          }
+          },
         } as OnClickMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
     });
   }
@@ -479,10 +566,10 @@ export class MenuResolver implements Resolve<boolean> {
 
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)
+      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME),
     ]).pipe(
       filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists),
-      take(1)
+      take(1),
     ).subscribe(() => {
       // Hides the import menu for unauthorised people
       // If in the future more sub-menus are added,
@@ -493,7 +580,7 @@ export class MenuResolver implements Resolve<boolean> {
         visible: true,
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.import'
+          text: 'menu.section.import',
         } as TextMenuItemModel,
         icon: 'file-import',
         index: 2,
@@ -507,9 +594,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: 'menu.section.import_metadata',
-          link: '/admin/metadata-import'
+          link: '/admin/metadata-import',
         } as LinkMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'import_batch',
@@ -519,9 +606,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: 'menu.section.import_batch',
-          link: '/admin/batch-import'
+          link: '/admin/batch-import',
         } as LinkMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
     });
   }
@@ -530,101 +617,101 @@ export class MenuResolver implements Resolve<boolean> {
    * Create menu sections dependent on whether or not the current user is a site administrator
    */
   createSiteAdministratorMenuSections() {
-    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).subscribe((authorized) => {
-      const menuList = [
-        /*  Admin Search */
-        {
-          id: 'admin_search',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.admin_search',
-            link: '/admin/search'
-          } as LinkMenuItemModel,
-          icon: 'search',
-          index: 5
-        },
-        /*  Registries */
-        {
-          id: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.registries'
-          } as TextMenuItemModel,
-          icon: 'list',
-          index: 6
-        },
-        {
-          id: 'registries_metadata',
-          parentID: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.registries_metadata',
-            link: 'admin/registries/metadata'
-          } as LinkMenuItemModel,
-        },
-        {
-          id: 'registries_format',
-          parentID: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.registries_format',
-            link: 'admin/registries/bitstream-formats'
-          } as LinkMenuItemModel,
-        },
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf)
+      .subscribe((authorized) => {
+        const menuList = [
+          {
+            id: 'admin_search',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.admin_search',
+              link: '/admin/search',
+            } as LinkMenuItemModel,
+            icon: 'search',
+            index: 5,
+          },
+          /*  Registries */
+          {
+            id: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.TEXT,
+              text: 'menu.section.registries',
+            } as TextMenuItemModel,
+            icon: 'list',
+            index: 6,
+          },
+          {
+            id: 'registries_metadata',
+            parentID: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.registries_metadata',
+              link: 'admin/registries/metadata',
+            } as LinkMenuItemModel,
+          },
+          {
+            id: 'registries_format',
+            parentID: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.registries_format',
+              link: 'admin/registries/bitstream-formats',
+            } as LinkMenuItemModel,
+          },
 
-        /* Curation tasks */
-        {
-          id: 'curation_tasks',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.curation_task',
-            link: 'admin/curation-tasks'
-          } as LinkMenuItemModel,
-          icon: 'filter',
-          index: 7
-        },
+          /* Curation tasks */
+          {
+            id: 'curation_tasks',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.curation_task',
+              link: 'admin/curation-tasks',
+            } as LinkMenuItemModel,
+            icon: 'filter',
+            index: 7,
+          },
 
-        /* Workflow */
-        {
-          id: 'workflow',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.workflow',
-            link: '/admin/workflow'
-          } as LinkMenuItemModel,
-          icon: 'user-check',
-          index: 11
-        },
-        {
-          id: 'system_wide_alert',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.system-wide-alert',
-            link: '/admin/system-wide-alert'
-          } as LinkMenuItemModel,
-          icon: 'exclamation-circle',
-          index: 12
-        },
-      ];
+          /* Workflow */
+          {
+            id: 'workflow',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.workflow',
+              link: '/admin/workflow',
+            } as LinkMenuItemModel,
+            icon: 'user-check',
+            index: 11,
+          },
+          {
+            id: 'system_wide_alert',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.system-wide-alert',
+              link: '/admin/system-wide-alert',
+            } as LinkMenuItemModel,
+            icon: 'exclamation-circle',
+            index: 12,
+          },
+        ];
 
-      menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
-        shouldPersistOnRouteChange: true
-      })));
-    });
+        menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
+          shouldPersistOnRouteChange: true,
+        })));
+      });
   }
 
   /**
@@ -633,7 +720,7 @@ export class MenuResolver implements Resolve<boolean> {
   createAccessControlMenuSections() {
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.authorizationService.isAuthorized(FeatureID.CanManageGroups)
+      this.authorizationService.isAuthorized(FeatureID.CanManageGroups),
     ]).subscribe(([isSiteAdmin, canManageGroups]) => {
       const menuList = [
         /* Access Control */
@@ -645,7 +732,7 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_people',
-            link: '/access-control/epeople'
+            link: '/access-control/epeople',
           } as LinkMenuItemModel,
         },
         {
@@ -656,7 +743,7 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_groups',
-            link: '/access-control/groups'
+            link: '/access-control/groups',
           } as LinkMenuItemModel,
         },
         {
@@ -667,7 +754,7 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_bulk',
-            link: '/access-control/bulk-access'
+            link: '/access-control/bulk-access',
           } as LinkMenuItemModel,
         },
         // TODO: enable this menu item once the feature has been implemented
@@ -688,10 +775,66 @@ export class MenuResolver implements Resolve<boolean> {
           visible: canManageGroups || isSiteAdmin,
           model: {
             type: MenuItemType.TEXT,
-            text: 'menu.section.access_control'
+            text: 'menu.section.access_control',
           } as TextMenuItemModel,
           icon: 'key',
-          index: 4
+          index: 4,
+        },
+      ];
+
+      menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
+        shouldPersistOnRouteChange: true,
+      })));
+    });
+  }
+
+  /**
+   * Create menu sections dependent on whether or not the current user is a site administrator
+   */
+  createReportMenuSections() {
+    observableCombineLatest([
+      this.configurationDataService.findByPropertyName('contentreport.enable').pipe(
+        map((res: RemoteData<ConfigurationProperty>) => res.hasSucceeded && res.payload && res.payload.values[0] === 'true'),
+      ),
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+    ]).subscribe(([isSiteAdmin]) => {
+      const menuList = [
+        {
+          id: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.reports',
+          } as TextMenuItemModel,
+          icon: 'file-alt',
+          index: 5,
+        },
+        /* Collections Report */
+        {
+          id: 'reports_collections',
+          parentID: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.reports.collections',
+            link: '/admin/reports/collections',
+          } as LinkMenuItemModel,
+          icon: 'user-check',
+        },
+        /* Queries Report */
+        {
+          id: 'reports_queries',
+          parentID: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.reports.queries',
+            link: '/admin/reports/queries',
+          } as LinkMenuItemModel,
+          icon: 'user-check',
         },
       ];
 
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
index af043b447b..ae0284da17 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
@@ -1,28 +1,44 @@
 /* eslint-disable max-classes-per-file */
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, ElementRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  ElementRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-
+import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { Observable } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestScheduler } from 'rxjs/testing';
 
-import { CollectionSelectorComponent } from './collection-selector.component';
-import { CollectionDropdownComponent } from '../../shared/collection-dropdown/collection-dropdown.component';
-import { Collection } from '../../core/shared/collection.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { Community } from '../../core/shared/community.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { MockElementRef } from '../../shared/testing/element-ref.mock';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { CollectionDropdownComponent } from '../../shared/collection-dropdown/collection-dropdown.component';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { MockElementRef } from '../../shared/testing/element-ref.mock';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { CollectionSelectorComponent } from './collection-selector.component';
 
 
 describe('CollectionSelectorComponent', () => {
@@ -34,7 +50,7 @@ describe('CollectionSelectorComponent', () => {
   const community: Community = Object.assign(new Community(), {
     id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-    name: 'Community 1'
+    name: 'Community 1',
   });
 
   const collections: Collection[] = [
@@ -45,9 +61,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 1'
+          value: 'Community 1-Collection 1',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
@@ -56,9 +72,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 2'
+          value: 'Community 1-Collection 2',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
@@ -67,9 +83,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 3'
+          value: 'Community 1-Collection 3',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
@@ -78,9 +94,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 4'
+          value: 'Community 1-Collection 4',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: 'a5159760-f362-4659-9e81-e3253ad91ede',
@@ -89,18 +105,18 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 5'
+          value: 'Community 1-Collection 5',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
-    })
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
+    }),
   ];
 
   const collectionDataServiceMock = {
     getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
       return hot( 'a|', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList(collections))
+        a: createSuccessfulRemoteDataObject(createPaginatedList(collections)),
       });
-    }
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -109,29 +125,29 @@ describe('CollectionSelectorComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ CollectionSelectorComponent, CollectionDropdownComponent ],
       providers: [
-        {provide: CollectionDataService, useValue: collectionDataServiceMock},
-        {provide: ElementRef, useClass: MockElementRef},
-        {provide: NgbActiveModal, useValue: modal},
-        {provide: ActivatedRoute, useValue: {}},
-        ChangeDetectorRef
+        { provide: CollectionDataService, useValue: collectionDataServiceMock },
+        { provide: ElementRef, useClass: MockElementRef },
+        { provide: NgbActiveModal, useValue: modal },
+        { provide: ActivatedRoute, useValue: {} },
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     scheduler = getTestScheduler();
     fixture = TestBed.overrideComponent(CollectionSelectorComponent, {
       set: {
-        template: '<ds-collection-dropdown (selectionChange)="selectObject($event)"></ds-collection-dropdown>'
-      }
+        template: '<ds-collection-dropdown (selectionChange)="selectObject($event)"></ds-collection-dropdown>',
+      },
     }).createComponent(CollectionSelectorComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
index 855dc9c36d..fd39cea117 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { CollectionListEntry } from '../../shared/collection-dropdown/collection-dropdown.component';
@@ -11,7 +10,7 @@ import { CollectionListEntry } from '../../shared/collection-dropdown/collection
 @Component({
   selector: 'ds-collection-selector',
   templateUrl: './collection-selector.component.html',
-  styleUrls: ['./collection-selector.component.scss']
+  styleUrls: ['./collection-selector.component.scss'],
 })
 export class CollectionSelectorComponent {
 
diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
index c388d2d356..e7bc422665 100644
--- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
@@ -1,18 +1,24 @@
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { Context } from '../core/shared/context.model';
+import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock';
+import { RoleServiceMock } from '../shared/mocks/role-service.mock';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../shared/search/models/search-filter.model';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { RoleServiceMock } from '../shared/mocks/role-service.mock';
-import { cold, hot } from 'jasmine-marbles';
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
-import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
-import { Context } from '../core/shared/context.model';
 import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock';
+import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
+import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 
 describe('MyDSpaceConfigurationService', () => {
   let service: MyDSpaceConfigurationService;
@@ -20,25 +26,25 @@ describe('MyDSpaceConfigurationService', () => {
   const prefixFilter = {
     'f.namedresourcetype': ['another value'],
     'f.dateSubmitted.min': ['2013'],
-    'f.dateSubmitted.max': ['2018']
+    'f.dateSubmitted.max': ['2018'],
   };
   const defaults = new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
     sort: new SortOptions('score', SortDirection.DESC),
     query: '',
-    scope: ''
+    scope: '',
   });
 
   const backendFilters = [
     new SearchFilter('f.namedresourcetype', ['another value']),
-    new SearchFilter('f.dateSubmitted', ['[2013 TO 2018]'], 'equals')
+    new SearchFilter('f.dateSubmitted', ['[2013 TO 2018]'], 'equals'),
   ];
 
   const spy = jasmine.createSpyObj('RouteService', {
     getQueryParameterValue: observableOf(value1),
     getQueryParamsWithPrefix: observableOf(prefixFilter),
     getRouteParameterValue: observableOf(''),
-    getRouteDataValue: observableOf({})
+    getRouteDataValue: observableOf({}),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -184,8 +190,8 @@ describe('MyDSpaceConfigurationService', () => {
 
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
-          MyDSpaceConfigurationValueType.Workspace
-        ]
+          MyDSpaceConfigurationValueType.Workspace,
+        ],
       }));
     });
 
@@ -199,8 +205,8 @@ describe('MyDSpaceConfigurationService', () => {
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
           MyDSpaceConfigurationValueType.SupervisedItems,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
 
@@ -214,8 +220,8 @@ describe('MyDSpaceConfigurationService', () => {
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
           MyDSpaceConfigurationValueType.SupervisedItems,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
 
@@ -230,8 +236,8 @@ describe('MyDSpaceConfigurationService', () => {
         b: [
           MyDSpaceConfigurationValueType.Workspace,
           MyDSpaceConfigurationValueType.SupervisedItems,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
   });
@@ -242,8 +248,8 @@ describe('MyDSpaceConfigurationService', () => {
       spyOn(service, 'getAvailableConfigurationTypes').and.returnValue(hot('a', {
         a: [
           MyDSpaceConfigurationValueType.Workspace,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
 
       const list$ = service.getAvailableConfigurationOptions();
@@ -253,14 +259,14 @@ describe('MyDSpaceConfigurationService', () => {
           {
             value: MyDSpaceConfigurationValueType.Workspace,
             label: `mydspace.show.${MyDSpaceConfigurationValueType.Workspace}`,
-            context: Context.Workspace
+            context: Context.Workspace,
           },
           {
             value: MyDSpaceConfigurationValueType.Workflow,
             label: `mydspace.show.${MyDSpaceConfigurationValueType.Workflow}`,
-            context: Context.Workflow
-          }
-        ]
+            context: Context.Workflow,
+          },
+        ],
       }));
     });
   });
diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts
index bc18e0cc18..bbc9ba1c33 100644
--- a/src/app/my-dspace-page/my-dspace-configuration.service.ts
+++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts
@@ -1,27 +1,35 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
+import { LinkService } from '../core/cache/builders/link.service';
+import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { RequestService } from '../core/data/request.service';
+import { PaginationService } from '../core/pagination/pagination.service';
 import { RoleService } from '../core/roles/role.service';
-import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { RouteService } from '../core/services/route.service';
+import { Context } from '../core/shared/context.model';
+import { HALEndpointService } from '../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { RouteService } from '../core/services/route.service';
-import { PaginationService } from '../core/pagination/pagination.service';
-import { LinkService } from '../core/cache/builders/link.service';
-import { HALEndpointService } from '../core/shared/hal-endpoint.service';
-import { RequestService } from '../core/data/request.service';
-import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service';
-import { Context } from '../core/shared/context.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 
 export const MyDSpaceConfigurationToContextMap = new Map([
   [MyDSpaceConfigurationValueType.Workspace, Context.Workspace],
   [MyDSpaceConfigurationValueType.SupervisedItems, Context.SupervisedItems],
-  [MyDSpaceConfigurationValueType.Workflow, Context.Workflow]
+  [MyDSpaceConfigurationValueType.Workflow, Context.Workflow],
 ]);
 
 
@@ -36,7 +44,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
   protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'mydspace-page',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -135,7 +143,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
           configurationOptions.push({ value, label, context });
         });
         return configurationOptions;
-      })
+      }),
     );
   }
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7db6db9a8d..0157110035 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,5 +1,6 @@
-  <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" [disabled]="!(initialized$|async)"
+  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -9,15 +10,15 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission-external' | translate}}"
+            type="button" [disabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="importControlsDropdownMenu"
          aria-labelledby="dropdownImport">
       <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index 86d99fb841..ec7608f8d7 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -1,19 +1,32 @@
-import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
-import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
+
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
 
 export function getMockEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo;
@@ -22,26 +35,26 @@ export function getMockEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type2: ItemType = {
     id: '2',
     label: 'Journal',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type3: ItemType = {
     id: '2',
     label: 'DataPackage',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipTypeImport: rd$,
-    hasMoreThanOneAuthorizedImport: observableOf(true)
+    hasMoreThanOneAuthorizedImport: observableOf(true),
   });
 }
 
@@ -52,12 +65,12 @@ export function getMockEmptyEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipTypeImport: rd$,
-    hasMoreThanOneAuthorizedImport: observableOf(false)
+    hasMoreThanOneAuthorizedImport: observableOf(false),
   });
 }
 
@@ -72,7 +85,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
 
   describe('With only one Entity', () => {
@@ -85,14 +98,14 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
         declarations: [
           MyDSpaceNewExternalDropdownComponent,
           TestComponent,
-          BrowserOnlyMockPipe
+          BrowserOnlyMockPipe,
         ],
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
-          MyDSpaceNewExternalDropdownComponent
+          MyDSpaceNewExternalDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -142,9 +155,9 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
-          MyDSpaceNewExternalDropdownComponent
+          MyDSpaceNewExternalDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -183,7 +196,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 53beb746a1..2c2a77da48 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -1,15 +1,26 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 /**
  * This component represents the 'Import metadata from external source' dropdown menu
@@ -17,7 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 @Component({
   selector: 'ds-my-dspace-new-external-dropdown',
   styleUrls: ['./my-dspace-new-external-dropdown.component.scss'],
-  templateUrl: './my-dspace-new-external-dropdown.component.html'
+  templateUrl: './my-dspace-new-external-dropdown.component.html',
 })
 export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
 
@@ -67,24 +78,24 @@ export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
         if (!response) {
           const findListOptions: FindListOptions = {
             elementsPerPage: 1,
-            currentPage: 1
+            currentPage: 1,
           };
           return this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findListOptions).pipe(
             map((entities: RemoteData<PaginatedList<ItemType>>) => {
               this.initialized$ = observableOf(true);
               return entities.payload.page[0];
             }),
-            take(1)
+            take(1),
           );
         } else {
           this.initialized$ = observableOf(true);
           return observableOf(null);
         }
       }),
-      take(1)
+      take(1),
     );
     this.subs.push(
-      this.singleEntity$.subscribe((result) => this.singleEntity = result )
+      this.singleEntity$.subscribe((result) => this.singleEntity = result ),
     );
   }
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 84d0649277..730b1db1c7 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,5 +1,6 @@
-  <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+            [disabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -7,15 +8,15 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission' | translate}}"
+            type="button"  [disabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="entityControlsDropdownMenu"
          aria-labelledby="dropdownSubmission">
       <ds-entity-dropdown [isSubmission]="true" (selectionChange)="openDialog($event)"></ds-entity-dropdown>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 1ad8e6c0c3..bd150c12b6 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -1,18 +1,31 @@
-import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
+
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
 
 export function getMockEntityTypeService(): EntityTypeDataService {
   const type1: ItemType = {
@@ -20,26 +33,26 @@ export function getMockEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type2: ItemType = {
     id: '2',
     label: 'Journal',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type3: ItemType = {
     id: '2',
     label: 'DataPackage',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipType: rd$,
-    hasMoreThanOneAuthorized: observableOf(true)
+    hasMoreThanOneAuthorized: observableOf(true),
   });
 }
 
@@ -50,12 +63,12 @@ export function getMockEmptyEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipType: rd$,
-    hasMoreThanOneAuthorized: observableOf(false)
+    hasMoreThanOneAuthorized: observableOf(false),
   });
 }
 
@@ -70,13 +83,13 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
 
   const modalStub = {
     open: () => null,
     close: () => null,
-    dismiss: () => null
+    dismiss: () => null,
   };
 
   describe('With only one Entity', () => {
@@ -94,9 +107,9 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
-          MyDSpaceNewSubmissionDropdownComponent
+          MyDSpaceNewSubmissionDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -146,9 +159,9 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
-          MyDSpaceNewSubmissionDropdownComponent
+          MyDSpaceNewSubmissionDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -188,7 +201,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 133086c08b..4283ab89af 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -1,16 +1,27 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { hasValue } from '../../../shared/empty.util';
-import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component represents the new submission dropdown
@@ -18,7 +29,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 @Component({
   selector: 'ds-my-dspace-new-submission-dropdown',
   styleUrls: ['./my-dspace-new-submission-dropdown.component.scss'],
-  templateUrl: './my-dspace-new-submission-dropdown.component.html'
+  templateUrl: './my-dspace-new-submission-dropdown.component.html',
 })
 export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy {
 
@@ -68,24 +79,24 @@ export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy
         if (!response) {
           const findListOptions: FindListOptions = {
             elementsPerPage: 1,
-            currentPage: 1
+            currentPage: 1,
           };
           return this.entityTypeService.getAllAuthorizedRelationshipType(findListOptions).pipe(
             map((entities: RemoteData<PaginatedList<ItemType>>) => {
               this.initialized$ = observableOf(true);
               return entities.payload.page[0];
             }),
-            take(1)
+            take(1),
           );
         } else {
           this.initialized$ = observableOf(true);
           return observableOf(null);
         }
       }),
-      take(1)
+      take(1),
     );
     this.subs.push(
-      this.singleEntity$.subscribe((result) => this.singleEntity = result )
+      this.singleEntity$.subscribe((result) => this.singleEntity = result ),
     );
   }
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
index ed61fab1d6..436a290bfe 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
@@ -1,38 +1,52 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createTestComponent } from '../../shared/testing/utils.test';
-import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
-import { DragService } from '../../core/drag.service';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { DragService } from '../../core/drag.service';
 import { CookieService } from '../../core/services/cookie.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { HostWindowService } from '../../shared/host-window.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
+import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createTestComponent } from '../../shared/testing/utils.test';
+import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
 import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec';
-import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
   const uploader: any = jasmine.createSpyObj('uploader', {
     clearQueue: jasmine.createSpy('clearQueue').and.stub(),
     onBuildItemForm: jasmine.createSpy('onBuildItemForm').and.stub(),
-    uploadAll: jasmine.createSpy('uploadAll').and.stub()
+    uploadAll: jasmine.createSpy('uploadAll').and.stub(),
   });
 
   beforeEach(waitForAsync(() => {
@@ -41,15 +55,15 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         NgbModule,
-        RouterTestingModule
+        RouterTestingModule,
       ],
       declarations: [
         MyDSpaceNewSubmissionComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -65,7 +79,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
         { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -118,7 +132,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index 0694fc63bf..953e3c6707 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,21 +1,28 @@
-import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { AuthService } from '../../core/auth/auth.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SearchResult } from '../../shared/search/models/search-result.model';
-import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component';
 import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
 import { UploaderError } from '../../shared/upload/uploader/uploader-error.model';
-import { Router } from '@angular/router';
+import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component';
 
 /**
  * This component represents the whole mydspace page header
@@ -23,7 +30,7 @@ import { Router } from '@angular/router';
 @Component({
   selector: 'ds-my-dspace-new-submission',
   styleUrls: ['./my-dspace-new-submission.component.scss'],
-  templateUrl: './my-dspace-new-submission.component.html'
+  templateUrl: './my-dspace-new-submission.component.html',
 })
 export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   /**
@@ -72,10 +79,10 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   ngOnInit() {
     this.uploadFilesOptions.autoUpload = false;
     this.sub = this.halService.getEndpoint('workspaceitems').pipe(first()).subscribe((url) => {
-        this.uploadFilesOptions.url = url;
-        this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
-        this.changeDetectorRef.detectChanges();
-      }
+      this.uploadFilesOptions.url = url;
+      this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+      this.changeDetectorRef.detectChanges();
+    },
     );
   }
 
@@ -92,7 +99,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
         // To avoid confusion and ambiguity, redirect the user on the publication page.
         this.router.navigateByUrl(link);
       } else if (workspaceitems.length > 1) {
-        this.notificationsService.success(null, this.translate.get('mydspace.upload.upload-multiple-successful', {qty: workspaceitems.length}));
+        this.notificationsService.success(null, this.translate.get('mydspace.upload.upload-multiple-successful', { qty: workspaceitems.length }));
       }
 
     } else {
diff --git a/src/app/my-dspace-page/my-dspace-page-routing.module.ts b/src/app/my-dspace-page/my-dspace-page-routing.module.ts
index 6894194344..3c970c7c2a 100644
--- a/src/app/my-dspace-page/my-dspace-page-routing.module.ts
+++ b/src/app/my-dspace-page/my-dspace-page-routing.module.ts
@@ -1,8 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { MyDSpaceGuard } from './my-dspace.guard';
 import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 @NgModule({
   imports: [
@@ -11,15 +12,15 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         path: '',
         component: ThemedMyDSpacePageComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'mydspace.title', breadcrumbKey: 'mydspace' },
         canActivate: [
-          MyDSpaceGuard
-        ]
-      }
-    ])
-  ]
+          MyDSpaceGuard,
+        ],
+      },
+    ]),
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the mydspace page path.
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index ea5784170f..cfae8e07a8 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -1,4 +1,6 @@
 <div class="container">
+  <ds-suggestions-notification></ds-suggestions-notification>
+  <ds-my-dspace-qa-events-notifications></ds-my-dspace-qa-events-notifications>
   <ds-my-dspace-new-submission *dsShowOnlyForRole="[roleTypeEnum.Submitter]"></ds-my-dspace-new-submission>
 </div>
 
diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts
index 34bf20d462..d6bcdc3654 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.spec.ts
@@ -1,18 +1,26 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { ComponentFixture, fakeAsync, flush, TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { of as observableOf } from 'rxjs';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from './my-dspace-page.component';
+import { Context } from '../core/shared/context.model';
 import { SearchService } from '../core/shared/search/search.service';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
-import { Context } from '../core/shared/context.model';
+import {
+  MyDSpacePageComponent,
+  SEARCH_CONFIG_SERVICE,
+} from './my-dspace-page.component';
 import SpyObj = jasmine.SpyObj;
 
 describe('MyDSpacePageComponent', () => {
@@ -20,24 +28,24 @@ describe('MyDSpacePageComponent', () => {
   let fixture: ComponentFixture<MyDSpacePageComponent>;
 
   const searchServiceStub: SpyObj<SearchService> = jasmine.createSpyObj('SearchService', {
-    setServiceOptions: jasmine.createSpy('setServiceOptions')
+    setServiceOptions: jasmine.createSpy('setServiceOptions'),
   });
 
   const myDSpaceConfigurationServiceStub: SpyObj<MyDSpaceConfigurationService> = jasmine.createSpyObj('MyDSpaceConfigurationService', {
-    getAvailableConfigurationOptions: jasmine.createSpy('getAvailableConfigurationOptions')
+    getAvailableConfigurationOptions: jasmine.createSpy('getAvailableConfigurationOptions'),
   });
 
   const configurationList = [
     {
       value: MyDSpaceConfigurationValueType.Workspace,
       label: `mydspace.show.${MyDSpaceConfigurationValueType.Workspace}`,
-      context: Context.Workspace
+      context: Context.Workspace,
     },
     {
       value: MyDSpaceConfigurationValueType.Workflow,
       label: `mydspace.show.${MyDSpaceConfigurationValueType.Workflow}`,
-      context: Context.Workflow
-    }
+      context: Context.Workflow,
+    },
   ];
 
   beforeEach(waitForAsync(() => {
@@ -48,16 +56,16 @@ describe('MyDSpacePageComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: MyDSpaceConfigurationService, useValue: myDSpaceConfigurationServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MyDSpacePageComponent, {
       set: {
         providers: [
           {
             provide: SEARCH_CONFIG_SERVICE,
-            useValue: myDSpaceConfigurationServiceStub
-          }
-        ]
-      }
+            useValue: myDSpaceConfigurationServiceStub,
+          },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -77,7 +85,7 @@ describe('MyDSpacePageComponent', () => {
   it('should init properly context and configuration', fakeAsync(() => {
 
     expect(comp.configurationList$).toBeObservable(cold('(a|)', {
-      a: configurationList
+      a: configurationList,
     }));
 
     flush();
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index c5176ef29e..4c12104812 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,16 +1,22 @@
-import { ChangeDetectionStrategy, Component, Inject, InjectionToken, OnInit } from '@angular/core';
-
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  InjectionToken,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { SearchService } from '../core/shared/search/search.service';
+
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
-import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { ViewMode } from '../core/shared/view-mode.model';
 import { MyDSpaceRequest } from '../core/data/request.models';
-import { Context } from '../core/shared/context.model';
 import { RoleType } from '../core/roles/role-types';
+import { Context } from '../core/shared/context.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { ViewMode } from '../core/shared/view-mode.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 
 export const MYDSPACE_ROUTE = '/mydspace';
 export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
@@ -26,9 +32,9 @@ export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> =
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: MyDSpaceConfigurationService
-    }
-  ]
+      useClass: MyDSpaceConfigurationService,
+    },
+  ],
 })
 export class MyDSpacePageComponent implements OnInit {
 
diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts
index 6ad50af96a..2e7afce9ce 100644
--- a/src/app/my-dspace-page/my-dspace-page.module.ts
+++ b/src/app/my-dspace-page/my-dspace-page.module.ts
@@ -1,20 +1,21 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
-
-import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
-import { MyDSpacePageComponent } from './my-dspace-page.component';
-import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
+import { UploadModule } from '../shared/upload/upload.module';
+import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
 import { MyDSpaceGuard } from './my-dspace.guard';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
-import { MyDspaceSearchModule } from './my-dspace-search.module';
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
 import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component';
+import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
+import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
+import { MyDSpacePageComponent } from './my-dspace-page.component';
+import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
+import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
+import { MyDspaceSearchModule } from './my-dspace-search.module';
 import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
-import { SearchModule } from '../shared/search/search.module';
-import { UploadModule } from '../shared/upload/upload.module';
 
 const DECLARATIONS = [
   MyDSpacePageComponent,
@@ -22,7 +23,8 @@ const DECLARATIONS = [
   MyDSpaceNewSubmissionComponent,
   CollectionSelectorComponent,
   MyDSpaceNewSubmissionDropdownComponent,
-  MyDSpaceNewExternalDropdownComponent
+  MyDSpaceNewExternalDropdownComponent,
+  MyDspaceQaEventsNotificationsComponent,
 ];
 
 @NgModule({
@@ -33,11 +35,12 @@ const DECLARATIONS = [
     MyDspacePageRoutingModule,
     MyDspaceSearchModule.withEntryComponents(),
     UploadModule,
+    NotificationsModule,
   ],
   declarations: DECLARATIONS,
   providers: [
     MyDSpaceGuard,
-    MyDSpaceConfigurationService
+    MyDSpaceConfigurationService,
   ],
   exports: DECLARATIONS,
 })
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
new file mode 100644
index 0000000000..e44d2c6e48
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -0,0 +1,29 @@
+<ng-container *ngIf="(sources$ | async)?.length > 0">
+  <ng-container *ngFor="let source of sources$ | async">
+    <div
+      class="alert alert-info d-flex flex-row"
+      *ngIf="source.totalEvents > 0"
+    >
+    <div class="source-logo-container">
+      <img
+        class="source-logo"
+        src="assets/images/qa-{{ source.id }}-logo.png"
+        onerror="this.src='assets/images/dspace-logo.svg'"
+        alt="{{ source.id }} logo"
+      />
+    </div>
+      <div class="w-100 d-flex justify-content-between">
+        <div class="pl-4 align-self-center">
+          {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
+        </div>
+        <button
+          [routerLink]="[getQualityAssuranceRoute(), source.id]"
+          [queryParams]="{ forward: true }"
+          class="btn btn-primary align-self-center"
+        >
+          {{ "mydspace.qa-event-notification-info.check.button" | translate }}
+        </button>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss
new file mode 100644
index 0000000000..2a62342b7c
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss
@@ -0,0 +1,13 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.source-logo-container {
+  width: var(--ds-qa-logo-width);
+  display: flex;
+  justify-content: center;
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts
new file mode 100644
index 0000000000..8f059718a4
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+import { createPaginatedList } from 'src/app/shared/testing/utils.test';
+
+import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications.component';
+
+describe('MyDspaceQaEventsNotificationsComponent', () => {
+  let component: MyDspaceQaEventsNotificationsComponent;
+  let fixture: ComponentFixture<MyDspaceQaEventsNotificationsComponent>;
+
+  let qualityAssuranceSourceDataServiceStub: any;
+  const obj = createSuccessfulRemoteDataObject$(createPaginatedList([new QualityAssuranceSourceObject()]));
+
+  beforeEach(async () => {
+    qualityAssuranceSourceDataServiceStub = {
+      getSources: () => obj,
+    };
+    await TestBed.configureTestingModule({
+      declarations: [ MyDspaceQaEventsNotificationsComponent ],
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(MyDspaceQaEventsNotificationsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
new file mode 100644
index 0000000000..625265c683
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -0,0 +1,66 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  of,
+  tap,
+} from 'rxjs';
+import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
+
+import { getNotificatioQualityAssuranceRoute } from '../../admin/admin-routing-paths';
+import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+
+@Component({
+  selector: 'ds-my-dspace-qa-events-notifications',
+  templateUrl: './my-dspace-qa-events-notifications.component.html',
+  styleUrls: ['./my-dspace-qa-events-notifications.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MyDspaceQaEventsNotificationsComponent  implements OnInit {
+
+  /**
+   * An Observable that emits an array of QualityAssuranceSourceObject.
+   */
+  sources$: Observable<QualityAssuranceSourceObject[]> = of([]);
+
+  constructor(private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService) { }
+
+  ngOnInit(): void {
+    this.getSources();
+  }
+
+  /**
+   * Retrieves the sources for Quality Assurance.
+   * @returns An Observable of the sources for Quality Assurance.
+   * @throws An error if the retrieval of Quality Assurance sources fails.
+   */
+  getSources() {
+    this.sources$ = this.qualityAssuranceSourceDataService.getSources()
+      .pipe(
+        getFirstCompletedRemoteData(),
+        tap((rd) => {
+          if (rd.hasFailed) {
+            throw new Error('Can\'t retrieve Quality Assurance sources');
+          }
+        }),
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+      );
+  }
+
+  /**
+   * Retrieves the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+}
diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
index 71d1343a30..066f144237 100644
--- a/src/app/my-dspace-page/my-dspace-search.module.ts
+++ b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -1,31 +1,30 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '../shared/shared.module';
-
-import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
-import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
-import { ClaimedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
-import { PoolSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
-import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
-import { WorkspaceItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
-import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
-import { ClaimedTaskSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
-import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
-import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
-import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
-import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
-import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
+import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
+import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
 import { ItemCollectionComponent } from '../shared/object-collection/shared/mydspace-item-collection/item-collection.component';
+import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
+import { ClaimedTaskSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
 import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
 import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
+import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
+import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
+import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
+import { WorkspaceItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
+import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
+import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
+import { ClaimedDeclinedTaskSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component';
+import { ClaimedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
 import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
 import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
-import { ClaimedDeclinedTaskSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component';
+import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
+import { PoolSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
+import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
+import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
+import { SharedModule } from '../shared/shared.module';
+import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
 
 const ENTRY_COMPONENTS = [
   WorkspaceItemSearchResultListElementComponent,
@@ -64,7 +63,7 @@ const DECLARATIONS = [
   ],
   declarations: [
     ...DECLARATIONS,
-  ]
+  ],
 })
 
 /**
@@ -78,7 +77,7 @@ export class MyDspaceSearchModule {
   static withEntryComponents() {
     return {
       ngModule: MyDspaceSearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/my-dspace-page/my-dspace.guard.ts b/src/app/my-dspace-page/my-dspace.guard.ts
index 9cb9aff485..efc4244a86 100644
--- a/src/app/my-dspace-page/my-dspace.guard.ts
+++ b/src/app/my-dspace-page/my-dspace.guard.ts
@@ -1,12 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, NavigationExtras, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  NavigationExtras,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { isEmpty } from '../shared/empty.util';
-import { MYDSPACE_ROUTE } from './my-dspace-page.component';
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
+import { MYDSPACE_ROUTE } from './my-dspace-page.component';
 
 /**
  * Prevent unauthorized activating and loading of mydspace configuration
@@ -45,7 +54,7 @@ export class MyDSpaceGuard implements CanActivate {
     if (isEmpty(configuration) || !configurationList.includes(configuration as MyDSpaceConfigurationValueType)) {
       // If configuration param is empty or is not included in available configurations redirect to a default configuration value
       const navigationExtras: NavigationExtras = {
-        queryParams: {configuration: configurationDefault}
+        queryParams: { configuration: configurationDefault },
       };
 
       this.router.navigate([MYDSPACE_ROUTE], navigationExtras);
diff --git a/src/app/my-dspace-page/themed-my-dspace-page.component.ts b/src/app/my-dspace-page/themed-my-dspace-page.component.ts
index 55ebc51c8d..4a756abab7 100644
--- a/src/app/my-dspace-page/themed-my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/themed-my-dspace-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
 
@@ -8,7 +9,7 @@ import { MyDSpacePageComponent } from './my-dspace-page.component';
 @Component({
   selector: 'ds-themed-my-dspace-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedMyDSpacePageComponent extends ThemedComponent<MyDSpacePageComponent> {
 
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index b502326164..00752e7c04 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,22 +1,36 @@
-<div class="nav-item dropdown expandable-navbar-section text-md-center"
-    *ngVar="(active | async) as isActive"
-    (keyup.enter)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keyup.space)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keydown.space)="$event.preventDefault()"
-    (mouseenter)="activateSection($event)"
-    (mouseleave)="deactivateSection($event)">
-    <a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
+<div class="ds-menu-item-wrapper text-md-center"
+    [id]="'expandable-navbar-section-' + section.id"
+    (mouseenter)="onMouseEnter($event, isActive)"
+    (mouseleave)="onMouseLeave($event, isActive)"
+    data-test="navbar-section-wrapper"
+    *ngVar="(active | async) as isActive">
+    <a href="javascript:void(0);" routerLinkActive="active"
+       role="menuitem"
+       (keyup.enter)="toggleSection($event)"
+       (keyup.space)="toggleSection($event)"
+       (click)="toggleSection($event)"
+       (keydown.space)="$event.preventDefault()"
+       aria-haspopup="menu"
+       data-test="navbar-section-toggler"
+       [attr.aria-expanded]="isActive"
+       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
+       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
        [class.disabled]="section.model?.disabled"
-       id="browseDropdown" (click)="toggleSection($event)"
-       data-toggle="dropdown">
+       id="browseDropdown">
+      <span class="flex-fill">
         <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
+      </span>
+      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <ul @slide *ngIf="(active | async)" (click)="deactivateSection($event)"
-        class="m-0 shadow-none border-top-0 dropdown-menu show">
-        <ng-container *ngFor="let subSection of (subSections$ | async)">
+    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
+        [id]="expandableNavbarSectionId(section.id)"
+        role="menu"
+        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
             <ng-container
                     *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </ng-container>
-    </ul>
+        </div>
+    </div>
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 65de77b600..8849fbd809 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -1,32 +1,24 @@
-.expandable-navbar-section {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-  justify-content: center;
-}
+:host {
+  .ds-menu-item-wrapper {
+    position: relative; // align dropdown menu with respect to this element
+  }
 
-.dropdown-menu {
+  .dropdown-menu {
     overflow: hidden;
-    min-width: 100%;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    ::ng-deep a.nav-link {
-        padding-right: var(--bs-spacer);
-        padding-left: var(--bs-spacer);
-        white-space: nowrap;
+    @include media-breakpoint-down(sm) {
+      border: 0;
+      background-color: var(--ds-expandable-navbar-bg);
     }
-}
-
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)) {
-    .dropdown-toggle {
-        &:after {
-            float: right;
-            margin-top: calc(var(--bs-spacer) / 2);
-        }
-    }
-    .dropdown-menu {
-        border: 0;
+    @include media-breakpoint-up(md) {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      background-color: var(--ds-navbar-dropdown-bg);
+    }
+  }
 
+  .toggle-menu-icon {
+    &, &:hover {
+      text-decoration: none;
     }
+  }
 }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 488c9ab251..ee7732e4f1 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,15 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
-import { By } from '@angular/platform-browser';
-import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
+
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { VarDirective } from '../../shared/utils/var.directive';
+import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 
 describe('ExpandableNavbarSectionComponent', () => {
   let component: ExpandableNavbarSectionComponent;
@@ -24,12 +28,12 @@ describe('ExpandableNavbarSectionComponent', () => {
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-        ]
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        ],
       }).overrideComponent(ExpandableNavbarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -47,120 +51,138 @@ describe('ExpandableNavbarSectionComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    describe('when the mouse enters the section header', () => {
+    describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseEnter').and.callThrough();
+        spyOn(component, 'activateSection').and.callThrough();
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
-          }
+          },
         });
       });
 
-      it('should call activateSection on the menuService', () => {
+      it('should call onMouseEnter', () => {
+        expect(component.onMouseEnter).toHaveBeenCalled();
+      });
+
+      it('should activate the section', () => {
+        expect(component.activateSection).toHaveBeenCalled();
         expect(menuService.activateSection).toHaveBeenCalled();
       });
     });
 
-    describe('when the mouse leaves the section header', () => {
+    describe('when the mouse leaves the section header (while active)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseLeave').and.callThrough();
+        spyOn(component, 'deactivateSection').and.callThrough();
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
+        component.ngOnInit();
+        component.mouseEntered = true;
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
-          }
+          },
         });
       });
 
-      it('should call deactivateSection on the menuService', () => {
+      it('should call onMouseLeave', () => {
+        expect(component.onMouseLeave).toHaveBeenCalled();
+      });
+
+      it('should deactivate the section', () => {
+        expect(component.deactivateSection).toHaveBeenCalled();
         expect(menuService.deactivateSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while inactive)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
       it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
-      });
-    });
-
-    describe('when a click occurs on the section header', () => {
-      beforeEach(() => {
-        spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
-        sidebarToggler.triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
-      });
-
-      it('should not call toggleActiveSection on the menuService', () => {
-        expect(menuService.toggleActiveSection).not.toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
   });
@@ -173,12 +195,12 @@ describe('ExpandableNavbarSectionComponent', () => {
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(300) }
-        ]
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(300) },
+        ],
       }).overrideComponent(ExpandableNavbarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -195,10 +217,10 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse enters the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
-          }
+          },
         });
       });
 
@@ -210,10 +232,10 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse leaves the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
-          }
+          },
         });
       });
 
@@ -225,10 +247,10 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when a click occurs on the section header link', () => {
       beforeEach(() => {
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         sidebarToggler.triggerEventHandler('click', {
           preventDefault: () => {/**/
-          }
+          },
         });
       });
 
@@ -243,7 +265,7 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 5bc69bcbb4..29bd205dd0 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,11 +1,18 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
-import { MenuService } from '../../shared/menu/menu.service';
-import { slide } from '../../shared/animations/slide';
+import {
+  Component,
+  HostListener,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
+
+import { slide } from '../../shared/animations/slide';
 import { HostWindowService } from '../../shared/host-window.service';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
 /**
  * Represents an expandable section in the navbar
@@ -14,21 +21,50 @@ import { MenuID } from '../../shared/menu/menu-id.model';
   selector: 'ds-expandable-navbar-section',
   templateUrl: './expandable-navbar-section.component.html',
   styleUrls: ['./expandable-navbar-section.component.scss'],
-  animations: [slide]
+  animations: [slide],
 })
-@rendersSectionForMenu(MenuID.PUBLIC, true)
 export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
   /**
    * This section resides in the Public Navbar
    */
   menuID = MenuID.PUBLIC;
 
+  /**
+   * True if mouse has entered the menu section toggler
+   */
+  mouseEntered = false;
+
+  /**
+   * True if screen size was small before a resize event
+   */
+  wasMobile = undefined;
+
+  /**
+   * Observable that emits true if the screen is small, false otherwise
+   */
+  isMobile$: Observable<boolean>;
+
+  @HostListener('window:resize', ['$event'])
+  onResize() {
+    this.isMobile$.pipe(
+      first(),
+    ).subscribe((isMobile) => {
+      // When switching between desktop and mobile active sections should be deactivated
+      if (isMobile !== this.wasMobile) {
+        this.wasMobile = isMobile;
+        this.menuService.deactivateSection(this.menuID, this.section.id);
+        this.mouseEntered = false;
+      }
+    });
+  }
+
   constructor(@Inject('sectionDataProvider') menuSection,
               protected menuService: MenuService,
               protected injector: Injector,
-              private windowService: HostWindowService
+              private windowService: HostWindowService,
   ) {
     super(menuSection, menuService, injector);
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
@@ -36,48 +72,42 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   }
 
   /**
-   * Overrides the super function that activates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be activated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * When the mouse enters the section toggler activate the menu section
+   * @param $event
+   * @param isActive
    */
-  activateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
-      first()
+  onMouseEnter($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
+      first(),
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.activateSection(event);
+      if (!isMobile && !isActive && !this.mouseEntered) {
+        this.activateSection($event);
       }
+      this.mouseEntered = true;
     });
   }
 
   /**
-   * Overrides the super function that deactivates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be deactivated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * When the mouse leaves the section toggler deactivate the menu section
+   * @param $event
+   * @param isActive
    */
-  deactivateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
-      first()
+  onMouseLeave($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
+      first(),
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.deactivateSection(event);
+      if (!isMobile && isActive && this.mouseEntered) {
+        this.deactivateSection($event);
       }
+      this.mouseEntered = false;
     });
   }
 
   /**
-   * Overrides the super function that toggles this section (triggered on click)
-   * Has an extra check to make sure the section can only be toggled on mobile devices
-   * @param {Event} event The user event that triggered this function
+   * returns the ID of the DOM element representing the navbar section
+   * @param sectionId
    */
-  toggleSection(event): void {
-    event.preventDefault();
-    this.windowService.isXsOrSm().pipe(
-      first()
-    ).subscribe((isMobile) => {
-      if (isMobile) {
-        super.toggleSection(event);
-      }
-    });
+  expandableNavbarSectionId(sectionId: string) {
+    return `expandable-navbar-section-${sectionId}-dropdown`;
   }
 }
diff --git a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
index e33dca4104..e342e9641c 100644
--- a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
+
+import { MenuID } from '../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
-import { MenuID } from '../../shared/menu/menu-id.model';
 
 /**
  * Themed wrapper for ExpandableNavbarSectionComponent
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-themed-expandable-navbar-section]',
+  selector: 'ds-themed-expandable-navbar-section',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index 42754be1e6..1411d3b6a6 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,3 +1,4 @@
-<div class="nav-item navbar-section text-md-center">
+<div class="ds-menu-item-wrapper text-md-center"
+     [id]="'navbar-section-' + section.id">
   <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
 </div>
diff --git a/src/app/navbar/navbar-section/navbar-section.component.scss b/src/app/navbar/navbar-section/navbar-section.component.scss
index 7af4ada8e6..e69de29bb2 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.scss
+++ b/src/app/navbar/navbar-section/navbar-section.component.scss
@@ -1,5 +0,0 @@
-.navbar-section {
-  display: flex;
-  align-items: center;
-  height: 100%;
-}
diff --git a/src/app/navbar/navbar-section/navbar-section.component.spec.ts b/src/app/navbar/navbar-section/navbar-section.component.spec.ts
index 122bf48636..52c734965a 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.spec.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.spec.ts
@@ -1,13 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { NavbarSectionComponent } from './navbar-section.component';
-import { HostWindowService } from '../../shared/host-window.service';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { Component } from '@angular/core';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
+import { NavbarSectionComponent } from './navbar-section.component';
 
 describe('NavbarSectionComponent', () => {
   let component: NavbarSectionComponent;
@@ -21,12 +25,12 @@ describe('NavbarSectionComponent', () => {
       providers: [
         { provide: 'sectionDataProvider', useValue: {} },
         { provide: MenuService, useValue: menuService },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-      ]
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+      ],
     }).overrideComponent(NavbarSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -48,7 +52,7 @@ describe('NavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/navbar/navbar-section/navbar-section.component.ts b/src/app/navbar/navbar-section/navbar-section.component.ts
index 9f75a96f6e..e47f36d68f 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.ts
@@ -1,17 +1,22 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { MenuSectionComponent } from '../../shared/menu/menu-section/menu-section.component';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
+
 import { MenuService } from '../../shared/menu/menu.service';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuSectionComponent } from '../../shared/menu/menu-section/menu-section.component';
 
 /**
  * Represents a non-expandable section in the navbar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-navbar-section]',
+  selector: 'ds-navbar-section',
   templateUrl: './navbar-section.component.html',
-  styleUrls: ['./navbar-section.component.scss']
+  styleUrls: ['./navbar-section.component.scss'],
 })
 @rendersSectionForMenu(MenuID.PUBLIC, false)
 export class NavbarSectionComponent extends MenuSectionComponent implements OnInit {
@@ -22,7 +27,7 @@ export class NavbarSectionComponent extends MenuSectionComponent implements OnIn
 
   constructor(@Inject('sectionDataProvider') menuSection,
               protected menuService: MenuService,
-              protected injector: Injector
+              protected injector: Injector,
   ) {
     super(menuSection, menuService, injector);
   }
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index bc1e04f513..63938617f5 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,18 +1,21 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-    class="navbar navbar-light navbar-expand-md p-md-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
-    <div class="navbar-inner-container w-100" [class.container]="!(isXsOrSm$ | async)">
-        <div class="reset-padding-md w-100">
-            <div id="collapsingNav">
-                <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
-                    <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-                        <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-                    </li>
-                    <ng-container *ngFor="let section of (sections | async)">
-                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-                    </ng-container>
-                </ul>
-            </div>
+<nav [ngClass]="{'open': (menuCollapsed | async) !== true}"
+     [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+     class="navbar navbar-light navbar-expand-md px-md-0 pt-md-0 pt-3 navbar-container" role="navigation"
+     [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
+  <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
+  <div class="navbar-inner-container w-100" [class.container]="(isMobile$ | async) !== true">
+    <div class="w-100">
+      <div id="collapsingNav">
+        <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+          <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
+        </ng-container>
+        <div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
+          <ng-container *ngFor="let section of (sections | async)">
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+          </ng-container>
         </div>
+      </div>
     </div>
+  </div>
 </nav>
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index 441ee82c96..b74408f0f5 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,45 +1,64 @@
-nav.navbar {
-    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
+:host {
+  --ds-expandable-navbar-height: auto;
+
+  nav.navbar {
+    background-color: var(--ds-navbar-bg);
     align-items: baseline;
-}
+    padding: 0;
+  }
 
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
+  /** Mobile menu styling **/
+  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-        width: 100%;
-        background-color: var(--bs-white);
-        position: absolute;
-        overflow: hidden;
-        height: 0;
-        &.open {
-          height: auto;
-          min-height: 100vh; //doesn't matter because wrapper is sticky
-        }
+      width: 100%;
+      background-color: var(--bs-white);
+      position: absolute;
+      overflow: hidden;
+      height: 0;
+      z-index: var(--ds-nav-z-index);
+      &.open {
+        height: auto;
+        min-height: 100vh; //doesn't matter because wrapper is sticky
+        border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border
+      }
     }
-}
+  }
 
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
+  @media screen and (min-width: map-get($grid-breakpoints, md)) {
     .reset-padding-md {
-        margin-left: calc(var(--bs-spacer) / -2);
-        margin-right: calc(var(--bs-spacer) / -2);
+      margin-left: calc(var(--bs-spacer) / -1);
+      margin-right: calc(var(--bs-spacer) / -1);
     }
-}
+  }
 
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
+  /* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
+  .navbar-expand-md.navbar-container {
     @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-        > .navbar-inner-container {
-            padding: 0 var(--bs-spacer);
-        }
-        padding: 0;
+      > .navbar-inner-container {
+        padding: 0 var(--bs-spacer);
+      }
+      padding: 0;
     }
-}
+  }
 
-.navbar-nav {
-  ::ng-deep a.nav-link {
-    color: var(--ds-navbar-link-color);
-  }
-  ::ng-deep a.nav-link:hover {
-    color: var(--ds-navbar-link-color-hover);
+  #main-navbar ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    .dropdown-menu {
+      padding: 0.5rem !important;
+    }
+
+    .ds-menu-item {
+      display: block;
+      color: var(--ds-navbar-link-color);
+      padding: 0.5rem 0;
+
+      &:hover, &:focus {
+        color: var(--ds-navbar-link-color-hover);
+      }
+    }
   }
 }
diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts
index 983eace055..d24643944b 100644
--- a/src/app/navbar/navbar.component.spec.ts
+++ b/src/app/navbar/navbar.component.spec.ts
@@ -1,35 +1,50 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { of as observableOf } from 'rxjs';
-
-import { NavbarComponent } from './navbar.component';
+import {
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { HostWindowService } from '../shared/host-window.service';
-import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuService } from '../shared/menu/menu.service';
-import { MenuServiceStub } from '../shared/testing/menu-service.stub';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { BrowseService } from '../core/browse/browse.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { buildPaginatedList } from '../core/data/paginated-list.model';
-import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-decorator';
-import { Item } from '../core/shared/item.model';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { ThemeService } from '../shared/theme-support/theme.service';
-import { getMockThemeService } from '../shared/mocks/theme-service.mock';
-import { Store, StoreModule } from '@ngrx/store';
-import { AppState, storeModuleConfig } from '../app.reducer';
-import { authReducer } from '../core/auth/auth.reducer';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  AppState,
+  storeModuleConfig,
+} from '../app.reducer';
+import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-data-type';
+import { authReducer } from '../core/auth/auth.reducer';
 import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
-import { EPersonMock } from '../shared/testing/eperson.mock';
+import { BrowseService } from '../core/browse/browse.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
 import { FlatBrowseDefinition } from '../core/shared/flat-browse-definition.model';
-import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
 import { HierarchicalBrowseDefinition } from '../core/shared/hierarchical-browse-definition.model';
+import { Item } from '../core/shared/item.model';
+import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
+import { HostWindowService } from '../shared/host-window.service';
+import { MenuService } from '../shared/menu/menu.service';
+import { getMockThemeService } from '../shared/mocks/theme-service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { EPersonMock } from '../shared/testing/eperson.mock';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
+import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { NavbarComponent } from './navbar.component';
 
 let comp: NavbarComponent;
 let fixture: ComponentFixture<NavbarComponent>;
@@ -37,7 +52,7 @@ let store: Store<AppState>;
 let initialState: any;
 
 const authorizationService = jasmine.createSpyObj('authorizationService', {
-  isAuthorized: observableOf(true)
+  isAuthorized: observableOf(true),
 });
 
 const mockItem = Object.assign(new Item(), {
@@ -47,16 +62,16 @@ const mockItem = Object.assign(new Item(), {
   lastModified: '2018',
   _links: {
     self: {
-      href: 'https://localhost:8000/items/fake-id'
-    }
-  }
+      href: 'https://localhost:8000/items/fake-id',
+    },
+  },
 });
 
 const routeStub = {
   data: observableOf({
-    dso: createSuccessfulRemoteDataObject(mockItem)
+    dso: createSuccessfulRemoteDataObject(mockItem),
   }),
-  children: []
+  children: [],
 };
 
 
@@ -71,31 +86,31 @@ describe('NavbarComponent', () => {
         new FlatBrowseDefinition(), {
           id: 'title',
           dataType: BrowseByDataType.Title,
-        }
+        },
       ),
       Object.assign(
         new FlatBrowseDefinition(), {
           id: 'dateissued',
           dataType: BrowseByDataType.Date,
-          metadataKeys: ['dc.date.issued']
-        }
+          metadataKeys: ['dc.date.issued'],
+        },
       ),
       Object.assign(
         new ValueListBrowseDefinition(), {
           id: 'author',
           dataType: BrowseByDataType.Metadata,
-        }
+        },
       ),
       Object.assign(
         new ValueListBrowseDefinition(), {
           id: 'subject',
           dataType: BrowseByDataType.Metadata,
-        }
+        },
       ),
       Object.assign(
         new HierarchicalBrowseDefinition(), {
           id: 'srsc',
-        }
+        },
       ),
     ];
     initialState = {
@@ -107,9 +122,9 @@ describe('NavbarComponent', () => {
           loading: false,
           authToken: new AuthTokenInfo('test_token'),
           userId: EPersonMock.id,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
 
     TestBed.configureTestingModule({
@@ -130,7 +145,7 @@ describe('NavbarComponent', () => {
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();  // compile template and css
   }));
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 0cfad9e431..a883756da3 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,17 +1,28 @@
-import { Component, Injector } from '@angular/core';
-import { slideMobileNav } from '../shared/animations/slide';
-import { MenuComponent } from '../shared/menu/menu.component';
-import { MenuService } from '../shared/menu/menu.service';
-import { HostWindowService } from '../shared/host-window.service';
-import { BrowseService } from '../core/browse/browse.service';
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { MenuID } from '../shared/menu/menu-id.model';
-import { ThemeService } from '../shared/theme-support/theme.service';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+
 import { AppState } from '../app.reducer';
 import { isAuthenticated } from '../core/auth/selectors';
+import { BrowseService } from '../core/browse/browse.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { slideMobileNav } from '../shared/animations/slide';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
+import { MenuComponent } from '../shared/menu/menu.component';
+import { MenuService } from '../shared/menu/menu.service';
+import { MenuID } from '../shared/menu/menu-id.model';
+import { ThemeService } from '../shared/theme-support/theme.service';
 
 /**
  * Component representing the public navbar
@@ -20,14 +31,15 @@ import { isAuthenticated } from '../core/auth/selectors';
   selector: 'ds-navbar',
   styleUrls: ['./navbar.component.scss'],
   templateUrl: './navbar.component.html',
-  animations: [slideMobileNav]
+  animations: [slideMobileNav],
 })
-export class NavbarComponent extends MenuComponent {
+export class NavbarComponent extends MenuComponent implements OnInit {
   /**
    * The menu ID of the Navbar is PUBLIC
    * @type {MenuID.PUBLIC}
    */
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   /**
    * Whether user is authenticated.
@@ -35,7 +47,7 @@ export class NavbarComponent extends MenuComponent {
    */
   public isAuthenticated$: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   constructor(protected menuService: MenuService,
     protected injector: Injector,
@@ -51,7 +63,7 @@ export class NavbarComponent extends MenuComponent {
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
     this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
   }
 }
diff --git a/src/app/navbar/navbar.effects.spec.ts b/src/app/navbar/navbar.effects.spec.ts
index 787ecafeec..d01eef5051 100644
--- a/src/app/navbar/navbar.effects.spec.ts
+++ b/src/app/navbar/navbar.effects.spec.ts
@@ -1,14 +1,18 @@
 import { TestBed } from '@angular/core/testing';
-import { NavbarEffects } from './navbar.effects';
-import { HostWindowResizeAction } from '../shared/host-window.actions';
-import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
 import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import { HostWindowResizeAction } from '../shared/host-window.actions';
 import { CollapseMenuAction } from '../shared/menu/menu.actions';
 import { MenuService } from '../shared/menu/menu.service';
-import { MenuServiceStub } from '../shared/testing/menu-service.stub';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { NavbarEffects } from './navbar.effects';
 
 describe('NavbarEffects', () => {
   let navbarEffects: NavbarEffects;
diff --git a/src/app/navbar/navbar.effects.ts b/src/app/navbar/navbar.effects.ts
index dc3a29e1bf..a40c2c99d6 100644
--- a/src/app/navbar/navbar.effects.ts
+++ b/src/app/navbar/navbar.effects.ts
@@ -1,18 +1,26 @@
-import { first, map, switchMap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  first,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
 import { HostWindowActionTypes } from '../shared/host-window.actions';
 import {
   CollapseMenuAction,
   ExpandMenuPreviewAction,
-  MenuActionTypes
+  MenuActionTypes,
 } from '../shared/menu/menu.actions';
 import { MenuService } from '../shared/menu/menu.service';
-import { NoOpAction } from '../shared/ngrx/no-op.action';
-import { MenuState } from '../shared/menu/menu-state.model';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { MenuState } from '../shared/menu/menu-state.model';
+import { NoOpAction } from '../shared/ngrx/no-op.action';
 
 @Injectable()
 export class NavbarEffects {
@@ -21,26 +29,26 @@ export class NavbarEffects {
    * Effect that collapses the public menu on window resize
    * @type {Observable<CollapseMenuAction>}
    */
-   resize$ = createEffect(() => this.actions$
+  resize$ = createEffect(() => this.actions$
     .pipe(
       ofType(HostWindowActionTypes.RESIZE),
-      map(() => new CollapseMenuAction(this.menuID))
+      map(() => new CollapseMenuAction(this.menuID)),
     ));
 
   /**
    * Effect that collapses the public menu on reroute
    * @type {Observable<CollapseMenuAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(ROUTER_NAVIGATION),
-      map(() => new CollapseMenuAction(this.menuID))
+      map(() => new CollapseMenuAction(this.menuID)),
     ));
   /**
    * Effect that collapses the public menu when the admin sidebar opens
    * @type {Observable<CollapseMenuAction>}
    */
-   openAdminSidebar$ = createEffect(() => this.actions$
+  openAdminSidebar$ = createEffect(() => this.actions$
     .pipe(
       ofType(MenuActionTypes.EXPAND_MENU_PREVIEW),
       switchMap((action: ExpandMenuPreviewAction) => {
@@ -54,7 +62,7 @@ export class NavbarEffects {
             }
             return new NoOpAction();
           }));
-      })
+      }),
     ));
   constructor(private actions$: Actions, private menuService: MenuService) {
 
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index de3244099d..ddc1bb693f 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -1,21 +1,20 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
+import { FormsModule } from '@angular/forms';
 import { EffectsModule } from '@ngrx/effects';
 
 import { CoreModule } from '../core/core.module';
-import { NavbarEffects } from './navbar.effects';
-import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
+import { MenuModule } from '../shared/menu/menu.module';
+import { SharedModule } from '../shared/shared.module';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
 import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
 import { NavbarComponent } from './navbar.component';
-import { MenuModule } from '../shared/menu/menu.module';
-import { SharedModule } from '../shared/shared.module';
-import { FormsModule } from '@angular/forms';
+import { NavbarEffects } from './navbar.effects';
+import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
 import { ThemedNavbarComponent } from './themed-navbar.component';
 
 const effects = [
-  NavbarEffects
+  NavbarEffects,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -32,7 +31,7 @@ const ENTRY_COMPONENTS = [
     MenuModule,
     FormsModule,
     EffectsModule.forFeature(effects),
-    CoreModule.forRoot()
+    CoreModule.forRoot(),
   ],
   declarations: [
     ...ENTRY_COMPONENTS,
@@ -43,8 +42,8 @@ const ENTRY_COMPONENTS = [
   exports: [
     ThemedNavbarComponent,
     NavbarSectionComponent,
-    ThemedExpandableNavbarSectionComponent
-  ]
+    ThemedExpandableNavbarSectionComponent,
+  ],
 })
 
 /**
@@ -58,7 +57,7 @@ export class NavbarModule {
   static withEntryComponents() {
     return {
       ngModule: NavbarModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/navbar/themed-navbar.component.ts b/src/app/navbar/themed-navbar.component.ts
index 43efdc181e..5a33fe517e 100644
--- a/src/app/navbar/themed-navbar.component.ts
+++ b/src/app/navbar/themed-navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { NavbarComponent } from './navbar.component';
 
diff --git a/src/app/notifications/notifications-effects.ts b/src/app/notifications/notifications-effects.ts
new file mode 100644
index 0000000000..d06c9dae53
--- /dev/null
+++ b/src/app/notifications/notifications-effects.ts
@@ -0,0 +1,9 @@
+import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
+import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
+import { SuggestionTargetsEffects } from './suggestion-targets/suggestion-targets.effects';
+
+export const notificationsEffects = [
+  QualityAssuranceTopicsEffects,
+  QualityAssuranceSourceEffects,
+  SuggestionTargetsEffects,
+];
diff --git a/src/app/notifications/notifications-state.service.spec.ts b/src/app/notifications/notifications-state.service.spec.ts
new file mode 100644
index 0000000000..5db3b98c23
--- /dev/null
+++ b/src/app/notifications/notifications-state.service.spec.ts
@@ -0,0 +1,545 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { cold } from 'jasmine-marbles';
+
+import {
+  qualityAssuranceSourceObjectMissingPid,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+  qualityAssuranceTopicObjectMissingPid,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../shared/mocks/notifications.mock';
+import { suggestionNotificationsReducers } from './notifications.reducer';
+import { NotificationsStateService } from './notifications-state.service';
+import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
+import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
+
+describe('NotificationsStateService', () => {
+  let service: NotificationsStateService;
+  let serviceAsAny: any;
+  let store: any;
+  let initialState: any;
+
+  describe('Topis State', () => {
+    function init(mode: string) {
+      if (mode === 'empty') {
+        initialState = {
+          suggestionNotifications: {
+            qaTopic: {
+              topics: [],
+              processing: false,
+              loaded: false,
+              totalPages: 0,
+              currentPage: 0,
+              totalElements: 0,
+              totalLoadedPages: 0,
+            },
+          },
+        };
+      } else {
+        initialState = {
+          suggestionNotifications: {
+            qaTopic: {
+              topics: [
+                qualityAssuranceTopicObjectMorePid,
+                qualityAssuranceTopicObjectMoreAbstract,
+                qualityAssuranceTopicObjectMissingPid,
+              ],
+              processing: false,
+              loaded: true,
+              totalPages: 1,
+              currentPage: 1,
+              totalElements: 3,
+              totalLoadedPages: 1,
+            },
+          },
+        };
+      }
+    }
+
+    describe('Testing methods with empty topic objects', () => {
+      beforeEach(async () => {
+        init('empty');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceTopics', () => {
+        it('Should return an empty array', () => {
+          const result = service.getQualityAssuranceTopics();
+          const expected = cold('(a)', {
+            a: [],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotalPages', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceTopicsTotalPages();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsCurrentPage', () => {
+        it('Should return minus one (0)', () => {
+          const result = service.getQualityAssuranceTopicsCurrentPage();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotals', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceTopicsTotals();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoading', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceTopicsLoading();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoaded', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsLoaded();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing methods with topic objects', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceTopics', () => {
+        it('Should return an array of topics', () => {
+          const result = service.getQualityAssuranceTopics();
+          const expected = cold('(a)', {
+            a: [
+              qualityAssuranceTopicObjectMorePid,
+              qualityAssuranceTopicObjectMoreAbstract,
+              qualityAssuranceTopicObjectMissingPid,
+            ],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotalPages', () => {
+        it('Should return one (1)', () => {
+          const result = service.getQualityAssuranceTopicsTotalPages();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsCurrentPage', () => {
+        it('Should return minus zero (1)', () => {
+          const result = service.getQualityAssuranceTopicsCurrentPage();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotals', () => {
+        it('Should return three (3)', () => {
+          const result = service.getQualityAssuranceTopicsTotals();
+          const expected = cold('(a)', {
+            a: 3,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoading', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsLoading();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoaded', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceTopicsLoaded();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing the topic dispatch methods', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('dispatchRetrieveQualityAssuranceTopics', () => {
+        it('Should call store.dispatch', () => {
+          const elementsPerPage = 3;
+          const currentPage = 1;
+          const action = new RetrieveAllTopicsAction(elementsPerPage, currentPage, 'source', 'target');
+          service.dispatchRetrieveQualityAssuranceTopics(elementsPerPage, currentPage, 'source', 'target');
+          expect(serviceAsAny.store.dispatch).toHaveBeenCalledWith(action);
+        });
+      });
+    });
+  });
+
+  describe('Source State', () => {
+    function init(mode: string) {
+      if (mode === 'empty') {
+        initialState = {
+          suggestionNotifications: {
+            qaSource: {
+              source: [],
+              processing: false,
+              loaded: false,
+              totalPages: 0,
+              currentPage: 0,
+              totalElements: 0,
+              totalLoadedPages: 0,
+            },
+          },
+        };
+      } else {
+        initialState = {
+          suggestionNotifications: {
+            qaSource: {
+              source: [
+                qualityAssuranceSourceObjectMorePid,
+                qualityAssuranceSourceObjectMoreAbstract,
+                qualityAssuranceSourceObjectMissingPid,
+              ],
+              processing: false,
+              loaded: true,
+              totalPages: 1,
+              currentPage: 1,
+              totalElements: 3,
+              totalLoadedPages: 1,
+            },
+          },
+        };
+      }
+    }
+
+    describe('Testing methods with empty source objects', () => {
+      beforeEach(async () => {
+        init('empty');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceSource', () => {
+        it('Should return an empty array', () => {
+          const result = service.getQualityAssuranceSource();
+          const expected = cold('(a)', {
+            a: [],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotalPages', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceSourceTotalPages();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourcesCurrentPage', () => {
+        it('Should return minus one (0)', () => {
+          const result = service.getQualityAssuranceSourceCurrentPage();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotals', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceSourceTotals();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoading', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceSourceLoading();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoaded', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceLoaded();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing methods with Source objects', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceSource', () => {
+        it('Should return an array of Source', () => {
+          const result = service.getQualityAssuranceSource();
+          const expected = cold('(a)', {
+            a: [
+              qualityAssuranceSourceObjectMorePid,
+              qualityAssuranceSourceObjectMoreAbstract,
+              qualityAssuranceSourceObjectMissingPid,
+            ],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotalPages', () => {
+        it('Should return one (1)', () => {
+          const result = service.getQualityAssuranceSourceTotalPages();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceCurrentPage', () => {
+        it('Should return minus zero (1)', () => {
+          const result = service.getQualityAssuranceSourceCurrentPage();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotals', () => {
+        it('Should return three (3)', () => {
+          const result = service.getQualityAssuranceSourceTotals();
+          const expected = cold('(a)', {
+            a: 3,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoading', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceLoading();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoaded', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceSourceLoaded();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing the Source dispatch methods', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('dispatchRetrieveQualityAssuranceSource', () => {
+        it('Should call store.dispatch', () => {
+          const elementsPerPage = 3;
+          const currentPage = 1;
+          const action = new RetrieveAllSourceAction(elementsPerPage, currentPage);
+          service.dispatchRetrieveQualityAssuranceSource(elementsPerPage, currentPage);
+          expect(serviceAsAny.store.dispatch).toHaveBeenCalledWith(action);
+        });
+      });
+    });
+  });
+
+
+});
diff --git a/src/app/notifications/notifications-state.service.ts b/src/app/notifications/notifications-state.service.ts
new file mode 100644
index 0000000000..aab06519dd
--- /dev/null
+++ b/src/app/notifications/notifications-state.service.ts
@@ -0,0 +1,216 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { SuggestionNotificationsState } from './notifications.reducer';
+import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
+import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
+import {
+  getQualityAssuranceSourceCurrentPageSelector,
+  getQualityAssuranceSourceTotalPagesSelector,
+  getQualityAssuranceSourceTotalsSelector,
+  getQualityAssuranceTopicsCurrentPageSelector,
+  getQualityAssuranceTopicsTotalPagesSelector,
+  getQualityAssuranceTopicsTotalsSelector,
+  isQualityAssuranceSourceLoadedSelector,
+  isQualityAssuranceSourceProcessingSelector,
+  isQualityAssuranceTopicsLoadedSelector,
+  isQualityAssuranceTopicsProcessingSelector,
+  qualityAssuranceSourceObjectSelector,
+  qualityAssuranceTopicsObjectSelector,
+} from './selectors';
+
+/**
+ * The service handling the Notifications State.
+ */
+@Injectable()
+export class NotificationsStateService {
+
+  /**
+   * Initialize the service variables.
+   * @param {Store<SuggestionNotificationsState>} store
+   */
+  constructor(private store: Store<SuggestionNotificationsState>) { }
+
+  // Quality Assurance topics
+  // --------------------------------------------------------------------------
+
+  /**
+   * Returns the list of Quality Assurance topics from the state.
+   *
+   * @return Observable<QualityAssuranceTopicObject>
+   *    The list of Quality Assurance topics.
+   */
+  public getQualityAssuranceTopics(): Observable<QualityAssuranceTopicObject[]> {
+    return this.store.pipe(select(qualityAssuranceTopicsObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loading, 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isQualityAssuranceTopicsLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loaded, 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceTopicsLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the topics (ex.: a REST call), 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceTopicsProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Quality Assurance topics.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance topics pages.
+   */
+  public getQualityAssuranceTopicsTotalPages(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsTotalPagesSelector));
+  }
+
+  /**
+   * Returns the current page of the Quality Assurance topics, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Quality Assurance topics page.
+   */
+  public getQualityAssuranceTopicsCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Quality Assurance topics.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance topics.
+   */
+  public getQualityAssuranceTopicsTotals(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Quality Assurance topics state, retrieving the topics from the server.
+   *
+   * @param elementsPerPage
+   *    The number of the topics per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveQualityAssuranceTopics(elementsPerPage: number, currentPage: number, sourceId: string, targteId?: string): void {
+    this.store.dispatch(new RetrieveAllTopicsAction(elementsPerPage, currentPage, sourceId, targteId));
+  }
+
+  // Quality Assurance source
+  // --------------------------------------------------------------------------
+
+  /**
+   * Returns the list of Quality Assurance source from the state.
+   *
+   * @return Observable<QualityAssuranceSourceObject>
+   *    The list of Quality Assurance source.
+   */
+  public getQualityAssuranceSource(): Observable<QualityAssuranceSourceObject[]> {
+    return this.store.pipe(select(qualityAssuranceSourceObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loading, 'false' otherwise.
+   */
+  public isQualityAssuranceSourceLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isQualityAssuranceSourceLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loaded, 'false' otherwise.
+   */
+  public isQualityAssuranceSourceLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceSourceLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the source (ex.: a REST call), 'false' otherwise.
+   */
+  public isQualityAssuranceSourceProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceSourceProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Quality Assurance source.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance source pages.
+   */
+  public getQualityAssuranceSourceTotalPages(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceTotalPagesSelector));
+  }
+
+  /**
+   * Returns the current page of the Quality Assurance source, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Quality Assurance source page.
+   */
+  public getQualityAssuranceSourceCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Quality Assurance source.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance source.
+   */
+  public getQualityAssuranceSourceTotals(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Quality Assurance source state, retrieving the source from the server.
+   *
+   * @param elementsPerPage
+   *    The number of the source per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveQualityAssuranceSource(elementsPerPage: number, currentPage: number): void {
+    this.store.dispatch(new RetrieveAllSourceAction(elementsPerPage, currentPage));
+  }
+}
diff --git a/src/app/notifications/notifications.module.ts b/src/app/notifications/notifications.module.ts
new file mode 100644
index 0000000000..70b3eed590
--- /dev/null
+++ b/src/app/notifications/notifications.module.ts
@@ -0,0 +1,111 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+import {
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { storeModuleConfig } from '../app.reducer';
+import { CoreModule } from '../core/core.module';
+import { QualityAssuranceEventDataService } from '../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceSourceDataService } from '../core/notifications/qa/source/quality-assurance-source-data.service';
+import { QualityAssuranceTopicDataService } from '../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { SuggestionSourceDataService } from '../core/notifications/source/suggestion-source-data.service';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import {
+  suggestionNotificationsReducers,
+  SuggestionNotificationsState,
+} from './notifications.reducer';
+import { notificationsEffects } from './notifications-effects';
+import { NotificationsStateService } from './notifications-state.service';
+import { EPersonDataComponent } from './qa/events/ePerson-data/ePerson-data.component';
+import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
+import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component';
+import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component';
+import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
+import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
+import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service';
+import { SuggestionActionsComponent } from './suggestion-actions/suggestion-actions.component';
+import { SuggestionEvidencesComponent } from './suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
+import { SuggestionListElementComponent } from './suggestion-list-element/suggestion-list-element.component';
+import { PublicationClaimComponent } from './suggestion-targets/publication-claim/publication-claim.component';
+import { SuggestionTargetsStateService } from './suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from './suggestions.service';
+import { SuggestionsNotificationComponent } from './suggestions-notification/suggestions-notification.component';
+import { SuggestionsPopupComponent } from './suggestions-popup/suggestions-popup.component';
+
+const MODULES = [
+  CommonModule,
+  SharedModule,
+  SearchModule,
+  CoreModule.forRoot(),
+  StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),
+  EffectsModule.forFeature(notificationsEffects),
+  TranslateModule,
+];
+
+const COMPONENTS = [
+  QualityAssuranceTopicsComponent,
+  QualityAssuranceEventsComponent,
+  QualityAssuranceSourceComponent,
+  EPersonDataComponent,
+  PublicationClaimComponent,
+  SuggestionActionsComponent,
+  SuggestionListElementComponent,
+  SuggestionEvidencesComponent,
+  SuggestionsPopupComponent,
+  SuggestionsNotificationComponent,
+];
+
+const DIRECTIVES = [ ];
+
+const ENTRY_COMPONENTS = [
+  ProjectEntryImportModalComponent,
+];
+
+const PROVIDERS = [
+  NotificationsStateService,
+  QualityAssuranceTopicsService,
+  QualityAssuranceSourceService,
+  QualityAssuranceTopicDataService,
+  QualityAssuranceSourceDataService,
+  QualityAssuranceEventDataService,
+  SuggestionsService,
+  SuggestionSourceDataService,
+  SuggestionTargetDataService,
+  SuggestionTargetsStateService,
+  SuggestionsDataService,
+];
+
+@NgModule({
+  imports: [
+    ...MODULES,
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...DIRECTIVES,
+    ...ENTRY_COMPONENTS,
+  ],
+  providers: [
+    ...PROVIDERS,
+  ],
+  entryComponents: [
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...COMPONENTS,
+    ...DIRECTIVES,
+  ],
+})
+
+/**
+ * This module handles all components that are necessary for the OpenAIRE components
+ */
+export class NotificationsModule {
+}
diff --git a/src/app/notifications/notifications.reducer.ts b/src/app/notifications/notifications.reducer.ts
new file mode 100644
index 0000000000..14ca6c0347
--- /dev/null
+++ b/src/app/notifications/notifications.reducer.ts
@@ -0,0 +1,34 @@
+import {
+  ActionReducerMap,
+  createFeatureSelector,
+} from '@ngrx/store';
+
+import {
+  qualityAssuranceSourceReducer,
+  QualityAssuranceSourceState,
+} from './qa/source/quality-assurance-source.reducer';
+import {
+  qualityAssuranceTopicsReducer,
+  QualityAssuranceTopicState,
+} from './qa/topics/quality-assurance-topics.reducer';
+import {
+  SuggestionTargetsReducer,
+  SuggestionTargetState,
+} from './suggestion-targets/suggestion-targets.reducer';
+
+/**
+ * The OpenAIRE State
+ */
+export interface SuggestionNotificationsState {
+  'qaTopic': QualityAssuranceTopicState;
+  'qaSource': QualityAssuranceSourceState;
+  'suggestionTarget': SuggestionTargetState;
+}
+
+export const suggestionNotificationsReducers: ActionReducerMap<SuggestionNotificationsState> = {
+  qaTopic: qualityAssuranceTopicsReducer,
+  qaSource: qualityAssuranceSourceReducer,
+  suggestionTarget: SuggestionTargetsReducer,
+};
+
+export const suggestionNotificationsSelector = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
new file mode 100644
index 0000000000..058457fd40
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
@@ -0,0 +1,10 @@
+<ng-container *ngIf="ePersonId">
+  <ng-container *ngIf="getEPersonData$() | async as ePersonData">
+    <ng-container *ngFor="let property of properties">
+      <span *ngIf="ePersonData[property]">
+        {{ ePersonData[property] }}
+      </span>
+      <br>
+    </ng-container>
+  </ng-container>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss
rename to src/app/notifications/qa/events/ePerson-data/ePerson-data.component.scss
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts
new file mode 100644
index 0000000000..6407dc6df6
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts
@@ -0,0 +1,62 @@
+/* tslint:disable:no-unused-variable */
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { EPerson } from 'src/app/core/eperson/models/eperson.model';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+
+import { EPersonDataService } from './../../../../core/eperson/eperson-data.service';
+import { EPersonDataComponent } from './ePerson-data.component';
+
+describe('EPersonDataComponent', () => {
+  let component: EPersonDataComponent;
+  let fixture: ComponentFixture<EPersonDataComponent>;
+  let ePersonDataService = jasmine.createSpyObj('EPersonDataService', ['findById']);
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EPersonDataComponent ],
+      providers: [ {
+        provide: EPersonDataService,
+        useValue: ePersonDataService,
+      } ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EPersonDataComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should retrieve EPerson data when ePersonId is provided', () => {
+    const ePersonId = '123';
+    const ePersonData = Object.assign(new EPerson(), {
+      id: ePersonId,
+      email: 'john.doe@domain.com',
+      metadata: [
+        {
+          key: 'eperson.firstname',
+          value: 'John',
+        },
+        {
+          key: 'eperson.lastname',
+          value: 'Doe',
+        },
+      ],
+    });
+    const ePersonDataRD$ = createSuccessfulRemoteDataObject$(ePersonData);
+    ePersonDataService.findById.and.returnValue(ePersonDataRD$);
+    component.ePersonId = ePersonId;
+    component.getEPersonData$();
+    fixture.detectChanges();
+    expect(ePersonDataService.findById).toHaveBeenCalledWith(ePersonId, true);
+  });
+});
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
new file mode 100644
index 0000000000..e058e70b42
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
@@ -0,0 +1,52 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-eperson-data',
+  templateUrl: './ePerson-data.component.html',
+  styleUrls: ['./ePerson-data.component.scss'],
+})
+/**
+ * Represents the component for displaying ePerson data.
+ */
+export class EPersonDataComponent {
+
+  /**
+   * The ID of the ePerson.
+   */
+  @Input() ePersonId: string;
+
+  /**
+   * The properties of the ePerson to display.
+   */
+  @Input() properties: string[];
+
+  /**
+   * Creates an instance of the EPersonDataComponent.
+   * @param ePersonDataService The service for retrieving ePerson data.
+   */
+  constructor(private ePersonDataService: EPersonDataService) { }
+
+  /**
+   * Retrieves the EPerson data based on the provided ePersonId.
+   * @returns An Observable that emits the EPerson data.
+   */
+  getEPersonData$(): Observable<EPerson> {
+    if (this.ePersonId) {
+      return this.ePersonDataService.findById(this.ePersonId, true).pipe(
+        getFirstCompletedRemoteData(),
+        getRemoteDataPayload(),
+      );
+    }
+  }
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
new file mode 100644
index 0000000000..fa2ec3b008
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -0,0 +1,287 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">
+        <div class="d-flex justify-content-between">
+          {{'notifications.events.title'| translate}}
+        </div>
+      </h2>
+      <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
+        <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+      </ds-alert>
+      <ds-alert *ngIf="targetId" [type]="'alert-info'">
+        <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+        <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
+      </ds-alert>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <h4 class="border-bottom pb-2">
+        {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
+      </h4>
+
+      <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+
+      <ds-pagination *ngIf="(isEventPageLoading | async) !== true"
+                      [paginationOptions]="paginationConfig"
+                      [collectionSize]="(totalElements$ | async)"
+                      [sortOptions]="paginationSortConfig"
+                      (paginationChange)="getQualityAssuranceEvents()">
+
+        <ng-container>
+          <div *ngIf="(eventsUpdated$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'quality-assurance.noEvents' | translate}}
+          </div>
+          <div *ngIf="(eventsUpdated$ | async)?.length !== 0" class="table-responsive mt-2">
+            <table id="events" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
+                <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
+                <th *ngIf="hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1" scope="col" class="content-col">
+                  {{'quality-assurance.event.table.project-details' | translate}}
+                </th>
+                <ng-container *ngIf="hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)">
+                  <th scope="col" class="content-col">
+                    {{'quality-assurance.event.table.reasons' | translate}}
+                  </th>
+                  <th scope="col" class="content-col">
+                    {{'quality-assurance.event.table.person-who-requested' | translate}}
+                  </th>
+                </ng-container>
+                <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let eventElement of (eventsUpdated$ | async); let i = index">
+                  <td>{{eventElement?.event?.trust}}
+                  </td>
+                  <td><a *ngIf="eventElement?.target"
+                         target="_blank"
+                         rel="noopener noreferrer"
+                         [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
+                    <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
+                    <div *ngIf="eventElement?.event?.message?.serviceId">
+                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
+                      <span [title]="eventElement.event.message.serviceId">
+                        <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
+                      </span>
+                    </div>
+                    <div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
+                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
+                      <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
+                        <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
+                      </span>
+                    </div>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/PID') !== -1">
+                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.type}}</span></p>
+                    <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
+                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
+                        {{eventElement.event.message.value}}
+                      </a>
+                      <ng-template #noPID><span class="badge badge-info">{{eventElement.event.message.value}}</span></ng-template>
+                    </p>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/SUBJECT') !== -1">
+                    <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
+                       </span><br><span class="badge badge-info">{{eventElement.event.message.value}}</span></p>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/ABSTRACT') !== -1">
+                    <p class="abstract-container" [class.show]="showMore">
+                      <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
+                      <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
+                    </p>
+                    <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
+                      <i *ngIf="!showMore" class="fas fa-angle-down"></i>
+                      <i *ngIf="showMore" class="fas fa-angle-up"></i>
+                      {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
+                    </button>
+                  </td>
+                  <ng-container *ngIf="showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1">
+                    <td>
+                      <p>
+                        <span *ngIf="eventElement.event.message">
+                          <span>{{eventElement.event.message.reason}}</span><br>
+                        </span>
+                      </p>
+                    </td>
+                    <td>
+                      <p>
+                        <span *ngIf="eventElement.event.originalId">
+                          <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
+                        </span>
+                      </p>
+                    </td>
+                  </ng-container>
+
+                  <td *ngIf="showTopic.indexOf('/PROJECT') !== -1">
+                    <p>
+                      {{'quality-assurance.event.table.suggestedProject' | translate}}
+                    </p>
+                    <p>
+                      <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
+                      <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
+                    </p>
+                    <p>
+                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.acronym}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.code}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.funder}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.jurisdiction}}</span></span>
+                    </p>
+                    <hr>
+                    <div>
+                      {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
+                      <a target="_blank" rel="noopener noreferrer" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
+                      <div class="btn-group">
+                        <button *ngIf="!eventElement.hasProject"
+                                class="btn btn-outline-primary btn-sm"
+                                [disabled]="eventElement.isRunning"
+                                (click)="openModalLookup(eventElement); $event.stopPropagation();"
+                                [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
+                        >
+                          <i class="fas fa-search"></i>
+                        </button>
+                        <button *ngIf="eventElement.hasProject"
+                                class="btn btn-outline-danger btn-sm"
+                                [disabled]="eventElement.isRunning"
+                                (click)="removeProject(eventElement)"
+                                [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
+                        >
+                          <i class="fas fa-trash-alt"></i>
+                        </button>
+                      </div>
+                    </div>
+                  </td>
+                  <td>
+                    <div *ngIf="(isAdmin$ | async)" class="btn-group button-width">
+                      <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
+                              class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.import' | translate"
+                      >
+                        <i class="fas fa-check"></i>
+                      </button>
+                      <button *ngIf="showTopic.indexOf('/PROJECT') === -1"
+                              class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="executeAction('ACCEPTED', eventElement)"
+                              [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
+                      >
+                        <i class="fas fa-check"></i>
+                      </button>
+                      <button class="btn btn-outline-dark btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('DISCARDED', eventElement, ignoreModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
+                      >
+                        <i class="fas fa-ban"></i>
+                      </button>
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('REJECTED', eventElement, rejectModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
+                      >
+                        <i class="fas fa-trash-alt"></i>
+                      </button>
+                    </div>
+                    <div *ngIf="(isAdmin$ | async) !== true" class="btn-group button-width">
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                              (click)="openModal('UNDO', eventElement, undoModal)">
+                        <i class="fas fa-trash-alt"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
+
+<ng-template #acceptModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="acceptModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.accept.description' | translate}}</p>
+
+    <button class="btn btn-outline-success float-right" (click)="modal.close('do')">
+      <i class="fas fa-check"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.import' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #ignoreModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.ignore' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #rejectModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.reject.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.reject' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #undoModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.undo.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.undo' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.scss b/src/app/notifications/qa/events/quality-assurance-events.component.scss
new file mode 100644
index 0000000000..29c16328c3
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.scss
@@ -0,0 +1,28 @@
+.button-col, .trust-col {
+  width: 15%;
+}
+
+.title-col {
+  width: 30%;
+}
+.content-col {
+  width: 40%;
+}
+
+.button-width {
+  width: 100%;
+}
+
+.abstract-container {
+  height: 76px;
+  overflow: hidden;
+}
+
+.text-ellipsis {
+  text-overflow: ellipsis;
+}
+
+.show {
+  overflow: visible;
+  height: auto;
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
new file mode 100644
index 0000000000..0346982760
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -0,0 +1,358 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceEventRestService,
+  ItemMockPid8,
+  ItemMockPid9,
+  ItemMockPid10,
+  NotificationsMockDspaceObject,
+  qualityAssuranceEventObjectMissingProjectFound,
+  qualityAssuranceEventObjectMissingProjectNotFound,
+} from '../../../shared/mocks/notifications.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
+import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
+
+describe('QualityAssuranceEventsComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceEventsComponent>;
+  let comp: QualityAssuranceEventsComponent;
+  let compAsAny: any;
+  let scheduler: TestScheduler;
+
+  const modalStub = {
+    open: () => ( { result: new Promise((res, rej) => 'do') } ),
+    close: () => null,
+    dismiss: () => null,
+  };
+  const qualityAssuranceEventRestServiceStub: any = getMockQualityAssuranceEventRestService();
+  const activatedRouteParams = {
+    qualityAssuranceEventsParams: {
+      currentPage: 0,
+      pageSize: 10,
+    },
+  };
+  const activatedRouteParamsMap = {
+    id: 'ENRICH!MISSING!PROJECT',
+  };
+
+  const events: QualityAssuranceEventObject[] = [
+    qualityAssuranceEventObjectMissingProjectFound,
+    qualityAssuranceEventObjectMissingProjectNotFound,
+  ];
+  const paginationService = new PaginationServiceStub();
+
+  function getQualityAssuranceEventData1(): QualityAssuranceEventData {
+    return {
+      event: qualityAssuranceEventObjectMissingProjectFound,
+      id: qualityAssuranceEventObjectMissingProjectFound.id,
+      title: qualityAssuranceEventObjectMissingProjectFound.title,
+      hasProject: true,
+      projectTitle: qualityAssuranceEventObjectMissingProjectFound.message.title,
+      projectId: ItemMockPid10.id,
+      handle: ItemMockPid10.handle,
+      reason: null,
+      isRunning: false,
+      target: ItemMockPid8,
+    };
+  }
+
+  function getQualityAssuranceEventData2(): QualityAssuranceEventData {
+    return {
+      event: qualityAssuranceEventObjectMissingProjectNotFound,
+      id: qualityAssuranceEventObjectMissingProjectNotFound.id,
+      title: qualityAssuranceEventObjectMissingProjectNotFound.title,
+      hasProject: false,
+      projectTitle: null,
+      projectId: null,
+      handle: null,
+      reason: null,
+      isRunning: false,
+      target: ItemMockPid9,
+    };
+  }
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceEventsComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub(activatedRouteParamsMap, activatedRouteParams) },
+        { provide: QualityAssuranceEventDataService, useValue: qualityAssuranceEventRestServiceStub },
+        { provide: NgbModal, useValue: modalStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: getMockTranslateService() },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ItemDataService, useValue: {} },
+        { provide: AuthorizationDataService, useValue: {} },
+        QualityAssuranceEventsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+    scheduler = getTestScheduler();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-event></ds-quality-assurance-event>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceEventsComponent', inject([QualityAssuranceEventsComponent], (app: QualityAssuranceEventsComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceEventsComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    describe('fetchEvents', () => {
+      it('should fetch events', () => {
+        const result = compAsAny.fetchEvents(events);
+        const expected = cold('(a|)', {
+          a: [
+            getQualityAssuranceEventData1(),
+            getQualityAssuranceEventData2(),
+          ],
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('modalChoice', () => {
+      beforeEach(() => {
+        spyOn(comp, 'executeAction');
+        spyOn(comp, 'openModal');
+      });
+
+      it('should call executeAction if a project is present', () => {
+        const action = 'ACCEPTED';
+        comp.modalChoice(action, getQualityAssuranceEventData1(), modalStub);
+        expect(comp.executeAction).toHaveBeenCalledWith(action, getQualityAssuranceEventData1());
+      });
+
+      it('should call openModal if a project is not present', () => {
+        const action = 'ACCEPTED';
+        comp.modalChoice(action, getQualityAssuranceEventData2(), modalStub);
+        expect(comp.openModal).toHaveBeenCalledWith(action, getQualityAssuranceEventData2(), modalStub);
+      });
+    });
+
+    describe('openModal', () => {
+      it('should call modalService.open', () => {
+        const action = 'ACCEPTED';
+        comp.selectedReason = null;
+        spyOn(compAsAny.modalService, 'open').and.returnValue({ result: new Promise((res, rej) => 'do' ) });
+        spyOn(comp, 'executeAction');
+
+        comp.openModal(action, getQualityAssuranceEventData1(), modalStub);
+        expect(compAsAny.modalService.open).toHaveBeenCalled();
+      });
+    });
+
+    describe('openModalLookup', () => {
+      it('should call modalService.open', () => {
+        spyOn(comp, 'boundProject');
+        spyOn(compAsAny.modalService, 'open').and.returnValue(
+          {
+            componentInstance: {
+              externalSourceEntry: null,
+              label: null,
+              importedObject: observableOf({
+                indexableObject: NotificationsMockDspaceObject,
+              }),
+            },
+          },
+        );
+        scheduler.schedule(() => {
+          comp.openModalLookup(getQualityAssuranceEventData1());
+        });
+        scheduler.flush();
+
+        expect(compAsAny.modalService.open).toHaveBeenCalled();
+        expect(compAsAny.boundProject).toHaveBeenCalled();
+      });
+    });
+
+    describe('executeAction', () => {
+      it('should call getQualityAssuranceEvents on 200 response from REST', () => {
+        const action = 'ACCEPTED';
+        spyOn(compAsAny, 'getQualityAssuranceEvents').and.returnValue(observableOf([
+          getQualityAssuranceEventData1(),
+          getQualityAssuranceEventData2(),
+        ]));
+        qualityAssuranceEventRestServiceStub.patchEvent.and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+        scheduler.schedule(() => {
+          comp.executeAction(action, getQualityAssuranceEventData1());
+        });
+        scheduler.flush();
+
+        expect(compAsAny.getQualityAssuranceEvents).toHaveBeenCalled();
+      });
+    });
+
+    describe('boundProject', () => {
+      it('should populate the project data inside "eventData"', () => {
+        const eventData = getQualityAssuranceEventData2();
+        const projectId = 'UUID-23943-34u43-38344';
+        const projectName = 'Test Project';
+        const projectHandle = '1000/1000';
+        qualityAssuranceEventRestServiceStub.boundProject.and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+        scheduler.schedule(() => {
+          comp.boundProject(eventData, projectId, projectName, projectHandle);
+        });
+        scheduler.flush();
+
+        expect(eventData.hasProject).toEqual(true);
+        expect(eventData.projectId).toEqual(projectId);
+        expect(eventData.projectTitle).toEqual(projectName);
+        expect(eventData.handle).toEqual(projectHandle);
+      });
+    });
+
+    describe('removeProject', () => {
+      it('should remove the project data inside "eventData"', () => {
+        const eventData = getQualityAssuranceEventData1();
+        qualityAssuranceEventRestServiceStub.removeProject.and.returnValue(createNoContentRemoteDataObject$());
+
+        scheduler.schedule(() => {
+          comp.removeProject(eventData);
+        });
+        scheduler.flush();
+
+        expect(eventData.hasProject).toEqual(false);
+        expect(eventData.projectId).toBeNull();
+        expect(eventData.projectTitle).toBeNull();
+        expect(eventData.handle).toBeNull();
+      });
+    });
+
+    describe('getQualityAssuranceEvents', () => {
+      it('should call the "qualityAssuranceEventRestService.getEventsByTopic" to take data and "fetchEvents" to populate eventData', () => {
+        comp.paginationConfig = new PaginationComponentOptions();
+        comp.paginationConfig.currentPage = 1;
+        comp.paginationConfig.pageSize = 20;
+        comp.paginationSortConfig = new SortOptions('trust', SortDirection.DESC);
+        comp.topic = activatedRouteParamsMap.id;
+        const options: FindListOptions = Object.assign(new FindListOptions(), {
+          currentPage: comp.paginationConfig.currentPage,
+          elementsPerPage: comp.paginationConfig.pageSize,
+        });
+
+        const pageInfo = new PageInfo({
+          elementsPerPage: comp.paginationConfig.pageSize,
+          totalElements: 2,
+          totalPages: 1,
+          currentPage: comp.paginationConfig.currentPage,
+        });
+        const array =  [
+          qualityAssuranceEventObjectMissingProjectFound,
+          qualityAssuranceEventObjectMissingProjectNotFound,
+        ];
+        const paginatedList = buildPaginatedList(pageInfo, array);
+        const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+        qualityAssuranceEventRestServiceStub.getEventsByTopic.and.returnValue(observableOf(paginatedListRD));
+        spyOn(compAsAny, 'fetchEvents').and.returnValue(observableOf([
+          getQualityAssuranceEventData1(),
+          getQualityAssuranceEventData2(),
+        ]));
+
+        scheduler.schedule(() => {
+          compAsAny.getQualityAssuranceEvents().subscribe();
+        });
+        scheduler.flush();
+
+        expect(compAsAny.qualityAssuranceEventRestService.getEventsByTopic).toHaveBeenCalledWith(
+          activatedRouteParamsMap.id,
+          options,
+          followLink('target'),followLink('related'),
+        );
+        expect(compAsAny.fetchEvents).toHaveBeenCalled();
+      });
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
new file mode 100644
index 0000000000..cd6bf28f34
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -0,0 +1,539 @@
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  last,
+  map,
+  mergeMap,
+  scan,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import {
+  QualityAssuranceEventObject,
+  SourceQualityAssuranceEventMessageObject,
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemSearchResult } from '../../../shared/object-collection/shared/item-search-result.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  ProjectEntryImportModalComponent,
+  QualityAssuranceEventData,
+} from '../project-entry-import-modal/project-entry-import-modal.component';
+
+/**
+ * Component to display the Quality Assurance event list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-events',
+  templateUrl: './quality-assurance-events.component.html',
+  styleUrls: ['./quality-assurance-events.component.scss'],
+})
+export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'bep',
+    currentPage: 1,
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance event list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions = new SortOptions('trust', SortDirection.DESC);
+  /**
+   * Array to save the presence of a project inside an Quality Assurance event.
+   * @type {QualityAssuranceEventData[]>}
+   */
+  public eventsUpdated$: BehaviorSubject<QualityAssuranceEventData[]> = new BehaviorSubject([]);
+  /**
+   * The total number of Quality Assurance events.
+   * @type {Observable<number>}
+   */
+  public totalElements$: BehaviorSubject<number> = new BehaviorSubject<number>(null);
+  /**
+   * The topic of the Quality Assurance events; suitable for displaying.
+   * @type {string}
+   */
+  public showTopic: string;
+  /**
+   * The topic of the Quality Assurance events; suitable for HTTP calls.
+   * @type {string}
+   */
+  public topic: string;
+  /**
+   * The sourceId of the Quality Assurance events.
+   * @type {string}
+   */
+  sourceId: string;
+  /**
+   * The rejected/ignore reason.
+   * @type {string}
+   */
+  public selectedReason: string;
+  /**
+   * Contains the information about the loading status of the page.
+   * @type {Observable<boolean>}
+   */
+  public isEventPageLoading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The modal reference.
+   * @type {any}
+   */
+  public modalRef: any;
+  /**
+   * Used to store the status of the 'Show more' button of the abstracts.
+   * @type {boolean}
+   */
+  public showMore = false;
+  /**
+   * The quality assurance source base url for project search
+   */
+  public sourceUrlForProjectSearch: string;
+  /**
+   * The FindListOptions object
+   */
+  protected defaultConfig: FindListOptions = Object.assign(new FindListOptions(), { sort: this.paginationSortConfig });
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The target item id, retrieved from the topic-id composition.
+   */
+  public targetId: string;
+
+  /**
+   * The URL of the item page/target.
+   */
+  public itemPageUrl: string;
+
+  /**
+   * Plain topic name (without the source id)
+   */
+  public selectedTopicName: string;
+
+
+  /**
+   * Observable that emits a boolean value indicating whether the user is an admin.
+   */
+  isAdmin$: Observable<boolean>;
+
+  /**
+   * Initialize the component variables.
+   * @param {ActivatedRoute} activatedRoute
+   * @param {NgbModal} modalService
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceEventDataService} qualityAssuranceEventRestService
+   * @param {PaginationService} paginationService
+   * @param {TranslateService} translateService
+   * @param authorizationService
+   * @param itemService
+   */
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private modalService: NgbModal,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceEventRestService: QualityAssuranceEventDataService,
+    private paginationService: PaginationService,
+    private translateService: TranslateService,
+    private authorizationService: AuthorizationDataService,
+    private itemService: ItemDataService,
+  ) {
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.isEventPageLoading.next(true);
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+    this.activatedRoute.paramMap.pipe(
+      tap((params) => {
+        this.sourceUrlForProjectSearch = environment.qualityAssuranceConfig.sourceUrlMapForProjectSearch[params.get('sourceId')];
+        this.sourceId = params.get('sourceId');
+      }),
+      map((params) => params.get('topicId')),
+      take(1),
+      switchMap((id: string) => {
+        const regEx = /!/g;
+        this.showTopic = id.replace(regEx, '/');
+        this.topic = id;
+        const splitList = this.showTopic?.split(':');
+        this.targetId = splitList.length > 2 ? splitList.pop() : null;
+        this.selectedTopicName = splitList[1];
+        this.sourceId = splitList[0];
+        return this.getQualityAssuranceEvents();
+      }),
+    ).subscribe(
+      {
+        next: (events: QualityAssuranceEventData[]) => {
+          this.eventsUpdated$.next(events);
+          this.isEventPageLoading.next(false);
+        },
+        error: (error: unknown) => {
+          this.isEventPageLoading.next(false);
+        },
+      },
+    );
+  }
+
+  /**
+   * Check if table have a detail column
+   */
+  public hasDetailColumn(): boolean {
+    return (this.showTopic.indexOf('/PROJECT') !== -1 ||
+      this.showTopic.indexOf('/PID') !== -1 ||
+      this.showTopic.indexOf('/SUBJECT') !== -1 ||
+      this.showTopic.indexOf('/WITHDRAWN') !== -1 ||
+      this.showTopic.indexOf('/REINSTATE') !== -1 ||
+      this.showTopic.indexOf('/ABSTRACT') !== -1
+    );
+  }
+
+  /**
+   * Open a modal or run the executeAction directly based on the presence of the project.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   * @param {any} content
+   *    Reference to the modal
+   */
+  public modalChoice(action: string, eventData: QualityAssuranceEventData, content: any): void {
+    if (eventData.hasProject) {
+      this.executeAction(action, eventData);
+    } else {
+      this.openModal(action, eventData, content);
+    }
+  }
+
+  /**
+   * Open the selected modal and performs the action if needed.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   * @param {any} content
+   *    Reference to the modal
+   */
+  public openModal(action: string, eventData: QualityAssuranceEventData, content: any): void {
+    this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then(
+      (result) => {
+        if (result === 'do') {
+          eventData.reason = this.selectedReason;
+          this.executeAction(action, eventData);
+        }
+        this.selectedReason = null;
+      },
+      (_reason) => {
+        this.selectedReason = null;
+      },
+    );
+  }
+
+  /**
+   * Open a modal where the user can select the project.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event item data
+   */
+  public openModalLookup(eventData: QualityAssuranceEventData): void {
+    this.modalRef = this.modalService.open(ProjectEntryImportModalComponent, {
+      size: 'lg',
+    });
+    const modalComp = this.modalRef.componentInstance;
+    modalComp.externalSourceEntry = eventData;
+    modalComp.label = 'project';
+    this.subs.push(
+      modalComp.importedObject.pipe(take(1))
+        .subscribe((object: ItemSearchResult) => {
+          const projectTitle = Metadata.first(object.indexableObject.metadata, 'dc.title');
+          this.boundProject(
+            eventData,
+            object.indexableObject.id,
+            projectTitle.value,
+            object.indexableObject.handle,
+          );
+        }),
+    );
+  }
+
+  /**
+   * Performs the choosen action calling the REST service.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   */
+  public executeAction(action: string, eventData: QualityAssuranceEventData): void {
+    eventData.isRunning = true;
+    let operation;
+    if (action === 'UNDO') {
+      operation = this.delete(eventData);
+    } else {
+      operation = this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason);
+    }
+    this.subs.push(
+      operation.pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.action.saved'),
+            );
+            return this.getQualityAssuranceEvents();
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.action.error'),
+            );
+            return of(this.eventsUpdated$.value);
+          }
+        }),
+      ).subscribe((events: QualityAssuranceEventData[]) => {
+        this.eventsUpdated$.next(events);
+        eventData.isRunning = false;
+      }),
+    );
+  }
+
+  /**
+   * Bound a project to the publication described in the Quality Assurance event calling the REST service.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event item data
+   * @param {string} projectId
+   *    the project Id to bound
+   * @param {string} projectTitle
+   *    the project title
+   * @param {string} projectHandle
+   *    the project handle
+   */
+  public boundProject(eventData: QualityAssuranceEventData, projectId: string, projectTitle: string, projectHandle: string): void {
+    eventData.isRunning = true;
+    this.subs.push(
+      this.qualityAssuranceEventRestService.boundProject(eventData.id, projectId).pipe(getFirstCompletedRemoteData())
+        .subscribe((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.project.bounded'),
+            );
+            eventData.hasProject = true;
+            eventData.projectTitle = projectTitle;
+            eventData.handle = projectHandle;
+            eventData.projectId = projectId;
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.project.error'),
+            );
+          }
+          eventData.isRunning = false;
+        }),
+    );
+  }
+
+  /**
+   * Remove the bounded project from the publication described in the Quality Assurance event calling the REST service.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   */
+  public removeProject(eventData: QualityAssuranceEventData): void {
+    eventData.isRunning = true;
+    this.subs.push(
+      this.qualityAssuranceEventRestService.removeProject(eventData.id).pipe(getFirstCompletedRemoteData())
+        .subscribe((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.project.removed'),
+            );
+            eventData.hasProject = false;
+            eventData.projectTitle = null;
+            eventData.handle = null;
+            eventData.projectId = null;
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.project.error'),
+            );
+          }
+          eventData.isRunning = false;
+        }),
+    );
+  }
+
+  /**
+   * Check if the event has a valid href.
+   * @param event
+   */
+  public hasPIDHref(event: SourceQualityAssuranceEventMessageObject): boolean {
+    return this.getPIDHref(event) !== null;
+  }
+
+  /**
+   * Get the event pid href.
+   * @param event
+   */
+  public getPIDHref(event: SourceQualityAssuranceEventMessageObject): string {
+    return event.pidHref;
+  }
+
+  /**
+   * Dispatch the Quality Assurance events retrival.
+   */
+  public getQualityAssuranceEvents(): Observable<QualityAssuranceEventData[]> {
+    return this.paginationService.getFindListOptions(this.paginationConfig.id, this.defaultConfig).pipe(
+      distinctUntilChanged(),
+      switchMap((options: FindListOptions) => this.qualityAssuranceEventRestService.getEventsByTopic(
+        this.topic,
+        options,
+        followLink('target'), followLink('related'),
+      )),
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<PaginatedList<QualityAssuranceEventObject>>) => {
+        if (rd.hasSucceeded) {
+          this.totalElements$.next(rd.payload.totalElements);
+          if (rd.payload?.page?.length > 0) {
+            return this.fetchEvents(rd.payload.page);
+          } else {
+            return of([]);
+          }
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance events from the Broker events REST service');
+        }
+      }),
+      take(1),
+      tap(() => {
+        this.qualityAssuranceEventRestService.clearFindByTopicRequests();
+      }),
+    );
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Fetch Quality Assurance events in order to build proper QualityAssuranceEventData object.
+   *
+   * @param {QualityAssuranceEventObject[]} events
+   *    the Quality Assurance event item
+   * @return array of QualityAssuranceEventData
+   */
+  protected fetchEvents(events: QualityAssuranceEventObject[]): Observable<QualityAssuranceEventData[]> {
+    return from(events).pipe(
+      mergeMap((event: QualityAssuranceEventObject) => {
+        const related$ = event.related.pipe(
+          getFirstCompletedRemoteData(),
+        );
+        const target$ = event.target.pipe(
+          getFirstCompletedRemoteData(),
+        );
+        return combineLatest([related$, target$]).pipe(
+          map(([relatedItemRD, targetItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+            const data: QualityAssuranceEventData = {
+              event: event,
+              id: event.id,
+              title: event.title,
+              hasProject: false,
+              projectTitle: null,
+              projectId: null,
+              handle: null,
+              reason: null,
+              isRunning: false,
+              target: (targetItemRD?.hasSucceeded) ? targetItemRD.payload : null,
+            };
+            if (relatedItemRD?.hasSucceeded && relatedItemRD?.payload?.id) {
+              data.hasProject = true;
+              data.projectTitle = event.message.title;
+              data.projectId = relatedItemRD?.payload?.id;
+              data.handle = relatedItemRD?.payload?.handle;
+            }
+            return data;
+          }),
+        );
+      }),
+      scan((acc: any, value: any) => [...acc, value], []),
+      last(),
+    );
+  }
+
+  /**
+   * Deletes a quality assurance event.
+   * @param qaEvent The quality assurance event to delete.
+   * @returns An Observable of RemoteData containing NoContent.
+   */
+  delete(qaEvent: QualityAssuranceEventData): Observable<RemoteData<NoContent>> {
+    return this.qualityAssuranceEventRestService.deleteQAEvent(qaEvent);
+  }
+
+  /**
+   * Returns an Observable that emits the title of the target item.
+   * The target item is retrieved by its ID using the itemService.
+   * The title is extracted from the first metadata value of the item.
+   * The item page URL is also set in the component.
+   * @returns An Observable that emits the title of the target item.
+   */
+  public getTargetItemTitle(): Observable<string> {
+    return this.itemService.findById(this.targetId).pipe(
+      take(1),
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((item: Item) => this.itemPageUrl = getItemPageRoute(item)),
+      map((item: Item) => item.firstMetadataValue('dc.title')),
+    );
+  }
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
new file mode 100644
index 0000000000..1004082a93
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -0,0 +1,71 @@
+<div class="modal-header">
+  <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
+  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+          (click)="close()">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <small>{{ (labelPrefix + label + '.publication' | translate) }}</small>
+  <div class="mb-3">
+    <div class="text-truncate">
+      <a target="_blank" [routerLink]="'/items/{{(externalSourceEntry.event.target|async)?.payload?.id}}'">
+        {{externalSourceEntry.title}}
+      </a>
+    </div>
+  </div>
+  <div *ngIf="externalSourceEntry.projectTitle">
+    <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
+    <div class="mb-3">
+      <div class="text-truncate">
+        <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
+          {{externalSourceEntry.projectTitle}}
+        </a>
+      </div>
+    </div>
+  </div>
+
+  <h4>{{ (labelPrefix + label + '.select' | translate) }}</h4>
+
+  <div id="project-entities" class="mb-3">
+
+    <div id="project-search" class="input-group mb-3">
+      <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
+      <div class="input-group-append">
+        <button type="button" class="btn btn-outline-secondary" [disabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [disabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+      </div>
+    </div>
+
+    <ds-loading *ngIf="(isLoading$ | async)" message="{{'loading.search-results' | translate}}"></ds-loading>
+    <ds-themed-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true"
+                              [searchResults]="(localEntitiesRD$ | async)"
+                              [sortConfig]="this.searchOptions?.sort"
+                              [searchConfig]="this.searchOptions"
+                              [selectable]="true"
+                              [disableHeader]="true"
+                              [hidePaginationDetail]="false"
+                              [selectionConfig]="{ repeatable: false, listId: entityListId }"
+                              [showCsvExport]="false"
+                              [linkType]="linkTypes.ExternalLink"
+                              [context]="context"
+                              (deselectObject)="deselectEntity()"
+                              (selectObject)="selectEntity($event)">
+    </ds-themed-search-results>
+
+    <div *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true">
+      <ds-alert [type]="'alert-info'">
+        <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
+      </ds-alert>
+    </div>
+
+  </div>
+</div>
+<div class="modal-footer">
+  <div>
+    <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
+  </div>
+  <div>
+    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+  </div>
+</div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
new file mode 100644
index 0000000000..7db9839e38
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
@@ -0,0 +1,3 @@
+.modal-footer {
+  justify-content: space-between;
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
new file mode 100644
index 0000000000..cddac117b5
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -0,0 +1,222 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { Item } from '../../../core/shared/item.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  ItemMockPid10,
+  NotificationsMockDspaceObject,
+  qualityAssuranceEventObjectMissingProjectFound,
+} from '../../../shared/mocks/notifications.mock';
+import { getMockSearchService } from '../../../shared/mocks/search-service.mock';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import {
+  ImportType,
+  ProjectEntryImportModalComponent,
+} from './project-entry-import-modal.component';
+
+const eventData = {
+  event: qualityAssuranceEventObjectMissingProjectFound,
+  id: qualityAssuranceEventObjectMissingProjectFound.id,
+  title: qualityAssuranceEventObjectMissingProjectFound.title,
+  hasProject: true,
+  projectTitle: qualityAssuranceEventObjectMissingProjectFound.message.title,
+  projectId: ItemMockPid10.id,
+  handle: ItemMockPid10.handle,
+  reason: null,
+  isRunning: false,
+};
+
+const searchString = 'Test project to search';
+const pagination = Object.assign(
+  new PaginationComponentOptions(), {
+    id: 'notifications-project-bound',
+    pageSize: 3,
+  },
+);
+const searchOptions = Object.assign(new PaginatedSearchOptions(
+  {
+    configuration: 'funding',
+    query: searchString,
+    pagination: pagination,
+  },
+));
+const pageInfo = new PageInfo({
+  elementsPerPage: 3,
+  totalElements: 1,
+  totalPages: 1,
+  currentPage: 1,
+});
+const array = [
+  NotificationsMockDspaceObject,
+];
+const paginatedList = buildPaginatedList(pageInfo, array);
+const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+describe('ProjectEntryImportModalComponent test suite', () => {
+  let fixture: ComponentFixture<ProjectEntryImportModalComponent>;
+  let comp: ProjectEntryImportModalComponent;
+  let compAsAny: any;
+
+  const modalStub = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+  const uuid = '123e4567-e89b-12d3-a456-426614174003';
+  const searchServiceStub: any = getMockSearchService();
+
+
+  beforeEach(async (() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        ProjectEntryImportModalComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: SearchService, useValue: searchServiceStub },
+        { provide: SelectableListService, useValue: jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']) },
+        ProjectEntryImportModalComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      searchServiceStub.search.and.returnValue(observableOf(paginatedListRD));
+      const html = `
+        <ds-project-entry-import-modal [externalSourceEntry]="eventData"></ds-project-entry-import-modal>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ProjectEntryImportModalComponent', inject([ProjectEntryImportModalComponent], (app: ProjectEntryImportModalComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ProjectEntryImportModalComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    describe('close', () => {
+      it('should close the modal', () => {
+        comp.close();
+        expect(modalStub.close).toHaveBeenCalled();
+      });
+    });
+
+    describe('search', () => {
+      it('should call SearchService.search', () => {
+
+        (searchServiceStub as any).search.and.returnValue(observableOf(paginatedListRD));
+        comp.pagination = pagination;
+
+        comp.search(searchString);
+        expect(comp.searchService.search).toHaveBeenCalledWith(searchOptions);
+      });
+    });
+
+    describe('bound', () => {
+      it('should call close, deselectAllLists and importedObject.emit', () => {
+        spyOn(comp, 'deselectAllLists');
+        spyOn(comp, 'close');
+        spyOn(comp.importedObject, 'emit');
+        comp.selectedEntity = NotificationsMockDspaceObject;
+        comp.bound();
+
+        expect(comp.importedObject.emit).toHaveBeenCalled();
+        expect(comp.deselectAllLists).toHaveBeenCalled();
+        expect(comp.close).toHaveBeenCalled();
+      });
+    });
+
+    describe('selectEntity', () => {
+      const entity = Object.assign(new Item(), { uuid: uuid });
+      beforeEach(() => {
+        comp.selectEntity(entity);
+      });
+
+      it('should set selected entity', () => {
+        expect(comp.selectedEntity).toBe(entity);
+      });
+
+      it('should set the import type to local entity', () => {
+        expect(comp.selectedImportType).toEqual(ImportType.LocalEntity);
+      });
+    });
+
+    describe('deselectEntity', () => {
+      const entity = Object.assign(new Item(), { uuid: uuid });
+      beforeEach(() => {
+        comp.selectedImportType = ImportType.LocalEntity;
+        comp.selectedEntity = entity;
+        comp.deselectEntity();
+      });
+
+      it('should remove the selected entity', () => {
+        expect(comp.selectedEntity).toBeUndefined();
+      });
+
+      it('should set the import type to none', () => {
+        expect(comp.selectedImportType).toEqual(ImportType.None);
+      });
+    });
+
+    describe('deselectAllLists', () => {
+      it('should call SelectableListService.deselectAll', () => {
+        comp.deselectAllLists();
+        expect(compAsAny.selectService.deselectAll).toHaveBeenCalledWith(comp.entityListId);
+        expect(compAsAny.selectService.deselectAll).toHaveBeenCalledWith(comp.authorityListId);
+      });
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+  eventData = eventData;
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
new file mode 100644
index 0000000000..5349a3c995
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -0,0 +1,291 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import {
+  QualityAssuranceEventObject,
+  SourceQualityAssuranceEventMessageObject,
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { CollectionElementLinkType } from '../../../shared/object-collection/collection-element-link.type';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+
+/**
+ * The possible types of import for the external entry
+ */
+export enum ImportType {
+  None = 'None',
+  LocalEntity = 'LocalEntity',
+  LocalAuthority = 'LocalAuthority',
+  NewEntity = 'NewEntity',
+  NewAuthority = 'NewAuthority'
+}
+
+/**
+ * The data type passed from the parent page
+ */
+export interface QualityAssuranceEventData {
+  /**
+   * The Quality Assurance event
+   */
+  event: QualityAssuranceEventObject;
+  /**
+   * The Quality Assurance event Id (uuid)
+   */
+  id: string;
+  /**
+   * The publication title
+   */
+  title: string;
+  /**
+   * Contains the boolean that indicates if a project is present
+   */
+  hasProject: boolean;
+  /**
+   * The project title, if present
+   */
+  projectTitle: string;
+  /**
+   * The project id (uuid), if present
+   */
+  projectId: string;
+  /**
+   * The project handle, if present
+   */
+  handle: string;
+  /**
+   * The reject/discard reason
+   */
+  reason: string;
+  /**
+   * Contains the boolean that indicates if there is a running operation (REST call)
+   */
+  isRunning: boolean;
+  /**
+   * The related publication DSpace item
+   */
+  target?: Item;
+}
+
+@Component({
+  selector: 'ds-project-entry-import-modal',
+  styleUrls: ['./project-entry-import-modal.component.scss'],
+  templateUrl: './project-entry-import-modal.component.html',
+})
+/**
+ * Component to display a modal window for linking a project to an Quality Assurance event
+ * Shows information about the selected project and a selectable list.
+ */
+export class ProjectEntryImportModalComponent implements OnInit {
+  /**
+   * The external source entry
+   */
+  @Input() externalSourceEntry: QualityAssuranceEventData;
+  /**
+   * The number of results per page
+   */
+  pageSize = 3;
+  /**
+   * The prefix for every i18n key within this modal
+   */
+  labelPrefix = 'quality-assurance.event.modal.';
+  /**
+   * The search configuration to retrieve project
+   */
+  configuration = 'funding';
+  /**
+   * The label to use for all messages (added to the end of relevant i18n keys)
+   */
+  label: string;
+  /**
+   * The project title from the parent object
+   */
+  projectTitle: string;
+  /**
+   * The search results
+   */
+  localEntitiesRD$: Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>;
+  /**
+   * Information about the data loading status
+   */
+  isLoading$ = observableOf(true);
+  /**
+   * Search options to use for fetching projects
+   */
+  searchOptions: PaginatedSearchOptions;
+  /**
+   * The context we're currently in (submission)
+   */
+  context = Context.EntitySearchModalWithNameVariants;
+  /**
+   * List ID for selecting local entities
+   */
+  entityListId = 'notifications-project-bound';
+  /**
+   * List ID for selecting local authorities
+   */
+  authorityListId = 'notifications-project-bound-authority';
+  /**
+   * ImportType enum
+   */
+  importType = ImportType;
+  /**
+   * The type of link to render in listable elements
+   */
+  linkTypes = CollectionElementLinkType;
+  /**
+   * The type of import the user currently has selected
+   */
+  selectedImportType = ImportType.None;
+  /**
+   * The selected local entity
+   */
+  selectedEntity: ListableObject;
+  /**
+   * An project has been selected, send it to the parent component
+   */
+  importedObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  /**
+   * Pagination options
+   */
+  pagination: PaginationComponentOptions;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {NgbActiveModal} modal
+   * @param {SearchService} searchService
+   * @param {SelectableListService} selectService
+   */
+  constructor(public modal: NgbActiveModal,
+              public searchService: SearchService,
+              private selectService: SelectableListService) { }
+
+  /**
+   * Component intitialization.
+   */
+  public ngOnInit(): void {
+    this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'notifications-project-bound', pageSize: this.pageSize });
+    this.projectTitle = (this.externalSourceEntry.projectTitle !== null) ? this.externalSourceEntry.projectTitle
+      : (this.externalSourceEntry.event.message as SourceQualityAssuranceEventMessageObject).title;
+    this.searchOptions = Object.assign(new PaginatedSearchOptions(
+      {
+        configuration: this.configuration,
+        query: this.projectTitle,
+        pagination: this.pagination,
+      },
+    ));
+    this.localEntitiesRD$ = this.searchService.search(this.searchOptions);
+    this.subs.push(
+      this.localEntitiesRD$.subscribe(
+        () => this.isLoading$ = observableOf(false),
+      ),
+    );
+  }
+
+  /**
+   * Close the modal.
+   */
+  public close(): void {
+    this.deselectAllLists();
+    this.modal.close();
+  }
+
+  /**
+   * Perform a project search by title.
+   */
+  public search(searchTitle): void {
+    if (isNotEmpty(searchTitle)) {
+      const filterRegEx = /[:]/g;
+      this.isLoading$ = observableOf(true);
+      this.searchOptions = Object.assign(new PaginatedSearchOptions(
+        {
+          configuration: this.configuration,
+          query: (searchTitle) ? searchTitle.replace(filterRegEx, '') : searchTitle,
+          pagination: this.pagination,
+        },
+      ));
+      this.localEntitiesRD$ = this.searchService.search(this.searchOptions);
+      this.subs.push(
+        this.localEntitiesRD$.subscribe(
+          () => this.isLoading$ = observableOf(false),
+        ),
+      );
+    }
+  }
+
+  /**
+   * Perform the bound of the project.
+   */
+  public bound(): void {
+    if (this.selectedEntity !== undefined) {
+      this.importedObject.emit(this.selectedEntity);
+    }
+    this.selectedImportType = ImportType.None;
+    this.deselectAllLists();
+    this.close();
+  }
+
+  /**
+   * Deselected a local entity
+   */
+  public deselectEntity(): void {
+    this.selectedEntity = undefined;
+    if (this.selectedImportType === ImportType.LocalEntity) {
+      this.selectedImportType = ImportType.None;
+    }
+  }
+
+  /**
+   * Selected a local entity
+   * @param entity
+   */
+  public selectEntity(entity): void {
+    this.selectedEntity = entity;
+    this.selectedImportType = ImportType.LocalEntity;
+  }
+
+  /**
+   * Deselect every element from both entity and authority lists
+   */
+  public deselectAllLists(): void {
+    this.selectService.deselectAll(this.entityListId);
+    this.selectService.deselectAll(this.authorityListId);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.deselectAllLists();
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.actions.ts b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
new file mode 100644
index 0000000000..0493b035ab
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
@@ -0,0 +1,99 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { type } from '../../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const QualityAssuranceSourceActionTypes = {
+  ADD_SOURCE: type('dspace/integration/notifications/qa/ADD_SOURCE'),
+  RETRIEVE_ALL_SOURCE: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE'),
+  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
+};
+
+/**
+ * An ngrx action to retrieve all the Quality Assurance source.
+ */
+export class RetrieveAllSourceAction implements Action {
+  type = QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE;
+  payload: {
+    elementsPerPage: number;
+    currentPage: number;
+  };
+
+  /**
+   * Create a new RetrieveAllSourceAction.
+   *
+   * @param elementsPerPage
+   *    the number of source per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(elementsPerPage: number, currentPage: number) {
+    this.payload = {
+      elementsPerPage,
+      currentPage,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Quality Assurance source' error.
+ */
+export class RetrieveAllSourceErrorAction implements Action {
+  type = QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR;
+}
+
+/**
+ * An ngrx action to load the Quality Assurance source objects.
+ * Called by the ??? effect.
+ */
+export class AddSourceAction implements Action {
+  type = QualityAssuranceSourceActionTypes.ADD_SOURCE;
+  payload: {
+    source: QualityAssuranceSourceObject[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddSourceAction.
+   *
+   * @param source
+   *    the list of source
+   * @param totalPages
+   *    the total available pages of source
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Quality Assurance source
+   */
+  constructor(source: QualityAssuranceSourceObject[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      source,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type QualityAssuranceSourceActions
+  = RetrieveAllSourceAction
+  |RetrieveAllSourceErrorAction
+  |AddSourceAction;
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
new file mode 100644
index 0000000000..bf461873a1
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -0,0 +1,58 @@
+<div class="container">
+    <div class="row">
+      <div class="col-12">
+        <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+        <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <h4 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h4>
+
+        <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+        <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
+                       [paginationOptions]="paginationConfig"
+                       [collectionSize]="(totalElements$ | async)"
+                       [hideGear]="false"
+                       [hideSortOptions]="true"
+                       (paginationChange)="getQualityAssuranceSource()">
+
+          <ds-loading class="container" *ngIf="(isSourceProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
+          <ng-container *ngIf="(isSourceProcessing() | async) !== true">
+            <div *ngIf="(sources$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+              {{'quality-assurance.noSource' | translate}}
+            </div>
+            <div *ngIf="(sources$ | async)?.length !== 0" class="table-responsive mt-2">
+              <table id="epeople" class="table table-striped table-hover table-bordered">
+                <thead>
+                <tr>
+                  <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
+                  <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                  <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                </tr>
+                </thead>
+                <tbody>
+                  <tr *ngFor="let sourceElement of (sources$ | async); let i = index">
+                    <td>{{sourceElement.id}}</td>
+                    <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        <button
+                                class="btn btn-outline-primary btn-sm"
+                                title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
+                                [routerLink]="[sourceElement.id]">
+                          <span class="badge badge-info">{{sourceElement.totalEvents}}</span>
+                          <i class="fas fa-info fa-fw"></i>
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </div>
+    </div>
+  </div>
+
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
rename to src/app/notifications/qa/source/quality-assurance-source.component.scss
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
new file mode 100644
index 0000000000..c0da6edc3b
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -0,0 +1,161 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import {
+  getMockNotificationsStateService,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { NotificationsStateService } from '../../notifications-state.service';
+import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
+
+describe('QualityAssuranceSourceComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceSourceComponent>;
+  let comp: QualityAssuranceSourceComponent;
+  let compAsAny: any;
+  const mockNotificationsStateService = getMockNotificationsStateService();
+  const activatedRouteParams = {
+    qualityAssuranceSourceParams: {
+      currentPage: 0,
+      pageSize: 5,
+    },
+  };
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceSourceComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
+        { provide: PaginationService, useValue: paginationService },
+        QualityAssuranceSourceComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then(() => {
+      mockNotificationsStateService.getQualityAssuranceSource.and.returnValue(observableOf([
+        qualityAssuranceSourceObjectMorePid,
+        qualityAssuranceSourceObjectMoreAbstract,
+      ]));
+      mockNotificationsStateService.getQualityAssuranceSourceTotalPages.and.returnValue(observableOf(1));
+      mockNotificationsStateService.getQualityAssuranceSourceCurrentPage.and.returnValue(observableOf(0));
+      mockNotificationsStateService.getQualityAssuranceSourceTotals.and.returnValue(observableOf(2));
+      mockNotificationsStateService.isQualityAssuranceSourceLoaded.and.returnValue(observableOf(true));
+      mockNotificationsStateService.isQualityAssuranceSourceLoading.and.returnValue(observableOf(false));
+      mockNotificationsStateService.isQualityAssuranceSourceProcessing.and.returnValue(observableOf(false));
+    });
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-source></ds-quality-assurance-source>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceSourceComponent', inject([QualityAssuranceSourceComponent], (app: QualityAssuranceSourceComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests running with two Source', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceSourceComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it(('Should init component properly'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      expect(comp.sources$).toBeObservable(cold('(a|)', {
+        a: [
+          qualityAssuranceSourceObjectMorePid,
+          qualityAssuranceSourceObjectMoreAbstract,
+        ],
+      }));
+      expect(comp.totalElements$).toBeObservable(cold('(a|)', {
+        a: 2,
+      }));
+    });
+
+    it(('Should set data properly after the view init'), () => {
+      spyOn(compAsAny, 'getQualityAssuranceSource');
+
+      comp.ngAfterViewInit();
+      fixture.detectChanges();
+
+      expect(compAsAny.getQualityAssuranceSource).toHaveBeenCalled();
+    });
+
+    it(('isSourceLoading should return FALSE'), () => {
+      expect(comp.isSourceLoading()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('isSourceProcessing should return FALSE'), () => {
+      expect(comp.isSourceProcessing()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('getQualityAssuranceSource should call the service to dispatch a STATE change'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceSource(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage).and.callThrough();
+      expect(compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceSource).toHaveBeenCalledWith(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage);
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
new file mode 100644
index 0000000000..8818a3f9e4
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -0,0 +1,152 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+} from 'rxjs/operators';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { QualityAssuranceSourcePageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { NotificationsStateService } from '../../notifications-state.service';
+
+/**
+ * Component to display the Quality Assurance source list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-source',
+  templateUrl: './quality-assurance-source.component.html',
+  styleUrls: ['./quality-assurance-source.component.scss'],
+})
+export class QualityAssuranceSourceComponent implements OnInit {
+
+  /**
+  * The pagination system configuration for HTML listing.
+  * @type {PaginationComponentOptions}
+  */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'btp',
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance source list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions;
+  /**
+   * The Quality Assurance source list.
+   */
+  public sources$: Observable<QualityAssuranceSourceObject[]>;
+  /**
+   * The total number of Quality Assurance sources.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {NotificationsStateService} notificationsStateService
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private notificationsStateService: NotificationsStateService,
+  ) { }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.sources$ = this.notificationsStateService.getQualityAssuranceSource();
+    this.totalElements$ = this.notificationsStateService.getQualityAssuranceSourceTotals();
+  }
+
+  /**
+   * First Quality Assurance source loading after view initialization.
+   */
+  ngAfterViewInit(): void {
+    this.subs.push(
+      this.notificationsStateService.isQualityAssuranceSourceLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getQualityAssuranceSource();
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loading, 'false' otherwise.
+   */
+  public isSourceLoading(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceSourceLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the source (ex.: a REST call), 'false' otherwise.
+   */
+  public isSourceProcessing(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceSourceProcessing();
+  }
+
+  /**
+   * Dispatch the Quality Assurance source retrival.
+   */
+  public getQualityAssuranceSource(): void {
+    this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.notificationsStateService.dispatchRetrieveQualityAssuranceSource(
+        options.pageSize,
+        options.currentPage,
+      );
+    });
+  }
+
+  /**
+   * Update pagination Config from route params
+   *
+   * @param eventsRouteParams
+   */
+  protected updatePaginationFromRouteParams(eventsRouteParams: QualityAssuranceSourcePageParams) {
+    if (eventsRouteParams.currentPage) {
+      this.paginationConfig.currentPage = eventsRouteParams.currentPage;
+    }
+    if (eventsRouteParams.pageSize) {
+      if (this.paginationConfig.pageSizeOptions.includes(eventsRouteParams.pageSize)) {
+        this.paginationConfig.pageSize = eventsRouteParams.pageSize;
+      } else {
+        this.paginationConfig.pageSize = this.paginationConfig.pageSizeOptions[0];
+      }
+    }
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.effects.ts b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
new file mode 100644
index 0000000000..d866d43365
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
@@ -0,0 +1,100 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  AddSourceAction,
+  QualityAssuranceSourceActionTypes,
+  RetrieveAllSourceAction,
+  RetrieveAllSourceErrorAction,
+} from './quality-assurance-source.actions';
+import { QualityAssuranceSourceService } from './quality-assurance-source.service';
+
+/**
+ * Provides effect methods for the Quality Assurance source actions.
+ */
+@Injectable()
+export class QualityAssuranceSourceEffects {
+
+  /**
+   * Retrieve all Quality Assurance source managing pagination and errors.
+   */
+  retrieveAllSource$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE),
+    withLatestFrom(this.store$),
+    switchMap(([action, currentState]: [RetrieveAllSourceAction, any]) => {
+      return this.qualityAssuranceSourceService.getSources(
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+      ).pipe(
+        map((sources: PaginatedList<QualityAssuranceSourceObject>) =>
+          new AddSourceAction(sources.page, sources.totalPages, sources.currentPage, sources.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          } else {
+            console.error('Unexpected object thrown', error);
+          }
+          return observableOf(new RetrieveAllSourceErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllSourceErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('quality-assurance.source.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Clear find all source requests from cache.
+   */
+  addSourceAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.ADD_SOURCE),
+    tap(() => {
+      this.qualityAssuranceSourceDataService.clearFindAllSourceRequests();
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
+   * @param {QualityAssuranceSourceDataService} qualityAssuranceSourceDataService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceSourceService: QualityAssuranceSourceService,
+    private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService,
+  ) {
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
new file mode 100644
index 0000000000..89db166926
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
@@ -0,0 +1,71 @@
+import {
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import {
+  AddSourceAction,
+  RetrieveAllSourceAction,
+  RetrieveAllSourceErrorAction,
+} from './quality-assurance-source.actions';
+import {
+  qualityAssuranceSourceReducer,
+  QualityAssuranceSourceState,
+} from './quality-assurance-source.reducer';
+
+describe('qualityAssuranceSourceReducer test suite', () => {
+  let qualityAssuranceSourceInitialState: QualityAssuranceSourceState;
+  const elementPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(() => {
+    qualityAssuranceSourceInitialState = {
+      source: [],
+      processing: false,
+      loaded: false,
+      totalPages: 0,
+      currentPage: 0,
+      totalElements: 0,
+    };
+  });
+
+  it('Action RETRIEVE_ALL_SOURCE should set the State property "processing" to TRUE', () => {
+    const expectedState = qualityAssuranceSourceInitialState;
+    expectedState.processing = true;
+
+    const action = new RetrieveAllSourceAction(elementPerPage, currentPage);
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action RETRIEVE_ALL_SOURCE_ERROR should change the State to initial State but processing, loaded, and currentPage', () => {
+    const expectedState = qualityAssuranceSourceInitialState;
+    expectedState.processing = false;
+    expectedState.loaded = true;
+    expectedState.currentPage = 0;
+
+    const action = new RetrieveAllSourceErrorAction();
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action ADD_SOURCE should populate the State with Quality Assurance source', () => {
+    const expectedState = {
+      source: [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ],
+      processing: false,
+      loaded: true,
+      totalPages: 1,
+      currentPage: 0,
+      totalElements: 2,
+    };
+
+    const action = new AddSourceAction(
+      [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ],
+      1, 0, 2,
+    );
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
new file mode 100644
index 0000000000..2c81462c8d
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
@@ -0,0 +1,75 @@
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import {
+  QualityAssuranceSourceActions,
+  QualityAssuranceSourceActionTypes,
+} from './quality-assurance-source.actions';
+
+/**
+ * The interface representing the Quality Assurance source state.
+ */
+export interface QualityAssuranceSourceState {
+  source: QualityAssuranceSourceObject[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+}
+
+/**
+ * Used for the Quality Assurance source state initialization.
+ */
+const qualityAssuranceSourceInitialState: QualityAssuranceSourceState = {
+  source: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+};
+
+/**
+ * The Quality Assurance Source Reducer
+ *
+ * @param state
+ *    the current state initialized with qualityAssuranceSourceInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return QualityAssuranceSourceState
+ *    the new state
+ */
+export function qualityAssuranceSourceReducer(state = qualityAssuranceSourceInitialState, action: QualityAssuranceSourceActions): QualityAssuranceSourceState {
+  switch (action.type) {
+    case QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE: {
+      return Object.assign({}, state, {
+        source: [],
+        processing: true,
+      });
+    }
+
+    case QualityAssuranceSourceActionTypes.ADD_SOURCE: {
+      return Object.assign({}, state, {
+        source: action.payload.source,
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR: {
+      return Object.assign({}, state, {
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
new file mode 100644
index 0000000000..12e0ab9a29
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
@@ -0,0 +1,71 @@
+import { TestBed } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceSourceRestService,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { QualityAssuranceSourceService } from './quality-assurance-source.service';
+
+describe('QualityAssuranceSourceService', () => {
+  let service: QualityAssuranceSourceService;
+  let restService: QualityAssuranceSourceDataService;
+  let serviceAsAny: any;
+  let restServiceAsAny: any;
+
+  const pageInfo = new PageInfo();
+  const array = [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+  const elementsPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useClass: getMockQualityAssuranceSourceRestService },
+        { provide: QualityAssuranceSourceService, useValue: service },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    restService = TestBed.inject(QualityAssuranceSourceDataService);
+    restServiceAsAny = restService;
+    restServiceAsAny.getSources.and.returnValue(observableOf(paginatedListRD));
+    service = new QualityAssuranceSourceService(restService);
+    serviceAsAny = service;
+  });
+
+  describe('getSources', () => {
+    it('Should proxy the call to qualityAssuranceSourceRestService.getSources', () => {
+      const sortOptions = new SortOptions('name', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: elementsPerPage,
+        currentPage: currentPage,
+        sort: sortOptions,
+      };
+      const result = service.getSources(elementsPerPage, currentPage);
+      expect((service as any).qualityAssuranceSourceRestService.getSources).toHaveBeenCalledWith(findListOptions);
+    });
+
+    it('Should return a paginated list of Quality Assurance Source', () => {
+      const expected = cold('(a|)', {
+        a: paginatedList,
+      });
+      const result = service.getSources(elementsPerPage, currentPage);
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.ts b/src/app/notifications/qa/source/quality-assurance-source.service.ts
new file mode 100644
index 0000000000..790ca67695
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+/**
+ * The service handling all Quality Assurance source requests to the REST service.
+ */
+@Injectable()
+export class QualityAssuranceSourceService {
+
+  /**
+   * Initialize the service variables.
+   * @param {QualityAssuranceSourceDataService} qualityAssuranceSourceRestService
+   */
+  constructor(
+    private qualityAssuranceSourceRestService: QualityAssuranceSourceDataService,
+  ) {
+  }
+
+  /**
+   * Return the list of Quality Assurance source managing pagination and errors.
+   *
+   * @param elementsPerPage
+   *    The number of the source per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<QualityAssuranceSourceObject>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(elementsPerPage, currentPage): Observable<PaginatedList<QualityAssuranceSourceObject>> {
+    const sortOptions = new SortOptions('name', SortDirection.ASC);
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.qualityAssuranceSourceRestService.getSources(findListOptions).pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<PaginatedList<QualityAssuranceSourceObject>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance source from the Broker source REST service');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
new file mode 100644
index 0000000000..670fd7b52a
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
@@ -0,0 +1,103 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { type } from '../../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const QualityAssuranceTopicActionTypes = {
+  ADD_TOPICS: type('dspace/integration/notifications/qa/topic/ADD_TOPICS'),
+  RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
+  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
+};
+
+/**
+ * An ngrx action to retrieve all the Quality Assurance topics.
+ */
+export class RetrieveAllTopicsAction implements Action {
+  type = QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS;
+  payload: {
+    elementsPerPage: number;
+    currentPage: number;
+    source: string;
+    target?: string;
+  };
+
+  /**
+   * Create a new RetrieveAllTopicsAction.
+   *
+   * @param elementsPerPage
+   *    the number of topics per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(elementsPerPage: number, currentPage: number, source: string, target?: string) {
+    this.payload = {
+      elementsPerPage,
+      currentPage,
+      source,
+      target,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Quality Assurance topics' error.
+ */
+export class RetrieveAllTopicsErrorAction implements Action {
+  type = QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR;
+}
+
+/**
+ * An ngrx action to load the Quality Assurance topic objects.
+ * Called by the ??? effect.
+ */
+export class AddTopicsAction implements Action {
+  type = QualityAssuranceTopicActionTypes.ADD_TOPICS;
+  payload: {
+    topics: QualityAssuranceTopicObject[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddTopicsAction.
+   *
+   * @param topics
+   *    the list of topics
+   * @param totalPages
+   *    the total available pages of topics
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Quality Assurance topics
+   */
+  constructor(topics: QualityAssuranceTopicObject[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      topics,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type QualityAssuranceTopicsActions
+  = AddTopicsAction
+  |RetrieveAllTopicsAction
+  |RetrieveAllTopicsErrorAction;
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
new file mode 100644
index 0000000000..6825bdd080
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -0,0 +1,61 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+      <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
+      <ds-alert *ngIf="targetId" [type]="'alert-info'">
+        {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
+        <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
+      </ds-alert>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <h4 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h4>
+
+      <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
+                     [paginationOptions]="paginationConfig"
+                     [collectionSize]="(totalElements$ | async)"
+                     [hideGear]="false"
+                     [hideSortOptions]="true"
+                     (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
+
+        <ds-loading class="container" *ngIf="(isTopicsProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
+        <ng-container *ngIf="(isTopicsProcessing() | async) !== true">
+          <div *ngIf="(topics$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'quality-assurance.noTopics' | translate}}
+          </div>
+          <div *ngIf="(topics$ | async)?.length !== 0" class="table-responsive mt-2">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
+                <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let topicElement of (topics$ | async); let i = index">
+                  <td>{{topicElement.name}}</td>
+                  <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                  <td>
+                    <div class="btn-group edit-field">
+                      <button
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
+                              [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
+                        <span class="badge badge-info">{{topicElement.totalEvents}}</span>
+                        <i class="fas fa-info fa-fw"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss b/src/app/notifications/qa/topics/quality-assurance-topics.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.scss
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
new file mode 100644
index 0000000000..2791e69dd4
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -0,0 +1,169 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import {
+  getMockNotificationsStateService,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { NotificationsStateService } from '../../notifications-state.service';
+import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
+
+describe('QualityAssuranceTopicsComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceTopicsComponent>;
+  let comp: QualityAssuranceTopicsComponent;
+  let compAsAny: any;
+  const mockNotificationsStateService = getMockNotificationsStateService();
+  const activatedRouteParams = {
+    qualityAssuranceTopicsParams: {
+      currentPage: 0,
+      pageSize: 5,
+    },
+  };
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceTopicsComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
+          params: {
+            sourceId: 'openaire',
+            targetId: null,
+          },
+        } } },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ItemDataService, useValue: {} },
+        QualityAssuranceTopicsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then(() => {
+      mockNotificationsStateService.getQualityAssuranceTopics.and.returnValue(observableOf([
+        qualityAssuranceTopicObjectMorePid,
+        qualityAssuranceTopicObjectMoreAbstract,
+      ]));
+      mockNotificationsStateService.getQualityAssuranceTopicsTotalPages.and.returnValue(observableOf(1));
+      mockNotificationsStateService.getQualityAssuranceTopicsCurrentPage.and.returnValue(observableOf(0));
+      mockNotificationsStateService.getQualityAssuranceTopicsTotals.and.returnValue(observableOf(2));
+      mockNotificationsStateService.isQualityAssuranceTopicsLoaded.and.returnValue(observableOf(true));
+      mockNotificationsStateService.isQualityAssuranceTopicsLoading.and.returnValue(observableOf(false));
+      mockNotificationsStateService.isQualityAssuranceTopicsProcessing.and.returnValue(observableOf(false));
+    });
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-topic></ds-quality-assurance-topic>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceTopicsComponent', inject([QualityAssuranceTopicsComponent], (app: QualityAssuranceTopicsComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests running with two topics', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceTopicsComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it(('Should init component properly'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      expect(comp.topics$).toBeObservable(cold('(a|)', {
+        a: [
+          qualityAssuranceTopicObjectMorePid,
+          qualityAssuranceTopicObjectMoreAbstract,
+        ],
+      }));
+      expect(comp.totalElements$).toBeObservable(cold('(a|)', {
+        a: 2,
+      }));
+    });
+
+    it(('Should set data properly after the view init'), () => {
+      spyOn(compAsAny, 'getQualityAssuranceTopics');
+
+      comp.ngAfterViewInit();
+      fixture.detectChanges();
+
+      expect(compAsAny.getQualityAssuranceTopics).toHaveBeenCalled();
+    });
+
+    it(('isTopicsLoading should return FALSE'), () => {
+      expect(comp.isTopicsLoading()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('isTopicsProcessing should return FALSE'), () => {
+      expect(comp.isTopicsProcessing()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('getQualityAssuranceTopics should call the service to dispatch a STATE change'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceTopics(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage).and.callThrough();
+      expect(compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceTopics).toHaveBeenCalledWith(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage);
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
new file mode 100644
index 0000000000..4778daa962
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -0,0 +1,236 @@
+import {
+  AfterViewInit,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { QualityAssuranceTopicsPageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { NotificationsStateService } from '../../notifications-state.service';
+
+/**
+ * Component to display the Quality Assurance topic list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-topic',
+  templateUrl: './quality-assurance-topics.component.html',
+  styleUrls: ['./quality-assurance-topics.component.scss'],
+})
+export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit {
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'btp',
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance topic list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions;
+  /**
+   * The Quality Assurance topic list.
+   */
+  public topics$: Observable<QualityAssuranceTopicObject[]>;
+  /**
+   * The total number of Quality Assurance topics.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * This property represents a sourceId which is used to retrive a topic
+   * @type {string}
+   */
+  public sourceId: string;
+
+  /**
+   * This property represents a targetId (item-id) which is used to retrive a topic
+   * @type {string}
+   */
+  public targetId: string;
+
+  /**
+   * The URL of the item page.
+   */
+  public itemPageUrl: string;
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {ActivatedRoute} activatedRoute
+   * @param itemService
+   * @param {NotificationsStateService} notificationsStateService
+   * @param router
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private activatedRoute: ActivatedRoute,
+    private itemService: ItemDataService,
+    private notificationsStateService: NotificationsStateService,
+    private router: Router,
+  ) {
+    this.sourceId = this.activatedRoute.snapshot.params.sourceId;
+    this.targetId = this.activatedRoute.snapshot.params.targetId;
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.topics$ = this.notificationsStateService.getQualityAssuranceTopics().pipe(
+      tap((topics: QualityAssuranceTopicObject[]) => {
+        const forward = this.activatedRoute.snapshot.queryParams?.forward === 'true';
+        if (topics.length === 1 && forward) {
+          // If there is only one topic, navigate to the first topic automatically
+          this.router.navigate([this.getQualityAssuranceRoute(), this.sourceId, topics[0].id]);
+        }
+      }),
+    );
+    this.totalElements$ = this.notificationsStateService.getQualityAssuranceTopicsTotals();
+  }
+
+  /**
+   * First Quality Assurance topics loading after view initialization.
+   */
+  ngAfterViewInit(): void {
+    this.subs.push(
+      this.notificationsStateService.isQualityAssuranceTopicsLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getQualityAssuranceTopics(this.sourceId, this.targetId);
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loading, 'false' otherwise.
+   */
+  public isTopicsLoading(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceTopicsLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the topics (ex.: a REST call), 'false' otherwise.
+   */
+  public isTopicsProcessing(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceTopicsProcessing();
+  }
+
+  /**
+   * Dispatch the Quality Assurance topics retrival.
+   */
+  public getQualityAssuranceTopics(source: string, target?: string): void {
+    this.subs.push(this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.notificationsStateService.dispatchRetrieveQualityAssuranceTopics(
+        options.pageSize,
+        options.currentPage,
+        source,
+        target,
+      );
+    }));
+  }
+
+  /**
+   * Update pagination Config from route params
+   *
+   * @param eventsRouteParams
+   */
+  protected updatePaginationFromRouteParams(eventsRouteParams: QualityAssuranceTopicsPageParams) {
+    if (eventsRouteParams.currentPage) {
+      this.paginationConfig.currentPage = eventsRouteParams.currentPage;
+    }
+    if (eventsRouteParams.pageSize) {
+      if (this.paginationConfig.pageSizeOptions.includes(eventsRouteParams.pageSize)) {
+        this.paginationConfig.pageSize = eventsRouteParams.pageSize;
+      } else {
+        this.paginationConfig.pageSize = this.paginationConfig.pageSizeOptions[0];
+      }
+    }
+  }
+
+  /**
+   * Returns an Observable that emits the title of the target item.
+   * The target item is retrieved by its ID using the itemService.
+   * The title is extracted from the first metadata value of the item.
+   * The item page URL is also set in the component.
+   * @returns An Observable that emits the title of the target item.
+   */
+  getTargetItemTitle(): Observable<string> {
+    return this.itemService.findById(this.targetId).pipe(
+      take(1),
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((item: Item) => this.itemPageUrl = getItemPageRoute(item)),
+      map((item: Item) => item.firstMetadataValue('dc.title')),
+    );
+  }
+
+  /**
+   * Returns the page route for the given item.
+   * @param item The item to get the page route for.
+   * @returns The page route for the given item.
+   */
+  getItemPageRoute(item: Item): string {
+    return getItemPageRoute(item);
+  }
+
+  /**
+   * Returns the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
new file mode 100644
index 0000000000..0009df0ef5
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
@@ -0,0 +1,101 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  AddTopicsAction,
+  QualityAssuranceTopicActionTypes,
+  RetrieveAllTopicsAction,
+  RetrieveAllTopicsErrorAction,
+} from './quality-assurance-topics.actions';
+import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
+
+/**
+ * Provides effect methods for the Quality Assurance topics actions.
+ */
+@Injectable()
+export class QualityAssuranceTopicsEffects {
+
+  /**
+   * Retrieve all Quality Assurance topics managing pagination and errors.
+   */
+  retrieveAllTopics$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS),
+    withLatestFrom(this.store$),
+    switchMap(([action, currentState]: [RetrieveAllTopicsAction, any]) => {
+      return this.qualityAssuranceTopicService.getTopics(
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+        action.payload.source,
+        action.payload.target,
+      ).pipe(
+        map((topics: PaginatedList<QualityAssuranceTopicObject>) =>
+          new AddTopicsAction(topics.page, topics.totalPages, topics.currentPage, topics.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          } else {
+            console.error('Unexpected object thrown', error);
+          }
+          return observableOf(new RetrieveAllTopicsErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllTopicsErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('quality-assurance.topic.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Clear find all topics requests from cache.
+   */
+  addTopicsAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.ADD_TOPICS),
+    tap(() => {
+      this.qualityAssuranceTopicDataService.clearFindAllTopicsRequests();
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceTopicsService} qualityAssuranceTopicService
+   * @param {QualityAssuranceTopicDataService} qualityAssuranceTopicDataService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceTopicService: QualityAssuranceTopicsService,
+    private qualityAssuranceTopicDataService: QualityAssuranceTopicDataService,
+  ) { }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
new file mode 100644
index 0000000000..06da2969fa
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
@@ -0,0 +1,71 @@
+import {
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import {
+  AddTopicsAction,
+  RetrieveAllTopicsAction,
+  RetrieveAllTopicsErrorAction,
+} from './quality-assurance-topics.actions';
+import {
+  qualityAssuranceTopicsReducer,
+  QualityAssuranceTopicState,
+} from './quality-assurance-topics.reducer';
+
+describe('qualityAssuranceTopicsReducer test suite', () => {
+  let qualityAssuranceTopicInitialState: QualityAssuranceTopicState;
+  const elementPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(() => {
+    qualityAssuranceTopicInitialState = {
+      topics: [],
+      processing: false,
+      loaded: false,
+      totalPages: 0,
+      currentPage: 0,
+      totalElements: 0,
+    };
+  });
+
+  it('Action RETRIEVE_ALL_TOPICS should set the State property "processing" to TRUE', () => {
+    const expectedState = qualityAssuranceTopicInitialState;
+    expectedState.processing = true;
+
+    const action = new RetrieveAllTopicsAction(elementPerPage, currentPage, 'ENRICH!MORE!ABSTRACT');
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action RETRIEVE_ALL_TOPICS_ERROR should change the State to initial State but processing, loaded, and currentPage', () => {
+    const expectedState = qualityAssuranceTopicInitialState;
+    expectedState.processing = false;
+    expectedState.loaded = true;
+    expectedState.currentPage = 0;
+
+    const action = new RetrieveAllTopicsErrorAction();
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action ADD_TOPICS should populate the State with Quality Assurance topics', () => {
+    const expectedState = {
+      topics: [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ],
+      processing: false,
+      loaded: true,
+      totalPages: 1,
+      currentPage: 0,
+      totalElements: 2,
+    };
+
+    const action = new AddTopicsAction(
+      [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ],
+      1, 0, 2,
+    );
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+});
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
new file mode 100644
index 0000000000..f1a644a53b
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
@@ -0,0 +1,75 @@
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import {
+  QualityAssuranceTopicActionTypes,
+  QualityAssuranceTopicsActions,
+} from './quality-assurance-topics.actions';
+
+/**
+ * The interface representing the Quality Assurance topic state.
+ */
+export interface QualityAssuranceTopicState {
+  topics: QualityAssuranceTopicObject[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+}
+
+/**
+ * Used for the Quality Assurance topic state initialization.
+ */
+const qualityAssuranceTopicInitialState: QualityAssuranceTopicState = {
+  topics: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+};
+
+/**
+ * The Quality Assurance Topic Reducer
+ *
+ * @param state
+ *    the current state initialized with qualityAssuranceTopicInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return QualityAssuranceTopicState
+ *    the new state
+ */
+export function qualityAssuranceTopicsReducer(state = qualityAssuranceTopicInitialState, action: QualityAssuranceTopicsActions): QualityAssuranceTopicState {
+  switch (action.type) {
+    case QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS: {
+      return Object.assign({}, state, {
+        topics: [],
+        processing: true,
+      });
+    }
+
+    case QualityAssuranceTopicActionTypes.ADD_TOPICS: {
+      return Object.assign({}, state, {
+        topics: action.payload.topics,
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR: {
+      return Object.assign({}, state, {
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
new file mode 100644
index 0000000000..a1ae542352
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
@@ -0,0 +1,74 @@
+import { TestBed } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceTopicRestService,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
+
+describe('QualityAssuranceTopicsService', () => {
+  let service: QualityAssuranceTopicsService;
+  let restService: QualityAssuranceTopicDataService;
+  let serviceAsAny: any;
+  let restServiceAsAny: any;
+
+  const pageInfo = new PageInfo();
+  const array = [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+  const elementsPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: QualityAssuranceTopicDataService, useClass: getMockQualityAssuranceTopicRestService },
+        { provide: QualityAssuranceTopicsService, useValue: service },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    restService = TestBed.inject(QualityAssuranceTopicDataService);
+    restServiceAsAny = restService;
+    restServiceAsAny.searchTopicsBySource.and.returnValue(observableOf(paginatedListRD));
+    restServiceAsAny.searchTopicsByTarget.and.returnValue(observableOf(paginatedListRD));
+    service = new QualityAssuranceTopicsService(restService);
+    serviceAsAny = service;
+  });
+
+  describe('getTopics', () => {
+    it('should proxy the call to qualityAssuranceTopicRestService.searchTopicsBySource', () => {
+      const sortOptions = new SortOptions('name', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: elementsPerPage,
+        currentPage: currentPage,
+        sort: sortOptions,
+        searchParams: [new RequestParam('source', 'openaire')],
+      };
+      service.getTopics(elementsPerPage, currentPage, 'openaire');
+      expect((service as any).qualityAssuranceTopicRestService.searchTopicsBySource).toHaveBeenCalledWith(findListOptions);
+    });
+
+    it('should return a paginated list of Quality Assurance topics', () => {
+      const expected = cold('(a|)', {
+        a: paginatedList,
+      });
+      const result = service.getTopics(elementsPerPage, currentPage, 'openaire');
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
new file mode 100644
index 0000000000..3c737990e0
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
@@ -0,0 +1,72 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+
+/**
+ * The service handling all Quality Assurance topic requests to the REST service.
+ */
+@Injectable()
+export class QualityAssuranceTopicsService {
+
+  /**
+   * Initialize the service variables.
+   * @param {QualityAssuranceTopicDataService} qualityAssuranceTopicRestService
+   */
+  constructor(
+    private qualityAssuranceTopicRestService: QualityAssuranceTopicDataService,
+  ) { }
+
+
+  /**
+   * Return the list of Quality Assurance topics managing pagination and errors.
+   *
+   * @param elementsPerPage
+   *    The number of the topics per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<QualityAssuranceTopicObject>>
+   *    The list of Quality Assurance topics.
+   */
+  public getTopics(elementsPerPage, currentPage, source: string, target?: string): Observable<PaginatedList<QualityAssuranceTopicObject>> {
+    const sortOptions = new SortOptions('name', SortDirection.ASC);
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+      searchParams: [new RequestParam('source', source)],
+    };
+
+    let request$: Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>>;
+
+    if (hasValue(target)) {
+      findListOptions.searchParams.push(new RequestParam('target', target));
+      request$ = this.qualityAssuranceTopicRestService.searchTopicsByTarget(findListOptions);
+    } else {
+      request$ = this.qualityAssuranceTopicRestService.searchTopicsBySource(findListOptions);
+    }
+
+    return request$.pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<PaginatedList<QualityAssuranceTopicObject>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance topics from the Broker topics REST service');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/notifications/selectors.ts b/src/app/notifications/selectors.ts
new file mode 100644
index 0000000000..10090d21dc
--- /dev/null
+++ b/src/app/notifications/selectors.ts
@@ -0,0 +1,155 @@
+import {
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { subStateSelector } from '../shared/selector.util';
+import {
+  suggestionNotificationsSelector,
+  SuggestionNotificationsState,
+} from './notifications.reducer';
+import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
+import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
+
+/**
+ * Returns the Notifications state.
+ * @function _getNotificationsState
+ * @param {AppState} state Top level state.
+ * @return {SuggestionNotificationsState}
+ */
+const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
+
+// Quality Assurance topics
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Quality Assurance topics State.
+ * @function qualityAssuranceTopicsStateSelector
+ * @return {QualityAssuranceTopicState}
+ */
+export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceTopicState>(suggestionNotificationsSelector, 'qaTopic');
+}
+
+/**
+ * Returns the Quality Assurance topics list.
+ * @function qualityAssuranceTopicsObjectSelector
+ * @return {QualityAssuranceTopicObject[]}
+ */
+export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
+}
+
+/**
+ * Returns true if the Quality Assurance topics are loaded.
+ * @function isQualityAssuranceTopicsLoadedSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.processing,
+);
+
+/**
+ * Returns the total available pages of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsTotalPagesSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.totalPages,
+);
+
+/**
+ * Returns the current page of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsCurrentPageSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.currentPage,
+);
+
+/**
+ * Returns the total number of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsTotalsSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.totalElements,
+);
+
+// Quality Assurance source
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Quality Assurance source State.
+ * @function qualityAssuranceSourceStateSelector
+ * @return {QualityAssuranceSourceState}
+ */
+export function qualityAssuranceSourceStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceSourceState>(suggestionNotificationsSelector, 'qaSource');
+}
+
+/**
+ * Returns the Quality Assurance source list.
+ * @function qualityAssuranceSourceObjectSelector
+ * @return {QualityAssuranceSourceObject[]}
+ */
+export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
+}
+
+/**
+ * Returns true if the Quality Assurance source are loaded.
+ * @function isQualityAssuranceSourceLoadedSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.processing,
+);
+
+/**
+ * Returns the total available pages of Quality Assurance source.
+ * @function getQualityAssuranceSourceTotalPagesSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.totalPages,
+);
+
+/**
+ * Returns the current page of Quality Assurance source.
+ * @function getQualityAssuranceSourceCurrentPageSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.currentPage,
+);
+
+/**
+ * Returns the total number of Quality Assurance source.
+ * @function getQualityAssuranceSourceTotalsSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceTotalsSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.totalElements,
+);
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
new file mode 100644
index 0000000000..2a46191dee
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -0,0 +1,29 @@
+<div class="d-inline">
+  <div ngbDropdown class="d-inline">
+    <button *ngIf="isCollectionFixed; else chooseCollection" class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
+      <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+    </button>
+    <ng-template #chooseCollection>
+      <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
+              type="button">
+        <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+        <span class="caret"></span>
+      </button>
+
+      <div ngbDropdownMenu
+           class="dropdown-menu"
+           id="entityControlsDropdownMenu"
+           aria-labelledby="dropdownSubmission">
+        <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
+      </div>
+    </ng-template>
+
+  </div>
+  <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
+    {{ ignoreSuggestionLabel() | translate}}</button>
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
+    <i class="fa fa-eye"></i>
+    <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
+    <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
+  </button>
+</div>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.scss b/src/app/notifications/suggestion-actions/suggestion-actions.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
new file mode 100644
index 0000000000..d25d21510c
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -0,0 +1,101 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { take } from 'rxjs/operators';
+
+import { Suggestion } from '../../core/notifications/models/suggestion.model';
+import { Collection } from '../../core/shared/collection.model';
+import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-list-element.component';
+
+/**
+ * Show and trigger the actions to submit for a suggestion
+ */
+@Component({
+  selector: 'ds-suggestion-actions',
+  styleUrls: [ './suggestion-actions.component.scss' ],
+  templateUrl: './suggestion-actions.component.html',
+})
+export class SuggestionActionsComponent {
+
+  @Input() object: Suggestion;
+
+  @Input() isBulk = false;
+
+  @Input() hasEvidence = false;
+
+  @Input() seeEvidence = false;
+
+  @Input() isCollectionFixed = false;
+
+  /**
+   * The component is used to Delete suggestion
+   */
+  @Output() ignoreSuggestionClicked = new EventEmitter<string>();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() approveAndImport = new EventEmitter<SuggestionApproveAndImport>();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() seeEvidences = new EventEmitter<boolean>();
+
+  constructor(private modalService: NgbModal) { }
+
+  /**
+   * Method called on clicking the button "approve & import", It opens a dialog for
+   * select a collection and it emits an approveAndImport event.
+   */
+  openDialog(entity: ItemType) {
+
+    const modalRef = this.modalService.open(CreateItemParentSelectorComponent);
+    modalRef.componentInstance.emitOnly = true;
+    modalRef.componentInstance.entityType = entity.label;
+
+    modalRef.componentInstance.select.pipe(take(1))
+      .subscribe((collection: Collection) => {
+        this.approveAndImport.emit({
+          suggestion: this.isBulk ? undefined : this.object,
+          collectionId: collection.id,
+        });
+      });
+  }
+
+  approveAndImportCollectionFixed() {
+    this.approveAndImport.emit({
+      suggestion: this.isBulk ? undefined : this.object,
+      collectionId: null,
+    });
+  }
+
+
+  /**
+   * Delete the suggestion
+   */
+  ignoreSuggestion() {
+    this.ignoreSuggestionClicked.emit(this.isBulk ? undefined : this.object.id);
+  }
+
+  /**
+   * Toggle See Evidence
+   */
+  toggleSeeEvidences() {
+    this.seeEvidences.emit(!this.seeEvidence);
+  }
+
+  ignoreSuggestionLabel(): string {
+    return this.isBulk ? 'suggestion.ignoreSuggestion.bulk' : 'suggestion.ignoreSuggestion' ;
+  }
+
+  approveAndImportLabel(): string {
+    return this.isBulk ? 'suggestion.approveAndImport.bulk' : 'suggestion.approveAndImport';
+  }
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
new file mode 100644
index 0000000000..e23c244eb4
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
@@ -0,0 +1,20 @@
+<div>
+  <div class="table-responsive" *ngIf="evidences">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>{{'suggestion.evidence.score' | translate}}</th>
+          <th>{{'suggestion.evidence.type' | translate}}</th>
+          <th>{{'suggestion.evidence.notes' | translate}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let evidence of evidences | dsObjectKeys">
+          <td>{{evidences[evidence].score}}</td>
+          <td>{{evidence | translate}}</td>
+          <td>{{evidences[evidence].notes}}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
rename to src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
new file mode 100644
index 0000000000..31f6405a2c
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { SuggestionEvidences } from '../../../core/notifications/models/suggestion.model';
+import { fadeIn } from '../../../shared/animations/fade';
+
+/**
+ * Show suggestion evidences such as score (authorScore, dateScore)
+ */
+@Component({
+  selector: 'ds-suggestion-evidences',
+  styleUrls: [ './suggestion-evidences.component.scss' ],
+  templateUrl: './suggestion-evidences.component.html',
+  animations: [fadeIn],
+})
+export class SuggestionEvidencesComponent {
+
+  @Input() evidences: SuggestionEvidences;
+
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
new file mode 100644
index 0000000000..ef27876f2c
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
@@ -0,0 +1,45 @@
+<div class="container">
+  <div class="row">
+    <!-- Bulk Selection Panel -->
+    <div class="col-1 text-center align-self-center">
+      <div class="">
+        <input type="checkbox" class="form-check-input"
+               [checked]="isSelected" (change)="changeSelected($event)"
+               [attr.aria-label]="object.display"/>
+      </div>
+    </div>
+    <!-- Total Score Panel -->
+    <div class="col-2 text-center align-self-center">
+      <div class="">
+        <div><strong> {{'suggestion.totalScore' | translate}}</strong> </div>
+        <span class="suggestion-score">{{ object.score }}</span>
+      </div>
+    </div>
+    <!-- Suggestion Panel -->
+    <div class="col">
+        <!-- Object Preview -->
+        <ds-item-search-result-list-element
+          [showLabel]="false"
+          [showThumbnails]="false"
+          [object]="listableObject"
+          [linkType]="0"
+        ></ds-item-search-result-list-element>
+        <!-- Actions -->
+      <ds-suggestion-actions class="parent mt-2" [hasEvidence]="hasEvidences()"
+                             [seeEvidence]="seeEvidence"
+                             [object]="object"
+                             [isCollectionFixed]="isCollectionFixed"
+                             (approveAndImport)="onApproveAndImport($event)"
+                             (seeEvidences)="onSeeEvidences($event)"
+                             (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
+      ></ds-suggestion-actions>
+    </div>
+  </div>
+  <!-- Evidences Panel -->
+  <div *ngIf="seeEvidence" class="mt-2 row">
+    <div class="col offset-3">
+      <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+    </div>
+  </div>
+</div>
+<hr>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss
new file mode 100644
index 0000000000..1c52209518
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss
@@ -0,0 +1,16 @@
+.issue-date {
+  color: #c8c8c8;
+}
+
+.parent {
+  display: flex;
+  gap:10px;
+}
+
+.import {
+  flex: initial;
+}
+
+.suggestion-score {
+  font-size: 1.5rem;
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
new file mode 100644
index 0000000000..b2b053e254
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
@@ -0,0 +1,85 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { Item } from '../../core/shared/item.model';
+import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { SuggestionListElementComponent } from './suggestion-list-element.component';
+
+describe('SuggestionListElementComponent', () => {
+  let component: SuggestionListElementComponent;
+  let fixture: ComponentFixture<SuggestionListElementComponent>;
+  let scheduler: TestScheduler;
+
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [SuggestionListElementComponent],
+      providers: [
+        NgbModal,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SuggestionListElementComponent);
+    component = fixture.componentInstance;
+    scheduler = getTestScheduler();
+
+    component.object = mockSuggestionPublicationOne;
+  });
+
+  describe('SuggestionListElementComponent test', () => {
+
+    it('should create', () => {
+      scheduler.schedule(() => fixture.detectChanges());
+      scheduler.flush();
+      const expectedIndexableObject = Object.assign(new Item(), {
+        id: mockSuggestionPublicationOne.id,
+        metadata: mockSuggestionPublicationOne.metadata,
+      });
+      expect(component).toBeTruthy();
+      expect(component.listableObject.hitHighlights).toEqual({});
+      expect(component.listableObject.indexableObject).toEqual(expectedIndexableObject);
+    });
+
+    it('should check if has evidence', () => {
+      expect(component.hasEvidences()).toBeTruthy();
+    });
+
+    it('should set seeEvidences', () => {
+      component.onSeeEvidences(true);
+      expect(component.seeEvidence).toBeTruthy();
+    });
+
+    it('should emit selection', () => {
+      spyOn(component.selected, 'next');
+      component.changeSelected({ target: { checked: true } });
+      expect(component.selected.next).toHaveBeenCalledWith(true);
+    });
+
+    it('should emit for deletion', () => {
+      spyOn(component.ignoreSuggestionClicked, 'emit');
+      component.onIgnoreSuggestion('1234');
+      expect(component.ignoreSuggestionClicked.emit).toHaveBeenCalledWith('1234');
+    });
+
+    it('should emit for approve and import', () => {
+      const event = { collectionId:'1234', suggestion: mockSuggestionPublicationOne };
+      spyOn(component.approveAndImport, 'emit');
+      component.onApproveAndImport(event);
+      expect(component.approveAndImport.emit).toHaveBeenCalledWith(event);
+    });
+  });
+});
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
new file mode 100644
index 0000000000..22e212525a
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -0,0 +1,109 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Suggestion } from 'src/app/core/notifications/models/suggestion.model';
+
+import { Item } from '../../core/shared/item.model';
+import { fadeIn } from '../../shared/animations/fade';
+import { isNotEmpty } from '../../shared/empty.util';
+
+/**
+ * A simple interface to unite a specific suggestion and the id of the chosen collection
+ */
+export interface SuggestionApproveAndImport {
+  suggestion: Suggestion;
+  collectionId: string;
+}
+
+/**
+ * Show all the suggestions by researcher
+ */
+@Component({
+  selector: 'ds-suggestion-list-item',
+  styleUrls: ['./suggestion-list-element.component.scss'],
+  templateUrl: './suggestion-list-element.component.html',
+  animations: [fadeIn],
+})
+export class SuggestionListElementComponent implements OnInit {
+
+  @Input() object: Suggestion;
+
+  @Input() isSelected = false;
+
+  @Input() isCollectionFixed = false;
+
+  public listableObject: any;
+
+  public seeEvidence = false;
+
+  /**
+   * The component is used to Delete suggestion
+   */
+  @Output() ignoreSuggestionClicked = new EventEmitter();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() approveAndImport = new EventEmitter();
+
+  /**
+   * New value whether the element is selected
+   */
+  @Output() selected = new EventEmitter<boolean>();
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {NgbModal} modalService
+   */
+  constructor(private modalService: NgbModal) { }
+
+  ngOnInit() {
+    this.listableObject = {
+      indexableObject: Object.assign(new Item(), { id: this.object.id, metadata: this.object.metadata }),
+      hitHighlights: {},
+    };
+  }
+
+  /**
+   * Approve and import the suggestion
+   */
+  onApproveAndImport(event: SuggestionApproveAndImport) {
+    this.approveAndImport.emit(event);
+  }
+
+  /**
+   * Delete the suggestion
+   */
+  onIgnoreSuggestion(suggestionId: string) {
+    this.ignoreSuggestionClicked.emit(suggestionId);
+  }
+
+  /**
+   * Change is selected value.
+   */
+  changeSelected(event) {
+    this.isSelected = event.target.checked;
+    this.selected.next(this.isSelected);
+  }
+
+  /**
+   * See the Evidence
+   */
+  hasEvidences() {
+    return isNotEmpty(this.object.evidences);
+  }
+
+  /**
+   * Set the see evidence variable.
+   */
+  onSeeEvidences(seeEvidence: boolean) {
+    this.seeEvidence = seeEvidence;
+  }
+
+}
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
new file mode 100644
index 0000000000..2b2a668916
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
@@ -0,0 +1,51 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1>
+
+      <ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading>
+      <ds-pagination *ngIf="(isTargetsLoading() | async) !== true"
+                     [paginationOptions]="paginationConfig"
+                     [collectionSize]="(totalElements$ | async)"
+                     [hideGear]="false"
+                     [retainScrollPosition]="false"
+                     (paginationChange)="getSuggestionTargets()">
+
+        <ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
+        <ng-container *ngIf="(isTargetsProcessing() | async) !== true">
+          <div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'suggestion.noTargets' | translate}}
+          </div>
+          <div *ngIf="(targets$|async)?.length !== 0" class="table-responsive mt-2">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr class="text-center">
+                  <th scope="col">{{'suggestion.table.name' | translate}}</th>
+                  <th scope="col">{{'suggestion.table.actions' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let targetElement of (targets$ | async); let i = index" class="text-center">
+                  <td>
+                    <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
+                  </td>
+                  <td>
+                    <div class="btn-group edit-field">
+                      <button (click)="redirectToSuggestions(targetElement.id)"
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{('suggestion.button.review.title' | translate: { total: targetElement.total.toString() }) +
+                                targetElement.display}}">
+                        <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
+                        <i class="fas fa-lightbulb"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.scss b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.scss
rename to src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
new file mode 100644
index 0000000000..9290f808bb
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -0,0 +1,152 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+} from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../../core/notifications/models/suggestion-target.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { getSuggestionPageRoute } from '../../../suggestions-page/suggestions-page-routing-paths';
+import { SuggestionsService } from '../../suggestions.service';
+import { SuggestionTargetsStateService } from '../suggestion-targets.state.service';
+
+/**
+ * Component to display the Suggestion Target list.
+ */
+@Component({
+  selector: 'ds-publication-claim',
+  templateUrl: './publication-claim.component.html',
+  styleUrls: ['./publication-claim.component.scss'],
+})
+export class PublicationClaimComponent implements OnInit {
+
+  /**
+   * The source for which to list targets
+   */
+  @Input() source: string;
+
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'stp',
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+
+  /**
+   * The Suggestion Target list.
+   */
+  public targets$: Observable<SuggestionTarget[]>;
+  /**
+   * The total number of Suggestion Targets.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {SuggestionTargetsStateService} suggestionTargetsStateService
+   * @param {SuggestionsService} suggestionService
+   * @param {Router} router
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionService: SuggestionsService,
+    private router: Router,
+  ) {
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.targets$ = this.suggestionTargetsStateService.getSuggestionTargets();
+    this.totalElements$ = this.suggestionTargetsStateService.getSuggestionTargetsTotals();
+
+    this.subs.push(
+      this.suggestionTargetsStateService.isSuggestionTargetsLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getSuggestionTargets();
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loading, 'false' otherwise.
+   */
+  public isTargetsLoading(): Observable<boolean> {
+    return this.suggestionTargetsStateService.isSuggestionTargetsLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the targets (ex.: a REST call), 'false' otherwise.
+   */
+  public isTargetsProcessing(): Observable<boolean> {
+    return this.suggestionTargetsStateService.isSuggestionTargetsProcessing();
+  }
+
+  /**
+   * Redirect to suggestion page.
+   *
+   * @param {string} id
+   *    the id of suggestion target
+   */
+  public redirectToSuggestions(id: string) {
+    this.router.navigate([getSuggestionPageRoute(id)]);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.suggestionTargetsStateService.dispatchClearSuggestionTargetsAction();
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Dispatch the Suggestion Targets retrival.
+   */
+  public getSuggestionTargets(): void {
+    this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+      take(1),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.suggestionTargetsStateService.dispatchRetrieveSuggestionTargets(
+        this.source,
+        options.pageSize,
+        options.currentPage,
+      );
+    });
+  }
+
+  public getTargetUuid(target: SuggestionTarget) {
+    return this.suggestionService.getTargetUuid(target);
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts b/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts
new file mode 100644
index 0000000000..abbf08d812
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts
@@ -0,0 +1,165 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { type } from '../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const SuggestionTargetActionTypes = {
+  ADD_TARGETS: type('dspace/integration/openaire/suggestions/target/ADD_TARGETS'),
+  CLEAR_TARGETS: type('dspace/integration/openaire/suggestions/target/CLEAR_TARGETS'),
+  RETRIEVE_TARGETS_BY_SOURCE: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE'),
+  RETRIEVE_TARGETS_BY_SOURCE_ERROR: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE_ERROR'),
+  ADD_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/ADD_USER_SUGGESTIONS'),
+  REFRESH_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS'),
+  REFRESH_USER_SUGGESTIONS_ERROR: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS_ERROR'),
+  MARK_USER_SUGGESTIONS_AS_VISITED: type('dspace/integration/openaire/suggestions/target/MARK_USER_SUGGESTIONS_AS_VISITED'),
+};
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * An ngrx action to retrieve all the Suggestion Targets.
+ */
+export class RetrieveTargetsBySourceAction implements Action {
+  type = SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE;
+  payload: {
+    source: string;
+    elementsPerPage: number;
+    currentPage: number;
+  };
+
+  /**
+   * Create a new RetrieveTargetsBySourceAction.
+   *
+   * @param source
+   *    the source for which to retrieve suggestion targets
+   * @param elementsPerPage
+   *    the number of targets per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(source: string, elementsPerPage: number, currentPage: number) {
+    this.payload = {
+      source,
+      elementsPerPage,
+      currentPage,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Suggestion Targets' error.
+ */
+export class RetrieveAllTargetsErrorAction implements Action {
+  type = SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR;
+}
+
+/**
+ * An ngrx action to load the Suggestion Target  objects.
+ */
+export class AddTargetAction implements Action {
+  type = SuggestionTargetActionTypes.ADD_TARGETS;
+  payload: {
+    targets: SuggestionTarget[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddTargetAction.
+   *
+   * @param targets
+   *    the list of targets
+   * @param totalPages
+   *    the total available pages of targets
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Suggestion Targets
+   */
+  constructor(targets: SuggestionTarget[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      targets,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/**
+ * An ngrx action to load the user Suggestion Target object.
+ * Called by the ??? effect.
+ */
+export class AddUserSuggestionsAction implements Action {
+  type = SuggestionTargetActionTypes.ADD_USER_SUGGESTIONS;
+  payload: {
+    suggestionTargets: SuggestionTarget[];
+  };
+
+  /**
+   * Create a new AddUserSuggestionsAction.
+   *
+   * @param suggestionTargets
+   *    the user suggestions target
+   */
+  constructor(suggestionTargets: SuggestionTarget[]) {
+    this.payload = { suggestionTargets };
+  }
+
+}
+
+/**
+ * An ngrx action to reload the user Suggestion Target object.
+ * Called by the ??? effect.
+ */
+export class RefreshUserSuggestionsAction implements Action {
+  type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS;
+}
+
+/**
+ * NgRx action to signify an error while handling {@link RefreshUserSuggestionsAction}
+ */
+export class RefreshUserSuggestionsErrorAction implements Action {
+  type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS_ERROR;
+}
+
+/**
+ * An ngrx action to Mark User Suggestions As Visited.
+ * Called by the ??? effect.
+ */
+export class MarkUserSuggestionsAsVisitedAction implements Action {
+  type = SuggestionTargetActionTypes.MARK_USER_SUGGESTIONS_AS_VISITED;
+}
+
+/**
+ * An ngrx action to clear targets state.
+ */
+export class ClearSuggestionTargetsAction implements Action {
+  type = SuggestionTargetActionTypes.CLEAR_TARGETS;
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type SuggestionTargetsActions
+  = AddTargetAction
+  | AddUserSuggestionsAction
+  | ClearSuggestionTargetsAction
+  | MarkUserSuggestionsAsVisitedAction
+  | RetrieveTargetsBySourceAction
+  | RetrieveAllTargetsErrorAction
+  | RefreshUserSuggestionsAction;
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
new file mode 100644
index 0000000000..e648190228
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
@@ -0,0 +1,116 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SuggestionsService } from '../suggestions.service';
+import {
+  AddTargetAction,
+  AddUserSuggestionsAction,
+  RefreshUserSuggestionsErrorAction,
+  RetrieveAllTargetsErrorAction,
+  RetrieveTargetsBySourceAction,
+  SuggestionTargetActionTypes,
+} from './suggestion-targets.actions';
+
+/**
+ * Provides effect methods for the Suggestion Targets actions.
+ */
+@Injectable()
+export class SuggestionTargetsEffects {
+
+  /**
+   * Retrieve all Suggestion Targets managing pagination and errors.
+   */
+  retrieveTargetsBySource$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE),
+    switchMap((action: RetrieveTargetsBySourceAction) => {
+      return this.suggestionsService.getTargets(
+        action.payload.source,
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+      ).pipe(
+        map((targets: PaginatedList<SuggestionTarget>) =>
+          new AddTargetAction(targets.page, targets.totalPages, targets.currentPage, targets.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          }
+          return of(new RetrieveAllTargetsErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllTargetsErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('suggestion.target.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Fetch the current user suggestion
+   */
+  refreshUserSuggestionsAction$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS),
+    switchMap(() => {
+      return this.store$.select((state: any) => state.core.auth.userId)
+        .pipe(
+          switchMap((userId: string) => {
+            return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
+              .pipe(
+                map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+                catchError((error: unknown) => {
+                  if (error instanceof Error) {
+                    console.error(error.message);
+                  }
+                  return of(new RefreshUserSuggestionsErrorAction());
+                }),
+              );
+          }),
+          catchError((error: unknown) => {
+            if (error instanceof Error) {
+              console.error(error.message);
+            }
+            return of(new RefreshUserSuggestionsErrorAction());
+          }),
+        );
+    })),
+  );
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {SuggestionsService} suggestionsService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private suggestionsService: SuggestionsService,
+  ) {
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts b/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts
new file mode 100644
index 0000000000..0fcf4c5fe2
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts
@@ -0,0 +1,103 @@
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import {
+  SuggestionTargetActionTypes,
+  SuggestionTargetsActions,
+} from './suggestion-targets.actions';
+
+/**
+ * The interface representing the OpenAIRE suggestion targets state.
+ */
+export interface SuggestionTargetState {
+  targets: SuggestionTarget[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+  currentUserTargets: SuggestionTarget[];
+  currentUserTargetsVisited: boolean;
+}
+
+/**
+ * Used for the OpenAIRE Suggestion Target state initialization.
+ */
+const SuggestionTargetInitialState: SuggestionTargetState = {
+  targets: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+  currentUserTargets: null,
+  currentUserTargetsVisited: false,
+};
+
+/**
+ * The OpenAIRE Broker Topic Reducer
+ *
+ * @param state
+ *    the current state initialized with SuggestionTargetInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return SuggestionTargetState
+ *    the new state
+ */
+export function SuggestionTargetsReducer(state = SuggestionTargetInitialState, action: SuggestionTargetsActions): SuggestionTargetState {
+  switch (action.type) {
+    case SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: true,
+      });
+    }
+
+    case SuggestionTargetActionTypes.ADD_TARGETS: {
+      return Object.assign({}, state, {
+        targets: state.targets.concat(action.payload.targets),
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    case SuggestionTargetActionTypes.ADD_USER_SUGGESTIONS: {
+      return Object.assign({}, state, {
+        currentUserTargets: action.payload.suggestionTargets,
+      });
+    }
+
+    case SuggestionTargetActionTypes.MARK_USER_SUGGESTIONS_AS_VISITED: {
+      return Object.assign({}, state, {
+        currentUserTargetsVisited: true,
+      });
+    }
+
+    case SuggestionTargetActionTypes.CLEAR_TARGETS: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: false,
+        loaded: false,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts b/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts
new file mode 100644
index 0000000000..b6ea910dce
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts
@@ -0,0 +1,166 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { SuggestionNotificationsState } from '../../notifications/notifications.reducer';
+import {
+  getCurrentUserSuggestionTargetsSelector,
+  getCurrentUserSuggestionTargetsVisitedSelector,
+  getSuggestionTargetCurrentPageSelector,
+  getSuggestionTargetTotalsSelector,
+  isReciterSuggestionTargetProcessingSelector,
+  isSuggestionTargetLoadedSelector,
+  suggestionTargetObjectSelector,
+} from '../../suggestion-notifications/selectors';
+import {
+  ClearSuggestionTargetsAction,
+  MarkUserSuggestionsAsVisitedAction,
+  RefreshUserSuggestionsAction,
+  RetrieveTargetsBySourceAction,
+} from './suggestion-targets.actions';
+
+/**
+ * The service handling the Suggestion targets State.
+ */
+@Injectable()
+export class SuggestionTargetsStateService {
+
+  /**
+   * Initialize the service variables.
+   * @param {Store<SuggestionNotificationsState>} store
+   */
+  constructor(private store: Store<SuggestionNotificationsState>) { }
+
+  /**
+   * Returns the list of Suggestion Targets from the state.
+   *
+   * @return Observable<SuggestionTarget>
+   *    The list of Suggestion Targets.
+   */
+  public getSuggestionTargets(): Observable<SuggestionTarget[]> {
+    return this.store.pipe(select(suggestionTargetObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loading, 'false' otherwise.
+   */
+  public isSuggestionTargetsLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isSuggestionTargetLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loaded, 'false' otherwise.
+   */
+  public isSuggestionTargetsLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isSuggestionTargetLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the targets (ex.: a REST call), 'false' otherwise.
+   */
+  public isSuggestionTargetsProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isReciterSuggestionTargetProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Suggestion Targets.
+   *
+   * @return Observable<number>
+   *    The number of the Suggestion Targets pages.
+   */
+  public getSuggestionTargetsTotalPages(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetTotalsSelector));
+  }
+
+  /**
+   * Returns the current page of the Suggestion Targets, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Suggestion Targets page.
+   */
+  public getSuggestionTargetsCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Suggestion Targets.
+   *
+   * @return Observable<number>
+   *    The number of the Suggestion Targets.
+   */
+  public getSuggestionTargetsTotals(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Suggestion Targets state, retrieving the targets from the server.
+   *
+   * @param source
+   *    the source for which to retrieve suggestion targets
+   * @param elementsPerPage
+   *    The number of the targets per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveSuggestionTargets(source: string, elementsPerPage: number, currentPage: number): void {
+    this.store.dispatch(new RetrieveTargetsBySourceAction(source, elementsPerPage, currentPage));
+  }
+
+  /**
+   * Returns, from the state, the suggestion targets for the current user.
+   *
+   * @return Observable<OpenaireReciterSuggestionTarget>
+   *    The Suggestion Targets object.
+   */
+  public getCurrentUserSuggestionTargets(): Observable<SuggestionTarget[]> {
+    return this.store.pipe(select(getCurrentUserSuggestionTargetsSelector));
+  }
+
+  /**
+   * Returns, from the state, whether or not the user has consulted their suggestion targets.
+   *
+   * @return Observable<boolean>
+   *    True if user already visited, false otherwise.
+   */
+  public hasUserVisitedSuggestions(): Observable<boolean> {
+    return this.store.pipe(select(getCurrentUserSuggestionTargetsVisitedSelector));
+  }
+
+  /**
+   * Dispatch a new MarkUserSuggestionsAsVisitedAction
+   */
+  public dispatchMarkUserSuggestionsAsVisitedAction(): void {
+    this.store.dispatch(new MarkUserSuggestionsAsVisitedAction());
+  }
+
+  /**
+   * Dispatch an action to clear the Reciter Suggestion Targets state.
+   */
+  public dispatchClearSuggestionTargetsAction(): void {
+    this.store.dispatch(new ClearSuggestionTargetsAction());
+  }
+
+  /**
+   * Dispatch an action to refresh the user suggestions.
+   */
+  public dispatchRefreshUserSuggestionsAction(): void {
+    this.store.dispatch(new RefreshUserSuggestionsAction());
+  }
+}
diff --git a/src/app/notifications/suggestion.service.spec.ts b/src/app/notifications/suggestion.service.spec.ts
new file mode 100644
index 0000000000..aee00c8bf4
--- /dev/null
+++ b/src/app/notifications/suggestion.service.spec.ts
@@ -0,0 +1,177 @@
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
+import { ResourceType } from '../core/shared/resource-type';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { mockSuggestionPublicationOne } from '../shared/mocks/publication-claim.mock';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { SuggestionsService } from './suggestions.service';
+
+describe('SuggestionsService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionsService;
+  let researcherProfileService: ResearcherProfileDataService;
+  let suggestionsDataService: SuggestionsDataService;
+  let suggestionTargetDataService: SuggestionTargetDataService;
+  let translateService: any = {
+    instant: (str) => str,
+  };
+  const suggestionTarget = {
+    id: '1234:4321',
+    display: 'display',
+    source: 'source',
+    total: 8,
+    type: new ResourceType('suggestiontarget'),
+  };
+
+  const mockResercherProfile = {
+    id: '1234',
+    uuid: '1234',
+    visible: true,
+  };
+
+  function initTestService() {
+    return new SuggestionsService(
+      researcherProfileService,
+      suggestionsDataService,
+      suggestionTargetDataService,
+      translateService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+      findById: createSuccessfulRemoteDataObject$(mockResercherProfile as ResearcherProfile),
+      findRelatedItemId: observableOf('1234'),
+    });
+
+    suggestionTargetDataService = jasmine.createSpyObj('suggestionTargetsDataService', {
+      getTargets: observableOf(null),
+      findById: observableOf(null),
+    });
+
+    suggestionsDataService = jasmine.createSpyObj('suggestionsDataService', {
+      searchBy: observableOf(null),
+      delete: observableOf(null),
+      deleteSuggestion: createSuccessfulRemoteDataObject$({}),
+      getSuggestionsByTargetAndSource : observableOf(null),
+      clearSuggestionRequests : null,
+      getTargetsByUser: observableOf(null),
+    });
+
+    service = initTestService();
+
+  });
+
+  describe('Suggestion service', () => {
+    it('should create', () => {
+      expect(service).toBeDefined();
+    });
+
+    it('should get targets', () => {
+      const sortOptions = new SortOptions('display', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: 10,
+        currentPage: 1,
+        sort: sortOptions,
+      };
+      service.getTargets('source', 10, 1);
+      expect(suggestionTargetDataService.getTargets).toHaveBeenCalledWith('source', findListOptions);
+    });
+
+    it('should get suggestions', () => {
+      const sortOptions = new SortOptions('display', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: 10,
+        currentPage: 1,
+        sort: sortOptions,
+      };
+      service.getSuggestions('source:target', 10, 1, sortOptions);
+      expect(suggestionsDataService.getSuggestionsByTargetAndSource).toHaveBeenCalledWith('target', 'source', findListOptions);
+    });
+
+    it('should clear suggestions', () => {
+      service.clearSuggestionRequests();
+      expect(suggestionsDataService.clearSuggestionRequests).toHaveBeenCalled();
+    });
+
+    it('should delete reviewed suggestion', () => {
+      service.deleteReviewedSuggestion('1234');
+      expect(suggestionsDataService.deleteSuggestion).toHaveBeenCalledWith('1234');
+    });
+
+    it('should retrieve current user suggestions', () => {
+      service.retrieveCurrentUserSuggestions('1234');
+      expect(researcherProfileService.findById).toHaveBeenCalledWith('1234', true);
+    });
+
+    it('should approve and import suggestion', () => {
+      spyOn(service, 'resolveCollectionId');
+      const workspaceitemService = { importExternalSourceEntry: (x,y) => observableOf(null) };
+      service.approveAndImport(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
+      expect(service.resolveCollectionId).toHaveBeenCalled();
+    });
+
+    it('should approve and import suggestions', () => {
+      spyOn(service, 'approveAndImport');
+      const workspaceitemService = { importExternalSourceEntry: (x,y) => observableOf(null) };
+      service.approveAndImportMultiple(workspaceitemService as unknown as WorkspaceitemDataService, [mockSuggestionPublicationOne], '1234');
+      expect(service.approveAndImport).toHaveBeenCalledWith(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
+    });
+
+    it('should delete suggestion', () => {
+      spyOn(service, 'deleteReviewedSuggestion').and.returnValue(createSuccessfulRemoteDataObject$({}));
+      service.ignoreSuggestion('1234');
+      expect(service.deleteReviewedSuggestion).toHaveBeenCalledWith('1234');
+    });
+
+    it('should delete suggestions', () => {
+      spyOn(service, 'ignoreSuggestion');
+      service.ignoreSuggestionMultiple([mockSuggestionPublicationOne]);
+      expect(service.ignoreSuggestion).toHaveBeenCalledWith(mockSuggestionPublicationOne.id);
+    });
+
+    it('should get target Uuid', () => {
+      expect(service.getTargetUuid(suggestionTarget as SuggestionTarget)).toBe('4321');
+      expect(service.getTargetUuid({ id: '' } as SuggestionTarget)).toBe(null);
+    });
+
+    it('should get suggestion interpolation', () => {
+      const result = service.getNotificationSuggestionInterpolation(suggestionTarget as SuggestionTarget);
+      expect(result.count).toEqual(suggestionTarget.total);
+      expect(result.source).toEqual('suggestion.source.' + suggestionTarget.source);
+      expect(result.type).toEqual('suggestion.type.' + suggestionTarget.source);
+      expect(result.suggestionId).toEqual(suggestionTarget.id);
+      expect(result.displayName).toEqual(suggestionTarget.display);
+    });
+
+    it('should translate suggestion type', () => {
+      expect(service.translateSuggestionType('source')).toEqual('suggestion.type.source');
+    });
+
+    it('should translate suggestion source', () => {
+      expect(service.translateSuggestionSource('source')).toEqual('suggestion.source.source');
+    });
+
+    it('should resolve collection id', () => {
+      expect(service.resolveCollectionId(mockSuggestionPublicationOne, '1234')).toEqual('1234');
+    });
+
+    it('should check if collection is fixed', () => {
+      expect(service.isCollectionFixed([mockSuggestionPublicationOne])).toBeFalse();
+    });
+  });
+});
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
new file mode 100644
index 0000000000..838bdb95ad
--- /dev/null
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
@@ -0,0 +1,9 @@
+<ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
+  <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
+    <div class="alert alert-success d-block" *ngIf="suggestion.total > 0">
+      <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+      {{ 'notification.suggestion.please' | translate }}
+      <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.html
rename to src/app/notifications/suggestions-notification/suggestions-notification.component.scss
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
new file mode 100644
index 0000000000..a3b22e982c
--- /dev/null
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -0,0 +1,44 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+
+/**
+ * Show suggestions notification, used on myDSpace and Profile pages
+ */
+@Component({
+  selector: 'ds-suggestions-notification',
+  templateUrl: './suggestions-notification.component.html',
+  styleUrls: ['./suggestions-notification.component.scss'],
+})
+export class SuggestionsNotificationComponent implements OnInit {
+
+  /**
+   * The user suggestion targets.
+   */
+  suggestionsRD$: Observable<SuggestionTarget[]>;
+
+  constructor(
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionsService: SuggestionsService,
+  ) { }
+
+  ngOnInit() {
+    this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+    this.suggestionsRD$ = this.suggestionTargetsStateService.getCurrentUserSuggestionTargets();
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return this.suggestionsService.getNotificationSuggestionInterpolation(suggestionTarget);
+  }
+
+}
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
new file mode 100644
index 0000000000..474dfa329e
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -0,0 +1,27 @@
+<div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
+  <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
+    <button (click)="removePopup()"
+            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+
+    <div class="d-flex flex-row">
+      <div class="d-flex flex-column justify-content-center align-items-center">
+        <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
+      </div>
+      <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+        <ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
+          <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
+            <div *ngIf="suggestion.total > 0">
+              <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+              {{ 'notification.suggestion.please' | translate }}
+              <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+            </div>
+          </ng-container>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+</div>
+
+
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.scss b/src/app/notifications/suggestions-popup/suggestions-popup.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.scss
rename to src/app/notifications/suggestions-popup/suggestions-popup.component.scss
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
new file mode 100644
index 0000000000..12c3280837
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
@@ -0,0 +1,81 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+import { SuggestionsPopupComponent } from './suggestions-popup.component';
+
+describe('SuggestionsPopupComponent', () => {
+  let component: SuggestionsPopupComponent;
+  let fixture: ComponentFixture<SuggestionsPopupComponent>;
+
+  const suggestionStateService = jasmine.createSpyObj('SuggestionTargetsStateService', {
+    hasUserVisitedSuggestions: jasmine.createSpy('hasUserVisitedSuggestions'),
+    getCurrentUserSuggestionTargets: jasmine.createSpy('getCurrentUserSuggestionTargets'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+    dispatchRefreshUserSuggestionsAction: jasmine.createSpy('dispatchRefreshUserSuggestionsAction'),
+  });
+
+  const mockNotificationInterpolation = { count: 12, source: 'source', suggestionId: 'id', displayName: 'displayName' };
+  const suggestionService = jasmine.createSpyObj('SuggestionService', {
+    getNotificationSuggestionInterpolation:
+      jasmine.createSpy('getNotificationSuggestionInterpolation').and.returnValue(mockNotificationInterpolation),
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ SuggestionsPopupComponent ],
+      providers: [
+        { provide: SuggestionTargetsStateService, useValue: suggestionStateService },
+        { provide: SuggestionsService, useValue: suggestionService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+
+    })
+      .compileComponents();
+  }));
+
+  describe('should create', () => {
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SuggestionsPopupComponent);
+      component = fixture.componentInstance;
+      spyOn(component, 'initializePopup').and.returnValue(null);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+      expect(component.initializePopup).toHaveBeenCalled();
+    });
+
+  });
+
+  describe('when there are publication suggestions', () => {
+
+    beforeEach(() => {
+      suggestionStateService.hasUserVisitedSuggestions.and.returnValue(observableOf(false));
+      suggestionStateService.getCurrentUserSuggestionTargets.and.returnValue(observableOf([mockSuggestionTargetsObjectOne]));
+      suggestionStateService.dispatchMarkUserSuggestionsAsVisitedAction.and.returnValue(observableOf(null));
+      suggestionStateService.dispatchRefreshUserSuggestionsAction.and.returnValue(observableOf(null));
+
+      fixture = TestBed.createComponent(SuggestionsPopupComponent);
+      component = fixture.componentInstance;
+      fixture.detectChanges();
+    });
+
+    it('should show a notification when new publication suggestions are available', () => {
+      expect(suggestionStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+      expect(suggestionStateService.dispatchMarkUserSuggestionsAsVisitedAction).toHaveBeenCalled();
+    });
+
+  });
+});
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
new file mode 100644
index 0000000000..f3ccc70cbd
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
@@ -0,0 +1,93 @@
+import { trigger } from '@angular/animations';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of,
+  Subject,
+} from 'rxjs';
+import {
+  take,
+  takeUntil,
+} from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { fromTopEnter } from '../../shared/animations/fromTop';
+import { isNotEmpty } from '../../shared/empty.util';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+
+/**
+ * Show suggestions on a popover window, used on the homepage
+ */
+@Component({
+  selector: 'ds-suggestions-popup',
+  templateUrl: './suggestions-popup.component.html',
+  styleUrls: ['./suggestions-popup.component.scss'],
+  animations: [
+    trigger('enterLeave', [
+      fromTopEnter,
+    ]),
+  ],
+})
+export class SuggestionsPopupComponent implements OnInit, OnDestroy {
+
+  labelPrefix = 'notification.';
+
+  subscription;
+
+  suggestionsRD$: Observable<SuggestionTarget[]>;
+
+
+  constructor(
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionsService: SuggestionsService,
+  ) { }
+
+  ngOnInit() {
+    this.initializePopup();
+  }
+
+  public initializePopup() {
+    const notifier = new Subject();
+    this.subscription = combineLatest([
+      this.suggestionTargetsStateService.getCurrentUserSuggestionTargets().pipe(take(2)),
+      this.suggestionTargetsStateService.hasUserVisitedSuggestions(),
+    ]).pipe(takeUntil(notifier)).subscribe(([suggestions, visited]) => {
+      this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+      if (isNotEmpty(suggestions)) {
+        if (!visited) {
+          this.suggestionsRD$ = of(suggestions);
+          this.suggestionTargetsStateService.dispatchMarkUserSuggestionsAsVisitedAction();
+          notifier.next(null);
+          notifier.complete();
+        }
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return this.suggestionsService.getNotificationSuggestionInterpolation(suggestionTarget);
+  }
+
+  /**
+   * Hide popup from view
+   */
+  public removePopup() {
+    this.suggestionsRD$ = null;
+  }
+}
diff --git a/src/app/notifications/suggestions.service.ts b/src/app/notifications/suggestions.service.ts
new file mode 100644
index 0000000000..bcd3ac1342
--- /dev/null
+++ b/src/app/notifications/suggestions.service.ts
@@ -0,0 +1,317 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  forkJoin,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { SuggestionConfig } from '../../config/suggestion-config.interfaces';
+import { environment } from '../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { PaginatedList } from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Suggestion } from '../core/notifications/models/suggestion.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
+import { NoContent } from '../core/shared/NoContent.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFinishedRemoteData,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload,
+} from '../core/shared/operators';
+import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { getSuggestionPageRoute } from '../suggestions-page/suggestions-page-routing-paths';
+
+/**
+ * useful for multiple approvals and ignores operation
+ * */
+export interface SuggestionBulkResult {
+  success: number;
+  fails: number;
+}
+
+/**
+ * The service handling all Suggestion Target  requests to the REST service.
+ */
+@Injectable()
+export class SuggestionsService {
+
+  /**
+   * Initialize the service variables.
+   * @param {ResearcherProfileDataService} researcherProfileService
+   * @param {SuggestionTargetDataService} suggestionTargetDataService
+   * @param {SuggestionsDataService} suggestionsDataService
+   * @param translateService
+   */
+  constructor(
+    private researcherProfileService: ResearcherProfileDataService,
+    private suggestionsDataService: SuggestionsDataService,
+    private suggestionTargetDataService: SuggestionTargetDataService,
+    private translateService: TranslateService,
+  ) {
+  }
+
+  /**
+   * Return the list of Suggestion Target managing pagination and errors.
+   *
+   * @param source
+   *    The source for which to retrieve targets
+   * @param elementsPerPage
+   *    The number of the target per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<OpenaireReciterSuggestionTarget>>
+   *    The list of Suggestion Targets.
+   */
+  public getTargets(source, elementsPerPage, currentPage): Observable<PaginatedList<SuggestionTarget>> {
+    const sortOptions = new SortOptions('display', SortDirection.ASC);
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.suggestionTargetDataService.getTargets(source, findListOptions).pipe(
+      getFinishedRemoteData(),
+      take(1),
+      map((rd: RemoteData<PaginatedList<SuggestionTarget>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Suggestion Target from the Search Target REST service');
+        }
+      }),
+    );
+  }
+
+  /**
+   * Return the list of review suggestions Target managing pagination and errors.
+   *
+   * @param targetId
+   *    The target id for which to find suggestions.
+   * @param elementsPerPage
+   *    The number of the target per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @param sortOptions
+   *    The sort options
+   * @return Observable<RemoteData<PaginatedList<Suggestion>>>
+   *    The list of Suggestion.
+   */
+  public getSuggestions(targetId: string, elementsPerPage, currentPage, sortOptions: SortOptions): Observable<PaginatedList<Suggestion>> {
+    const [source, target] = targetId.split(':');
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.suggestionsDataService.getSuggestionsByTargetAndSource(target, source, findListOptions).pipe(
+      getAllSucceededRemoteDataPayload(),
+    );
+  }
+
+  /**
+   * Clear suggestions requests from cache
+   */
+  public clearSuggestionRequests() {
+    this.suggestionsDataService.clearSuggestionRequests();
+  }
+
+  /**
+   * Used to delete Suggestion
+   * @suggestionId
+   */
+  public deleteReviewedSuggestion(suggestionId: string): Observable<RemoteData<NoContent>> {
+    return this.suggestionsDataService.deleteSuggestion(suggestionId).pipe(
+      map((response: RemoteData<NoContent>) => {
+        if (response.isSuccess) {
+          return response;
+        } else {
+          throw new Error('Can\'t delete Suggestion from the Search Target REST service');
+        }
+      }),
+      take(1),
+    );
+  }
+
+  /**
+   * Retrieve suggestion targets for the given user
+   *
+   * @param userUuid
+   *   The EPerson id for which to retrieve suggestion targets
+   */
+  public retrieveCurrentUserSuggestions(userUuid: string): Observable<SuggestionTarget[]> {
+    return this.researcherProfileService.findById(userUuid, true).pipe(
+      getFirstCompletedRemoteData(),
+      mergeMap((profile: RemoteData<ResearcherProfile> ) => {
+        if (isNotEmpty(profile) && profile.hasSucceeded && isNotEmpty(profile.payload)) {
+          return this.researcherProfileService.findRelatedItemId(profile.payload).pipe(
+            mergeMap((itemId: string) => {
+              return this.suggestionsDataService.getTargetsByUser(itemId).pipe(
+                getFirstSucceededRemoteListPayload(),
+              );
+            }),
+          );
+        } else {
+          return of([]);
+        }
+      }),
+      catchError(() => of([])),
+    );
+  }
+
+  /**
+   * Perform the approve and import operation over a single suggestion
+   * @param suggestion target suggestion
+   * @param collectionId the collectionId
+   * @param workspaceitemService injected dependency
+   * @private
+   */
+  public approveAndImport(workspaceitemService: WorkspaceitemDataService,
+    suggestion: Suggestion,
+    collectionId: string): Observable<WorkspaceItem> {
+
+    const resolvedCollectionId = this.resolveCollectionId(suggestion, collectionId);
+    return workspaceitemService.importExternalSourceEntry(suggestion.externalSourceUri, resolvedCollectionId)
+      .pipe(
+        getFirstSucceededRemoteDataPayload(),
+        catchError(() => of(null)),
+      );
+  }
+
+  /**
+   * Perform the delete operation over a single suggestion.
+   * @param suggestionId
+   */
+  public ignoreSuggestion(suggestionId): Observable<RemoteData<NoContent>> {
+    return this.deleteReviewedSuggestion(suggestionId).pipe(
+      catchError(() => of(null)),
+    );
+  }
+
+  /**
+   * Perform a bulk approve and import operation.
+   * @param workspaceitemService injected dependency
+   * @param suggestions the array containing the suggestions
+   * @param collectionId the collectionId
+   */
+  public approveAndImportMultiple(workspaceitemService: WorkspaceitemDataService,
+    suggestions: Suggestion[],
+    collectionId: string): Observable<SuggestionBulkResult> {
+
+    return forkJoin(suggestions.map((suggestion: Suggestion) =>
+      this.approveAndImport(workspaceitemService, suggestion, collectionId)))
+      .pipe(map((results: WorkspaceItem[]) => {
+        return {
+          success: results.filter((result) => result != null).length,
+          fails: results.filter((result) => result == null).length,
+        };
+      }), take(1));
+  }
+
+  /**
+   * Perform a bulk ignoreSuggestion operation.
+   * @param suggestions the array containing the suggestions
+   */
+  public ignoreSuggestionMultiple(suggestions: Suggestion[]): Observable<SuggestionBulkResult> {
+    return forkJoin(suggestions.map((suggestion: Suggestion) => this.ignoreSuggestion(suggestion.id)))
+      .pipe(map((results: RemoteData<NoContent>[]) => {
+        return {
+          success: results.filter((result) => result != null).length,
+          fails: results.filter((result) => result == null).length,
+        };
+      }), take(1));
+  }
+
+  /**
+   * Get the researcher uuid (for navigation purpose) from a target instance.
+   * TODO Find a better way
+   * @param target
+   * @return the researchUuid
+   */
+  public getTargetUuid(target: SuggestionTarget): string {
+    const tokens = target.id.split(':');
+    return tokens.length === 2 ? tokens[1] : null;
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return {
+      count: suggestionTarget.total,
+      source: this.translateService.instant(this.translateSuggestionSource(suggestionTarget.source)),
+      type:  this.translateService.instant(this.translateSuggestionType(suggestionTarget.source)),
+      suggestionId: suggestionTarget.id,
+      displayName: suggestionTarget.display,
+      url: getSuggestionPageRoute(suggestionTarget.id),
+    };
+  }
+
+  public translateSuggestionType(source: string): string {
+    return 'suggestion.type.' + source;
+  }
+
+  public translateSuggestionSource(source: string): string {
+    return 'suggestion.source.' + source;
+  }
+
+  /**
+   * If the provided collectionId ha no value, tries to resolve it by suggestion source.
+   * @param suggestion
+   * @param collectionId
+   */
+  public resolveCollectionId(suggestion: Suggestion, collectionId): string {
+    if (hasValue(collectionId)) {
+      return collectionId;
+    }
+    return environment.suggestion
+      .find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source)
+      .collectionId;
+  }
+
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection
+   * in the configuration.
+   * @param suggestions
+   */
+  public isCollectionFixed(suggestions: Suggestion[]): boolean {
+    return this.getFixedCollectionIds(suggestions).length === 1;
+  }
+
+  private getFixedCollectionIds(suggestions: Suggestion[]): string[] {
+    const collectionIds = {};
+    suggestions.forEach((suggestion: Suggestion) => {
+      const conf = environment.suggestion.find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source);
+      if (hasValue(conf)) {
+        collectionIds[conf.collectionId] = true;
+      }
+    });
+    return Object.keys(collectionIds);
+  }
+}
diff --git a/src/app/page-error/page-error.component.spec.ts b/src/app/page-error/page-error.component.spec.ts
index 0f876f3196..7361935af3 100644
--- a/src/app/page-error/page-error.component.spec.ts
+++ b/src/app/page-error/page-error.component.spec.ts
@@ -1,11 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PageErrorComponent } from './page-error.component';
-import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
+import { PageErrorComponent } from './page-error.component';
 
 describe('PageErrorComponent', () => {
   let component: PageErrorComponent;
@@ -13,8 +21,8 @@ describe('PageErrorComponent', () => {
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     queryParams: observableOf({
       status: 401,
-      code: 'orcid.generic-error'
-    })
+      code: 'orcid.generic-error',
+    }),
   });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -23,13 +31,13 @@ describe('PageErrorComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-      ]
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(PageErrorComponent);
diff --git a/src/app/page-error/page-error.component.ts b/src/app/page-error/page-error.component.ts
index dea1b68407..06d566f59c 100644
--- a/src/app/page-error/page-error.component.ts
+++ b/src/app/page-error/page-error.component.ts
@@ -1,4 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 /**
@@ -8,7 +11,7 @@ import { ActivatedRoute } from '@angular/router';
   selector: 'ds-page-error',
   styleUrls: ['./page-error.component.scss'],
   templateUrl: './page-error.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageErrorComponent {
   status: number;
diff --git a/src/app/page-error/themed-page-error.component.ts b/src/app/page-error/themed-page-error.component.ts
index 3bfc6bf1a1..517ca45206 100644
--- a/src/app/page-error/themed-page-error.component.ts
+++ b/src/app/page-error/themed-page-error.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageErrorComponent } from './page-error.component';
 
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.ts b/src/app/page-internal-server-error/page-internal-server-error.component.ts
index 7ecb0a7609..bba313d6d2 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.ts
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ServerResponseService } from '../core/services/server-response.service';
 
 /**
@@ -8,7 +12,7 @@ import { ServerResponseService } from '../core/services/server-response.service'
   selector: 'ds-page-internal-server-error',
   styleUrls: ['./page-internal-server-error.component.scss'],
   templateUrl: './page-internal-server-error.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageInternalServerErrorComponent {
 
diff --git a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
index a5f9101b69..157047688e 100644
--- a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
+++ b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageInternalServerErrorComponent } from './page-internal-server-error.component';
 
diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts
index b11de58269..dcbfed48b4 100644
--- a/src/app/pagenotfound/pagenotfound.component.ts
+++ b/src/app/pagenotfound/pagenotfound.component.ts
@@ -1,6 +1,11 @@
-import { ServerResponseService } from '../core/services/server-response.service';
-import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { AuthService } from '../core/auth/auth.service';
+import { ServerResponseService } from '../core/services/server-response.service';
 
 /**
  * This component representing the `PageNotFound` DSpace page.
@@ -9,7 +14,7 @@ import { AuthService } from '../core/auth/auth.service';
   selector: 'ds-pagenotfound',
   styleUrls: ['./pagenotfound.component.scss'],
   templateUrl: './pagenotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageNotFoundComponent implements OnInit {
 
diff --git a/src/app/pagenotfound/themed-pagenotfound.component.ts b/src/app/pagenotfound/themed-pagenotfound.component.ts
index 3d284b1d6d..ba3372411a 100644
--- a/src/app/pagenotfound/themed-pagenotfound.component.ts
+++ b/src/app/pagenotfound/themed-pagenotfound.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageNotFoundComponent } from './pagenotfound.component';
 
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
index ce26008c28..2558b6cf7a 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
@@ -1,2 +1,2 @@
-<h4 class="mt-4">{{title | translate}}</h4>
+<h2 class="h3 mt-4">{{title | translate}}</h2>
 <ng-content></ng-content>
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
index 57b596b8b6..31d18bc065 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
@@ -1,10 +1,15 @@
-import { ProcessDetailFieldComponent } from './process-detail-field.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { By } from '@angular/platform-browser';
+
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { ProcessDetailFieldComponent } from './process-detail-field.component';
 
 describe('ProcessDetailFieldComponent', () => {
   let component: ProcessDetailFieldComponent;
@@ -20,7 +25,7 @@ describe('ProcessDetailFieldComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -32,7 +37,7 @@ describe('ProcessDetailFieldComponent', () => {
   });
 
   it('should display the given title', () => {
-    const header = fixture.debugElement.query(By.css('h4')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
     expect(header.textContent).toContain(title);
   });
 });
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
index f8015b6788..7cb38653f4 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-process-detail-field',
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 5f905cbfff..521aec12c2 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,12 +1,12 @@
 <div class="container" *ngIf="(processRD$ | async)?.payload as process">
     <div class="row">
       <div class="col-10">
-        <h2 class="flex-grow-1">
+        <h1 class="flex-grow-1">
           {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
-        </h2>
+        </h1>
       </div>
-      <div *ngIf="refreshCounter$ | async as seconds" class="col-2 refresh-counter">
-        Refreshing in {{ seconds }}s <i class="fas fa-sync-alt fa-spin"></i>
+      <div *ngIf="isRefreshing$ | async" class="col-2 refresh-counter">
+        {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
       </div>
     </div>
 
@@ -47,16 +47,16 @@
     </ds-process-detail-field>
 
     <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
-        <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton"
+        <button *ngIf="!showOutputLogs && process?._links?.output?.href !== undefined" id="showOutputButton"
                 class="btn btn-primary" (click)="showProcessOutputLogs()">
             {{ 'process.detail.logs.button' | translate }}
         </button>
         <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
                            message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
-        <pre class="font-weight-bold text-secondary bg-light p-3"
+        <pre class="font-weight-bold text-secondary bg-light p-3" tabindex="0"
              *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
-        <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
-      && !(outputLogs$ | async) || (outputLogs$ | async)?.length == 0 || !process._links.output">
+        <p id="no-output-logs-message" *ngIf="((retrievingOutputLogs$ | async) !== true && showOutputLogs)
+      && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output">
             {{ 'process.detail.logs.none' | translate }}
         </p>
     </ds-process-detail-field>
diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
index 9552f9a092..aac8538074 100644
--- a/src/app/process-page/detail/process-detail.component.spec.ts
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -1,41 +1,48 @@
 import { HttpClient } from '@angular/common/http';
-import { AuthService } from '../../core/auth/auth.service';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
-import { ProcessDetailComponent } from './process-detail.component';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import {
-  waitForAsync,
   ComponentFixture,
   discardPeriodicTasks,
   fakeAsync,
   flush,
   flushMicrotasks,
   TestBed,
-  tick
+  tick,
+  waitForAsync,
 } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
-import { Process } from '../processes/process.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
-import { FileSizePipe } from '../../shared/utils/file-size-pipe';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { HasNoValuePipe } from '../../shared/utils/has-no-value.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { getProcessListRoute } from '../process-page-routing.paths';
-import {ProcessStatus} from '../processes/process-status.model';
+import { Process } from '../processes/process.model';
+import { ProcessDetailComponent } from './process-detail.component';
+import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
 
 describe('ProcessDetailComponent', () => {
   let component: ProcessDetailComponent;
@@ -45,44 +52,18 @@ describe('ProcessDetailComponent', () => {
   let nameService: DSONameService;
   let bitstreamDataService: BitstreamDataService;
   let httpClient: HttpClient;
-  let route: ActivatedRoute;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
+  let modalService;
+  let notificationsService: NotificationsServiceStub;
 
   let process: Process;
   let fileName: string;
   let files: Bitstream[];
 
-  let processOutput;
-
-  let modalService;
-  let notificationsService;
-
-  let router;
+  let processOutput: string;
 
   function init() {
-    processOutput = 'Process Started';
-    process = Object.assign(new Process(), {
-      processId: 1,
-      scriptName: 'script-name',
-      processStatus: 'COMPLETED',
-      parameters: [
-        {
-          name: '-f',
-          value: 'file.xml'
-        },
-        {
-          name: '-i',
-          value: 'identifier'
-        }
-      ],
-      _links: {
-        self: {
-          href: 'https://rest.api/processes/1'
-        },
-        output: {
-          href: 'https://rest.api/processes/1/output'
-        }
-      }
-    });
     fileName = 'fake-file-name';
     files = [
       Object.assign(new Bitstream(), {
@@ -91,64 +72,92 @@ describe('ProcessDetailComponent', () => {
           'dc.title': [
             {
               value: fileName,
-              language: null
-            }
-          ]
+              language: null,
+            },
+          ],
         },
         _links: {
-          content: { href: 'file-selflink' }
-        }
-      })
+          content: { href: 'file-selflink' },
+        },
+      }),
     ];
+    processOutput = 'Process Started';
+    process = Object.assign(new Process(), {
+      processId: 1,
+      scriptName: 'script-name',
+      processStatus: 'COMPLETED',
+      parameters: [
+        {
+          name: '-f',
+          value: 'file.xml',
+        },
+        {
+          name: '-i',
+          value: 'identifier',
+        },
+      ],
+      files: createSuccessfulRemoteDataObject$(Object.assign(new PaginatedList(), {
+        page: files,
+      })),
+      _links: {
+        self: {
+          href: 'https://rest.api/processes/1',
+        },
+        output: {
+          href: 'https://rest.api/processes/1/output',
+        },
+      },
+    });
     const logBitstream = Object.assign(new Bitstream(), {
       id: 'output.log',
       _links: {
-        content: { href: 'log-selflink' }
-      }
+        content: { href: 'log-selflink' },
+      },
     });
     processService = jasmine.createSpyObj('processService', {
       getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files)),
       delete: createSuccessfulRemoteDataObject$(null),
       findById: createSuccessfulRemoteDataObject$(process),
+      autoRefreshUntilCompletion: createSuccessfulRemoteDataObject$(process),
     });
     bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-      findByHref: createSuccessfulRemoteDataObject$(logBitstream)
+      findByHref: createSuccessfulRemoteDataObject$(logBitstream),
     });
     nameService = jasmine.createSpyObj('nameService', {
-      getName: fileName
+      getName: fileName,
     });
     httpClient = jasmine.createSpyObj('httpClient', {
-      get: observableOf(processOutput)
+      get: observableOf(processOutput),
     });
 
     modalService = jasmine.createSpyObj('modalService', {
-      open: {}
+      open: {},
     });
 
     notificationsService = new NotificationsServiceStub();
 
-    router = jasmine.createSpyObj('router', {
-      navigateByUrl:{}
-    });
+    router = new RouterStub();
 
-    route = jasmine.createSpyObj('route', {
-      data: observableOf({ process: createSuccessfulRemoteDataObject(process) }),
-      snapshot: {
-        params: { id: process.processId }
-      }
+    route = new ActivatedRouteStub({
+      id: process.processId,
+    }, {
+      process: createSuccessfulRemoteDataObject$(process),
     });
   }
 
   beforeEach(waitForAsync(() => {
     init();
-    TestBed.configureTestingModule({
-      declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe],
-      imports: [TranslateModule.forRoot()],
+    void TestBed.configureTestingModule({
+      declarations: [
+        ProcessDetailComponent,
+        ProcessDetailFieldComponent,
+        VarDirective,
+        FileSizePipe,
+        HasNoValuePipe,
+      ],
+      imports: [TranslateModule.forRoot(), RouterTestingModule],
       providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) }
-        },
+        { provide: ActivatedRoute, useValue: route },
         { provide: ProcessDataService, useValue: processService },
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: DSONameService, useValue: nameService },
@@ -158,7 +167,7 @@ describe('ProcessDetailComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         { provide: Router, useValue: router },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -203,7 +212,7 @@ describe('ProcessDetailComponent', () => {
       const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
       showOutputButton.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
     }));
@@ -228,7 +237,7 @@ describe('ProcessDetailComponent', () => {
       const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
       showOutputButton.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -253,6 +262,8 @@ describe('ProcessDetailComponent', () => {
   describe('deleteProcess', () => {
     it('should delete the process and navigate back to the overview page on success', () => {
       spyOn(component, 'closeModal');
+      spyOn(router, 'navigateByUrl').and.callThrough();
+
       component.deleteProcess(process);
 
       expect(processService.delete).toHaveBeenCalledWith(process.processId);
@@ -263,6 +274,7 @@ describe('ProcessDetailComponent', () => {
     it('should delete the process and not navigate on error', () => {
       (processService.delete as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
       spyOn(component, 'closeModal');
+      spyOn(router, 'navigateByUrl').and.callThrough();
 
       component.deleteProcess(process);
 
@@ -272,93 +284,4 @@ describe('ProcessDetailComponent', () => {
       expect(router.navigateByUrl).not.toHaveBeenCalled();
     });
   });
-
-  describe('refresh counter', () => {
-    const queryRefreshCounter = () => fixture.debugElement.query(By.css('.refresh-counter'));
-
-    describe('if process is completed', () => {
-      beforeEach(() => {
-        process.processStatus = ProcessStatus.COMPLETED;
-        route.data = observableOf({process: createSuccessfulRemoteDataObject(process)});
-      });
-
-      it('should not show',  () => {
-        spyOn(component, 'startRefreshTimer');
-
-        const refreshCounter = queryRefreshCounter();
-        expect(refreshCounter).toBeNull();
-
-        expect(component.startRefreshTimer).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('if process is not finished', () => {
-      beforeEach(() => {
-        process.processStatus = ProcessStatus.RUNNING;
-        route.data = observableOf({process: createSuccessfulRemoteDataObject(process)});
-        fixture.detectChanges();
-        component.stopRefreshTimer();
-      });
-
-      it('should call startRefreshTimer',  () => {
-        spyOn(component, 'startRefreshTimer');
-
-        component.ngOnInit();
-        fixture.detectChanges(); // subscribe to process observable with async pipe
-
-        expect(component.startRefreshTimer).toHaveBeenCalled();
-      });
-
-      it('should call refresh method every 5 seconds, until process is completed', fakeAsync(() => {
-        spyOn(component, 'refresh');
-        spyOn(component, 'stopRefreshTimer');
-
-        process.processStatus = ProcessStatus.COMPLETED;
-        // set findbyId to return a completed process
-        (processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
-
-        component.ngOnInit();
-        fixture.detectChanges(); // subscribe to process observable with async pipe
-
-        expect(component.refresh).not.toHaveBeenCalled();
-
-        expect(component.refreshCounter$.value).toBe(0);
-
-        tick(1001); // 1 second + 1 ms by the setTimeout
-        expect(component.refreshCounter$.value).toBe(5); // 5 - 0
-
-        tick(2001); // 2 seconds + 1 ms by the setTimeout
-        expect(component.refreshCounter$.value).toBe(3); // 5 - 2
-
-        tick(2001); // 2 seconds + 1 ms by the setTimeout
-        expect(component.refreshCounter$.value).toBe(1); // 3 - 2
-
-        tick(1001); // 1 second + 1 ms by the setTimeout
-        expect(component.refreshCounter$.value).toBe(0); // 1 - 1
-
-        tick(1000); // 1 second
-
-        expect(component.refresh).toHaveBeenCalledTimes(1);
-        expect(component.stopRefreshTimer).toHaveBeenCalled();
-
-        expect(component.refreshCounter$.value).toBe(0);
-
-        tick(1001); // 1 second + 1 ms by the setTimeout
-        // startRefreshTimer not called again
-        expect(component.refreshCounter$.value).toBe(0);
-
-        discardPeriodicTasks(); // discard any periodic tasks that have not yet executed
-      }));
-
-      it('should show if refreshCounter is different from 0', () => {
-        component.refreshCounter$.next(1);
-        fixture.detectChanges();
-
-        const refreshCounter = queryRefreshCounter();
-        expect(refreshCounter).not.toBeNull();
-      });
-
-    });
-
-  });
 });
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index a379dfe337..ab7d527aab 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -1,33 +1,60 @@
+import { isPlatformBrowser } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { Component, Inject, NgZone, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, interval, Observable, shareReplay, Subscription } from 'rxjs';
-import { finalize, map, switchMap, take, tap } from 'rxjs/operators';
+import {
+  Component,
+  Inject,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  finalize,
+  find,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
+  getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 import { hasValue } from '../../shared/empty.util';
-import { ProcessStatus } from '../processes/process-status.model';
-import { Process } from '../processes/process.model';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { getProcessListRoute } from '../process-page-routing.paths';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { isPlatformBrowser } from '@angular/common';
+import { PROCESS_PAGE_FOLLOW_LINKS } from '../process-page.resolver';
+import { getProcessListRoute } from '../process-page-routing.paths';
+import { Process } from '../processes/process.model';
+import { ProcessStatus } from '../processes/process-status.model';
 
 @Component({
   selector: 'ds-process-detail',
@@ -78,15 +105,17 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss ZZZZ';
 
-  refreshCounter$ = new BehaviorSubject(0);
+  isRefreshing$: Observable<boolean>;
+
+  isDeleting: boolean;
+
+  protected autoRefreshingID: string;
 
   /**
    * Reference to NgbModal
    */
   protected modalRef: NgbModalRef;
 
-  private refreshTimerSub?: Subscription;
-
   constructor(
     @Inject(PLATFORM_ID) protected platformId: object,
     protected route: ActivatedRoute,
@@ -99,7 +128,7 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
     protected http: HttpClient,
     protected modalService: NgbModal,
     protected notificationsService: NotificationsService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
   ) {}
 
   /**
@@ -108,69 +137,36 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.processRD$ = this.route.data.pipe(
-      map((data) => {
+      switchMap((data) => {
         if (isPlatformBrowser(this.platformId)) {
-          if (!this.isProcessFinished(data.process.payload)) {
-            this.startRefreshTimer();
-          }
-        }
-
-        return data.process as RemoteData<Process>;
-      }),
-      redirectOn4xx(this.router, this.authService),
-      shareReplay(1)
-    );
-
-    this.filesRD$ = this.processRD$.pipe(
-      getFirstSucceededRemoteDataPayload(),
-      switchMap((process: Process) => this.processService.getFiles(process.processId))
-    );
-  }
-
-  refresh() {
-    this.processRD$ = this.processService.findById(
-      this.route.snapshot.params.id,
-      false,
-      true,
-      followLink('script')
-    ).pipe(
-      getFirstSucceededRemoteData(),
-      redirectOn4xx(this.router, this.authService),
-      tap((processRemoteData: RemoteData<Process>) => {
-        if (!this.isProcessFinished(processRemoteData.payload)) {
-          this.startRefreshTimer();
-        }
-      }),
-      shareReplay(1)
-    );
-
-    this.filesRD$ = this.processRD$.pipe(
-      getFirstSucceededRemoteDataPayload(),
-      switchMap((process: Process) => this.processService.getFiles(process.processId))
-    );
-  }
-
-  startRefreshTimer() {
-    this.refreshCounter$.next(0);
-
-    this.refreshTimerSub = interval(1000).subscribe(
-      value => {
-        if (value > 5) {
-          setTimeout(() => {
-            this.refresh();
-            this.stopRefreshTimer();
-            this.refreshCounter$.next(0);
-          }, 1);
+          this.autoRefreshingID = this.route.snapshot.params.id;
+          return this.processService.autoRefreshUntilCompletion(this.autoRefreshingID, 5000, ...PROCESS_PAGE_FOLLOW_LINKS);
         } else {
-          this.refreshCounter$.next(5 - value);
+          return [data.process as RemoteData<Process>];
         }
-      });
+      }),
+      filter(() => !this.isDeleting),
+      redirectOn4xx(this.router, this.authService),
+    );
+
+    this.isRefreshing$ = this.processRD$.pipe(
+      find((processRD: RemoteData<Process>) => ProcessDataService.hasCompletedOrFailed(processRD.payload)),
+      map(() => false),
+      startWith(true),
+    );
+
+    this.filesRD$ = this.processRD$.pipe(
+      getAllSucceededRemoteDataPayload(),
+      switchMap((process: Process) => process.files),
+    );
   }
 
-  stopRefreshTimer() {
-    if (hasValue(this.refreshTimerSub)) {
-      this.refreshTimerSub.unsubscribe();
-      this.refreshTimerSub = undefined;
+  /**
+   * Make sure the autoRefreshUntilCompletion is cleaned up properly
+   */
+  ngOnDestroy() {
+    if (hasValue(this.autoRefreshingID)) {
+      this.processService.stopAutoRefreshing(this.autoRefreshingID);
     }
   }
 
@@ -193,7 +189,7 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
         getFirstSucceededRemoteDataPayload(),
         switchMap((process: Process) => {
           return this.bitstreamDataService.findByHref(process._links.output.href, false);
-        })
+        }),
       );
       this.outputLogFileUrl$ = processOutputRD$.pipe(
         getFirstSucceededRemoteData(),
@@ -209,17 +205,17 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
             map((token: string) => {
               return hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url;
             }));
-        })
+        }),
       );
     });
-     this.outputLogFileUrl$.pipe(take(1),
+    this.outputLogFileUrl$.pipe(take(1),
       switchMap((url: string) => {
         return this.getTextFile(url);
       }),
-      finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false)))
+      finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))),
     ).subscribe((logs: string) => {
-       this.outputLogs$.next(logs);
-     });
+      this.outputLogs$.next(logs);
+    });
   }
 
   getTextFile(filename: string): Observable<string> {
@@ -249,15 +245,17 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
    * @param process
    */
   deleteProcess(process: Process) {
+    this.isDeleting = true;
     this.processService.delete(process.processId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('process.detail.delete.success'));
         this.closeModal();
-        this.router.navigateByUrl(getProcessListRoute());
+        void this.router.navigateByUrl(getProcessListRoute());
       } else {
         this.notificationsService.error(this.translateService.get('process.detail.delete.error'));
+        this.isDeleting = false;
       }
     });
   }
@@ -276,8 +274,4 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
   closeModal() {
     this.modalRef.close();
   }
-
-  ngOnDestroy(): void {
-    this.stopRefreshTimer();
-  }
 }
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index ce6d62efec..211129489e 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -1,18 +1,18 @@
 <div class="container">
     <div class="row">
-        <h2 class="col-12">
+        <h1 class="col-12">
             {{headerKey | translate}}
-        </h2>
-        <div class="col-12 col-md-6">
+        </h1>
+        <div class="col-12 col-md-6 mb-2">
             <form #form="ngForm" (ngSubmit)="submitForm(form)">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
                 <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <button [routerLink]="['/processes']" class="btn btn-light float-left">{{ 'process.new.cancel' | translate }}</button>
-                <button type="submit" class="btn btn-light float-right">{{ 'process.new.submit' | translate }}</button>
+                <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
+                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
             </form>
         </div>
         <div class="col-12 col-md-6">
-            <ds-script-help [script]="selectedScript"></ds-script-help>
+            <ds-script-help *ngIf="selectedScript" [script]="selectedScript"></ds-script-help>
         </div>
     </div>
 
diff --git a/src/app/process-page/form/process-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts
index 10bc8294d3..ec1b794324 100644
--- a/src/app/process-page/form/process-form.component.spec.ts
+++ b/src/app/process-page/form/process-form.component.spec.ts
@@ -1,19 +1,26 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ProcessFormComponent } from './process-form.component';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ScriptParameter } from '../scripts/script-parameter.model';
-import { Script } from '../scripts/script.model';
-import { ProcessParameter } from '../processes/process-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { RequestService } from '../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { ProcessFormComponent } from './process-form.component';
 
 describe('ProcessFormComponent', () => {
   let component: ProcessFormComponent;
@@ -38,10 +45,10 @@ describe('ProcessFormComponent', () => {
         invoke: observableOf({
           response:
             {
-              isSuccessful: true
-            }
-        })
-      }
+              isSuccessful: true,
+            },
+        }),
+      },
     );
     router = {
       navigateByUrl: () => undefined,
@@ -56,8 +63,8 @@ describe('ProcessFormComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ProcessFormComponent],
       providers: [
@@ -66,7 +73,7 @@ describe('ProcessFormComponent', () => {
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeBySubstring', 'removeByHrefSubstring']) },
         { provide: Router, useValue: jasmine.createSpyObj('router', ['navigateByUrl']) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
index 70eb3160a8..eea83f9e93 100644
--- a/src/app/process-page/form/process-form.component.ts
+++ b/src/app/process-page/form/process-form.component.ts
@@ -1,18 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Script } from '../scripts/script.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { isEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { getProcessListRoute } from '../process-page-routing.paths';
 import { Process } from '../processes/process.model';
 import { ProcessParameter } from '../processes/process-parameter.model';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { Script } from '../scripts/script.model';
 import { ScriptParameter } from '../scripts/script-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { Router } from '@angular/router';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { getProcessListRoute } from '../process-page-routing.paths';
-import { isEmpty } from '../../shared/empty.util';
 
 /**
  * Component to create a new script
@@ -57,7 +67,6 @@ export class ProcessFormComponent implements OnInit {
     private scriptService: ScriptDataService,
     private notificationsService: NotificationsService,
     private translationService: TranslateService,
-    private requestService: RequestService,
     private router: Router) {
   }
 
@@ -78,11 +87,11 @@ export class ProcessFormComponent implements OnInit {
     }
 
     const stringParameters: ProcessParameter[] = this.parameters.map((parameter: ProcessParameter) => {
-        return {
-          name: parameter.name,
-          value: this.checkValue(parameter)
-        };
-      }
+      return {
+        name: parameter.name,
+        value: this.checkValue(parameter),
+      };
+    },
     );
     this.scriptService.invoke(this.selectedScript.id, stringParameters, this.files)
       .pipe(getFirstCompletedRemoteData())
@@ -91,7 +100,7 @@ export class ProcessFormComponent implements OnInit {
           const title = this.translationService.get('process.new.notification.success.title');
           const content = this.translationService.get('process.new.notification.success.content');
           this.notificationsService.success(title, content);
-          this.sendBack();
+          this.sendBack(rd.payload);
         } else {
           const title = this.translationService.get('process.new.notification.error.title');
           const content = this.translationService.get('process.new.notification.error.content');
@@ -143,11 +152,17 @@ export class ProcessFormComponent implements OnInit {
     return this.missingParameters.length > 0;
   }
 
-  private sendBack() {
-    this.requestService.removeByHrefSubstring('/processes');
-    /* should subscribe on the previous method to know the action is finished and then navigate,
-    will fix this when the removeByHrefSubstring changes are merged */
-    this.router.navigateByUrl(getProcessListRoute());
+  /**
+   * Redirect the user to the processes overview page with the new process' ID,
+   * so it can be highlighted in the overview table.
+   * @param newProcess The newly created process
+   * @private
+   */
+  private sendBack(newProcess: Process) {
+    const extras: NavigationExtras = {
+      queryParams: { new_process_id: newProcess.processId },
+    };
+    void this.router.navigate([getProcessListRoute()], extras);
   }
 }
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 4bf06bbade..1f1559b50b 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,16 +1,20 @@
-<div class="form-row mb-2 mx-0">
+<div class="form-row gap-2 mb-2 mx-0">
     <select id="process-parameters"
             class="form-control col"
             name="parameter-{{index}}"
+            [attr.aria-label]="'process.new.select-parameter' | translate"
             [(ngModel)]="selectedParameter"
             #param="ngModel">
-        <option [ngValue]="undefined">Add a parameter...</option>
+        <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
         <option *ngFor="let param of parameters" [ngValue]="param.name">
             {{param.nameLong || param.name}}
         </option>
     </select>
-    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col" [index]="index"></ds-parameter-value-input>
-    <button *ngIf="removable" class="btn btn-light col-1 remove-button" (click)="removeParameter.emit(parameterValue);"><span class="fas fa-trash"></span></button>
+    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
+    <button *ngIf="removable" [attr.aria-label]="'process.new.delete-parameter' | translate"
+            (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
+      <i class="fas fa-trash"></i>
+    </button>
     <span *ngIf="!removable" class="col-1"></span>
 </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
index 56fece56b4..64f1b55456 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
@@ -1,11 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ParameterSelectComponent } from './parameter-select.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
 import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
+import { ParameterSelectComponent } from './parameter-select.component';
 
 describe('ParameterSelectComponent', () => {
   let component: ParameterSelectComponent;
@@ -18,24 +23,27 @@ describe('ParameterSelectComponent', () => {
         new ScriptParameter(),
         {
           name: '-a',
-          type: ScriptParameterType.BOOLEAN
-        }
+          type: ScriptParameterType.BOOLEAN,
+        },
       ),
       Object.assign(
         new ScriptParameter(),
         {
           name: '-f',
-          type: ScriptParameterType.FILE
-        }
+          type: ScriptParameterType.FILE,
+        },
       ),
     ];
   }
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [ParameterSelectComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
index e016d3442f..95a8109d51 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -1,7 +1,17 @@
-import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { ProcessParameter } from '../../../processes/process-parameter.model';
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ControlContainer, NgForm } from '@angular/forms';
 import { controlContainerFactory } from '../../process-form.component';
 
 /**
@@ -14,8 +24,8 @@ import { controlContainerFactory } from '../../process-form.component';
   viewProviders: [{
     provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]]
-  }]
+    deps: [[new Optional(), NgForm]],
+  }],
 })
 export class ParameterSelectComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
index 914b331413..68171a23b2 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
@@ -1 +1 @@
-<input type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
index 38f119ad5b..2155784358 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
@@ -1,4 +1,9 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { BooleanValueInputComponent } from './boolean-value-input.component';
 
@@ -8,7 +13,10 @@ describe('BooleanValueInputComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [BooleanValueInputComponent]
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [BooleanValueInputComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
index 3f0a82b07a..93aca5cb99 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, OnInit, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the value of a boolean parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./boolean-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class BooleanValueInputComponent extends ValueInputComponent<boolean> implements OnInit {
   ngOnInit() {
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
index f367d3779f..4e77f4ed1b 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
index 2264a0f331..33b90d554b 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
@@ -1,10 +1,19 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { DateValueInputComponent } from './date-value-input.component';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { DateValueInputComponent } from './date-value-input.component';
 
 describe('DateValueInputComponent', () => {
   let component: DateValueInputComponent;
@@ -17,10 +26,10 @@ describe('DateValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
-      declarations: [DateValueInputComponent]
+      declarations: [DateValueInputComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index ce1414e8ad..1dcedb6e79 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, Input, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Input,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a date parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./date-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class DateValueInputComponent extends ValueInputComponent<string> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index cac3fbd82d..a741eacc86 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,5 +1,5 @@
 <label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
-    <span class="btn btn-light">
+    <span class="btn btn-primary">
         {{'process.new.parameter.file.upload-button' | translate}}
     </span>
     <span class="file-name ml-1">{{fileObject?.name}}</span>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
index 07aad6ce4e..5271a34d8d 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
@@ -1,13 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { FileValueInputComponent } from './file-value-input.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
 import { FileValueAccessorDirective } from '../../../../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../../../../shared/utils/require-file.validator';
-import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { FileValueInputComponent } from './file-value-input.component';
 
 describe('FileValueInputComponent', () => {
   let component: FileValueInputComponent;
@@ -20,11 +27,11 @@ describe('FileValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [FileValueInputComponent, FileValueAccessorDirective, FileValidator],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
 
     })
       .compileComponents();
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
index 796a5de58e..451860f10f 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -1,7 +1,14 @@
-import { Component, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a file parameter
@@ -12,7 +19,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./file-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class FileValueInputComponent extends ValueInputComponent<File> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
index a28e7798c1..cde98f835e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
@@ -1,19 +1,26 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ParameterValueInputComponent } from './parameter-value-input.component';
-import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
-import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
-import { StringValueInputComponent } from './string-value-input/string-value-input.component';
-import { FileValueInputComponent } from './file-value-input/file-value-input.component';
-import { DateValueInputComponent } from './date-value-input/date-value-input.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { FileValueAccessorDirective } from '../../../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../../../shared/utils/require-file.validator';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './date-value-input/date-value-input.component';
+import { FileValueInputComponent } from './file-value-input/file-value-input.component';
+import { ParameterValueInputComponent } from './parameter-value-input.component';
+import { StringValueInputComponent } from './string-value-input/string-value-input.component';
 
 describe('ParameterValueInputComponent', () => {
   let component: ParameterValueInputComponent;
@@ -40,8 +47,8 @@ describe('ParameterValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [
         ParameterValueInputComponent,
@@ -50,9 +57,9 @@ describe('ParameterValueInputComponent', () => {
         FileValueInputComponent,
         DateValueInputComponent,
         FileValueAccessorDirective,
-        FileValidator
+        FileValidator,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
index ec29ee5e1e..5d6c59962e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -1,7 +1,17 @@
-import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
-import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
 import { controlContainerFactory } from '../../process-form.component';
 
 /**
@@ -13,7 +23,7 @@ import { controlContainerFactory } from '../../process-form.component';
   styleUrls: ['./parameter-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class ParameterValueInputComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
index 246c62a0f6..bf60f9f024 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
index 6b7de9460d..224623a5ee 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
@@ -1,10 +1,19 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { StringValueInputComponent } from './string-value-input.component';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { StringValueInputComponent } from './string-value-input.component';
 
 describe('StringValueInputComponent', () => {
   let component: StringValueInputComponent;
@@ -17,12 +26,12 @@ describe('StringValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [StringValueInputComponent],
       providers: [
-      ]
+      ],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index 0424faec21..362eaf07cc 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, Optional, Input } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Input,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a string parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./string-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class StringValueInputComponent extends ValueInputComponent<string> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
index 7b3342651d..d224c4f0cd 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
@@ -1,11 +1,16 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 /**
  * Abstract class that represents value input components
  */
 @Component({
   selector: 'ds-value-input',
-  template: ''
+  template: '',
 })
 export abstract class ValueInputComponent<T> {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
index b44479c14a..4231892588 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
@@ -1,15 +1,22 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProcessParametersComponent } from './process-parameters.component';
-import { ProcessParameter } from '../../processes/process-parameter.model';
-import { By } from '@angular/platform-browser';
-import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ProcessParameter } from '../../processes/process-parameter.model';
 import { Script } from '../../scripts/script.model';
 import { ScriptParameter } from '../../scripts/script-parameter.model';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
+import { ProcessParametersComponent } from './process-parameters.component';
 
 describe('ProcessParametersComponent', () => {
   let component: ProcessParametersComponent;
@@ -35,11 +42,11 @@ describe('ProcessParametersComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ProcessParametersComponent, ParameterSelectComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index 85b59f7644..b5ed225480 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -1,8 +1,20 @@
-import { Component, EventEmitter, Input, OnChanges, Optional, Output, SimpleChanges } from '@angular/core';
-import { Script } from '../../scripts/script.model';
-import { ProcessParameter } from '../../processes/process-parameter.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Optional,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { hasValue } from '../../../shared/empty.util';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { Script } from '../../scripts/script.model';
 import { ScriptParameter } from '../../scripts/script-parameter.model';
 import { controlContainerFactory } from '../process-form.component';
 
@@ -16,8 +28,8 @@ import { controlContainerFactory } from '../process-form.component';
   viewProviders: [{
     provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]]
-  }]
+    deps: [[new Optional(), NgForm]],
+  }],
 })
 export class ProcessParametersComponent implements OnChanges {
   /**
@@ -99,7 +111,7 @@ export class ProcessParametersComponent implements OnChanges {
       this.parameterValues = this.script.parameters
         .filter((param) => param.mandatory)
         .map(
-          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name })
+          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name }),
         );
     }
     this.addParameter();
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
index f52ae4b6b9..7615edcfd4 100644
--- a/src/app/process-page/form/script-help/script-help.component.html
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -1,5 +1,5 @@
 <div class="text-secondary">
-  <h3>{{script?.name}}</h3>
+  <h2>{{script?.name}}</h2>
   <span>{{script?.description}}</span>
 
   <table class="table-borderless mt-3">
diff --git a/src/app/process-page/form/script-help/script-help.component.spec.ts b/src/app/process-page/form/script-help/script-help.component.spec.ts
index abfe8f9da1..20c868d9dc 100644
--- a/src/app/process-page/form/script-help/script-help.component.spec.ts
+++ b/src/app/process-page/form/script-help/script-help.component.spec.ts
@@ -1,14 +1,21 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ScriptHelpComponent } from './script-help.component';
-import { ScriptParameter } from '../../scripts/script-parameter.model';
-import { Script } from '../../scripts/script.model';
-import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+import { ScriptHelpComponent } from './script-help.component';
 
 describe('ScriptHelpComponent', () => {
   let component: ScriptHelpComponent;
@@ -18,11 +25,11 @@ describe('ScriptHelpComponent', () => {
   function init() {
     const param1 = Object.assign(
       new ScriptParameter(),
-      {name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE}
+      { name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE },
     );
     const param2 = Object.assign(
       new ScriptParameter(),
-      {name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN}
+      { name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN },
     );
     script = Object.assign(new Script(), { parameters: [param1, param2] });
   }
@@ -34,13 +41,13 @@ describe('ScriptHelpComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ ScriptHelpComponent ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
index 7e230a4a42..779c5b781a 100644
--- a/src/app/process-page/form/script-help/script-help.component.ts
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Script } from '../../scripts/script.model';
 import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
 
@@ -8,7 +12,7 @@ import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
 @Component({
   selector: 'ds-script-help',
   templateUrl: './script-help.component.html',
-  styleUrls: ['./script-help.component.scss']
+  styleUrls: ['./script-help.component.scss'],
 })
 export class ScriptHelpComponent {
   /**
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 72dc4c9348..819909b3ed 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -1,18 +1,30 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ScriptsSelectComponent } from './scripts-select.component';
-import { Script } from '../../scripts/script.model';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { RouterStub } from '../../../shared/testing/router.stub';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { Script } from '../../scripts/script.model';
+import { ScriptsSelectComponent } from './scripts-select.component';
 
 describe('ScriptsSelectComponent', () => {
   let component: ScriptsSelectComponent;
@@ -26,8 +38,8 @@ describe('ScriptsSelectComponent', () => {
     script2 = new Script();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        findAll: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [script1, script2]))
-      }
+        findAll: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [script1, script2])),
+      },
     );
   }
 
@@ -39,8 +51,8 @@ describe('ScriptsSelectComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ScriptsSelectComponent],
       providers: [
@@ -48,7 +60,7 @@ describe('ScriptsSelectComponent', () => {
         { provide: Router, useClass: RouterStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 4c7fe3bdf7..c657f7e16c 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,13 +1,44 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { Script } from '../../scripts/script.model';
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { Script } from '../../scripts/script.model';
 import { controlContainerFactory } from '../process-form.component';
 
 const SCRIPT_QUERY_PARAMETER = 'script';
@@ -21,7 +52,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
   styleUrls: ['./scripts-select.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
@@ -51,7 +82,7 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
       .pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
+        map((paginatedList: PaginatedList<Script>) => paginatedList.page),
       );
 
     this.routeSub = this.route.queryParams
@@ -64,10 +95,10 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
             .pipe(
               take(1),
               map((scripts) =>
-                scripts.find((script) => script.id === id)
-              )
-            )
-        )
+                scripts.find((script) => script.id === id),
+              ),
+            ),
+        ),
       ).subscribe((script: Script) => {
         this._selectedScript = script;
         this.select.emit(script);
@@ -89,13 +120,13 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     this.router.navigate([],
       {
         queryParams: { [SCRIPT_QUERY_PARAMETER]: value },
-      }
+      },
     );
   }
 
   @Input()
   set script(value: Script) {
-     this._selectedScript = value;
+    this._selectedScript = value;
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
index f61764ffd2..6e86952638 100644
--- a/src/app/process-page/new/new-process.component.html
+++ b/src/app/process-page/new/new-process.component.html
@@ -1,6 +1,6 @@
-<ng-container *ngIf="fromExisting$ && (fromExisting$ | async)">
+<ng-container *ngIf="fromExisting$ | async | dsHasValue; else newProcess">
     <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
 </ng-container>
-<ng-container *ngIf="!fromExisting$ || !(fromExisting$ | async)">
+<ng-template #newProcess>
     <ds-process-form headerKey="process.new.header"></ds-process-form>
-</ng-container>
+</ng-template>
diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts
index 48f0f097a9..e6b46efae0 100644
--- a/src/app/process-page/new/new-process.component.spec.ts
+++ b/src/app/process-page/new/new-process.component.spec.ts
@@ -1,22 +1,30 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NewProcessComponent } from './new-process.component';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ScriptParameter } from '../scripts/script-parameter.model';
-import { Script } from '../scripts/script.model';
-import { ProcessParameter } from '../processes/process-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { RequestService } from '../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { LinkService } from '../../core/cache/builders/link.service';
-import { VarDirective } from '../../shared/utils/var.directive';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { HasValuePipe } from '../../shared/utils/has-value.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { NewProcessComponent } from './new-process.component';
 
 describe('NewProcessComponent', () => {
   let component: NewProcessComponent;
@@ -40,10 +48,10 @@ describe('NewProcessComponent', () => {
         invoke: observableOf({
           response:
             {
-              isSuccessful: true
-            }
-        })
-      }
+              isSuccessful: true,
+            },
+        }),
+      },
     );
   }
 
@@ -55,10 +63,14 @@ describe('NewProcessComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
-      declarations: [NewProcessComponent, VarDirective],
+      declarations: [
+        NewProcessComponent,
+        VarDirective,
+        HasValuePipe,
+      ],
       providers: [
         { provide: ScriptDataService, useValue: scriptService },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -67,7 +79,7 @@ describe('NewProcessComponent', () => {
         { provide: LinkService, useValue: {} },
         { provide: ProcessDataService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
index f97ce1bc6b..035600eedb 100644
--- a/src/app/process-page/new/new-process.component.ts
+++ b/src/app/process-page/new/new-process.component.ts
@@ -1,12 +1,19 @@
-import { Component, OnInit } from '@angular/core';
-import { Process } from '../processes/process.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { LinkService } from '../../core/cache/builders/link.service';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { LinkService } from '../../core/cache/builders/link.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { Process } from '../processes/process.model';
 import { Script } from '../scripts/script.model';
 
 /**
@@ -40,7 +47,7 @@ export class NewProcessComponent implements OnInit {
       this.script$ = this.fromExisting$.pipe(
         map((process: Process) => this.linkService.resolveLink<Process>(process, followLink('script'))),
         switchMap((process: Process) => process.script),
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       );
     }
   }
diff --git a/src/app/process-page/overview/process-bulk-delete.service.spec.ts b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
index 5139048dd1..80d780e66b 100644
--- a/src/app/process-page/overview/process-bulk-delete.service.spec.ts
+++ b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
@@ -1,8 +1,12 @@
-import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 import { waitForAsync } from '@angular/core/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 
 describe('ProcessBulkDeleteService', () => {
 
@@ -13,7 +17,7 @@ describe('ProcessBulkDeleteService', () => {
 
   beforeEach(waitForAsync(() => {
     processDataService = jasmine.createSpyObj('processDataService', {
-      delete: createSuccessfulRemoteDataObject$(null)
+      delete: createSuccessfulRemoteDataObject$(null),
     });
     notificationsService = new NotificationsServiceStub();
     mockTranslateService = getMockTranslateService();
@@ -120,7 +124,7 @@ describe('ProcessBulkDeleteService', () => {
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-3');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-3'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-3' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('test-id-4');
@@ -128,18 +132,18 @@ describe('ProcessBulkDeleteService', () => {
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-5');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-5'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-5' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-6');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-6'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-6' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('test-id-7');
 
       expect(notificationsService.success).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.success', {count: 4});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.success', { count: 4 });
 
       expect(service.processesToDelete).toEqual(['error-id-3', 'error-id-5', 'error-id-6']);
 
diff --git a/src/app/process-page/overview/process-bulk-delete.service.ts b/src/app/process-page/overview/process-bulk-delete.service.ts
index c0943fb615..790bec080f 100644
--- a/src/app/process-page/overview/process-bulk-delete.service.ts
+++ b/src/app/process-page/overview/process-bulk-delete.service.ts
@@ -1,16 +1,25 @@
-import { Process } from '../processes/process.model';
 import { Injectable } from '@angular/core';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { isNotEmpty } from '../../shared/empty.util';
-import { BehaviorSubject, count, from } from 'rxjs';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { concatMap, filter, tap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  count,
+  from,
+} from 'rxjs';
+import {
+  concatMap,
+  filter,
+  tap,
+} from 'rxjs/operators';
+
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Process } from '../processes/process.model';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Service to facilitate removing processes in bulk.
@@ -31,7 +40,7 @@ export class ProcessBulkDeleteService {
   constructor(
     protected processDataService: ProcessDataService,
     protected notificationsService: NotificationsService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
   ) {
   }
 
@@ -101,17 +110,17 @@ export class ProcessBulkDeleteService {
           getFirstCompletedRemoteData(),
           tap((rd: RemoteData<Process>) => {
             if (rd.hasFailed) {
-              this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', {processId: processId}));
+              this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', { processId: processId }));
             } else {
               this.toggleDelete(processId);
             }
-          })
+          }),
         );
       }),
       filter((rd: RemoteData<Process>) => rd.hasSucceeded),
       count(),
     ).subscribe((value) => {
-      this.notificationsService.success(this.translateService.get('process.bulk.delete.success', {count: value}));
+      this.notificationsService.success(this.translateService.get('process.bulk.delete.success', { count: value }));
       this.isProcessingBehaviorSubject.next(false);
     });
   }
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 5bf5fee79f..cc4b39572b 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,59 +1,47 @@
 <div class="container">
     <div class="d-flex">
-        <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
+        <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
     </div>
-    <div class="d-flex justify-content-end">
+    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+
+    <div class="sections">
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.RUNNING"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeStarted"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.SCHEDULED"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCreated"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.COMPLETED"
+                [sortField]="ProcessSortField.endTime"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.FAILED"
+                [sortField]="ProcessSortField.endTime"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+    </div>
+
+    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+</div>
+
+<ng-template #buttons>
+    <div class="d-flex justify-content-end mb-2">
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
                 (click)="processBulkDeleteService.clearAllProcesses()"><i
-                class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
+            class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
         </button>
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
                 (click)="openDeleteModal(deleteModal)"><i
-                class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+            class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
         </button>
         <button class="btn btn-success" routerLink="/processes/new"><i
-                class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
-
+            class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
     </div>
-    <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
-                   [paginationOptions]="pageConfig"
-                   [pageInfoState]="(processesRD$ | async)?.payload"
-                   [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
-                   [hideGear]="true"
-                   [hidePagerWhenSinglePage]="true">
-        <div class="table-responsive">
-            <table class="table table-striped table-hover">
-                <thead>
-                <tr>
-                    <th scope="col">{{'process.overview.table.id' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.name' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.user' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.start' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.finish' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.status' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.actions' | translate}}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page"
-                    [class.table-danger]="processBulkDeleteService.isToBeDeleted(process.processId)">
-                    <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
-                    <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
-                    <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
-                    <td>{{process.startTime | date:dateFormat:'UTC'}}</td>
-                    <td>{{process.endTime | date:dateFormat:'UTC'}}</td>
-                    <td>{{process.processStatus}}</td>
-                    <td>
-                        <button class="btn btn-outline-danger"
-                                (click)="processBulkDeleteService.toggleDelete(process.processId)"><i
-                                class="fas fa-trash"></i></button>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </ds-pagination>
-</div>
+</ng-template>
 
 <ng-template #deleteModal>
 
@@ -70,7 +58,7 @@
         </div>
 
         <div class="modal-body">
-            <div *ngIf="!(processBulkDeleteService.isProcessing$() |async)">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
+            <div *ngIf="(processBulkDeleteService.isProcessing$() | async) !== true">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
             <div *ngIf="processBulkDeleteService.isProcessing$() |async" class="alert alert-info">
                 <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
@@ -88,4 +76,3 @@
 
 
 </ng-template>
-
diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
index 94071c0e59..ffc6bd23af 100644
--- a/src/app/process-page/overview/process-overview.component.spec.ts
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -1,88 +1,37 @@
-import { ProcessOverviewComponent } from './process-overview.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
-import { Process } from '../processes/process.model';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  NO_ERRORS_SCHEMA,
+  TemplateRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ProcessStatus } from '../processes/process-status.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { DatePipe } from '@angular/common';
-import { BehaviorSubject } from 'rxjs';
-import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
+
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { ProcessOverviewComponent } from './process-overview.component';
+import { ProcessOverviewService } from './process-overview.service';
 
 describe('ProcessOverviewComponent', () => {
   let component: ProcessOverviewComponent;
   let fixture: ComponentFixture<ProcessOverviewComponent>;
 
   let processService: ProcessDataService;
-  let ePersonService: EPersonDataService;
-  let paginationService;
-
-  let processes: Process[];
-  let ePerson: EPerson;
 
   let processBulkDeleteService;
   let modalService;
 
-  const pipe = new DatePipe('en-US');
-
   function init() {
-    processes = [
-      Object.assign(new Process(), {
-        processId: 1,
-        scriptName: 'script-name',
-        startTime: '2020-03-19 00:30:00',
-        endTime: '2020-03-19 23:30:00',
-        processStatus: ProcessStatus.COMPLETED
-      }),
-      Object.assign(new Process(), {
-        processId: 2,
-        scriptName: 'script-name',
-        startTime: '2020-03-20 00:30:00',
-        endTime: '2020-03-20 23:30:00',
-        processStatus: ProcessStatus.FAILED
-      }),
-      Object.assign(new Process(), {
-        processId: 3,
-        scriptName: 'another-script-name',
-        startTime: '2020-03-21 00:30:00',
-        endTime: '2020-03-21 23:30:00',
-        processStatus: ProcessStatus.RUNNING
-      })
-    ];
-    ePerson = Object.assign(new EPerson(), {
-      metadata: {
-        'eperson.firstname': [
-          {
-            value: 'John',
-            language: null
-          }
-        ],
-        'eperson.lastname': [
-          {
-            value: 'Doe',
-            language: null
-          }
-        ]
-      }
+    processService = jasmine.createSpyObj('processOverviewService', {
+      timeStarted: '2024-02-05 16:43:32',
     });
-    processService = jasmine.createSpyObj('processService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(processes))
-    });
-    ePersonService = jasmine.createSpyObj('ePersonService', {
-      findById: createSuccessfulRemoteDataObject$(ePerson)
-    });
-
-    paginationService = new PaginationServiceStub();
 
     processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
       clearAllProcesses: {},
@@ -91,20 +40,16 @@ describe('ProcessOverviewComponent', () => {
       hasSelected: true,
       isToBeDeleted: true,
       toggleDelete: {},
-      getAmountOfSelectedProcesses: 5
+      getAmountOfSelectedProcesses: 5,
 
     });
 
     (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
-      if (id === 2) {
-        return true;
-      } else {
-        return false;
-      }
+      return id === 2;
     });
 
     modalService = jasmine.createSpyObj('modalService', {
-      open: {}
+      open: {},
     });
   }
 
@@ -114,13 +59,11 @@ describe('ProcessOverviewComponent', () => {
       declarations: [ProcessOverviewComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ProcessDataService, useValue: processService },
-        { provide: EPersonDataService, useValue: ePersonService },
-        { provide: PaginationService, useValue: paginationService },
+        { provide: ProcessOverviewService, useValue: processService },
         { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
         { provide: NgbModal, useValue: modalService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -130,73 +73,6 @@ describe('ProcessOverviewComponent', () => {
     fixture.detectChanges();
   });
 
-  describe('table structure', () => {
-    let rowElements;
-
-    beforeEach(() => {
-      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
-    });
-
-    it(`should contain 3 rows`, () => {
-      expect(rowElements.length).toEqual(3);
-    });
-
-    it('should display the process IDs in the first column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].processId);
-      });
-    });
-
-    it('should display the script names in the second column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].scriptName);
-      });
-    });
-
-    it('should display the eperson\'s name in the third column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
-        expect(el.textContent).toContain(ePerson.name);
-      });
-    });
-
-    it('should display the start time in the fourth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
-        expect(el.textContent).toContain(pipe.transform(processes[index].startTime, component.dateFormat, 'UTC'));
-      });
-    });
-
-    it('should display the end time in the fifth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(5)')).nativeElement;
-        expect(el.textContent).toContain(pipe.transform(processes[index].endTime, component.dateFormat, 'UTC'));
-      });
-    });
-
-    it('should display the status in the sixth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(6)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].processStatus);
-      });
-    });
-    it('should display a delete button in the seventh column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(7)'));
-        expect(el.nativeElement.innerHTML).toContain('fas fa-trash');
-
-        el.query(By.css('button')).triggerEventHandler('click', null);
-        expect(processBulkDeleteService.toggleDelete).toHaveBeenCalledWith(processes[index].processId);
-      });
-    });
-    it('should indicate a row that has been selected for deletion', () => {
-      const deleteRow = fixture.debugElement.query(By.css('.table-danger'));
-      expect(deleteRow.nativeElement.innerHTML).toContain('/processes/' + processes[1].processId);
-    });
-  });
-
   describe('overview buttons', () => {
     it('should show a button to clear selected processes when there are selected processes', () => {
       const clearButton = fixture.debugElement.query(By.css('.btn-primary'));
@@ -232,7 +108,7 @@ describe('ProcessOverviewComponent', () => {
 
   describe('openDeleteModal', () => {
     it('should open the modal', () => {
-      component.openDeleteModal({});
+      component.openDeleteModal({} as TemplateRef<any>);
       expect(modalService.open).toHaveBeenCalledWith({});
     });
   });
@@ -240,13 +116,11 @@ describe('ProcessOverviewComponent', () => {
   describe('deleteSelected', () => {
     it('should call the deleteSelectedProcesses method on the processBulkDeleteService and close the modal when processing is done', () => {
       spyOn(component, 'closeModal');
-      spyOn(component, 'setProcesses');
 
       component.deleteSelected();
 
       expect(processBulkDeleteService.deleteSelectedProcesses).toHaveBeenCalled();
       expect(component.closeModal).toHaveBeenCalled();
-      expect(component.setProcesses).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 7fa3b12dac..3681ddf0a1 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,20 +1,19 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { Process } from '../processes/process.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { map, switchMap } from 'rxjs/operators';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Subscription } from 'rxjs';
+
 import { hasValue } from '../../shared/empty.util';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ProcessStatus } from '../processes/process-status.model';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import {
+  ProcessOverviewService,
+  ProcessSortField,
+} from './process-overview.service';
 
 @Component({
   selector: 'ds-process-overview',
@@ -25,72 +24,25 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
  */
 export class ProcessOverviewComponent implements OnInit, OnDestroy {
 
-  /**
-   * List of all processes
-   */
-  processesRD$: Observable<RemoteData<PaginatedList<Process>>>;
+  // Enums are redeclared here so they can be used in the template
+  protected readonly ProcessStatus = ProcessStatus;
+  protected readonly ProcessSortField = ProcessSortField;
 
-  /**
-   * The current pagination configuration for the page used by the FindAll method
-   */
-  config: FindListOptions = Object.assign(new FindListOptions(), {
-    elementsPerPage: 20
-  });
-
-  /**
-   * The current pagination configuration for the page
-   */
-  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'po',
-    pageSize: 20
-  });
-
-  /**
-   * Date format to use for start and end time of processes
-   */
-  dateFormat = 'yyyy-MM-dd HH:mm:ss';
-
-  processesToDelete: string[] = [];
   private modalRef: any;
 
   isProcessingSub: Subscription;
 
-  constructor(protected processService: ProcessDataService,
-              protected paginationService: PaginationService,
-              protected ePersonService: EPersonDataService,
+  constructor(protected processOverviewService: ProcessOverviewService,
               protected modalService: NgbModal,
               public processBulkDeleteService: ProcessBulkDeleteService,
-              protected dsoNameService: DSONameService,
   ) {
   }
 
   ngOnInit(): void {
-    this.setProcesses();
     this.processBulkDeleteService.clearAllProcesses();
   }
 
-  /**
-   * Send a request to fetch all processes for the current page
-   */
-  setProcesses() {
-    this.processesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
-      switchMap((config) => this.processService.findAll(config, true, false))
-    );
-  }
-
-  /**
-   * Get the name of an EPerson by ID
-   * @param id  ID of the EPerson
-   */
-  getEpersonName(id: string): Observable<string> {
-    return this.ePersonService.findById(id).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
-    );
-  }
-
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.pageConfig.id);
     if (hasValue(this.isProcessingSub)) {
       this.isProcessingSub.unsubscribe();
     }
@@ -100,7 +52,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
    * Open a given modal.
    * @param content   - the modal content.
    */
-  openDeleteModal(content) {
+  openDeleteModal(content: TemplateRef<any>) {
     this.modalRef = this.modalService.open(content);
   }
 
@@ -124,10 +76,9 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
     }
     this.isProcessingSub = this.processBulkDeleteService.isProcessing$()
       .subscribe((isProcessing) => {
-      if (!isProcessing) {
-        this.closeModal();
-        this.setProcesses();
-      }
-    });
+        if (!isProcessing) {
+          this.closeModal();
+        }
+      });
   }
 }
diff --git a/src/app/process-page/overview/process-overview.service.ts b/src/app/process-page/overview/process-overview.service.ts
new file mode 100644
index 0000000000..fc573d5160
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.service.ts
@@ -0,0 +1,101 @@
+import { DatePipe } from '@angular/common';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RequestParam } from '../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { hasValue } from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { Process } from '../processes/process.model';
+import { ProcessStatus } from '../processes/process-status.model';
+
+/**
+ * The sortable fields for processes
+ * See [the endpoint documentation]{@link https://github.com/DSpace/RestContract/blob/main/processes-endpoint.md#search-processes-by-property}
+ * for details.
+ */
+export enum ProcessSortField {
+  creationTime = 'creationTime',
+  startTime = 'startTime',
+  endTime = 'endTime',
+}
+
+/**
+ * Service to manage the processes displayed in the
+ * {@Link ProcessOverviewComponent} and the {@Link ProcessOverviewTableComponent}
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class ProcessOverviewService {
+
+  constructor(protected processDataService: ProcessDataService) {
+  }
+
+  /**
+   * Date format to use for start and end time of processes
+   */
+  dateFormat = 'yyyy-MM-dd HH:mm:ss';
+
+  datePipe = new DatePipe('en-US');
+
+
+  timeCreated = (process: Process) => this.datePipe.transform(process.creationTime, this.dateFormat, 'UTC');
+  timeCompleted = (process: Process) => this.datePipe.transform(process.endTime, this.dateFormat, 'UTC');
+  timeStarted = (process: Process) => this.datePipe.transform(process.startTime, this.dateFormat, 'UTC');
+
+  /**
+   * Retrieve processes by their status
+   * @param processStatus              The status for which to retrieve processes
+   * @param findListOptions            The FindListOptions object
+   * @param autoRefreshingIntervalInMs Optional: The interval by which to automatically refresh the retrieved processes.
+   * Leave empty or set to null to only retrieve the processes once.
+   */
+  getProcessesByProcessStatus(processStatus: ProcessStatus, findListOptions?: FindListOptions, autoRefreshingIntervalInMs: number = null): Observable<RemoteData<PaginatedList<Process>>> {
+    const requestParam = new RequestParam('processStatus', processStatus);
+    const options: FindListOptions = Object.assign(new FindListOptions(), {
+      searchParams: [requestParam],
+      elementsPerPage: 5,
+    }, findListOptions);
+
+    if (hasValue(autoRefreshingIntervalInMs) && autoRefreshingIntervalInMs > 0) {
+      this.processDataService.stopAutoRefreshing(processStatus);
+      return this.processDataService.autoRefreshingSearchBy(processStatus, 'byProperty', options, autoRefreshingIntervalInMs);
+    } else {
+      return this.processDataService.searchBy('byProperty', options);
+    }
+  }
+
+  /**
+   * Stop auto-refreshing the process with the given status
+   * @param processStatus the processStatus of the request to stop automatically refreshing
+   */
+  stopAutoRefreshing(processStatus: ProcessStatus) {
+    this.processDataService.stopAutoRefreshing(processStatus);
+  }
+
+  /**
+   * Map the provided paginationOptions to FindListOptions
+   * @param paginationOptions the PaginationComponentOptions to map
+   * @param sortField the field on which the processes are sorted
+   */
+  getFindListOptions(paginationOptions: PaginationComponentOptions, sortField: ProcessSortField): FindListOptions {
+    const sortOptions = new SortOptions(sortField, SortDirection.DESC);
+    return Object.assign(
+      new FindListOptions(),
+      {
+        currentPage: paginationOptions.currentPage,
+        elementsPerPage: paginationOptions.pageSize,
+        sort: sortOptions,
+      },
+    );
+  }
+
+}
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
new file mode 100644
index 0000000000..92a7c73f58
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -0,0 +1,66 @@
+<div class="mb-4">
+  <div class="d-flex" (click)="collapse.toggle()" [attr.aria-expanded]="!collapse.collapsed" role="button">
+    <h2 class="flex-grow-1">
+      {{'process.overview.table.' + processStatus.toLowerCase() + '.title' | translate}}
+      <span class="badge badge-pill badge-primary badge-nb-processes"
+            *ngIf="(processesRD$ | async) as processesRD">
+        {{processesRD?.payload?.totalElements}}
+      </span>
+      <span class="ml-2 toggle-icon">
+        <i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
+      </span>
+    </h2>
+  </div>
+
+  <div ngbCollapse #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+
+    <ng-container *ngVar="(processesRD$ | async) as processesRD">
+      <ds-themed-loading *ngIf="!processesRD || processesRD.isLoading"/>
+
+      <ds-pagination *ngIf="processesRD?.payload?.totalElements > 0"
+                     [paginationOptions]="(paginationOptions$ | async)"
+                     [collectionSize]="processesRD?.payload?.totalElements"
+                     [retainScrollPosition]="true"
+                     [hideGear]="true">
+
+        <div class="table-responsive mt-1">
+          <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+              <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
+              <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
+              <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
+              <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
+              <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr *ngFor="let tableEntry of processesRD?.payload?.page"
+                [class]="getRowClass(tableEntry.process)">
+              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
+              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
+              <td>{{tableEntry.user}}</td>
+              <td>{{tableEntry.info}}</td>
+              <td>
+                <button [attr.aria-label]="'process.overview.delete-process' | translate"
+                        aria-hidden="true"
+                        (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
+                        class="btn btn-outline-danger">
+                  <i class="fas fa-trash"></i>
+                </button>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+
+      </ds-pagination>
+
+      <div *ngIf="processesRD?.payload?.totalElements === 0">
+        <p>{{'process.overview.table.empty' | translate}}</p>
+      </div>
+    </ng-container>
+
+  </div>
+</div>
diff --git a/src/app/process-page/overview/table/process-overview-table.component.scss b/src/app/process-page/overview/table/process-overview-table.component.scss
new file mode 100644
index 0000000000..a9567be4c7
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.scss
@@ -0,0 +1,28 @@
+.toggle-icon {
+  font-size: calc(var(--bs-small-font-size) * 0.6);
+}
+
+.badge-nb-processes {
+  font-size: var(--ds-process-overview-table-nb-processes-badge-size);
+  vertical-align: middle;
+}
+
+.id-header {
+  width: var(--ds-process-overview-table-id-column-width);
+}
+
+.name-header {
+  width: var(--ds-process-overview-table-name-column-width);
+}
+
+.user-header {
+  width: var(--ds-process-overview-table-user-column-width);
+}
+
+.info-header {
+  width: var(--ds-process-overview-table-info-column-width);
+}
+
+.actions-header {
+  width: var(--ds-process-overview-table-actions-column-width);
+}
diff --git a/src/app/process-page/overview/table/process-overview-table.component.spec.ts b/src/app/process-page/overview/table/process-overview-table.component.spec.ts
new file mode 100644
index 0000000000..1cbb246082
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.spec.ts
@@ -0,0 +1,212 @@
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbCollapse,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { ProcessDataService } from '../../../core/data/processes/process-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RouteService } from '../../../core/services/route.service';
+import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { Process } from '../../processes/process.model';
+import { ProcessStatus } from '../../processes/process-status.model';
+import { ProcessBulkDeleteService } from '../process-bulk-delete.service';
+import { ProcessOverviewService } from '../process-overview.service';
+import { ProcessOverviewTableComponent } from './process-overview-table.component';
+
+describe('ProcessOverviewTableComponent', () => {
+  let component: ProcessOverviewTableComponent;
+  let fixture: ComponentFixture<ProcessOverviewTableComponent>;
+
+  let processOverviewService: ProcessOverviewService;
+  let processService: ProcessDataService;
+  let ePersonService: EPersonDataService;
+  let paginationService; // : PaginationService; Not typed as the stub does not fully implement PaginationService
+  let processBulkDeleteService: ProcessBulkDeleteService;
+  let modalService: NgbModal;
+  let authService; // : AuthService; Not typed as the mock does not fully implement AuthService
+  let routeService: RouteService;
+
+  let processes: Process[];
+  let ePerson: EPerson;
+
+  function init() {
+    processes = [
+      Object.assign(new Process(), {
+        processId: 1,
+        scriptName: 'script-a',
+        startTime: '2020-03-19 00:30:00',
+        endTime: '2020-03-19 23:30:00',
+        processStatus: ProcessStatus.COMPLETED,
+      }),
+      Object.assign(new Process(), {
+        processId: 2,
+        scriptName: 'script-b',
+        startTime: '2020-03-20 00:30:00',
+        endTime: '2020-03-20 23:30:00',
+        processStatus: ProcessStatus.FAILED,
+      }),
+      Object.assign(new Process(), {
+        processId: 3,
+        scriptName: 'script-c',
+        startTime: '2020-03-21 00:30:00',
+        endTime: '2020-03-21 23:30:00',
+        processStatus: ProcessStatus.RUNNING,
+      }),
+    ];
+    ePerson = Object.assign(new EPerson(), {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'John',
+            language: null,
+          },
+        ],
+        'eperson.lastname': [
+          {
+            value: 'Doe',
+            language: null,
+          },
+        ],
+      },
+    });
+    processOverviewService = jasmine.createSpyObj('processOverviewService', {
+      getFindListOptions: {
+        currentPage: 1,
+        elementsPerPage: 5,
+        sort: 'creationTime',
+      },
+      getProcessesByProcessStatus: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
+    });
+    processService = jasmine.createSpyObj('processService', {
+      searchBy: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      findById: createSuccessfulRemoteDataObject$(ePerson),
+    });
+
+    paginationService = new PaginationServiceStub();
+
+    processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
+      clearAllProcesses: {},
+      deleteSelectedProcesses: {},
+      isProcessing$: new BehaviorSubject(false),
+      hasSelected: true,
+      isToBeDeleted: true,
+      toggleDelete: {},
+      getAmountOfSelectedProcesses: 5,
+
+    });
+
+    (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
+      return id === 2;
+    });
+
+    modalService = jasmine.createSpyObj('modalService', {
+      open: {},
+    });
+
+    authService = new AuthServiceMock();
+    routeService = routeServiceStub;
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+
+    void TestBed.configureTestingModule({
+      declarations: [ProcessOverviewTableComponent, VarDirective, NgbCollapse],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ProcessOverviewService, useValue: processOverviewService },
+        { provide: ProcessDataService, useValue: processService },
+        { provide: EPersonDataService, useValue: ePersonService },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
+        { provide: NgbModal, useValue: modalService },
+        { provide: AuthService, useValue: authService },
+        { provide: RouteService, useValue: routeService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessOverviewTableComponent);
+    component = fixture.componentInstance;
+    component.getInfoValueMethod = (_process: Process) => 'process info';
+    component.processStatus = ProcessStatus.COMPLETED;
+    fixture.detectChanges();
+  });
+
+  describe('table structure', () => {
+    let rowElements;
+
+    beforeEach(() => {
+      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
+    });
+
+    it('should contain 3 rows', () => {
+      expect(rowElements.length).toEqual(3);
+    });
+
+    it('should display the process\' ID in the first column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processId);
+      });
+    });
+
+    it('should display the scripts name in the second column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].scriptName);
+      });
+    });
+
+    it('should display the eperson\'s name in the third column', () => {
+      rowElements.forEach((rowElement, _index) => {
+        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
+        expect(el.textContent).toContain(ePerson.name);
+      });
+    });
+
+    it('should display the requested info in the fourth column', () => {
+      rowElements.forEach((rowElement, _index) => {
+        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
+        expect(el.textContent).toContain('process info');
+      });
+    });
+
+    it('should display a delete button in the fifth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(5)'));
+        expect(el.nativeElement.innerHTML).toContain('fas fa-trash');
+
+        el.query(By.css('button')).triggerEventHandler('click', null);
+        expect(processBulkDeleteService.toggleDelete).toHaveBeenCalledWith(processes[index].processId);
+      });
+    });
+
+    it('should indicate a row that has been selected for deletion', () => {
+      const deleteRow = fixture.debugElement.query(By.css('.table-danger'));
+      expect(deleteRow.nativeElement.innerHTML).toContain('/processes/' + processes[1].processId);
+    });
+
+  });
+});
diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts
new file mode 100644
index 0000000000..102ff7226d
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.ts
@@ -0,0 +1,270 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  BehaviorSubject,
+  from as observableFrom,
+  mergeMap,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+import { PaginationService } from 'src/app/core/pagination/pagination.service';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { RouteService } from '../../../core/services/route.service';
+import { redirectOn4xx } from '../../../core/shared/authorized.operators';
+import {
+  getAllCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { Process } from '../../processes/process.model';
+import { ProcessStatus } from '../../processes/process-status.model';
+import { ProcessBulkDeleteService } from '../process-bulk-delete.service';
+import {
+  ProcessOverviewService,
+  ProcessSortField,
+} from '../process-overview.service';
+
+const NEW_PROCESS_PARAM = 'new_process_id';
+
+/**
+ * An interface to store a process and extra information related to the process
+ * that is displayed in the overview table.
+ */
+export interface ProcessOverviewTableEntry {
+  process: Process,
+  user: string,
+  info: string,
+}
+
+@Component({
+  selector: 'ds-process-overview-table',
+  styleUrls: ['./process-overview-table.component.scss'],
+  templateUrl: './process-overview-table.component.html',
+})
+export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
+
+  /**
+   * The status of the processes this sections should show
+   */
+  @Input() processStatus: ProcessStatus;
+
+  /**
+   * The field on which the processes in this table are sorted
+   * {@link ProcessSortField.creationTime} by default as every single process has a creation time,
+   * but not every process has a start or end time
+   */
+  @Input() sortField: ProcessSortField = ProcessSortField.creationTime;
+
+  /**
+   * Whether to use auto refresh for the processes shown in this table.
+   */
+  @Input() useAutoRefreshingSearchBy = false;
+
+  /**
+   * The interval by which to refresh if autoRefreshing is enabled
+   */
+  @Input() autoRefreshInterval = 5000;
+
+  /**
+   * The function used to retrieve the value that will be shown in the 'info' column of the table.
+   * {@Link ProcessOverviewService} contains some predefined functions.
+   */
+  @Input() getInfoValueMethod: (process: Process) => string;
+
+  /**
+   * List of processes and their info to be shown in this table
+   */
+  processesRD$: BehaviorSubject<RemoteData<PaginatedList<ProcessOverviewTableEntry>>>;
+
+  /**
+   * The pagination ID for this overview section
+   */
+  paginationId: string;
+
+  /**
+   * The current pagination options for the overview section
+   */
+  paginationOptions$: Observable<PaginationComponentOptions>;
+
+  /**
+   * Whether the table is collapsed
+   */
+  isCollapsed = false;
+
+  /**
+   * The id of the process to highlight
+   */
+  newProcessId: string;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  constructor(protected processOverviewService: ProcessOverviewService,
+              protected processBulkDeleteService: ProcessBulkDeleteService,
+              protected ePersonDataService: EPersonDataService,
+              protected dsoNameService: DSONameService,
+              protected paginationService: PaginationService,
+              protected routeService: RouteService,
+              protected router: Router,
+              protected auth: AuthService,
+              @Inject(PLATFORM_ID) protected platformId: object,
+  ) {
+  }
+
+  ngOnInit() {
+    // Only auto refresh on browsers
+    if (!isPlatformBrowser(this.platformId)) {
+      this.useAutoRefreshingSearchBy = false;
+    }
+
+    this.routeService.getQueryParameterValue(NEW_PROCESS_PARAM).pipe(take(1)).subscribe((id) => {
+      this.newProcessId = id;
+    });
+
+    // Creates an ID from the first 2 characters of the process status.
+    // Should two process status values ever start with the same substring,
+    // increase the number of characters until the ids are distinct.
+    this.paginationId = this.processStatus.toLowerCase().substring(0,2);
+
+    const defaultPaginationOptions = Object.assign(new PaginationComponentOptions(), {
+      id: this.paginationId,
+      pageSize: 5,
+    });
+
+    // Get the current pagination from the route
+    this.paginationOptions$ = this.paginationService.getCurrentPagination(this.paginationId, defaultPaginationOptions);
+
+    this.processesRD$ = new BehaviorSubject(undefined);
+
+    // Once we have the pagination, retrieve the processes matching the process type and the pagination
+    //
+    // Reasoning why this monstrosity is the way it is:
+    // To avoid having to recalculate the names of the submitters every time the page reloads, these have to be
+    // retrieved beforehand and stored with the process. This is where the ProcessOverviewTableEntry interface comes in.
+    // By storing the process together with the submitters name and the additional information to be shown in the table,
+    // the template can be as dumb as possible. As the retrieval of the name also is done through an observable, this
+    // complicates the construction of the data a bit though.
+    // The reason why we store these as RemoteData<PaginatedList<ProcessOverviewTableEntry>> and not simply as
+    // ProcessOverviewTableEntry[] is as follows:
+    // When storing the PaginatedList<Process> and ProcessOverviewTableEntry[] separately, there is a small delay
+    // between the update of the paginatedList and the entryArray. This results in the processOverviewPage showing
+    // no processes for a split second every time the processes are updated which in turn causes the different
+    // sections of the page to jump around. By combining these and causing the page to update only once this is avoided.
+    this.subs.push(this.paginationOptions$
+      .pipe(
+        // Map the paginationOptions to findListOptions
+        map((paginationOptions: PaginationComponentOptions) =>
+          this.processOverviewService.getFindListOptions(paginationOptions, this.sortField)),
+        // Use the findListOptions to retrieve the relevant processes every interval
+        switchMap((findListOptions: FindListOptions) =>
+          this.processOverviewService.getProcessesByProcessStatus(
+            this.processStatus, findListOptions, this.useAutoRefreshingSearchBy ? this.autoRefreshInterval : null),
+        ),
+        // Redirect the user when he is logged out
+        redirectOn4xx(this.router, this.auth),
+        getAllCompletedRemoteData(),
+        // Map RemoteData<PaginatedList<Process>> to RemoteData<PaginatedList<ProcessOverviewTableEntry>>
+        switchMap((processesRD: RemoteData<PaginatedList<Process>>) => {
+          // Create observable emitting all processes one by one
+          return  observableFrom(processesRD.payload.page).pipe(
+            // Map every Process to ProcessOverviewTableEntry
+            mergeMap((process: Process) => {
+              return this.getEPersonName(process.userId).pipe(
+                map((name) => {
+                  return {
+                    process: process,
+                    user: name,
+                    info: this.getInfoValueMethod(process),
+                  };
+                }),
+              );
+            }),
+            // Collect processOverviewTableEntries into array
+            toArray(),
+            // Create RemoteData<PaginatedList<ProcessOverviewTableEntry>>
+            map((entries: ProcessOverviewTableEntry[]) => {
+              const entriesPL: PaginatedList<ProcessOverviewTableEntry> =
+                Object.assign(new PaginatedList(), processesRD.payload, { page: entries });
+              const entriesRD: RemoteData<PaginatedList<ProcessOverviewTableEntry>> =
+                Object.assign({}, processesRD, { payload: entriesPL });
+              return entriesRD;
+            }),
+          );
+        }),
+
+      ).subscribe((next: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => {
+        this.processesRD$.next(next);
+      }));
+
+    // Collapse this section when the number of processes is zero the first time processes are retrieved
+    this.subs.push(this.processesRD$.pipe(
+      filter((processListRd: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => hasValue(processListRd)),
+      take(1),
+    ).subscribe(
+      (processesRD: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => {
+        if (!(processesRD.payload.totalElements > 0)) {
+          this.isCollapsed = true;
+        }
+      },
+    ));
+
+  }
+
+  /**
+   * Get the name of an EPerson by ID
+   * @param id  ID of the EPerson
+   */
+  getEPersonName(id: string): Observable<string> {
+    return this.ePersonDataService.findById(id).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
+    );
+  }
+
+  /**
+   * Get the css class for a row depending on the state of the process
+   * @param process
+   */
+  getRowClass(process: Process): string {
+    if (this.processBulkDeleteService.isToBeDeleted(process.processId)) {
+      return 'table-danger';
+    } else if (this.newProcessId === process.processId) {
+      return 'table-info';
+    } else {
+      return '';
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+    this.processOverviewService.stopAutoRefreshing(this.processStatus);
+  }
+
+}
diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts
index 6ed04c50ce..e4bdcba537 100644
--- a/src/app/process-page/process-breadcrumb.resolver.spec.ts
+++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts
@@ -1,7 +1,7 @@
-import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
-import { Process } from './processes/process.model';
 import { ProcessDataService } from '../core/data/processes/process-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { Process } from './processes/process.model';
 
 describe('ProcessBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -17,14 +17,14 @@ describe('ProcessBreadcrumbResolver', () => {
       path = 'rest.com/path/to/breadcrumb/12345';
       processBreadcrumbService = {};
       processDataService = {
-        findById: () => createSuccessfulRemoteDataObject$(process)
+        findById: () => createSuccessfulRemoteDataObject$(process),
       } as any;
       resolver = new ProcessBreadcrumbResolver(processBreadcrumbService, processDataService);
     });
 
     it('should resolve the breadcrumb config', (done) => {
-      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id} } as any, {url: path} as any);
-      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path};
+      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id } } as any, { url: path } as any);
+      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path };
       resolvedConfig.subscribe((config) => {
         expect(config).toEqual(expectedConfig);
         done();
diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts
index 23e3dca0a8..dc91dd15e4 100644
--- a/src/app/process-page/process-breadcrumb.resolver.ts
+++ b/src/app/process-page/process-breadcrumb.resolver.ts
@@ -1,13 +1,19 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Process } from './processes/process.model';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
+
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { followLink } from '../shared/utils/follow-link-config.model';
 import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { Process } from './processes/process.model';
 
 /**
  * This class represents a resolver that requests a specific process before the route is activated
@@ -28,13 +34,12 @@ export class ProcessBreadcrumbResolver implements Resolve<BreadcrumbConfig<Proce
     const id = route.params.id;
 
     return this.processService.findById(route.params.id, true, false, followLink('script')).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((object: Process) => {
+      getFirstCompletedRemoteData(),
+      map((object: RemoteData<Process>) => {
         const fullPath = state.url;
         const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
-        return { provider: this.breadcrumbService, key: object, url: url };
-      })
+        return { provider: this.breadcrumbService, key: object.payload, url: url };
+      }),
     );
   }
 }
diff --git a/src/app/process-page/process-breadcrumbs.service.spec.ts b/src/app/process-page/process-breadcrumbs.service.spec.ts
index 52b1434c1e..ad5f846796 100644
--- a/src/app/process-page/process-breadcrumbs.service.spec.ts
+++ b/src/app/process-page/process-breadcrumbs.service.spec.ts
@@ -1,7 +1,11 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+
 import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
 import { Process } from './processes/process.model';
 
 describe('ProcessBreadcrumbsService', () => {
@@ -14,7 +18,7 @@ describe('ProcessBreadcrumbsService', () => {
   function init() {
     exampleId = '12345';
     exampleScriptName = 'Example Script';
-    exampleProcess = Object.assign(new Process(), {processId: exampleId, scriptName: exampleScriptName});
+    exampleProcess = Object.assign(new Process(), { processId: exampleId, scriptName: exampleScriptName });
     exampleURL = 'example.com';
   }
 
diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts
index 26b0787a53..42b01ea5a8 100644
--- a/src/app/process-page/process-breadcrumbs.service.ts
+++ b/src/app/process-page/process-breadcrumbs.service.ts
@@ -1,7 +1,12 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
+import { hasValue } from '../shared/empty.util';
 import { Process } from './processes/process.model';
 
 /**
@@ -16,6 +21,10 @@ export class ProcessBreadcrumbsService implements BreadcrumbsProviderService<Pro
    * @param url The url to use as a link for this breadcrumb
    */
   getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
-    return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    if (hasValue(key)) {
+      return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    } else {
+      return observableOf([]);
+    }
   }
 }
diff --git a/src/app/process-page/process-page-routing.module.ts b/src/app/process-page/process-page-routing.module.ts
index 881ca0e853..f0bbe6de08 100644
--- a/src/app/process-page/process-page-routing.module.ts
+++ b/src/app/process-page/process-page-routing.module.ts
@@ -1,12 +1,13 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ProcessDetailComponent } from './detail/process-detail.component';
 import { NewProcessComponent } from './new/new-process.component';
 import { ProcessOverviewComponent } from './overview/process-overview.component';
-import { ProcessPageResolver } from './process-page.resolver';
-import { ProcessDetailComponent } from './detail/process-detail.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { ProcessPageResolver } from './process-page.resolver';
 
 @NgModule({
   imports: [
@@ -26,24 +27,24 @@ import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
             path: 'new',
             component: NewProcessComponent,
             resolve: { breadcrumb: I18nBreadcrumbResolver },
-            data: { title: 'process.new.title', breadcrumbKey: 'process.new' }
+            data: { title: 'process.new.title', breadcrumbKey: 'process.new' },
           },
           {
             path: ':id',
             component: ProcessDetailComponent,
             resolve: {
               process: ProcessPageResolver,
-              breadcrumb: ProcessBreadcrumbResolver
-            }
-          }
-        ]
+              breadcrumb: ProcessBreadcrumbResolver,
+            },
+          },
+        ],
       },
 
-    ])
+    ]),
   ],
   providers: [
-    ProcessPageResolver
-  ]
+    ProcessPageResolver,
+  ],
 })
 export class ProcessPageRoutingModule {
 
diff --git a/src/app/process-page/process-page-routing.paths.ts b/src/app/process-page/process-page-routing.paths.ts
index d8a95d8177..781bf9a51c 100644
--- a/src/app/process-page/process-page-routing.paths.ts
+++ b/src/app/process-page/process-page-routing.paths.ts
@@ -3,7 +3,7 @@ import { URLCombiner } from '../core/url-combiner/url-combiner';
 export const PROCESS_MODULE_PATH = 'processes';
 
 export const getProcessListRoute = () =>
-    `/${PROCESS_MODULE_PATH}`;
+  `/${PROCESS_MODULE_PATH}`;
 
 export const getProcessDetailRoute = (processId: string) =>
-    new URLCombiner(getProcessListRoute(), processId).toString();
+  new URLCombiner(getProcessListRoute(), processId).toString();
diff --git a/src/app/process-page/process-page-shared.module.ts b/src/app/process-page/process-page-shared.module.ts
index e666283e03..5ae4d7ea12 100644
--- a/src/app/process-page/process-page-shared.module.ts
+++ b/src/app/process-page/process-page-shared.module.ts
@@ -1,25 +1,30 @@
+import { DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+
 import { SharedModule } from '../shared/shared.module';
-import { NewProcessComponent } from './new/new-process.component';
-import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
-import { ScriptHelpComponent } from './form/script-help/script-help.component';
-import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
-import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
-import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
-import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
-import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
-import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
-import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
-import { ProcessOverviewComponent } from './overview/process-overview.component';
 import { ProcessDetailComponent } from './detail/process-detail.component';
 import { ProcessDetailFieldComponent } from './detail/process-detail-field/process-detail-field.component';
-import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
-import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
 import { ProcessFormComponent } from './form/process-form.component';
+import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
+import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
+import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
+import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
+import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
+import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
+import { ScriptHelpComponent } from './form/script-help/script-help.component';
+import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
+import { NewProcessComponent } from './new/new-process.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessOverviewTableComponent } from './overview/table/process-overview-table.component';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
 
 @NgModule({
   imports: [
     SharedModule,
+    NgbCollapseModule,
   ],
   declarations: [
     NewProcessComponent,
@@ -33,14 +38,16 @@ import { ProcessFormComponent } from './form/process-form.component';
     BooleanValueInputComponent,
     DateValueInputComponent,
     ProcessOverviewComponent,
+    ProcessOverviewTableComponent,
     ProcessDetailComponent,
     ProcessDetailFieldComponent,
-    ProcessFormComponent
+    ProcessFormComponent,
   ],
   providers: [
     ProcessBreadcrumbResolver,
-    ProcessBreadcrumbsService
-  ]
+    ProcessBreadcrumbsService,
+    DatePipe,
+  ],
 })
 
 export class ProcessPageSharedModule {
diff --git a/src/app/process-page/process-page.module.ts b/src/app/process-page/process-page.module.ts
index 2587813998..871efafc3e 100644
--- a/src/app/process-page/process-page.module.ts
+++ b/src/app/process-page/process-page.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { ProcessPageRoutingModule } from './process-page-routing.module';
 import { ProcessPageSharedModule } from './process-page-shared.module';
@@ -12,7 +13,7 @@ import { ProcessPageSharedModule } from './process-page-shared.module';
   declarations: [
   ],
   providers: [
-  ]
+  ],
 })
 
 export class ProcessPageModule {
diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts
index ba872302b3..4b2bb9870f 100644
--- a/src/app/process-page/process-page.resolver.ts
+++ b/src/app/process-page/process-page.resolver.ts
@@ -1,11 +1,20 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Process } from './processes/process.model';
-import { followLink } from '../shared/utils/follow-link-config.model';
+
 import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Process } from './processes/process.model';
+
+export const PROCESS_PAGE_FOLLOW_LINKS = [
+  followLink('files'),
+];
 
 /**
  * This class represents a resolver that requests a specific process before the route is activated
@@ -23,7 +32,7 @@ export class ProcessPageResolver implements Resolve<RemoteData<Process>> {
    * or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Process>> {
-    return this.processService.findById(route.params.id, false, true, followLink('script')).pipe(
+    return this.processService.findById(route.params.id, false, true, ...PROCESS_PAGE_FOLLOW_LINKS).pipe(
       getFirstCompletedRemoteData(),
     );
   }
diff --git a/src/app/process-page/processes/filetypes.model.ts b/src/app/process-page/processes/filetypes.model.ts
new file mode 100644
index 0000000000..8ce8bff2c5
--- /dev/null
+++ b/src/app/process-page/processes/filetypes.model.ts
@@ -0,0 +1,35 @@
+import { autoserialize } from 'cerialize';
+
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { FILETYPES } from './filetypes.resource-type';
+
+/**
+ * Object representing the file types of the {@link Bitstream}s of a {@link Process}
+ */
+@typedObject
+export class Filetypes {
+
+  static type = FILETYPES;
+
+  /**
+   * The id of this {@link Filetypes}
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The values of this {@link Filetypes}
+   */
+  @autoserialize
+    values: string[];
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+}
diff --git a/src/app/process-page/processes/filetypes.resource-type.ts b/src/app/process-page/processes/filetypes.resource-type.ts
new file mode 100644
index 0000000000..29f9636208
--- /dev/null
+++ b/src/app/process-page/processes/filetypes.resource-type.ts
@@ -0,0 +1,8 @@
+/**
+ * The resource type for {@link Filetypes}
+ *
+ * Needs to be in a separate file to prevent circular dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const FILETYPES = new ResourceType('filetypes');
diff --git a/src/app/process-page/processes/process-status.model.ts b/src/app/process-page/processes/process-status.model.ts
index b43340bffb..1ff42789d8 100644
--- a/src/app/process-page/processes/process-status.model.ts
+++ b/src/app/process-page/processes/process-status.model.ts
@@ -2,8 +2,8 @@
  * List of process statuses
  */
 export enum ProcessStatus {
-  SCHEDULED,
-  RUNNING,
-  COMPLETED,
-  FAILED
+  SCHEDULED = 'SCHEDULED',
+  RUNNING = 'RUNNING',
+  COMPLETED = 'COMPLETED',
+  FAILED = 'FAILED'
 }
diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts
index d5f6e77d32..7d28b24d36 100644
--- a/src/app/process-page/processes/process.model.ts
+++ b/src/app/process-page/processes/process.model.ts
@@ -1,18 +1,30 @@
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type';
-import { ProcessStatus } from './process-status.model';
-import { ProcessParameter } from './process-parameter.model';
-import { HALLink } from '../../core/shared/hal-link.model';
-import { autoserialize, deserialize } from 'cerialize';
-import { PROCESS } from './process.resource-type';
-import { excludeFromEquals } from '../../core/utilities/equals.decorators';
-import { ResourceType } from '../../core/shared/resource-type';
-import { link, typedObject } from '../../core/cache/builders/build-decorators';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { SCRIPT } from '../scripts/script.resource-type';
-import { Script } from '../scripts/script.model';
+
+import {
+  link,
+  typedObject,
+} from '../../core/cache/builders/build-decorators';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { BITSTREAM } from '../../core/shared/bitstream.resource-type';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { Script } from '../scripts/script.model';
+import { SCRIPT } from '../scripts/script.resource-type';
+import { Filetypes } from './filetypes.model';
+import { FILETYPES } from './filetypes.resource-type';
+import { PROCESS } from './process.resource-type';
+import { ProcessParameter } from './process-parameter.model';
+import { ProcessStatus } from './process-status.model';
 
 /**
  * Object representing a process
@@ -26,59 +38,66 @@ export class Process implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier for this process
    */
-  @autoserialize
-  processId: string;
+  @autoserializeAs(String)
+    processId: string;
 
   /**
    * The UUID for the user that started the process
    */
   @autoserialize
-  userId: string;
+    userId: string;
+
+  /**
+   * The creation time for this process
+   */
+  @autoserialize
+    creationTime: string;
 
   /**
    * The start time for this process
    */
   @autoserialize
-  startTime: string;
+    startTime: string;
 
   /**
    * The end time for this process
    */
   @autoserialize
-  endTime: string;
+    endTime: string;
 
   /**
    * The name of the script run by this process
    */
   @autoserialize
-  scriptName: string;
+    scriptName: string;
 
   /**
    * The status of this process
    */
   @autoserialize
-  processStatus: ProcessStatus;
+    processStatus: ProcessStatus;
 
   /**
    * The parameters for this process
    */
   @autoserialize
-  parameters: ProcessParameter[];
+    parameters: ProcessParameter[];
 
   /**
    * The {@link HALLink}s for this Process
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     script: HALLink,
     output: HALLink,
-    files: HALLink
+    files: HALLink,
+    filetypes: HALLink,
   };
 
   /**
@@ -86,12 +105,27 @@ export class Process implements CacheableObject {
    * Will be undefined unless the script {@link HALLink} has been resolved.
    */
   @link(SCRIPT)
-  script?: Observable<RemoteData<Script>>;
+    script?: Observable<RemoteData<Script>>;
 
   /**
    * The output logs created by this Process
    * Will be undefined unless the output {@link HALLink} has been resolved.
    */
   @link(PROCESS_OUTPUT_TYPE)
-  output?: Observable<RemoteData<Bitstream>>;
+    output?: Observable<RemoteData<Bitstream>>;
+
+  /**
+   * The files created by this Process
+   * Will be undefined unless the output {@link HALLink} has been resolved.
+   */
+  @link(BITSTREAM, true)
+    files?: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * The filetypes present in this Process
+   * Will be undefined unless the output {@link HALLink} has been resolved.
+   */
+  @link(FILETYPES)
+    filetypes?: Observable<RemoteData<Filetypes>>;
+
 }
diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/process-page/scripts/script.model.ts
index afb1d41524..7907695b10 100644
--- a/src/app/process-page/scripts/script.model.ts
+++ b/src/app/process-page/scripts/script.model.ts
@@ -1,11 +1,15 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
 import { HALLink } from '../../core/shared/hal-link.model';
-import { autoserialize, deserialize } from 'cerialize';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
 import { SCRIPT } from './script.resource-type';
 import { ScriptParameter } from './script-parameter.model';
-import { typedObject } from '../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../core/utilities/equals.decorators';
-import { ResourceType } from '../../core/shared/resource-type';
-import { CacheableObject } from '../../core/cache/cacheable-object.model';
 
 /**
  * Object representing a script
@@ -19,37 +23,37 @@ export class Script implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this script
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this script
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * A short description of this script
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The available parameters for this script
    */
   @autoserialize
-  parameters: ScriptParameter[];
+    parameters: ScriptParameter[];
 
   /**
    * The {@link HALLink}s for this Script
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 }
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
index 2843322818..66fa15c56e 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
@@ -1,20 +1,26 @@
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { ProfileClaimItemModalComponent } from './profile-claim-item-modal.component';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 import { Item } from '../../core/shared/item.model';
-import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { RouterStub } from '../../shared/testing/router.stub';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal.component';
 
 describe('ProfileClaimItemModalComponent', () => {
   let component: ProfileClaimItemModalComponent;
@@ -25,65 +31,65 @@ describe('ProfileClaimItemModalComponent', () => {
     metadata: {
       'person.email': [
         {
-          value: 'fake@email.com'
-        }
+          value: 'fake@email.com',
+        },
       ],
       'person.familyName': [
         {
-          value: 'Doe'
-        }
+          value: 'Doe',
+        },
       ],
       'person.givenName': [
         {
-          value: 'John'
-        }
-      ]
+          value: 'John',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item2: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake2@email.com'
-        }
+          value: 'fake2@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item3: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake3@email.com'
-        }
+          value: 'fake3@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
 
   const searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
@@ -91,16 +97,16 @@ describe('ProfileClaimItemModalComponent', () => {
   const searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 });
 
   const searchResult = Object.assign(new SearchObjects(), {
-    page: [searchResult1, searchResult2, searchResult3]
+    page: [searchResult1, searchResult2, searchResult3],
   });
   const emptySearchResult = Object.assign(new SearchObjects(), {
-    page: []
+    page: [],
   });
   const searchResultRD = createSuccessfulRemoteDataObject(searchResult);
   const emptySearchResultRD = createSuccessfulRemoteDataObject(emptySearchResult);
 
   const profileClaimService = jasmine.createSpyObj('profileClaimService', {
-    searchForSuggestions: jasmine.createSpy('searchForSuggestions')
+    searchForSuggestions: jasmine.createSpy('searchForSuggestions'),
   });
 
   beforeEach(waitForAsync(() => {
@@ -111,9 +117,9 @@ describe('ProfileClaimItemModalComponent', () => {
         { provide: NgbActiveModal, useValue: {} },
         { provide: ActivatedRoute, useValue: {} },
         { provide: Router, useValue: new RouterStub() },
-        { provide: ProfileClaimService, useValue: profileClaimService }
+        { provide: ProfileClaimService, useValue: profileClaimService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index ca8efcafc7..becf73c3f8 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -1,28 +1,36 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BehaviorSubject } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import {
-  DSOSelectorModalWrapperComponent
-} from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 
 /**
  * Component representing a modal that show a list of suggested profile item to claim
  */
 @Component({
   selector: 'ds-profile-claim-item-modal',
-  templateUrl: './profile-claim-item-modal.component.html'
+  templateUrl: './profile-claim-item-modal.component.html',
 })
 export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
 
@@ -70,7 +78,7 @@ export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperCompo
     this.profileClaimService.searchForSuggestions(this.dso as EPerson).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe(
-      (result: RemoteData<SearchObjects<DSpaceObject>>) => this.listEntries$.next(result)
+      (result: RemoteData<SearchObjects<DSpaceObject>>) => this.listEntries$.next(result),
     );
   }
 
diff --git a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
index e2a9ff1461..e84521a85d 100644
--- a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
+++ b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
@@ -1,15 +1,20 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
-
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { ProfileClaimService } from './profile-claim.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
+import {
+  createNoContentRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { Item } from '../../core/shared/item.model';
-import { createNoContentRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProfileClaimService } from './profile-claim.service';
 
 describe('ProfileClaimService', () => {
   let scheduler: TestScheduler;
@@ -22,81 +27,81 @@ describe('ProfileClaimService', () => {
     metadata: {
       'eperson.firstname': [
         {
-          value: 'John'
-        }
+          value: 'John',
+        },
       ],
       'eperson.lastname': [
         {
-          value: 'Doe'
+          value: 'Doe',
         },
       ],
     },
-    email: 'fake@email.com'
+    email: 'fake@email.com',
   });
   const item1: Item = Object.assign(new Item(), {
     uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e',
     metadata: {
       'person.email': [
         {
-          value: 'fake@email.com'
-        }
+          value: 'fake@email.com',
+        },
       ],
       'person.familyName': [
         {
-          value: 'Doe'
-        }
+          value: 'Doe',
+        },
       ],
       'person.givenName': [
         {
-          value: 'John'
-        }
-      ]
+          value: 'John',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item2: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake2@email.com'
-        }
+          value: 'fake2@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item3: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake3@email.com'
-        }
+          value: 'fake3@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
 
   const searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
@@ -104,10 +109,10 @@ describe('ProfileClaimService', () => {
   const searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 });
 
   const searchResult = Object.assign(new SearchObjects(), {
-    page: [searchResult1, searchResult2, searchResult3]
+    page: [searchResult1, searchResult2, searchResult3],
   });
   const emptySearchResult = Object.assign(new SearchObjects(), {
-    page: []
+    page: [],
   });
   const searchResultRD = createSuccessfulRemoteDataObject(searchResult);
   const emptySearchResultRD = createSuccessfulRemoteDataObject(emptySearchResult);
@@ -116,7 +121,7 @@ describe('ProfileClaimService', () => {
     scheduler = getTestScheduler();
 
     searchService = jasmine.createSpyObj('SearchService', {
-      search: jasmine.createSpy('search')
+      search: jasmine.createSpy('search'),
     });
 
     service = new ProfileClaimService(searchService);
@@ -133,7 +138,7 @@ describe('ProfileClaimService', () => {
       it('should return true', () => {
         const result = service.hasProfilesToSuggest(eperson);
         const expected = cold('(a|)', {
-          a: true
+          a: true,
         });
         expect(result).toBeObservable(expected);
       });
@@ -148,7 +153,7 @@ describe('ProfileClaimService', () => {
       it('should return false', () => {
         const result = service.hasProfilesToSuggest(eperson);
         const expected = cold('(a|)', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -159,7 +164,7 @@ describe('ProfileClaimService', () => {
       it('should return false', () => {
         const result = service.hasProfilesToSuggest(null);
         const expected = cold('(a|)', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -178,7 +183,7 @@ describe('ProfileClaimService', () => {
       it('should return the proper search object', () => {
         const result = service.searchForSuggestions(eperson);
         const expected = cold('(a|)', {
-          a: searchResultRD
+          a: searchResultRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -193,7 +198,7 @@ describe('ProfileClaimService', () => {
       it('should return null', () => {
         const result = service.searchForSuggestions(eperson);
         const expected = cold('(a|)', {
-          a: emptySearchResultRD
+          a: emptySearchResultRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -204,7 +209,7 @@ describe('ProfileClaimService', () => {
       it('should return null', () => {
         const result = service.searchForSuggestions(null);
         const expected = cold('(a|)', {
-          a: createNoContentRemoteDataObject()
+          a: createNoContentRemoteDataObject(),
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/profile-page/profile-claim/profile-claim.service.ts b/src/app/profile-page/profile-claim/profile-claim.service.ts
index ea907ef629..f6d2ad35f1 100644
--- a/src/app/profile-page/profile-claim/profile-claim.service.ts
+++ b/src/app/profile-page/profile-claim/profile-claim.service.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchService } from '../../core/shared/search/search.service';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { createNoContentRemoteDataObject } from '../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 
 /**
  * Service that handle profiles claim.
@@ -32,7 +37,7 @@ export class ProfileClaimService {
       getFirstCompletedRemoteData(),
       map((rd: RemoteData<SearchObjects<DSpaceObject>>) => {
         return isNotEmpty(rd) && rd.hasSucceeded && rd.payload?.page?.length > 0;
-      })
+      }),
     );
   }
 
@@ -60,7 +65,7 @@ export class ProfileClaimService {
     }
     return this.searchService.search(new PaginatedSearchOptions({
       configuration: 'eperson_claims',
-      query: query
+      query: query,
     }), null, false, true);
   }
 
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
index 1dc1db26cc..69f827ec07 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
@@ -1,15 +1,26 @@
-import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import cloneDeep from 'lodash/cloneDeep';
+
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import cloneDeep from 'lodash/cloneDeep';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form.component';
 
 describe('ProfilePageMetadataFormComponent', () => {
   let component: ProfilePageMetadataFormComponent;
@@ -28,35 +39,35 @@ describe('ProfilePageMetadataFormComponent', () => {
         'eperson.firstname': [
           {
             value: 'John',
-            language: null
-          }
+            language: null,
+          },
         ],
         'eperson.lastname': [
           {
             value: 'Doe',
-            language: null
-          }
+            language: null,
+          },
         ],
         'eperson.language': [
           {
             value: 'de',
-            language: null
-          }
-        ]
-      }
+            language: null,
+          },
+        ],
+      },
     });
 
     epersonService = jasmine.createSpyObj('epersonService', {
-      update: createSuccessfulRemoteDataObject$(user)
+      update: createSuccessfulRemoteDataObject$(user),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
     translate = {
       instant: () => 'translated',
-      onLangChange: new EventEmitter()
+      onLangChange: new EventEmitter(),
     };
 
   }
@@ -70,9 +81,9 @@ describe('ProfilePageMetadataFormComponent', () => {
         { provide: EPersonDataService, useValue: epersonService },
         { provide: TranslateService, useValue: translate },
         { provide: NotificationsService, useValue: notificationsService },
-        FormBuilderService
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index c4e164a7e8..eb6d40bcfc 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,25 +1,36 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormValueControlModel,
   DynamicInputModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
-import { UntypedFormGroup } from '@angular/forms';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { LangConfig } from '../../../config/lang-config.interface';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import cloneDeep from 'lodash/cloneDeep';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../core/shared/operators';
+
+import { LangConfig } from '../../../config/lang-config.interface';
+import { environment } from '../../../environments/environment';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-profile-page-metadata-form',
-  templateUrl: './profile-page-metadata-form.component.html'
+  templateUrl: './profile-page-metadata-form.component.html',
 })
 /**
  * Component for a user to edit their metadata
@@ -43,38 +54,42 @@ export class ProfilePageMetadataFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'email',
       name: 'email',
-      readOnly: true
+      readOnly: true,
+      disabled: true,
     }),
     new DynamicInputModel({
       id: 'firstname',
       name: 'eperson.firstname',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'This field is required'
+        required: 'This field is required',
       },
+      autoComplete: 'given-name',
     }),
     new DynamicInputModel({
       id: 'lastname',
       name: 'eperson.lastname',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'This field is required'
+        required: 'This field is required',
       },
+      autoComplete: 'family-name',
     }),
     new DynamicInputModel({
       id: 'phone',
-      name: 'eperson.phone'
+      name: 'eperson.phone',
+      autoComplete: 'tel',
     }),
     new DynamicSelectModel<string>({
       id: 'language',
-      name: 'eperson.language'
-    })
+      name: 'eperson.language',
+    }),
   ];
 
   /**
@@ -135,7 +150,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
           (fieldModel as DynamicSelectModel<string>).options =
             this.activeLangs.map((langConfig) => Object.assign({ value: langConfig.code, label: langConfig.label }));
         }
-      }
+      },
     );
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
   }
@@ -153,7 +168,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
             fieldModel.errorMessages[key] = this.translate.instant(this.ERROR_PREFIX + fieldModel.id + '.' + key);
           });
         }
-      }
+      },
     );
   }
 
@@ -187,22 +202,22 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       } else if (hasValue(fieldModel.value)) {
         newMetadata[fieldModel.name] = [{
           value: fieldModel.value,
-          language: null
+          language: null,
         } as any];
         changed = true;
       }
     });
 
     if (changed) {
-      this.epersonService.update(Object.assign(cloneDeep(this.user), {metadata: newMetadata})).pipe(
+      this.epersonService.update(Object.assign(cloneDeep(this.user), { metadata: newMetadata })).pipe(
         getFirstSucceededRemoteData(),
-        getRemoteDataPayload()
+        getRemoteDataPayload(),
       ).subscribe((user) => {
         this.user = user;
         this.setFormValues();
         this.notificationsService.success(
           this.translate.instant(this.NOTIFICATION_PREFIX + 'success.title'),
-          this.translate.instant(this.NOTIFICATION_PREFIX + 'success.content')
+          this.translate.instant(this.NOTIFICATION_PREFIX + 'success.content'),
         );
       });
     }
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 2d959c1dfe..8d48da08d9 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -18,7 +18,7 @@
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
     </span>
-    <span *ngIf="!(isProcessingCreate() | async)">
+    <span *ngIf="(isProcessingCreate() | async) !== true">
         <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
     </span>
   </button>
@@ -30,7 +30,7 @@
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
-        <span *ngIf="!(isProcessingDelete() | async)">
+        <span *ngIf="(isProcessingDelete() | async) !== true">
             <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
         </span>
     </button>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
index 9bb0d0a6e2..acef932917 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
@@ -1,23 +1,29 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
 
 describe('ProfilePageResearcherFormComponent', () => {
 
@@ -39,17 +45,17 @@ describe('ProfilePageResearcherFormComponent', () => {
   function init() {
 
     user = Object.assign(new EPerson(), {
-      id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241'
+      id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241',
     });
 
     profile = Object.assign(new ResearcherProfile(), {
       id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241',
       visible: false,
-      type: 'profile'
+      type: 'profile',
     });
 
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: observableOf(user)
+      getAuthenticatedUserFromStore: observableOf(user),
     });
 
     researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
@@ -57,7 +63,7 @@ describe('ProfilePageResearcherFormComponent', () => {
       create: observableOf(profile),
       setVisibility: jasmine.createSpy('setVisibility'),
       delete: observableOf(true),
-      findRelatedItemId: observableOf('a42557ca-cbb8-4442-af9c-3bb5cad2d075')
+      findRelatedItemId: observableOf('a42557ca-cbb8-4442-af9c-3bb5cad2d075'),
     });
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -78,9 +84,9 @@ describe('ProfilePageResearcherFormComponent', () => {
         { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ProfileClaimService, useValue: profileClaimService },
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index d63360fbf4..35945ddb3a 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -1,24 +1,39 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/profile-claim-item-modal.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { AuthService } from '../../core/auth/auth.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { isNotEmpty } from '../../shared/empty.util';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/profile-claim-item-modal.component';
 
 @Component({
   selector: 'ds-profile-page-researcher-form',
@@ -147,7 +162,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
    */
   toggleProfileVisibility(researcherProfile: ResearcherProfile): void {
     this.researcherProfileService.setVisibility(researcherProfile, !researcherProfile.visible).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<ResearcherProfile>) => {
       if (rd.hasSucceeded) {
         this.researcherProfile$.next(rd.payload);
@@ -181,7 +196,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
   createProfileFromScratch() {
     this.processingCreate$.next(true);
     this.researcherProfileService.create().pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processingCreate$.next(false);
       if (remoteData.isSuccess) {
diff --git a/src/app/profile-page/profile-page-routing.module.ts b/src/app/profile-page/profile-page-routing.module.ts
index 695a78837f..44795a16e3 100644
--- a/src/app/profile-page/profile-page-routing.module.ts
+++ b/src/app/profile-page/profile-page-routing.module.ts
@@ -1,14 +1,15 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', pathMatch: 'full', component: ThemedProfilePageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'profile', title: 'profile.title' } }
-    ])
-  ]
+      { path: '', pathMatch: 'full', component: ThemedProfilePageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'profile', title: 'profile.title' } },
+    ]),
+  ],
 })
 export class ProfilePageRoutingModule {
 
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 866b962986..ae80b5351b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -1,14 +1,21 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
-import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../core/cache/response.models';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
 
 describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
@@ -19,12 +26,12 @@ describe('ProfilePageSecurityFormComponent', () => {
 
   function init() {
     epersonService = jasmine.createSpyObj('epersonService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: observableOf(new RestResponse(true, 200, 'OK')),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
   }
 
@@ -34,11 +41,11 @@ describe('ProfilePageSecurityFormComponent', () => {
       declarations: [ProfilePageSecurityFormComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        {provide: EPersonDataService, useValue: epersonService},
-        {provide: NotificationsService, useValue: notificationsService},
-        FormBuilderService
+        { provide: EPersonDataService, useValue: epersonService },
+        { provide: NotificationsService, useValue: notificationsService },
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -51,14 +58,14 @@ describe('ProfilePageSecurityFormComponent', () => {
   describe('On value change', () => {
     describe('when the password has changed', () => {
       beforeEach(() => {
-        component.formGroup.patchValue({password: 'password'});
-        component.formGroup.patchValue({passwordrepeat: 'password'});
+        component.formGroup.patchValue({ password: 'password' });
+        component.formGroup.patchValue({ passwordrepeat: 'password' });
       });
 
       it('should emit the value and validity on password change with invalid validity', fakeAsync(() => {
         spyOn(component.passwordValue, 'emit');
         spyOn(component.isInvalid, 'emit');
-        component.formGroup.patchValue({password: 'new-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
 
         tick(300);
 
@@ -68,7 +75,7 @@ describe('ProfilePageSecurityFormComponent', () => {
 
       it('should emit the value on password change', fakeAsync(() => {
         spyOn(component.passwordValue, 'emit');
-        component.formGroup.patchValue({password: 'new-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
 
         tick(300);
 
@@ -80,8 +87,8 @@ describe('ProfilePageSecurityFormComponent', () => {
         spyOn(component.currentPasswordValue, 'emit');
         component.FORM_PREFIX = 'profile.security.form.';
         component.ngOnInit();
-        component.formGroup.patchValue({password: 'new-password'});
-        component.formGroup.patchValue({'current-password': 'current-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
+        component.formGroup.patchValue({ 'current-password': 'current-password' });
         tick(300);
 
         expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 04292ea96e..dc6ecab63b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -1,17 +1,31 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { map } from 'rxjs/operators';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-profile-page-security-form',
-  templateUrl: './profile-page-security-form.component.html'
+  templateUrl: './profile-page-security-form.component.html',
 })
 /**
  * Component for a user to edit their security information
@@ -39,13 +53,15 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'password',
       name: 'password',
-      inputType: 'password'
+      inputType: 'password',
+      autoComplete: 'new-password',
     }),
     new DynamicInputModel({
       id: 'passwordrepeat',
       name: 'passwordrepeat',
-      inputType: 'password'
-    })
+      inputType: 'password',
+      autoComplete: 'new-password',
+    }),
   ];
 
   /**
@@ -57,13 +73,13 @@ export class ProfilePageSecurityFormComponent implements OnInit {
    * Indicates whether the "checkPasswordEmpty" needs to be added or not
    */
   @Input()
-  passwordCanBeEmpty = true;
+    passwordCanBeEmpty = true;
 
   /**
    * Prefix for the form's label messages of this component
    */
   @Input()
-  FORM_PREFIX: string;
+    FORM_PREFIX: string;
 
   private subs: Subscription[] = [];
 
@@ -79,7 +95,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
         id: 'current-password',
         name: 'current-password',
         inputType: 'password',
-        required: true
+        required: true,
+        autoComplete: 'current-password',
       }));
     }
     if (this.passwordCanBeEmpty) {
@@ -98,8 +115,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     this.subs.push(
       this.formGroup.statusChanges.pipe(
         debounceTime(300),
-        map((status: string) => status !== 'VALID')
-      ).subscribe((status) => this.isInvalid.emit(status))
+        map((status: string) => status !== 'VALID'),
+      ).subscribe((status) => this.isInvalid.emit(status)),
     );
 
     this.subs.push(this.formGroup.valueChanges.pipe(
@@ -119,7 +136,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     this.formModel.forEach(
       (fieldModel: DynamicInputModel) => {
         fieldModel.label = this.translate.instant(this.FORM_PREFIX + 'label.' + fieldModel.id);
-      }
+      },
     );
   }
 
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 44783da84e..b5703c47a3 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,13 +1,14 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
-    <ng-container *ngIf="isResearcherProfileEnabled() | async">
-      <h3 class="mb-4">{{'profile.head' | translate}}</h3>
+    <h1>{{'profile.title' | translate}}</h1>
+    <ng-container>
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
           <div class="mb-4">
             <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
           </div>
+          <ds-suggestions-notification></ds-suggestions-notification>
         </div>
       </div>
     </ng-container>
@@ -34,7 +35,7 @@
 
     <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
       <div *ngIf="groups?.length > 0">
-        <h3 class="mt-4">{{'profile.groups.head' | translate}}</h3>
+        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
         <ul class="list-group list-group-flush">
           <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
         </ul>
@@ -43,7 +44,7 @@
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
       <div *ngIf="specialGroups?.length > 0" data-test="specialGroups">
-        <h3 class="mt-4">{{'profile.special.groups.head' | translate}}</h3>
+        <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
         <ul class="list-group list-group-flush">
           <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
             {{ dsoNameService.getName(specialGroup) }}
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 709ed56790..4d7d91f830 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -1,28 +1,45 @@
-import { ProfilePageComponent } from './profile-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EPerson } from '../core/eperson/models/eperson.model';
-import { StoreModule } from '@ngrx/store';
-import { storeModuleConfig } from '../app.reducer';
-import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
-import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { authReducer } from '../core/auth/auth.reducer';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { createPaginatedList } from '../shared/testing/utils.test';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { AuthService } from '../core/auth/auth.service';
-import { RestResponse } from '../core/cache/response.models';
-import { provideMockStore } from '@ngrx/store/testing';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { EmptySpecialGroupDataMock$, SpecialGroupDataMock$ } from '../shared/testing/special-group.mock';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { storeModuleConfig } from '../app.reducer';
+import { authReducer } from '../core/auth/auth.reducer';
+import { AuthService } from '../core/auth/auth.service';
+import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
+import { RestResponse } from '../core/cache/response.models';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import {
+  EmptySpecialGroupDataMock$,
+  SpecialGroupDataMock$,
+} from '../shared/testing/special-group.mock';
+import { createPaginatedList } from '../shared/testing/utils.test';
+import { VarDirective } from '../shared/utils/var.directive';
+import { ProfilePageComponent } from './profile-page.component';
 
 describe('ProfilePageComponent', () => {
   let component: ProfilePageComponent;
@@ -40,19 +57,19 @@ describe('ProfilePageComponent', () => {
   const validConfiguration = Object.assign(new ConfigurationProperty(), {
     name: 'researcher-profile.entity-type',
     values: [
-      'Person'
-    ]
+      'Person',
+    ],
   });
   const emptyConfiguration = Object.assign(new ConfigurationProperty(), {
     name: 'researcher-profile.entity-type',
-    values: []
+    values: [],
   });
 
   function init() {
     user = Object.assign(new EPerson(), {
       id: 'userId',
       groups: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-      _links: { self: { href: 'test.com/uuid/1234567654321' } }
+      _links: { self: { href: 'test.com/uuid/1234567654321' } },
     });
     initialState = {
       core: {
@@ -63,26 +80,26 @@ describe('ProfilePageComponent', () => {
           loading: false,
           authToken: new AuthTokenInfo('test_token'),
           userId: user.id,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', { isAuthorized: canChangePassword });
     authService = jasmine.createSpyObj('authService', {
       getAuthenticatedUserFromStore: observableOf(user),
-      getSpecialGroupsFromAuthStatus: SpecialGroupDataMock$
+      getSpecialGroupsFromAuthStatus: SpecialGroupDataMock$,
     });
     epersonService = jasmine.createSpyObj('epersonService', {
       findById: createSuccessfulRemoteDataObject$(user),
-      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success')))
+      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success'))),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
     configurationService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: jasmine.createSpy('findByPropertyName')
+      findByPropertyName: jasmine.createSpy('findByPropertyName'),
     });
   }
 
@@ -93,7 +110,7 @@ describe('ProfilePageComponent', () => {
       imports: [
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       providers: [
         { provide: EPersonDataService, useValue: epersonService },
@@ -103,7 +120,7 @@ describe('ProfilePageComponent', () => {
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -123,7 +140,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns false and the security form returns true', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: false
+            updateProfile: false,
           });
           spyOn(component, 'updateSecurity').and.returnValue(true);
           component.updateProfile();
@@ -137,7 +154,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns true and the security form returns false', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: true
+            updateProfile: true,
           });
           component.updateProfile();
         });
@@ -150,7 +167,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns true and the security form returns true', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: true
+            updateProfile: true,
           });
           component.updateProfile();
         });
@@ -163,7 +180,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns false and the security form returns false', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: false
+            updateProfile: false,
           });
           component.updateProfile();
         });
@@ -219,7 +236,7 @@ describe('ProfilePageComponent', () => {
           component.setCurrentPasswordValue('current-password');
 
           operations = [
-            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password' } }
+            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password' } },
           ];
           result = component.updateSecurity();
         });
@@ -243,7 +260,7 @@ describe('ProfilePageComponent', () => {
           component.setInvalid(false);
           component.setCurrentPasswordValue('current-password');
           operations = [
-            { 'op': 'add', 'path': '/password', 'value': {'new_password': 'testest', 'current_password': 'current-password'  }}
+            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password'  } },
           ];
           result = component.updateSecurity();
           epersonService.patch(user, operations).subscribe((response) => {
@@ -288,27 +305,27 @@ describe('ProfilePageComponent', () => {
       });
     });
 
-  describe('check for specialGroups', () => {
-    it('should contains specialGroups list', () => {
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeTruthy();
-    });
+    describe('check for specialGroups', () => {
+      it('should contains specialGroups list', () => {
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeTruthy();
+      });
 
-    it('should not contains specialGroups list', () => {
-      component.specialGroupsRD$ = null;
-      fixture.detectChanges();
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeFalsy();
-    });
+      it('should not contains specialGroups list', () => {
+        component.specialGroupsRD$ = null;
+        fixture.detectChanges();
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeFalsy();
+      });
 
-    it('should not contains specialGroups list', () => {
-      component.specialGroupsRD$ = EmptySpecialGroupDataMock$;
-      fixture.detectChanges();
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeFalsy();
+      it('should not contains specialGroups list', () => {
+        component.specialGroupsRD$ = EmptySpecialGroupDataMock$;
+        fixture.detectChanges();
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeFalsy();
+      });
     });
   });
-  });
 
   describe('isResearcherProfileEnabled', () => {
 
@@ -322,7 +339,7 @@ describe('ProfilePageComponent', () => {
       it('should return true', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: true
+          a: true,
         });
         expect(result).toBeObservable(expected);
       });
@@ -338,7 +355,7 @@ describe('ProfilePageComponent', () => {
       it('should return false', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -354,7 +371,7 @@ describe('ProfilePageComponent', () => {
       it('should return false', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 343314999b..29697b21bc 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,29 +1,48 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { EPerson } from '../core/eperson/models/eperson.model';
-import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { Group } from '../core/eperson/models/group.model';
-import { RemoteData } from '../core/data/remote-data';
-import { PaginatedList } from '../core/data/paginated-list.model';
-import { filter, switchMap, tap } from 'rxjs/operators';
-import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getRemoteDataPayload } from '../core/shared/operators';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { AuthService } from '../core/auth/auth.service';
 import { Operation } from 'fast-json-patch';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { PaginatedList } from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { Group } from '../core/eperson/models/group.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
 
 @Component({
   selector: 'ds-profile-page',
   styleUrls: ['./profile-page.component.scss'],
-  templateUrl: './profile-page.component.html'
+  templateUrl: './profile-page.component.html',
 })
 /**
  * Component for a user to edit their profile information
@@ -97,14 +116,14 @@ export class ProfilePageComponent implements OnInit {
       switchMap((user: EPerson) => this.epersonService.findById(user.id, true, true, followLink('groups'))),
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
-      tap((user: EPerson) => this.currentUser = user)
+      tap((user: EPerson) => this.currentUser = user),
     );
     this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
     this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((configRD: RemoteData<ConfigurationProperty>) => {
       this.isResearcherProfileEnabled$.next(configRD.hasSucceeded && configRD.payload.values.length > 0);
     });
@@ -120,7 +139,7 @@ export class ProfilePageComponent implements OnInit {
     if (!metadataChanged && !securityChanged) {
       this.notificationsService.warning(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.content'),
       );
     }
   }
@@ -150,18 +169,18 @@ export class ProfilePageComponent implements OnInit {
     }
     if (!this.invalidSecurity && passEntered) {
       const operations = [
-        { 'op': 'add', 'path': '/password', 'value': { 'new_password': this.password, 'current_password': this.currentPassword } }
+        { 'op': 'add', 'path': '/password', 'value': { 'new_password': this.password, 'current_password': this.currentPassword } },
       ] as Operation[];
       this.epersonService.patch(this.currentUser, operations).pipe(getFirstCompletedRemoteData()).subscribe((response: RemoteData<EPerson>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
-            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content'),
           );
         } else {
           this.notificationsService.error(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.title'),
-            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.change-failed')
+            this.getPasswordErrorMessage(response),
           );
         }
       });
@@ -199,4 +218,18 @@ export class ProfilePageComponent implements OnInit {
     return this.isResearcherProfileEnabled$.asObservable();
   }
 
+  /**
+   * Returns an error message from a password validation request with a specific reason or
+   * a default message without specific reason.
+   * @param response from the validation password patch request.
+   */
+  getPasswordErrorMessage(response) {
+    if (response.hasFailed && isNotEmpty(response.errorMessage)) {
+      // Response has a specific error message. Show this message in the error notification.
+      return this.translate.instant(response.errorMessage);
+    }
+    // Show default error message notification.
+    return this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.change-failed');
+  }
+
 }
diff --git a/src/app/profile-page/profile-page.module.ts b/src/app/profile-page/profile-page.module.ts
index 0e2902de33..8420b5baa2 100644
--- a/src/app/profile-page/profile-page.module.ts
+++ b/src/app/profile-page/profile-page.module.ts
@@ -1,18 +1,17 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { NotificationsModule } from '../notifications/notifications.module';
+import { FormModule } from '../shared/form/form.module';
 import { SharedModule } from '../shared/shared.module';
-import { ProfilePageRoutingModule } from './profile-page-routing.module';
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
 import { ProfilePageComponent } from './profile-page.component';
 import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
+import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form/profile-page-researcher-form.component';
+import { ProfilePageRoutingModule } from './profile-page-routing.module';
 import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
-import {
-  ProfilePageResearcherFormComponent
-} from './profile-page-researcher-form/profile-page-researcher-form.component';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
-import { FormModule } from '../shared/form/form.module';
-import { UiSwitchModule } from 'ngx-ui-switch';
-import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
-
 
 @NgModule({
   imports: [
@@ -20,14 +19,15 @@ import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profi
     CommonModule,
     SharedModule,
     FormModule,
-    UiSwitchModule
+    UiSwitchModule,
+    NotificationsModule,
   ],
   exports: [
     ProfilePageComponent,
     ThemedProfilePageComponent,
     ProfilePageMetadataFormComponent,
     ProfilePageSecurityFormComponent,
-    ProfilePageResearcherFormComponent
+    ProfilePageResearcherFormComponent,
   ],
   declarations: [
     ProfilePageComponent,
@@ -35,8 +35,8 @@ import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profi
     ProfileClaimItemModalComponent,
     ProfilePageMetadataFormComponent,
     ProfilePageSecurityFormComponent,
-    ProfilePageResearcherFormComponent
-  ]
+    ProfilePageResearcherFormComponent,
+  ],
 })
 export class ProfilePageModule {
 
diff --git a/src/app/profile-page/themed-profile-page.component.ts b/src/app/profile-page/themed-profile-page.component.ts
index 2348d416cf..c7d60726c8 100644
--- a/src/app/profile-page/themed-profile-page.component.ts
+++ b/src/app/profile-page/themed-profile-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ProfilePageComponent } from './profile-page.component';
 
@@ -8,7 +9,7 @@ import { ProfilePageComponent } from './profile-page.component';
 @Component({
   selector: 'ds-themed-profile-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedProfilePageComponent extends ThemedComponent<ProfilePageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts
new file mode 100644
index 0000000000..c517ddafd4
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts
@@ -0,0 +1,7 @@
+
+export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance';
+export const NOTIFICATIONS_RECITER_SUGGESTION_PATH = 'suggestion-targets';
+
+export function getQualityAssuranceEditRoute() {
+  return `/${QUALITY_ASSURANCE_EDIT_PATH}`;
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts
new file mode 100644
index 0000000000..71847a83f5
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts
@@ -0,0 +1,122 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { QualityAssuranceBreadcrumbResolver } from '../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { QualityAssuranceBreadcrumbService } from '../core/breadcrumbs/quality-assurance-breadcrumb.service';
+import {
+  NOTIFICATIONS_RECITER_SUGGESTION_PATH,
+  QUALITY_ASSURANCE_EDIT_PATH,
+} from './notifications-pages-routing-paths';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { AdminNotificationsPublicationClaimPageResolver } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceEventsPageResolver } from './quality-assurance-events-page/quality-assurance-events-page.resolver';
+import { SourceDataResolver } from './quality-assurance-source-page-component/quality-assurance-source-data.resolver';
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceSourcePageResolver } from './quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page/quality-assurance-topics-page.component';
+import { QualityAssuranceTopicsPageResolver } from './quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${NOTIFICATIONS_RECITER_SUGGESTION_PATH}`,
+        component: NotificationsSuggestionTargetsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          reciterSuggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.recitersuggestion.page.title',
+          breadcrumbKey: 'admin.notifications.recitersuggestion',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
+        component: QualityAssuranceSourcePageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
+          sourceData: SourceDataResolver,
+        },
+        data: {
+          title: 'admin.notifications.source.breadcrumbs',
+          breadcrumbKey: 'admin.notifications.source',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
+        component: QualityAssuranceEventsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.event.page.title',
+          breadcrumbKey: 'admin.notifications.event',
+          showBreadcrumbsFluid: false,
+        },
+      },
+    ]),
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    AdminNotificationsPublicationClaimPageResolver,
+    SourceDataResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceTopicsPageResolver,
+    QualityAssuranceEventsPageResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceBreadcrumbResolver,
+    QualityAssuranceBreadcrumbService,
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class NotificationsPageRoutingModule {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts b/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts
new file mode 100644
index 0000000000..baf4f8357f
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts
@@ -0,0 +1,34 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { CoreModule } from '../core/core.module';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SharedModule } from '../shared/shared.module';
+import { NotificationsPageRoutingModule } from './notifications-pages-routing.module';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page/quality-assurance-topics-page.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    NotificationsPageRoutingModule,
+    NotificationsModule,
+  ],
+  declarations: [
+    NotificationsSuggestionTargetsPageComponent,
+    QualityAssuranceTopicsPageComponent,
+    QualityAssuranceEventsPageComponent,
+    QualityAssuranceSourcePageComponent,
+  ],
+  entryComponents: [],
+})
+/**
+ * This module handles all components related to the notifications pages
+ */
+export class NotificationsPageModule {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts
new file mode 100644
index 0000000000..13bcffbd5c
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+
+export interface AdminNotificationsPublicationClaimPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+
+export class AdminNotificationsPublicationClaimPageResolver implements Resolve<AdminNotificationsPublicationClaimPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminNotificationsSuggestionTargetsPageParams Emits the route parameters
+   */
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): AdminNotificationsPublicationClaimPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html
new file mode 100644
index 0000000000..11db25fa7b
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html
@@ -0,0 +1 @@
+<ds-publication-claim [source]="'oaire'"></ds-publication-claim>
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
rename to src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.scss
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts
new file mode 100644
index 0000000000..c782ca8216
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts
@@ -0,0 +1,43 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component';
+
+describe('NotificationsSuggestionTargetsPageComponent', () => {
+  let component: NotificationsSuggestionTargetsPageComponent;
+  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      providers: [
+        AdminNotificationsPublicationClaimPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts
new file mode 100644
index 0000000000..fcf583657b
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-notifications-reciter-page',
+  templateUrl: './notifications-suggestion-targets-page.component.html',
+  styleUrls: ['./notifications-suggestion-targets-page.component.scss'],
+})
+export class NotificationsSuggestionTargetsPageComponent {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html
new file mode 100644
index 0000000000..315209d342
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-events></ds-quality-assurance-events>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
new file mode 100644
index 0000000000..7915c8d7e6
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
@@ -0,0 +1,31 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page.component';
+
+describe('QualityAssuranceEventsPageComponent', () => {
+  let component: QualityAssuranceEventsPageComponent;
+  let fixture: ComponentFixture<QualityAssuranceEventsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceEventsPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceEventsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create AdminQualityAssuranceEventsPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts
new file mode 100644
index 0000000000..9959f1190d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA events related to a specific topic.
+ */
+@Component({
+  selector: 'ds-quality-assurance-events-page',
+  templateUrl: './quality-assurance-events-page.component.html',
+})
+export class QualityAssuranceEventsPageComponent {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts
new file mode 100644
index 0000000000..6feaa4ac1d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface AssuranceEventsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceEventsPageResolver implements Resolve<AssuranceEventsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceEventsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): AssuranceEventsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts
new file mode 100644
index 0000000000..5228a77b62
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts
@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceService } from '../../notifications/qa/source/quality-assurance-source.service';
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> {
+  private  pageSize = environment.qualityAssuranceConfig.pageSize;
+  /**
+   * Initialize the effect class variables.
+   * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
+   */
+  constructor(
+    private qualityAssuranceSourceService: QualityAssuranceSourceService,
+    private router: Router,
+  ) { }
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<QualityAssuranceSourceObject[]>
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<QualityAssuranceSourceObject[]> {
+    return this.qualityAssuranceSourceService.getSources(this.pageSize, 0).pipe(
+      map((sources: PaginatedList<QualityAssuranceSourceObject>) => {
+        if (sources.page.length === 1) {
+          this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]);
+        }
+        return sources.page;
+      }));
+  }
+
+  /**
+   *
+   * @param route url path
+   * @returns url path
+   */
+  getResolvedUrl(route: ActivatedRouteSnapshot): string {
+    return route.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts
new file mode 100644
index 0000000000..55278f86d5
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface QualityAssuranceSourcePageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceSourcePageResolver implements Resolve<QualityAssuranceSourcePageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceSourcePageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): QualityAssuranceSourcePageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html
new file mode 100644
index 0000000000..709103cf3d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-source></ds-quality-assurance-source>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts
new file mode 100644
index 0000000000..3a89aaa385
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts
@@ -0,0 +1,30 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page.component';
+
+describe('QualityAssuranceSourcePageComponent', () => {
+  let component: QualityAssuranceSourcePageComponent;
+  let fixture: ComponentFixture<QualityAssuranceSourcePageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceSourcePageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceSourcePageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create QualityAssuranceSourcePageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts
new file mode 100644
index 0000000000..f066364708
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA sources.
+ */
+@Component({
+  selector: 'ds-quality-assurance-source-page-component',
+  templateUrl: './quality-assurance-source-page.component.html',
+})
+export class QualityAssuranceSourcePageComponent {}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts
new file mode 100644
index 0000000000..b8f2cda536
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface QualityAssuranceTopicsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceTopicsPageResolver implements Resolve<QualityAssuranceTopicsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceTopicsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): QualityAssuranceTopicsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html
new file mode 100644
index 0000000000..fc905ad724
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-topic></ds-quality-assurance-topic>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
new file mode 100644
index 0000000000..c95f8cc8ec
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
@@ -0,0 +1,31 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page.component';
+
+describe('QualityAssuranceTopicsPageComponent', () => {
+  let component: QualityAssuranceTopicsPageComponent;
+  let fixture: ComponentFixture<QualityAssuranceTopicsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceTopicsPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceTopicsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create QualityAssuranceTopicsPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts
new file mode 100644
index 0000000000..5db1d3de02
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA topics related to a specific source.
+ */
+@Component({
+  selector: 'ds-notification-qa-page',
+  templateUrl: './quality-assurance-topics-page.component.html',
+})
+export class QualityAssuranceTopicsPageComponent {
+
+}
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index ed79b1d2d1..235932bdd2 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,8 +1,8 @@
 <div class="container">
-    <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
+    <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
     <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
-    <p *ngIf="validMailDomains.length != 0 && typeRequest === TYPE_REQUEST_REGISTER">
+    <p *ngIf="validMailDomains.length !== 0 && typeRequest === TYPE_REQUEST_REGISTER">
       {{ MESSAGE_PREFIX + '.info.maildomain' | translate}} {{ validMailDomains.join(', ')}}
     </p>
 
@@ -47,7 +47,7 @@
                            (showNotification)="showNotification($event)"></ds-google-recaptcha>
     </div>
 
-    <ng-container *ngIf="!((googleRecaptchaService.captchaVersion() | async) === 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
+    <ng-container *ngIf="((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
       <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index 9e852d9491..5a5b692c10 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -1,28 +1,41 @@
-import { waitForAsync, ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing';
-import { of as observableOf, of } from 'rxjs';
-import { RestResponse } from '../core/cache/response.models';
 import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { By } from '@angular/platform-browser';
-import { RouterStub } from '../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
 import {
-  RegisterEmailFormComponent,
-  TYPE_REQUEST_REGISTER,
-  TYPE_REQUEST_FORGOT
-} from './register-email-form.component';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RestResponse } from '../core/cache/response.models';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
-import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import {
+  RegisterEmailFormComponent,
+  TYPE_REQUEST_FORGOT,
+  TYPE_REQUEST_REGISTER,
+} from './register-email-form.component';
 
 describe('RegisterEmailFormComponent', () => {
 
@@ -34,7 +47,7 @@ describe('RegisterEmailFormComponent', () => {
   let notificationsService;
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: jasmine.createSpy('findByPropertyName')
+    findByPropertyName: jasmine.createSpy('findByPropertyName'),
   });
 
   const captchaVersion$ = of('v3');
@@ -55,7 +68,7 @@ describe('RegisterEmailFormComponent', () => {
     notificationsService = new NotificationsServiceStub();
 
     epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-      registerEmail: createSuccessfulRemoteDataObject$({})
+      registerEmail: createSuccessfulRemoteDataObject$({}),
     });
 
     jasmine.getEnv().allowRespy(true);
@@ -64,15 +77,15 @@ describe('RegisterEmailFormComponent', () => {
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [RegisterEmailFormComponent],
       providers: [
-        {provide: Router, useValue: router},
-        {provide: EpersonRegistrationService, useValue: epersonRegistrationService},
-        {provide: ConfigurationDataService, useValue: configurationDataService},
-        {provide: UntypedFormBuilder, useValue: new UntypedFormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: CookieService, useValue: new CookieServiceMock()},
-        {provide: GoogleRecaptchaService, useValue: googleRecaptchaService},
+        { provide: Router, useValue: router },
+        { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: GoogleRecaptchaService, useValue: googleRecaptchaService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -95,11 +108,11 @@ describe('RegisterEmailFormComponent', () => {
       expect(comp.form.invalid).toBeTrue();
     });
     it('should be invalid when no valid email is present', () => {
-      comp.form.patchValue({email: 'invalid'});
+      comp.form.patchValue({ email: 'invalid' });
       expect(comp.form.invalid).toBeTrue();
     });
     it('should be valid when a valid email is present', () => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
       expect(comp.form.invalid).toBeFalse();
     });
     it('should accept email with other domain names on TYPE_REQUEST_FORGOT form', () => {
@@ -115,7 +128,7 @@ describe('RegisterEmailFormComponent', () => {
       expect(comp.form.invalid).toBeFalse();
     });
     it('should be valid when uppercase letters are used', () => {
-      comp.form.patchValue({email: 'VALID@email.org'});
+      comp.form.patchValue({ email: 'VALID@email.org' });
       expect(comp.form.invalid).toBeFalse();
     });
     it('should not accept email with other domain names', () => {
@@ -145,7 +158,7 @@ describe('RegisterEmailFormComponent', () => {
   });
   describe('register', () => {
     it('should send a registration to the service and on success display a message and return to home', () => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
       expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
@@ -155,7 +168,7 @@ describe('RegisterEmailFormComponent', () => {
     it('should send a registration to the service and on error display a message', () => {
       (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
 
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
       expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
@@ -173,7 +186,7 @@ describe('RegisterEmailFormComponent', () => {
     }));
 
     it('should send a registration to the service and on success display a message and return to home', fakeAsync(() => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
       comp.register();
       tick();
       expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken', null);
@@ -183,7 +196,7 @@ describe('RegisterEmailFormComponent', () => {
     it('should send a registration to the service and on error display a message', fakeAsync(() => {
       (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
 
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
       tick();
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ddb77b669c..a16a37dc8b 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -1,29 +1,59 @@
-import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
-import {EpersonRegistrationService} from '../core/data/eperson-registration.service';
-import {NotificationsService} from '../shared/notifications/notifications.service';
-import {TranslateService} from '@ngx-translate/core';
-import {Router} from '@angular/router';
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators, ValidatorFn } from '@angular/forms';
-import {Registration} from '../core/shared/registration.model';
-import {RemoteData} from '../core/data/remote-data';
-import {ConfigurationDataService} from '../core/data/configuration-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
-import {ConfigurationProperty} from '../core/shared/configuration-property.model';
-import {isNotEmpty} from '../shared/empty.util';
-import {BehaviorSubject, combineLatest, Observable, of, switchMap} from 'rxjs';
-import {map, startWith, take} from 'rxjs/operators';
-import {CAPTCHA_NAME, GoogleRecaptchaService} from '../core/google-recaptcha/google-recaptcha.service';
-import {AlertType} from '../shared/alert/aletr-type';
-import {KlaroService} from '../shared/cookies/klaro.service';
-import {CookieService} from '../core/services/cookie.service';
-import { Subscription } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  ValidatorFn,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+  switchMap,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  take,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { RemoteData } from '../core/data/remote-data';
+import {
+  CAPTCHA_NAME,
+  GoogleRecaptchaService,
+} from '../core/google-recaptcha/google-recaptcha.service';
+import { CookieService } from '../core/services/cookie.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../core/shared/operators';
+import { Registration } from '../core/shared/registration.model';
+import { AlertType } from '../shared/alert/alert-type';
+import { KlaroService } from '../shared/cookies/klaro.service';
+import { isNotEmpty } from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
 
 export const TYPE_REQUEST_FORGOT = 'forgot';
 export const TYPE_REQUEST_REGISTER = 'register';
 
 @Component({
   selector: 'ds-register-email-form',
-  templateUrl: './register-email-form.component.html'
+  templateUrl: './register-email-form.component.html',
 })
 /**
  * Component responsible to render an email registration form.
@@ -39,13 +69,13 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * The message prefix
    */
   @Input()
-  MESSAGE_PREFIX: string;
+    MESSAGE_PREFIX: string;
 
   /**
    * Type of register request to be done, register new email or forgot password (same endpoint)
    */
   @Input()
-  typeRequest: string = null;
+    typeRequest: string = null;
 
   public AlertTypeEnum = AlertType;
 
@@ -99,12 +129,12 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       Validators.email,
       // Regex pattern borrowed from HTML5 specs for a valid email address:
       // https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
-      Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
+      Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$'),
     ];
     this.form = this.formBuilder.group({
       email: new UntypedFormControl('', {
         validators: validators,
-      })
+      }),
     });
     this.validMailDomains = [];
     if (this.typeRequest === TYPE_REQUEST_REGISTER) {
@@ -126,7 +156,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
     }
     this.subscriptions.push(this.configService.findByPropertyName('registration.verification.enabled').pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true')
+      map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true'),
     ).subscribe((res: boolean) => {
       this.registrationVerification = res;
     }));
@@ -165,13 +195,13 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
           }),
           take(1),
         ).subscribe((token) => {
-            if (isNotEmpty(token)) {
-              this.registration(token);
-            } else {
-              console.error('reCaptcha error');
-              this.showNotification('error');
-            }
+          if (isNotEmpty(token)) {
+            this.registration(token);
+          } else {
+            console.error('reCaptcha error');
+            this.showNotification('error');
           }
+        },
         ));
       } else {
         this.registration();
@@ -183,19 +213,19 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * Registration of an email address
    */
   registration(captchaToken = null) {
-    let registerEmail$ = captchaToken ?
+    const registerEmail$ = captchaToken ?
       this.epersonRegistrationService.registerEmail(this.email.value, captchaToken, this.typeRequest) :
       this.epersonRegistrationService.registerEmail(this.email.value, null, this.typeRequest);
     this.subscriptions.push(registerEmail$.subscribe((response: RemoteData<Registration>) => {
       if (response.hasSucceeded) {
         this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
-          this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
+          this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, { email: this.email.value }));
         this.router.navigate(['/home']);
-        } else if (response.statusCode === 422) {
-        this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, {domains: this.validMailDomains.join(', ')}));
+      } else if (response.statusCode === 422) {
+        this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, { domains: this.validMailDomains.join(', ') }));
       } else {
         this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`),
-          this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value}));
+          this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, { email: this.email.value }));
       }
     }));
   }
diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts
index a765759413..db15606cd7 100644
--- a/src/app/register-email-form/register-email-form.module.ts
+++ b/src/app/register-email-form/register-email-form.module.ts
@@ -1,20 +1,27 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { RegisterEmailFormComponent } from './register-email-form.component';
+import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component';
+
+const DECLARATIONS = [
+  RegisterEmailFormComponent,
+  ThemedRegisterEmailFormComponent,
+];
 
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
-    RegisterEmailFormComponent,
+    ...DECLARATIONS,
   ],
   providers: [],
   exports: [
-    RegisterEmailFormComponent,
-  ]
+    ...DECLARATIONS,
+  ],
 })
 
 /**
diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts
index 86b200018d..e286a548de 100644
--- a/src/app/register-email-form/registration.resolver.spec.ts
+++ b/src/app/register-email-form/registration.resolver.spec.ts
@@ -1,25 +1,26 @@
-import { RegistrationResolver } from './registration.resolver';
+import { first } from 'rxjs/operators';
+
 import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { Registration } from '../core/shared/registration.model';
-import { first } from 'rxjs/operators';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { RegistrationResolver } from './registration.resolver';
 
 describe('RegistrationResolver', () => {
   let resolver: RegistrationResolver;
   let epersonRegistrationService: EpersonRegistrationService;
 
   const token = 'test-token';
-  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: token, user:'user-uuid'});
+  const registration = Object.assign(new Registration(), { email: 'test@email.org', token: token, user:'user-uuid' });
 
   beforeEach(() => {
     epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-      searchByToken: createSuccessfulRemoteDataObject$(registration)
+      searchByToken: createSuccessfulRemoteDataObject$(registration),
     });
     resolver = new RegistrationResolver(epersonRegistrationService);
   });
   describe('resolve', () => {
     it('should resolve a registration based on the token', (done) => {
-      resolver.resolve({params: {token: token}} as any, undefined)
+      resolver.resolve({ params: { token: token } } as any, undefined)
         .pipe(first())
         .subscribe(
           (resolved) => {
@@ -27,7 +28,7 @@ describe('RegistrationResolver', () => {
             expect(resolved.payload.email).toEqual('test@email.org');
             expect(resolved.payload.user).toEqual('user-uuid');
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts
index 498d029492..ac374e3845 100644
--- a/src/app/register-email-form/registration.resolver.ts
+++ b/src/app/register-email-form/registration.resolver.ts
@@ -1,10 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { Registration } from '../core/shared/registration.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { RemoteData } from '../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { Registration } from '../core/shared/registration.model';
 
 @Injectable()
 /**
diff --git a/src/app/register-email-form/themed-registry-email-form.component.ts b/src/app/register-email-form/themed-registry-email-form.component.ts
new file mode 100644
index 0000000000..d24ff25b21
--- /dev/null
+++ b/src/app/register-email-form/themed-registry-email-form.component.ts
@@ -0,0 +1,40 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+
+/**
+ * Themed wrapper for {@link RegisterEmailFormComponent}
+ */
+@Component({
+  selector: 'ds-themed-register-email-form',
+  styleUrls: [],
+  templateUrl: '../shared/theme-support/themed.component.html',
+})
+export class ThemedRegisterEmailFormComponent extends ThemedComponent<RegisterEmailFormComponent> {
+
+  @Input() MESSAGE_PREFIX: string;
+
+  @Input() typeRequest: string;
+
+  protected inAndOutputNames: (keyof RegisterEmailFormComponent & keyof this)[] = [
+    'MESSAGE_PREFIX',
+    'typeRequest',
+  ];
+
+  protected getComponentName(): string {
+    return 'RegisterEmailFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../themes/${themeName}/app/register-email-form/register-email-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./register-email-form.component');
+  }
+
+}
diff --git a/src/app/register-page/create-profile/confirmed.validator.spec.ts b/src/app/register-page/create-profile/confirmed.validator.spec.ts
index b4d305fcf0..c7d412f394 100644
--- a/src/app/register-page/create-profile/confirmed.validator.spec.ts
+++ b/src/app/register-page/create-profile/confirmed.validator.spec.ts
@@ -1,5 +1,12 @@
-import { UntypedFormBuilder, UntypedFormControl } from '@angular/forms';
-import { fakeAsync, waitForAsync } from '@angular/core/testing';
+import {
+  fakeAsync,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+} from '@angular/forms';
+
 import { ConfirmedValidator } from './confirmed.validator';
 
 describe('ConfirmedValidator', () => {
@@ -9,9 +16,9 @@ describe('ConfirmedValidator', () => {
 
     passwordForm = (new UntypedFormBuilder()).group({
       password: new UntypedFormControl('', {}),
-      confirmPassword: new UntypedFormControl('', {})
+      confirmPassword: new UntypedFormControl('', {}),
     }, {
-      validator: ConfirmedValidator('password', 'confirmPassword')
+      validator: ConfirmedValidator('password', 'confirmPassword'),
     });
   }));
 
diff --git a/src/app/register-page/create-profile/confirmed.validator.ts b/src/app/register-page/create-profile/confirmed.validator.ts
index 914d50b540..730e1d00b6 100644
--- a/src/app/register-page/create-profile/confirmed.validator.ts
+++ b/src/app/register-page/create-profile/confirmed.validator.ts
@@ -11,7 +11,7 @@ export function ConfirmedValidator(controlName: string, matchingControlName: str
       return;
     }
     if (control.value !== matchingControl.value) {
-      matchingControl.setErrors({confirmedValidator: true});
+      matchingControl.setErrors({ confirmedValidator: true });
     } else {
       matchingControl.setErrors(null);
     }
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
index d5a1fea8b2..85178318d6 100644
--- a/src/app/register-page/create-profile/create-profile.component.spec.ts
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -1,31 +1,42 @@
-import { CreateProfileComponent } from './create-profile.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Registration } from '../../core/shared/registration.model';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AuthenticateAction } from '../../core/auth/auth.actions';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CoreState } from '../../core/core-state.model';
 import {
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from '../../core/end-user-agreement/end-user-agreement.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { CoreState } from '../../core/core-state.model';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { CreateProfileComponent } from './create-profile.component';
 
 describe('CreateProfileComponent', () => {
   let comp: CreateProfileComponent;
@@ -38,7 +49,7 @@ describe('CreateProfileComponent', () => {
   let store: Store<CoreState>;
   let endUserAgreementService: EndUserAgreementService;
 
-  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+  const registration = Object.assign(new Registration(), { email: 'test@email.org', token: 'test-token' });
 
   let values;
   let eperson: EPerson;
@@ -50,72 +61,72 @@ describe('CreateProfileComponent', () => {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'First'
-          }
-        ],
-          'eperson.lastname': [
-          {
-            value: 'Last'
+            value: 'First',
           },
         ],
-          'eperson.phone': [
+        'eperson.lastname': [
           {
-            value: 'Phone'
-          }
+            value: 'Last',
+          },
         ],
-          'eperson.language': [
+        'eperson.phone': [
           {
-            value: 'en'
-          }
-        ]
+            value: 'Phone',
+          },
+        ],
+        'eperson.language': [
+          {
+            value: 'en',
+          },
+        ],
       },
       email: 'test@email.org',
-        password: 'password',
+      password: 'password',
       canLogIn: true,
-      requireCertificate: false
+      requireCertificate: false,
     };
     eperson = Object.assign(new EPerson(), values);
     valuesWithAgreement = {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'First'
-          }
+            value: 'First',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'Last'
+            value: 'Last',
           },
         ],
         'eperson.phone': [
           {
-            value: 'Phone'
-          }
+            value: 'Phone',
+          },
         ],
         'eperson.language': [
           {
-            value: 'en'
-          }
+            value: 'en',
+          },
         ],
         [END_USER_AGREEMENT_METADATA_FIELD]: [
           {
-            value: 'true'
-          }
-        ]
+            value: 'true',
+          },
+        ],
       },
       email: 'test@email.org',
       password: 'password',
       canLogIn: true,
-      requireCertificate: false
+      requireCertificate: false,
     };
     epersonWithAgreement = Object.assign(new EPerson(), valuesWithAgreement);
 
-    route = {data: observableOf({registration: createSuccessfulRemoteDataObject(registration)})};
+    route = { data: observableOf({ registration: createSuccessfulRemoteDataObject(registration) }) };
     router = new RouterStub();
     notificationsService = new NotificationsServiceStub();
 
     ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
-      createEPersonForToken: createSuccessfulRemoteDataObject$({})
+      createEPersonForToken: createSuccessfulRemoteDataObject$({}),
     });
 
     store = jasmine.createSpyObj('store', {
@@ -124,22 +135,22 @@ describe('CreateProfileComponent', () => {
 
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
       isCookieAccepted: false,
-      removeCookieAccepted: {}
+      removeCookieAccepted: {},
     });
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [CreateProfileComponent],
       providers: [
-        {provide: Router, useValue: router},
-        {provide: ActivatedRoute, useValue: route},
-        {provide: Store, useValue: store},
-        {provide: EPersonDataService, useValue: ePersonDataService},
-        {provide: UntypedFormBuilder, useValue: new UntypedFormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: EndUserAgreementService, useValue: endUserAgreementService},
+        { provide: Router, useValue: router },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Store, useValue: store },
+        { provide: EPersonDataService, useValue: ePersonDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: EndUserAgreementService, useValue: endUserAgreementService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index eaaa983a43..de144464f3 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -1,25 +1,40 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map } from 'rxjs/operators';
-import { Registration } from '../../core/shared/registration.model';
-import { Observable } from 'rxjs';
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
-import { TranslateService } from '@ngx-translate/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { LangConfig } from '../../../config/lang-config.interface';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AuthenticateAction } from '../../core/auth/auth.actions';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { LangConfig } from '../../../config/lang-config.interface';
 import { environment } from '../../../environments/environment';
-import { isEmpty } from '../../shared/empty.util';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { CoreState } from '../../core/core-state.model';
 import { RemoteData } from '../../core/data/remote-data';
 import {
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from '../../core/end-user-agreement/end-user-agreement.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { CoreState } from '../../core/core-state.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { isEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -27,7 +42,7 @@ import { CoreState } from '../../core/core-state.model';
 @Component({
   selector: 'ds-create-profile',
   styleUrls: ['./create-profile.component.scss'],
-  templateUrl: './create-profile.component.html'
+  templateUrl: './create-profile.component.html',
 })
 export class CreateProfileComponent implements OnInit {
   registration$: Observable<Registration>;
@@ -54,7 +69,7 @@ export class CreateProfileComponent implements OnInit {
     private route: ActivatedRoute,
     private formBuilder: UntypedFormBuilder,
     private notificationsService: NotificationsService,
-    private endUserAgreementService: EndUserAgreementService
+    private endUserAgreementService: EndUserAgreementService,
   ) {
 
   }
@@ -126,37 +141,37 @@ export class CreateProfileComponent implements OnInit {
         metadata: {
           'eperson.firstname': [
             {
-              value: this.firstName.value
-            }
+              value: this.firstName.value,
+            },
           ],
           'eperson.lastname': [
             {
-              value: this.lastName.value
+              value: this.lastName.value,
             },
           ],
           'eperson.phone': [
             {
-              value: this.contactPhone.value
-            }
+              value: this.contactPhone.value,
+            },
           ],
           'eperson.language': [
             {
-              value: this.language.value
-            }
-          ]
+              value: this.language.value,
+            },
+          ],
         },
         email: this.email,
         password: this.password,
         canLogIn: true,
-        requireCertificate: false
+        requireCertificate: false,
       };
 
       // If the End User Agreement cookie is accepted, add end-user agreement metadata to the user
       if (this.endUserAgreementService.isCookieAccepted()) {
         values.metadata[END_USER_AGREEMENT_METADATA_FIELD] = [
           {
-            value: String(true)
-          }
+            value: String(true),
+          },
         ];
         this.endUserAgreementService.removeCookieAccepted();
       }
diff --git a/src/app/register-page/create-profile/themed-create-profile.component.ts b/src/app/register-page/create-profile/themed-create-profile.component.ts
index cc968bfbe2..6d895368cc 100644
--- a/src/app/register-page/create-profile/themed-create-profile.component.ts
+++ b/src/app/register-page/create-profile/themed-create-profile.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { CreateProfileComponent } from './create-profile.component';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { CreateProfileComponent } from './create-profile.component';
 
 /**
  * Themed wrapper for CreateProfileComponent
@@ -8,7 +9,7 @@ import { ThemedComponent } from '../../shared/theme-support/themed.component';
 @Component({
   selector: 'ds-themed-create-profile',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedCreateProfileComponent extends ThemedComponent<CreateProfileComponent> {
   protected getComponentName(): string {
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
index 1829bb2914..6a87a4e9e0 100644
--- a/src/app/register-page/register-email/register-email.component.html
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -1,3 +1,3 @@
-<ds-register-email-form
+<ds-themed-register-email-form
         [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="typeRequest">
-</ds-register-email-form>
+</ds-themed-register-email-form>
diff --git a/src/app/register-page/register-email/register-email.component.spec.ts b/src/app/register-page/register-email/register-email.component.spec.ts
index 17ef8101ae..d9aa440ccb 100644
--- a/src/app/register-page/register-email/register-email.component.spec.ts
+++ b/src/app/register-page/register-email/register-email.component.spec.ts
@@ -1,8 +1,13 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { ReactiveFormsModule } from '@angular/forms';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { RegisterEmailComponent } from './register-email.component';
 
 describe('RegisterEmailComponent', () => {
@@ -14,7 +19,7 @@ describe('RegisterEmailComponent', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [RegisterEmailComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/register-page/register-email/register-email.component.ts b/src/app/register-page/register-email/register-email.component.ts
index 228e8c56a0..8ecfcca61b 100644
--- a/src/app/register-page/register-email/register-email.component.ts
+++ b/src/app/register-page/register-email/register-email.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { TYPE_REQUEST_REGISTER } from '../../register-email-form/register-email-form.component';
 
 @Component({
   selector: 'ds-register-email',
   styleUrls: ['./register-email.component.scss'],
-  templateUrl: './register-email.component.html'
+  templateUrl: './register-email.component.html',
 })
 /**
  * Component responsible the email registration step when registering as a new user
diff --git a/src/app/register-page/register-email/themed-register-email.component.ts b/src/app/register-page/register-email/themed-register-email.component.ts
index 6da6899d99..deaed25193 100644
--- a/src/app/register-page/register-email/themed-register-email.component.ts
+++ b/src/app/register-page/register-email/themed-register-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { RegisterEmailComponent } from './register-email.component';
 
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
index 31a7681851..64200a45f4 100644
--- a/src/app/register-page/register-page-routing.module.ts
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
-import { ItemPageResolver } from '../item-page/item-page.resolver';
+
 import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard';
+import { ItemPageResolver } from '../item-page/item-page.resolver';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
+import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
 import { RegistrationGuard } from './registration.guard';
 
 @NgModule({
@@ -12,7 +13,7 @@ import { RegistrationGuard } from './registration.guard';
       {
         path: '',
         component: ThemedRegisterEmailComponent,
-        data: {title: 'register-email.title'},
+        data: { title: 'register-email.title' },
       },
       {
         path: ':token',
@@ -21,12 +22,12 @@ import { RegistrationGuard } from './registration.guard';
           RegistrationGuard,
           EndUserAgreementCookieGuard,
         ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
-    ItemPageResolver
-  ]
+    ItemPageResolver,
+  ],
 })
 /**
  * Module related to the navigation to components used to register a new user
diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts
index 6afb8154ea..4708987dc9 100644
--- a/src/app/register-page/register-page.module.ts
+++ b/src/app/register-page/register-page.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared/shared.module';
-import { RegisterPageRoutingModule } from './register-page-routing.module';
-import { RegisterEmailComponent } from './register-email/register-email.component';
-import { CreateProfileComponent } from './create-profile/create-profile.component';
-import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { NgModule } from '@angular/core';
+
 import { ProfilePageModule } from '../profile-page/profile-page.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { SharedModule } from '../shared/shared.module';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
+import { RegisterEmailComponent } from './register-email/register-email.component';
 import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
+import { RegisterPageRoutingModule } from './register-page-routing.module';
 
 @NgModule({
   imports: [
@@ -21,9 +22,9 @@ import { ThemedRegisterEmailComponent } from './register-email/themed-register-e
     RegisterEmailComponent,
     ThemedRegisterEmailComponent,
     CreateProfileComponent,
-    ThemedCreateProfileComponent
+    ThemedCreateProfileComponent,
   ],
-  providers: []
+  providers: [],
 })
 
 /**
diff --git a/src/app/register-page/registration.guard.spec.ts b/src/app/register-page/registration.guard.spec.ts
index 9fb8dd3a33..7ac67895b6 100644
--- a/src/app/register-page/registration.guard.spec.ts
+++ b/src/app/register-page/registration.guard.spec.ts
@@ -1,14 +1,19 @@
-import { RegistrationGuard } from './registration.guard';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../core/auth/auth.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { RemoteData } from '../core/data/remote-data';
+import { Registration } from '../core/shared/registration.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
-import { Registration } from '../core/shared/registration.model';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { RemoteData } from '../core/data/remote-data';
+import { RegistrationGuard } from './registration.guard';
 
 describe('RegistrationGuard', () => {
   let guard: RegistrationGuard;
diff --git a/src/app/register-page/registration.guard.ts b/src/app/register-page/registration.guard.ts
index a0f07d2fbe..5eac132434 100644
--- a/src/app/register-page/registration.guard.ts
+++ b/src/app/register-page/registration.guard.ts
@@ -1,14 +1,20 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { AuthService } from '../core/auth/auth.service';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * A guard responsible for redirecting to 4xx pages upon retrieving a Registration object
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
index ef5f83e46b..0c1b4c64c2 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
@@ -1,26 +1,37 @@
-import { DenyRequestCopyComponent } from './deny-request-copy.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ItemRequestDataService } from '../../core/data/item-request-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
-import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { DenyRequestCopyComponent } from './deny-request-copy.component';
 
 describe('DenyRequestCopyComponent', () => {
   let component: DenyRequestCopyComponent;
@@ -43,20 +54,20 @@ describe('DenyRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     user = Object.assign(new EPerson(), {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'first'
-          }
+            value: 'first',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'last'
-          }
-        ]
+            value: 'last',
+          },
+        ],
       },
       email: 'user-email',
     });
@@ -67,15 +78,15 @@ describe('DenyRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
 
     router = jasmine.createSpyObj('router', {
@@ -110,7 +121,7 @@ describe('DenyRequestCopyComponent', () => {
         { provide: ItemRequestDataService, useValue: itemRequestService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index 098c7a1efd..4c9b53b4e2 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,29 +1,42 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { AuthService } from '../../core/auth/auth.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { Item } from '../../core/shared/item.model';
-import { isNotEmpty } from '../../shared/empty.util';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 
 @Component({
   selector: 'ds-deny-request-copy',
   styleUrls: ['./deny-request-copy.component.scss'],
-  templateUrl: './deny-request-copy.component.html'
+  templateUrl: './deny-request-copy.component.html',
 })
 /**
  * Component for denying an item request
@@ -98,7 +111,7 @@ export class DenyRequestCopyComponent implements OnInit {
     this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((itemRequest: ItemRequest) => this.itemRequestService.deny(itemRequest.token, email)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('deny-request-copy.success'));
diff --git a/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
index 664e4c541b..460d99ab76 100644
--- a/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
 
-import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component';
+import { DenyRequestCopyComponent } from './deny-request-copy.component';
 
 /**
  * Themed wrapper for deny-request-copy.component
@@ -12,15 +12,15 @@ import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/den
   templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedDenyRequestCopyComponent extends ThemedComponent<DenyRequestCopyComponent> {
-    protected getComponentName(): string {
-        return 'DenyRequestCopyComponent';
-    }
+  protected getComponentName(): string {
+    return 'DenyRequestCopyComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./deny-request-copy.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./deny-request-copy.component');
+  }
 }
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 70146ab52c..286e87554b 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
+            [disabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
index 3857c0d91b..1c944a9b71 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
@@ -1,10 +1,15 @@
-import { EmailRequestCopyComponent } from './email-request-copy.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VarDirective } from '../../shared/utils/var.directive';
+import { EmailRequestCopyComponent } from './email-request-copy.component';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 describe('EmailRequestCopyComponent', () => {
@@ -22,7 +27,7 @@ describe('EmailRequestCopyComponent', () => {
       providers: [
         { provide: Location, useValue: location },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index ab2c8b4526..9e13215346 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,11 +1,17 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RequestCopyEmail } from './request-copy-email.model';
 import { Location } from '@angular/common';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { RequestCopyEmail } from './request-copy-email.model';
 
 @Component({
   selector: 'ds-email-request-copy',
   styleUrls: ['./email-request-copy.component.scss'],
-  templateUrl: './email-request-copy.component.html'
+  templateUrl: './email-request-copy.component.html',
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts b/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts
index d010e43060..3d74abbde7 100644
--- a/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts
@@ -1,4 +1,9 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
 
 import { EmailRequestCopyComponent } from './email-request-copy.component';
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
index 5c37a86f24..b066a47cb5 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
@@ -1,23 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 import {
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  getRequestCopyDenyRoute,
+  getRequestCopyGrantRoute,
+} from '../request-copy-routing-paths';
 import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy.component';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
-import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths';
-import { By } from '@angular/platform-browser';
 
 describe('GrantDenyRequestCopyComponent', () => {
   let component: GrantDenyRequestCopyComponent;
@@ -37,7 +48,7 @@ describe('GrantDenyRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     itemName = 'item-name';
     item = Object.assign(new Item(), {
@@ -45,15 +56,15 @@ describe('GrantDenyRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
     itemUrl = getItemPageRoute(item);
 
@@ -81,7 +92,7 @@ describe('GrantDenyRequestCopyComponent', () => {
         { provide: ItemDataService, useValue: itemDataService },
         { provide: DSONameService, useValue: nameService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -130,7 +141,7 @@ describe('GrantDenyRequestCopyComponent', () => {
 
     it('should be displayed when decisionDate is defined', () => {
       component.itemRequestRD$ = createSuccessfulRemoteDataObject$(Object.assign(new ItemRequest(), itemRequest, {
-        decisionDate: 'defined-date'
+        decisionDate: 'defined-date',
       }));
       fixture.detectChanges();
 
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
index b130c23abe..c88c3c73ab 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
@@ -1,25 +1,38 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths';
-import { Item } from '../../core/shared/item.model';
-import { ItemDataService } from '../../core/data/item-data.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import {
+  getRequestCopyDenyRoute,
+  getRequestCopyGrantRoute,
+} from '../request-copy-routing-paths';
 
 @Component({
   selector: 'ds-grant-deny-request-copy',
   styleUrls: ['./grant-deny-request-copy.component.scss'],
-  templateUrl: './grant-deny-request-copy.component.html'
+  templateUrl: './grant-deny-request-copy.component.html',
 })
 /**
  * Component for an author to decide to grant or deny an item request
@@ -86,11 +99,11 @@ export class GrantDenyRequestCopyComponent implements OnInit {
 
     this.denyRoute$ = this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((itemRequest: ItemRequest) => getRequestCopyDenyRoute(itemRequest.token))
+      map((itemRequest: ItemRequest) => getRequestCopyDenyRoute(itemRequest.token)),
     );
     this.grantRoute$ = this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((itemRequest: ItemRequest) => getRequestCopyGrantRoute(itemRequest.token))
+      map((itemRequest: ItemRequest) => getRequestCopyGrantRoute(itemRequest.token)),
     );
   }
 
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
index 32fef125ea..3d6dbc7bee 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
@@ -1,26 +1,37 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ItemRequestDataService } from '../../core/data/item-request-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 import { GrantRequestCopyComponent } from './grant-request-copy.component';
-import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
 
 describe('GrantRequestCopyComponent', () => {
   let component: GrantRequestCopyComponent;
@@ -43,20 +54,20 @@ describe('GrantRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     user = Object.assign(new EPerson(), {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'first'
-          }
+            value: 'first',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'last'
-          }
-        ]
+            value: 'last',
+          },
+        ],
       },
       email: 'user-email',
     });
@@ -67,15 +78,15 @@ describe('GrantRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
 
     router = jasmine.createSpyObj('router', {
@@ -110,7 +121,7 @@ describe('GrantRequestCopyComponent', () => {
         { provide: ItemRequestDataService, useValue: itemRequestService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index baf078df76..5536a70384 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,23 +1,34 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { TranslateService } from '@ngx-translate/core';
 import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 
 @Component({
   selector: 'ds-grant-request-copy',
   styleUrls: ['./grant-request-copy.component.scss'],
-  templateUrl: './grant-request-copy.component.html'
+  templateUrl: './grant-request-copy.component.html',
 })
 /**
  * Component for granting an item request
@@ -72,7 +83,7 @@ export class GrantRequestCopyComponent implements OnInit {
     this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((itemRequest: ItemRequest) => this.itemRequestService.grant(itemRequest.token, email, this.suggestOpenAccess)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('grant-request-copy.success'));
diff --git a/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts
index 625dcef57a..274df47a0a 100644
--- a/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
 import { GrantRequestCopyComponent } from './grant-request-copy.component';
 
 /**
diff --git a/src/app/request-copy/request-copy-routing-paths.ts b/src/app/request-copy/request-copy-routing-paths.ts
index 1d0204a1b8..2518e34fc2 100644
--- a/src/app/request-copy/request-copy-routing-paths.ts
+++ b/src/app/request-copy/request-copy-routing-paths.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getRequestCopyModulePath } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 
 export function getRequestCopyRoute(token: string) {
   return new URLCombiner(getRequestCopyModulePath(), token).toString();
diff --git a/src/app/request-copy/request-copy-routing.module.ts b/src/app/request-copy/request-copy-routing.module.ts
index 4138fc42a6..1c8c8ce1dd 100644
--- a/src/app/request-copy/request-copy-routing.module.ts
+++ b/src/app/request-copy/request-copy-routing.module.ts
@@ -1,10 +1,14 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { RequestCopyResolver } from './request-copy.resolver';
-import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
-import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
+
 import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
+import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
 import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
+import { RequestCopyResolver } from './request-copy.resolver';
+import {
+  REQUEST_COPY_DENY_PATH,
+  REQUEST_COPY_GRANT_PATH,
+} from './request-copy-routing-paths';
 
 @NgModule({
   imports: [
@@ -12,7 +16,7 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
       {
         path: ':token',
         resolve: {
-          request: RequestCopyResolver
+          request: RequestCopyResolver,
         },
         children: [
           {
@@ -27,14 +31,14 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
             path: REQUEST_COPY_GRANT_PATH,
             component: ThemedGrantRequestCopyComponent,
           },
-        ]
-      }
-    ])
+        ],
+      },
+    ]),
   ],
   providers: [
     RequestCopyResolver,
-    GrantDenyRequestCopyComponent
-  ]
+    GrantDenyRequestCopyComponent,
+  ],
 })
 export class RequestCopyRoutingModule {
 }
diff --git a/src/app/request-copy/request-copy.module.ts b/src/app/request-copy/request-copy.module.ts
index 90d741a879..71bb19d6b7 100644
--- a/src/app/request-copy/request-copy.module.ts
+++ b/src/app/request-copy/request-copy.module.ts
@@ -1,20 +1,21 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
-import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
-import { RequestCopyRoutingModule } from './request-copy-routing.module';
 import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
 import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
 import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
 import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
+import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
 import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
 import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
+import { RequestCopyRoutingModule } from './request-copy-routing.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    RequestCopyRoutingModule
+    RequestCopyRoutingModule,
   ],
   declarations: [
     GrantDenyRequestCopyComponent,
@@ -28,7 +29,7 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
   exports: [
     ThemedEmailRequestCopyComponent,
   ],
-  providers: []
+  providers: [],
 })
 
 /**
diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts
index e5c98b0138..e7f1c1bc53 100644
--- a/src/app/request-copy/request-copy.resolver.ts
+++ b/src/app/request-copy/request-copy.resolver.ts
@@ -1,9 +1,14 @@
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { ItemRequestDataService } from '../core/data/item-request-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { ItemRequest } from '../core/shared/item-request.model';
-import { Observable } from 'rxjs';
-import { ItemRequestDataService } from '../core/data/item-request-data.service';
-import { Injectable } from '@angular/core';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
index a8af0ef5b5..6cfa4e2775 100644
--- a/src/app/root.module.ts
+++ b/src/app/root.module.ts
@@ -1,48 +1,35 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import {
-  AdminSidebarSectionComponent
-} from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
 import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
+import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
+import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
 import { ThemedAdminSidebarComponent } from './admin/admin-sidebar/themed-admin-sidebar.component';
-import {
-  ExpandableAdminSidebarSectionComponent
-} from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
-import { FooterComponent } from './footer/footer.component';
-import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
-import { HeaderComponent } from './header/header.component';
-import { NavbarModule } from './navbar/navbar.module';
-import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
-import { NotificationComponent } from './shared/notifications/notification/notification.component';
-import {
-  NotificationsBoardComponent
-} from './shared/notifications/notifications-board/notifications-board.component';
-import { SharedModule } from './shared/shared.module';
 import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
+import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
+import { FooterComponent } from './footer/footer.component';
+import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ForbiddenComponent } from './forbidden/forbidden.component';
+import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
+import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
+import { HeaderComponent } from './header/header.component';
+import { ThemedHeaderComponent } from './header/themed-header.component';
+import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
+import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
+import { NavbarModule } from './navbar/navbar.module';
+import { PageErrorComponent } from './page-error/page-error.component';
+import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
+import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
 import { RootComponent } from './root/root.component';
 import { ThemedRootComponent } from './root/themed-root.component';
-import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
-import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
-import { ThemedHeaderComponent } from './header/themed-header.component';
-import { ThemedFooterComponent } from './footer/themed-footer.component';
-import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
-import {
-  ThemedHeaderNavbarWrapperComponent
-} from './header-nav-wrapper/themed-header-navbar-wrapper.component';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
-import {
-  ThemedPageInternalServerErrorComponent
-} from './page-internal-server-error/themed-page-internal-server-error.component';
-import {
-  PageInternalServerErrorComponent
-} from './page-internal-server-error/page-internal-server-error.component';
-import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
-import { PageErrorComponent } from './page-error/page-error.component';
-import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
+import { NotificationComponent } from './shared/notifications/notification/notification.component';
+import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
+import { SharedModule } from './shared/shared.module';
 import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.module';
 
 const IMPORTS = [
@@ -90,10 +77,10 @@ const EXPORTS = [
 
 @NgModule({
   imports: [
-    ...IMPORTS
+    ...IMPORTS,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   declarations: [
     ...DECLARATIONS,
@@ -101,7 +88,7 @@ const EXPORTS = [
   exports: [
     ...EXPORTS,
     ...DECLARATIONS,
-  ]
+  ],
 })
 export class RootModule {
 
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index bf49e507c0..533efea9d1 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,13 +1,17 @@
+<button (click)="skipToMainContent()" class="sr-only" id="skip-to-main-content">
+  {{ 'root.skip-to-content' | translate }}
+</button>
+
 <div class="outer-wrapper" [class.d-none]="shouldShowFullscreenLoader" [@slideSidebarPadding]="{
-     value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
-     params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
+     value: ((isSidebarVisible$ | async) !== true ? 'hidden' : (slideSidebarOver$ | async) ? 'unpinned' : 'pinned'),
+     params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
     }">
-  <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
+  <ds-themed-admin-sidebar [expandedSidebarWidth$]="expandedSidebarWidth$" [collapsedSidebarWidth$]="collapsedSidebarWidth$"></ds-themed-admin-sidebar>
   <div class="inner-wrapper">
     <ds-system-wide-alert-banner></ds-system-wide-alert-banner>
     <ds-themed-header-navbar-wrapper></ds-themed-header-navbar-wrapper>
-    <main class="main-content">
-      <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
+    <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
+    <main class="my-cs" id="main-content">
 
       <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
         <ds-themed-loading [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/root/root.component.scss b/src/app/root/root.component.scss
index e69de29bb2..9eb198417a 100644
--- a/src/app/root/root.component.scss
+++ b/src/app/root/root.component.scss
@@ -0,0 +1,16 @@
+#skip-to-main-content {
+  position: absolute;
+  top: -40px;
+  left: 0;
+  opacity: 0;
+  transition: opacity 0.3s;
+  z-index: calc(var(--ds-nav-z-index) + 1);
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+
+  &:focus {
+    opacity: 1;
+    top: 0;
+  }
+}
diff --git a/src/app/root/root.component.spec.ts b/src/app/root/root.component.spec.ts
index ab148b8ebd..e81eec3090 100644
--- a/src/app/root/root.component.spec.ts
+++ b/src/app/root/root.component.spec.ts
@@ -1,32 +1,45 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RootComponent } from './root.component';
 import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { StoreModule } from '@ngrx/store';
-import { authReducer } from '../core/auth/auth.reducer';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { storeModuleConfig } from '../app.reducer';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
-import { MetadataService } from '../core/metadata/metadata.service';
-import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
-import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
-import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
+import { authReducer } from '../core/auth/auth.reducer';
 import { AuthService } from '../core/auth/auth.service';
-import { AuthServiceMock } from '../shared/mocks/auth.service.mock';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from '../shared/mocks/router.mock';
-import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { LocaleService } from '../core/locale/locale.service';
+import { MetadataService } from '../core/metadata/metadata.service';
+import { RouteService } from '../core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../core/services/window.service';
+import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from '../shared/mocks/auth.service.mock';
+import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
+import { RouterMock } from '../shared/mocks/router.mock';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../shared/testing/css-variable-service.stub';
-import { HostWindowService } from '../shared/host-window.service';
 import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
-import { LocaleService } from '../core/locale/locale.service';
-import { provideMockStore } from '@ngrx/store/testing';
-import { RouteService } from '../core/services/route.service';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
+import { RootComponent } from './root.component';
 
 describe('RootComponent', () => {
   let component: RootComponent;
@@ -41,8 +54,8 @@ describe('RootComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [RootComponent], // declare the test component
@@ -59,9 +72,9 @@ describe('RootComponent', () => {
         { provide: LocaleService, useValue: {} },
         provideMockStore({ core: { auth: { loading: false } } } as any),
         RootComponent,
-        RouteService
+        RouteService,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 3c2d65fc1f..6cfa095dbf 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,25 +1,30 @@
-import { map, startWith } from 'rxjs/operators';
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  first,
+  map,
+  skipWhile,
+  startWith,
+} from 'rxjs/operators';
+import { INotificationBoardOptions } from 'src/config/notifications-config.interfaces';
 
-import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-
-import { MetadataService } from '../core/metadata/metadata.service';
-import { HostWindowState } from '../shared/search/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
-import { AuthService } from '../core/auth/auth.service';
-import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
-import { MenuService } from '../shared/menu/menu.service';
-import { HostWindowService } from '../shared/host-window.service';
-import { ThemeConfig } from '../../config/theme.model';
-import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
+import { ThemeConfig } from '../../config/theme.config';
 import { environment } from '../../environments/environment';
-import { slideSidebarPadding } from '../shared/animations/slide';
-import { MenuID } from '../shared/menu/menu-id.model';
 import { getPageInternalServerErrorRoute } from '../app-routing-paths';
-import { hasValueOperator } from '../shared/empty.util';
+import { slideSidebarPadding } from '../shared/animations/slide';
+import { HostWindowService } from '../shared/host-window.service';
+import { MenuService } from '../shared/menu/menu.service';
+import { MenuID } from '../shared/menu/menu-id.model';
+import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
 
 @Component({
   selector: 'ds-root',
@@ -28,13 +33,13 @@ import { hasValueOperator } from '../shared/empty.util';
   animations: [slideSidebarPadding],
 })
 export class RootComponent implements OnInit {
-  sidebarVisible: Observable<boolean>;
-  slideSidebarOver: Observable<boolean>;
-  collapsedSidebarWidth: Observable<string>;
-  totalSidebarWidth: Observable<string>;
   theme: Observable<ThemeConfig> = of({} as any);
-  notificationOptions;
-  models;
+  isSidebarVisible$: Observable<boolean>;
+  slideSidebarOver$: Observable<boolean>;
+  collapsedSidebarWidth$: Observable<string>;
+  expandedSidebarWidth$: Observable<string>;
+  notificationOptions: INotificationBoardOptions;
+  models: any;
 
   /**
    * Whether or not to show a full screen loader
@@ -47,28 +52,28 @@ export class RootComponent implements OnInit {
   @Input() shouldShowRouteLoader: boolean;
 
   constructor(
-    @Inject(NativeWindowService) private _window: NativeWindowRef,
-    private translate: TranslateService,
-    private store: Store<HostWindowState>,
-    private metadata: MetadataService,
-    private angulartics2DSpace: Angulartics2DSpace,
-    private authService: AuthService,
     private router: Router,
     private cssService: CSSVariableService,
     private menuService: MenuService,
-    private windowService: HostWindowService
+    private windowService: HostWindowService,
   ) {
     this.notificationOptions = environment.notifications;
   }
 
   ngOnInit() {
-    this.sidebarVisible = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+    this.isSidebarVisible$ = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
 
-    this.collapsedSidebarWidth = this.cssService.getVariable('--ds-collapsed-sidebar-width').pipe(hasValueOperator());
-    this.totalSidebarWidth = this.cssService.getVariable('--ds-total-sidebar-width').pipe(hasValueOperator());
+    this.expandedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-total-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
+    this.collapsedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-fixed-element-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
 
     const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
-    this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
+    this.slideSidebarOver$ = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile),
         startWith(true),
@@ -78,4 +83,12 @@ export class RootComponent implements OnInit {
       this.shouldShowRouteLoader = false;
     }
   }
+
+  skipToMainContent() {
+    const mainContent = document.getElementById('main-content');
+    if (mainContent) {
+      mainContent.tabIndex = -1;
+      mainContent.focus();
+    }
+  }
 }
diff --git a/src/app/root/themed-root.component.ts b/src/app/root/themed-root.component.ts
index 5dfa1edf31..894d0dfee2 100644
--- a/src/app/root/themed-root.component.ts
+++ b/src/app/root/themed-root.component.ts
@@ -1,6 +1,10 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { RootComponent } from './root.component';
-import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-root',
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index 2b30507f3e..e9b5f285fb 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,9 +1,12 @@
-<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
+<div [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
   <div class="d-inline-block position-relative">
-    <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on">
+    <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p-1" [attr.data-test]="'header-search-box' | dsBrowserOnly">
+             class="bg-transparent position-absolute form-control dropdown-menu-right pl-1 pr-4"
+             [class.display]="searchExpanded ? 'inline-block' : 'none'"
+             [tabIndex]="searchExpanded ? 0 : -1"
+             [attr.data-test]="'header-search-box' | dsBrowserOnly">
       <button class="submit-icon btn btn-link btn-link-inline" [attr.aria-label]="'nav.search.button' | translate" type="button" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()" [attr.data-test]="'header-search-icon' | dsBrowserOnly">
         <em class="fas fa-search fa-lg fa-fw"></em>
       </button>
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index cf46c25d91..a276482b53 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -12,6 +12,7 @@ input[type="text"] {
   cursor: pointer;
   position: sticky;
   top: 0;
+  border: 0 !important;
 
   color: var(--ds-header-icon-color);
   &:hover, &:focus {
diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
index b67f5f0eb4..2a0a59ac16 100644
--- a/src/app/search-navbar/search-navbar.component.spec.ts
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -1,38 +1,44 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NavigationExtras, Router } from '@angular/router';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SearchService } from '../core/shared/search/search.service';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-
-import { SearchNavbarComponent } from './search-navbar.component';
-import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
-import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserOnlyMockPipe } from '../shared/testing/browser-only-mock.pipe';
+import { SearchNavbarComponent } from './search-navbar.component';
 
 describe('SearchNavbarComponent', () => {
   let component: SearchNavbarComponent;
   let fixture: ComponentFixture<SearchNavbarComponent>;
   let mockSearchService: any;
   let router: Router;
-  let routerStub;
-  let paginationService;
 
   beforeEach(waitForAsync(() => {
     mockSearchService = {
       getSearchLink() {
         return '/search';
-      }
+      },
     };
 
-    routerStub = {
-      navigate: (commands) => commands
-    };
-
-    paginationService = new PaginationServiceStub();
-
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -42,16 +48,16 @@ describe('SearchNavbarComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [
         SearchNavbarComponent,
         BrowserOnlyMockPipe,
       ],
       providers: [
-        { provide: SearchService, useValue: mockSearchService }
-      ]
+        { provide: SearchService, useValue: mockSearchService },
+      ],
     })
       .compileComponents();
   }));
@@ -72,10 +78,10 @@ describe('SearchNavbarComponent', () => {
       spyOn(component, 'expand').and.callThrough();
       spyOn(component, 'onSubmit').and.callThrough();
       spyOn(router, 'navigate');
-      const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+      const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
       searchIcon.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -88,16 +94,16 @@ describe('SearchNavbarComponent', () => {
     describe('empty query', () => {
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', {
             preventDefault: () => {/**/
-            }
+            },
           });
           tick();
           fixture.detectChanges();
         }));
         it('to search page with empty query', () => {
-          const extras: NavigationExtras = {queryParams: { query: '' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: '' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: '' });
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
         });
@@ -109,20 +115,20 @@ describe('SearchNavbarComponent', () => {
       beforeEach(async () => {
         await fixture.whenStable();
         fixture.detectChanges();
-        searchInput = fixture.debugElement.query(By.css('#search-navbar-container form input'));
+        searchInput = fixture.debugElement.query(By.css('form input'));
         searchInput.nativeElement.value = 'test';
         searchInput.nativeElement.dispatchEvent(new Event('input'));
         fixture.detectChanges();
       });
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', null);
           tick();
           fixture.detectChanges();
         }));
         it('to search page with query', async () => {
-          const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: 'test' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' });
 
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 98e64f6e10..b1ddc52f97 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -1,6 +1,11 @@
-import { Component, ElementRef, ViewChild } from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
+
 import { SearchService } from '../core/shared/search/search.service';
 import { expandSearchInput } from '../shared/animations/slide';
 
@@ -11,7 +16,7 @@ import { expandSearchInput } from '../shared/animations/slide';
   selector: 'ds-search-navbar',
   templateUrl: './search-navbar.component.html',
   styleUrls: ['./search-navbar.component.scss'],
-  animations: [expandSearchInput]
+  animations: [expandSearchInput],
 })
 export class SearchNavbarComponent {
 
@@ -67,7 +72,6 @@ export class SearchNavbarComponent {
 
     this.router.navigate(linkToNavigateTo, {
       queryParams: queryParams,
-      queryParamsHandling: 'merge'
     });
   }
 }
diff --git a/src/app/search-navbar/themed-search-navbar.component.ts b/src/app/search-navbar/themed-search-navbar.component.ts
index a90e782194..f4a8f1d270 100644
--- a/src/app/search-navbar/themed-search-navbar.component.ts
+++ b/src/app/search-navbar/themed-search-navbar.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { SearchNavbarComponent } from './search-navbar.component';
-import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-search-navbar',
diff --git a/src/app/search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts
index 4468aad9c4..2467e5ada4 100644
--- a/src/app/search-page/configuration-search-page.component.spec.ts
+++ b/src/app/search-page/configuration-search-page.component.spec.ts
@@ -1,10 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+
+import { RouteService } from '../core/services/route.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { configureSearchComponentTestingModule } from '../shared/search/search.component.spec';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { Component, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { RouteService } from '../core/services/route.service';
 import createSpy = jasmine.createSpy;
 
 const CONFIGURATION = 'test-configuration';
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 768149de6a..e919bcb396 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,13 +1,22 @@
-import { HostWindowService } from '../shared/host-window.service';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SearchComponent } from '../shared/search/search.component';
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { pushInOut } from '../shared/animations/push';
-import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
+import { Router } from '@angular/router';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../config/app-config.interface';
 import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
-import { Router } from '@angular/router';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
+import { pushInOut } from '../shared/animations/push';
+import { HostWindowService } from '../shared/host-window.service';
+import { SearchComponent } from '../shared/search/search.component';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -21,9 +30,9 @@ import { Router } from '@angular/router';
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 export class ConfigurationSearchPageComponent extends SearchComponent {
@@ -32,7 +41,9 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router);
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
   }
 }
diff --git a/src/app/search-page/configuration-search-page.guard.ts b/src/app/search-page/configuration-search-page.guard.ts
index c52a0a6d8e..28d68618b0 100644
--- a/src/app/search-page/configuration-search-page.guard.ts
+++ b/src/app/search-page/configuration-search-page.guard.ts
@@ -1,5 +1,9 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable()
diff --git a/src/app/search-page/search-page-routing.module.ts b/src/app/search-page/search-page-routing.module.ts
index 9e39ad1bc9..42be35903c 100644
--- a/src/app/search-page/search-page-routing.module.ts
+++ b/src/app/search-page/search-page-routing.module.ts
@@ -1,30 +1,30 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
 import { SearchPageModule } from './search-page.module';
-import { ThemedSearchPageComponent } from './themed-search-page.component';
 import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component';
+import { ThemedSearchPageComponent } from './themed-search-page.component';
 
 @NgModule({
   imports: [
     SearchPageModule,
     RouterModule.forChild([{
-        path: '',
-        resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' },
-        children: [
-          { path: '', component: ThemedSearchPageComponent },
-          { path: ':configuration', component: ThemedConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard] }
-        ]
-      }]
-    )
+      path: '',
+      resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' },
+      children: [
+        { path: '', component: ThemedSearchPageComponent },
+        { path: ':configuration', component: ThemedConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard] },
+      ],
+    }],
+    ),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class SearchPageRoutingModule {
 }
diff --git a/src/app/search-page/search-page.component.ts b/src/app/search-page/search-page.component.ts
index 38647b779b..15c697ffc9 100644
--- a/src/app/search-page/search-page.component.ts
+++ b/src/app/search-page/search-page.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-page',
@@ -8,9 +9,9 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 /**
  * This component represents the whole search page
diff --git a/src/app/search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts
index cc76d0427d..5b23184b43 100644
--- a/src/app/search-page/search-page.module.ts
+++ b/src/app/search-page/search-page.module.ts
@@ -1,21 +1,22 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../core/core.module';
-import { SharedModule } from '../shared/shared.module';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { SearchPageComponent } from './search-page.component';
-import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedSearchPageComponent } from './themed-search-page.component';
 import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
+import { SearchPageComponent } from './search-page.component';
+import { ThemedSearchPageComponent } from './themed-search-page.component';
 
 const components = [
   SearchPageComponent,
-  ThemedSearchPageComponent
+  ThemedSearchPageComponent,
 ];
 
 @NgModule({
@@ -26,16 +27,16 @@ const components = [
     CoreModule.forRoot(),
     StatisticsModule.forRoot(),
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: components,
   providers: [
     SidebarService,
     SearchFilterService,
     ConfigurationSearchPageGuard,
-    SearchConfigurationService
+    SearchConfigurationService,
   ],
-  exports: components
+  exports: components,
 })
 
 /**
diff --git a/src/app/search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts
index e367ee5238..b5d917f707 100644
--- a/src/app/search-page/themed-configuration-search-page.component.ts
+++ b/src/app/search-page/themed-configuration-search-page.component.ts
@@ -1,8 +1,12 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { Context } from '../core/shared/context.model';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
-import { Observable } from 'rxjs';
-import { Context } from '../core/shared/context.model';
 
 /**
  * Themed wrapper for ConfigurationSearchPageComponent
@@ -39,19 +43,19 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
    * The width of the sidebar (bootstrap columns)
    */
   @Input()
-  sideBarWidth: number;
+    sideBarWidth: number;
 
   /**
    * The currently applied configuration (determines title of search)
    */
   @Input()
-  configuration$: Observable<string>;
+    configuration$: Observable<string>;
 
   /**
    * The current context
    */
   @Input()
-  context: Context;
+    context: Context;
 
   protected inAndOutputNames: (keyof ConfigurationSearchPageComponent & keyof this)[] =
     ['context', 'configuration', 'fixedFilterQuery', 'inPlaceSearch', 'searchEnabled', 'sideBarWidth'];
diff --git a/src/app/search-page/themed-search-page.component.ts b/src/app/search-page/themed-search-page.component.ts
index 12acd6174c..295e1d7916 100644
--- a/src/app/search-page/themed-search-page.component.ts
+++ b/src/app/search-page/themed-search-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { SearchPageComponent } from './search-page.component';
 
diff --git a/src/app/shared/abstract-component-loader/abstract-component-loader.component.html b/src/app/shared/abstract-component-loader/abstract-component-loader.component.html
new file mode 100644
index 0000000000..2035dbadd0
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/abstract-component-loader.component.html
@@ -0,0 +1 @@
+<ng-template dsDynamicComponentLoader></ng-template>
diff --git a/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts
new file mode 100644
index 0000000000..5b52ed7b48
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts
@@ -0,0 +1,156 @@
+import {
+  Component,
+  ComponentRef,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+import { Subscription } from 'rxjs';
+
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { ThemeService } from '../theme-support/theme.service';
+import { DynamicComponentLoaderDirective } from './dynamic-component-loader.directive';
+
+/**
+ * To create a new loader component you will need to:
+ * <ul>
+ *   <li>Create a new LoaderComponent component extending this component</li>
+ *   <li>Point the templateUrl to this component's templateUrl</li>
+ *   <li>Add all the @Input()/@Output() names that the dynamically generated components should inherit from the loader to the inputNames/outputNames lists</li>
+ *   <li>Create a decorator file containing the new decorator function, a map containing all the collected {@link Component}s and a function to retrieve the {@link Component}</li>
+ *   <li>Call the function to retrieve the correct {@link Component} in getComponent()</li>
+ *   <li>Add all the @Input()s you had to used in getComponent() in the inputNamesDependentForComponent array</li>
+ * </ul>
+ */
+@Component({
+  selector: 'ds-abstract-component-loader',
+  templateUrl: './abstract-component-loader.component.html',
+})
+export abstract class AbstractComponentLoaderComponent<T> implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * Directive to determine where the dynamic child component is located
+   */
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) componentDirective: DynamicComponentLoaderDirective;
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<T>;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The @Input() that are used to find the matching component using {@link getComponent}. When the value of
+   * one of these @Input() change this loader needs to retrieve the best matching component again using the
+   * {@link getComponent} method.
+   */
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [];
+
+  /**
+   * The list of the @Input() names that should be passed down to the dynamically created components.
+   */
+  protected inputNames: (keyof this & string)[] = [];
+
+  /**
+   * The list of the @Output() names that should be passed down to the dynamically created components.
+   */
+  protected outputNames: (keyof this & string)[] = [];
+
+  constructor(
+    protected themeService: ThemeService,
+  ) {
+  }
+
+  /**
+   * Set up the dynamic child component
+   */
+  ngOnInit(): void {
+    this.instantiateComponent();
+  }
+
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(this.compRef)) {
+      if (this.inputNamesDependentForComponent.some((name: keyof this & string) => hasValue(changes[name]) && changes[name].previousValue !== changes[name].currentValue)) {
+        // Recreate the component when the @Input()s used by getComponent() aren't up-to-date anymore
+        this.destroyComponentInstance();
+        this.instantiateComponent();
+      } else {
+        this.connectInputsAndOutputs();
+      }
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription: Subscription) => hasValue(subscription))
+      .forEach((subscription: Subscription) => subscription.unsubscribe());
+    this.destroyComponentInstance();
+  }
+
+  /**
+   * Creates the component and connects the @Input() & @Output() from the ThemedComponent to its child Component.
+   */
+  public instantiateComponent(): void {
+    const component: GenericConstructor<T> = this.getComponent();
+
+    const viewContainerRef: ViewContainerRef = this.componentDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+      },
+    );
+
+    this.connectInputsAndOutputs();
+  }
+
+  /**
+   * Destroys the themed component and calls it's `ngOnDestroy`
+   */
+  public destroyComponentInstance(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = null;
+    }
+  }
+
+  /**
+   * Fetch the component depending on the item's entity type, metadata representation type and context
+   */
+  public abstract getComponent(): GenericConstructor<T>;
+
+  /**
+   * Connect the inputs and outputs of this component to the dynamic component,
+   * to ensure they're in sync, the ngOnChanges method will automatically be called by setInput
+   */
+  public connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inputNames.filter((name: string) => this[name] !== undefined).filter((name: string) => this[name] !== this.compRef.instance[name]).forEach((name: string) => {
+        // Using setInput will automatically trigger the ngOnChanges
+        this.compRef.setInput(name, this[name]);
+      });
+    }
+    if (isNotEmpty(this.outputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.outputNames.filter((name: string) => this[name] !== undefined).filter((name: string) => this[name] !== this.compRef.instance[name]).forEach((name: string) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
+}
diff --git a/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts b/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts
new file mode 100644
index 0000000000..b670b7bea4
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts
@@ -0,0 +1,19 @@
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
+
+/**
+ * Directive used as a hook to know where to inject the dynamic loaded component
+ */
+@Directive({
+  selector: '[dsDynamicComponentLoader]',
+})
+export class DynamicComponentLoaderDirective {
+
+  constructor(
+    public viewContainerRef: ViewContainerRef,
+  ) {
+  }
+
+}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index cd56904bd7..2ec3b51219 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -88,10 +88,11 @@
       </div>
 
       <div>
-        <label>&nbsp;</label>
+        <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
         <div class="input-group">
 
           <button type="button" class="btn btn-outline-danger"
+                  [attr.aria-label]="'access-control-remove' | translate"
                   [disabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
index 964eb30de2..827f749f3d 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
@@ -1,14 +1,17 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AccessControlArrayFormComponent } from './access-control-array-form.component';
-import { FormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ToDatePipe } from './to-date.pipe';
+import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { SharedBrowseByModule } from '../../browse-by/shared-browse-by.module';
+import { AccessControlArrayFormComponent } from './access-control-array-form.component';
+import { ToDatePipe } from './to-date.pipe';
 
 describe('AccessControlArrayFormComponent', () => {
   let component: AccessControlArrayFormComponent;
@@ -17,15 +20,15 @@ describe('AccessControlArrayFormComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ CommonModule, FormsModule, SharedBrowseByModule, TranslateModule.forRoot(), NgbDatepickerModule ],
-      declarations: [ AccessControlArrayFormComponent, ToDatePipe  ]
+      declarations: [ AccessControlArrayFormComponent, ToDatePipe  ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AccessControlArrayFormComponent);
     component = fixture.componentInstance;
-    component.dropdownOptions = [{name: 'Option1'}, {name: 'Option2'}] as any;
+    component.dropdownOptions = [{ name: 'Option1' }, { name: 'Option2' }] as any;
     component.type = 'item';
     fixture.detectChanges();
   });
@@ -62,7 +65,7 @@ describe('AccessControlArrayFormComponent', () => {
     // set value to item1
     component.accessControlChanged(
       component.form.accessControls[1],
-      'item1'
+      'item1',
     );
 
     component.reset();
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 227de596ff..a8248fdb7d 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -1,23 +1,29 @@
-import {Component, Input, OnInit, ViewChild} from '@angular/core';
-import {NgForm} from '@angular/forms';
-import {AccessesConditionOption} from '../../../core/config/models/config-accesses-conditions-options.model';
-import {dateToISOFormat} from '../../date.util';
+import {
+  Component,
+  Input,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { NgForm } from '@angular/forms';
+
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
+import { dateToISOFormat } from '../../date.util';
 
 @Component({
   selector: 'ds-access-control-array-form',
   templateUrl: './access-control-array-form.component.html',
   styleUrls: ['./access-control-array-form.component.scss'],
-  exportAs: 'accessControlArrayForm'
+  exportAs: 'accessControlArrayForm',
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
   @Input() mode!: 'add' | 'replace';
   @Input() type!: 'item' | 'bitstream';
 
-  @ViewChild('ngForm', {static: true}) ngForm!: NgForm;
+  @ViewChild('ngForm', { static: true }) ngForm!: NgForm;
 
   form: { accessControls: AccessControlItem[] } = {
-    accessControls: [emptyAccessControlItem()] // Start with one empty access control item
+    accessControls: [emptyAccessControlItem()], // Start with one empty access control item
   };
 
   formDisabled = true;
@@ -43,7 +49,7 @@ export class AccessControlArrayFormComponent implements OnInit {
   addAccessControlItem(itemName: string = null) {
     this.form.accessControls = [
       ...this.form.accessControls,
-      {...emptyAccessControlItem(), itemName}
+      { ...emptyAccessControlItem(), itemName },
     ];
   }
 
@@ -67,7 +73,7 @@ export class AccessControlArrayFormComponent implements OnInit {
       .map(x => ({
         name: x.itemName,
         startDate: (x.startDate ? dateToISOFormat(x.startDate) : null),
-        endDate: (x.endDate ? dateToISOFormat(x.endDate) : null)
+        endDate: (x.endDate ? dateToISOFormat(x.endDate) : null),
       }));
   }
 
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts b/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts
index 203d12a59d..7c2817c96a 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts
@@ -1,10 +1,13 @@
-import {Pipe, PipeTransform} from '@angular/core';
-import {NgbDateStruct} from '@ng-bootstrap/ng-bootstrap/datepicker/ngb-date-struct';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap/datepicker/ngb-date-struct';
 
 @Pipe({
   // eslint-disable-next-line @angular-eslint/pipe-prefix
   name: 'toDate',
-  pure: false
+  pure: false,
 })
 export class ToDatePipe implements PipeTransform {
   transform(dateValue: string | null): NgbDateStruct | null {
@@ -16,7 +19,7 @@ export class ToDatePipe implements PipeTransform {
     return {
       year: date.getFullYear(),
       month: date.getMonth() + 1,
-      day: date.getDate()
+      day: date.getDate(),
     } as NgbDateStruct;
   }
 
diff --git a/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts b/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts
index b5081db6c2..15f4a72e46 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts
@@ -1,4 +1,4 @@
-import {ListableObject} from '../object-collection/shared/listable-object.model';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
 
 export const createAccessControlInitialFormState = (): AccessControlFormState => ({
   item: {
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index a5173d10d7..ce0f5845c6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -4,27 +4,29 @@
       <ds-alert
         *ngIf="titleMessage"
         [type]="AlertType.Info"
-        [content]="titleMessage">
+        [content]="titleMessage"
+        class="d-block pb-3">
       </ds-alert>
 
-      <div class="row mt-5">
+      <div class="row">
         <div class="col-12 col-md-6 border-right d-flex flex-column justify-content-between">
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{ 'access-control-item-header-toggle' | translate }}
-              </h4>
+              </h2>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-item-toggle.disable' : 'access-control-item-toggle.enable') | translate"
                 [(ngModel)]="state.item.toggleStatus"
                 (ngModelChange)="handleStatusChange('item', $event)">
               </ui-switch>
             </div>
 
-            <div class="row mt-3">
-              <div class="col-12 col-md-3">
+            <fieldset class="row mt-3">
+              <legend class="h4 col-12 col-md-3">
                 {{ 'access-control-mode' | translate }}
-              </div>
+              </legend>
               <div class="col-12 col-md-8">
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
@@ -45,11 +47,11 @@
                   </label>
                 </div>
               </div>
-            </div>
+            </fieldset>
           </div>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #itemAccessCmp
@@ -65,20 +67,21 @@
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{'access-control-bitstream-header-toggle' | translate}}
-              </h4>
+              </h2>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-bitstream-toggle.disable' : 'access-control-bitstream-toggle.enable') | translate"
                 [(ngModel)]="state.bitstream.toggleStatus"
                 (ngModelChange)="handleStatusChange('bitstream', $event)">
               </ui-switch>
             </div>
 
             <div *ngIf="showLimitToSpecificBitstreams" class="row mt-3">
-            <div class="col-12">
-              {{'access-control-limit-to-specific' | translate}}
-            </div>
-            <div class="col-12">
+            <fieldset class="col-12">
+              <legend class="h4">
+                {{'access-control-limit-to-specific' | translate}}
+              </legend>
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
@@ -99,6 +102,7 @@
 
                   <button
                     *ngIf="itemRD"
+                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
                     [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
@@ -107,14 +111,14 @@
 
                 </label>
               </div>
-            </div>
+            </fieldset>
             </div>
           </div>
 
-          <div class="row mt-3">
-            <div class="col-12 col-md-3">
+          <fieldset class="row mt-3">
+            <legend class="h4 col-12 col-md-3">
               {{'access-control-mode' | translate}}
-            </div>
+            </legend>
             <div class="col-12 col-md-8">
               <div class="form-check">
                 <input class="form-check-input" type="radio"
@@ -135,10 +139,10 @@
                 </label>
               </div>
             </div>
-          </div>
+          </fieldset>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #bitstreamAccessCmp
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
index 4d02f7a52d..cde4d8ecde 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
@@ -1,22 +1,29 @@
-import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
-import {NgbDatepickerModule, NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
-import {Component} from '@angular/core';
-import {of} from 'rxjs';
-import {AccessControlFormContainerComponent} from './access-control-form-container.component';
-import {BulkAccessControlService} from './bulk-access-control.service';
-import {BulkAccessConfigDataService} from '../../core/config/bulk-access-config-data.service';
-import {Item} from '../../core/shared/item.model';
-import {SelectableListService} from '../object-list/selectable-list/selectable-list.service';
-import {createAccessControlInitialFormState} from './access-control-form-container-intial-state';
-import {CommonModule} from '@angular/common';
-import {SharedBrowseByModule} from '../browse-by/shared-browse-by.module';
-import {TranslateModule} from '@ngx-translate/core';
-import {FormsModule} from '@angular/forms';
-import {UiSwitchModule} from 'ngx-ui-switch';
+import { CommonModule } from '@angular/common';
+import { Component } from '@angular/core';
 import {
-  ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID
-} from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
-import {AccessControlFormModule} from './access-control-form.module';
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import {
+  NgbDatepickerModule,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
+import { of } from 'rxjs';
+
+import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
+import { Item } from '../../core/shared/item.model';
+import { SharedBrowseByModule } from '../browse-by/shared-browse-by.module';
+import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { AccessControlFormModule } from './access-control-form.module';
+import { AccessControlFormContainerComponent } from './access-control-form-container.component';
+import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
+import { BulkAccessControlService } from './bulk-access-control.service';
+import { ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
 
 
 describe('AccessControlFormContainerComponent', () => {
@@ -24,30 +31,30 @@ describe('AccessControlFormContainerComponent', () => {
   let fixture: ComponentFixture<AccessControlFormContainerComponent<any>>;
 
 
-// Mock NgbModal
-  @Component({selector: 'ds-ngb-modal', template: ''})
+  // Mock NgbModal
+  @Component({ selector: 'ds-ngb-modal', template: '' })
   class MockNgbModalComponent {
   }
 
-// Mock dependencies
+  // Mock dependencies
   const mockBulkAccessControlService = {
-    createPayloadFile: jasmine.createSpy('createPayloadFile').and.returnValue({file: 'mocked-file'}),
+    createPayloadFile: jasmine.createSpy('createPayloadFile').and.returnValue({ file: 'mocked-file' }),
     executeScript: jasmine.createSpy('executeScript').and.returnValue(of('success')),
   };
 
   const mockBulkAccessConfigDataService = {
-    findByName: jasmine.createSpy('findByName').and.returnValue(of({payload: {options: []}})),
+    findByName: jasmine.createSpy('findByName').and.returnValue(of({ payload: { options: [] } })),
   };
 
   const mockSelectableListService = {
-    getSelectableList: jasmine.createSpy('getSelectableList').and.returnValue(of({selection: []})),
+    getSelectableList: jasmine.createSpy('getSelectableList').and.returnValue(of({ selection: [] })),
     deselectAll: jasmine.createSpy('deselectAll'),
   };
 
   const mockNgbModal = {
     open: jasmine.createSpy('open').and.returnValue(
-      { componentInstance: {}, closed: of({})} as NgbModalRef
-    )
+      { componentInstance: {}, closed: of({}) } as NgbModalRef,
+    ),
   };
 
   beforeEach(async () => {
@@ -60,13 +67,13 @@ describe('AccessControlFormContainerComponent', () => {
         AccessControlFormModule,
         TranslateModule.forRoot(),
         NgbDatepickerModule,
-        UiSwitchModule
+        UiSwitchModule,
       ],
       providers: [
-        {provide: BulkAccessControlService, useValue: mockBulkAccessControlService},
-        {provide: BulkAccessConfigDataService, useValue: mockBulkAccessConfigDataService},
-        {provide: SelectableListService, useValue: mockSelectableListService},
-        {provide: NgbModal, useValue: mockNgbModal},
+        { provide: BulkAccessControlService, useValue: mockBulkAccessControlService },
+        { provide: BulkAccessConfigDataService, useValue: mockBulkAccessConfigDataService },
+        { provide: SelectableListService, useValue: mockSelectableListService },
+        { provide: NgbModal, useValue: mockNgbModal },
       ],
     }).compileComponents();
   });
@@ -99,7 +106,7 @@ describe('AccessControlFormContainerComponent', () => {
     const itemAccess = 'itemAccess';
     component.bitstreamAccessCmp.getValue = jasmine.createSpy('getValue').and.returnValue(bitstreamAccess);
     component.itemAccessCmp.getValue = jasmine.createSpy('getValue').and.returnValue(itemAccess);
-    component.itemRD = {payload: {uuid: 'item-uuid'}} as any;
+    component.itemRD = { payload: { uuid: 'item-uuid' } } as any;
 
     component.submit();
 
@@ -143,7 +150,7 @@ describe('AccessControlFormContainerComponent', () => {
   it('should unsubscribe and deselect all on component destroy', () => {
     component.ngOnDestroy();
     expect(component.selectableListService.deselectAll).toHaveBeenCalledWith(
-      ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID
+      ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID,
     );
   });
 });
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 69a598f7ce..04c5179212 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -1,30 +1,42 @@
-import { ChangeDetectorRef, Component, Input, OnDestroy, ViewChild } from '@angular/core';
-import { concatMap, Observable, shareReplay } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
-import { BulkAccessControlService } from './bulk-access-control.service';
-import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  ViewChild,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { map, take } from 'rxjs/operators';
+import {
+  concatMap,
+  Observable,
+  shareReplay,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
+import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { AlertType } from '../alert/alert-type';
+import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
+import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
+import { BulkAccessControlService } from './bulk-access-control.service';
 import {
   ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID,
-  ItemAccessControlSelectBitstreamsModalComponent
+  ItemAccessControlSelectBitstreamsModalComponent,
 } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
-import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model';
-import { AlertType } from '../alert/aletr-type';
-import {
-  createAccessControlInitialFormState
-} from './access-control-form-container-intial-state';
 
 @Component({
   selector: 'ds-access-control-form-container',
   templateUrl: './access-control-form-container.component.html',
   styleUrls: [ './access-control-form-container.component.scss' ],
-  exportAs: 'dsAccessControlForm'
+  exportAs: 'dsAccessControlForm',
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
@@ -60,7 +72,7 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
     private bulkAccessControlService: BulkAccessControlService,
     public selectableListService: SelectableListService,
     protected modalService: NgbModal,
-    private cdr: ChangeDetectorRef
+    private cdr: ChangeDetectorRef,
   ) {}
 
   state = createAccessControlInitialFormState();
@@ -68,7 +80,7 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
   dropdownData$: Observable<BulkAccessConditionOptions> = this.bulkAccessConfigService.findByName('default').pipe(
     getFirstCompletedRemoteData(),
     map((configRD: RemoteData<BulkAccessConditionOptions>) => configRD.hasSucceeded ? configRD.payload : null),
-    shareReplay(1)
+    shareReplay({ refCount: false, bufferSize: 1 }),
   );
 
   /**
@@ -78,12 +90,12 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
     console.log({
       bitstream: this.bitstreamAccessCmp.getValue(),
       item: this.itemAccessCmp.getValue(),
-      state: this.state
+      state: this.state,
     });
     return {
       bitstream: this.bitstreamAccessCmp.getValue(),
       item: this.itemAccessCmp.getValue(),
-      state: this.state
+      state: this.state,
     };
   }
 
@@ -108,12 +120,12 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
     const { file } = this.bulkAccessControlService.createPayloadFile({
       bitstreamAccess,
       itemAccess,
-      state: this.state
+      state: this.state,
     });
 
     this.bulkAccessControlService.executeScript(
       [ this.itemRD.payload.uuid ],
-      file
+      file,
     ).pipe(take(1)).subscribe((res) => {
       console.log('success', res);
     });
@@ -145,7 +157,7 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
 
     ref.closed.pipe(
       concatMap(() => this.selectableListService.getSelectableList(ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID)),
-      take(1)
+      take(1),
     ).subscribe((list) => {
       this.state.bitstream.selectedBitstreams = list?.selection || [];
       this.cdr.detectChanges();
diff --git a/src/app/shared/access-control-form-container/access-control-form.module.ts b/src/app/shared/access-control-form-container/access-control-form.module.ts
index 3bbdb3ab5d..075d85d4d1 100644
--- a/src/app/shared/access-control-form-container/access-control-form.module.ts
+++ b/src/app/shared/access-control-form-container/access-control-form.module.ts
@@ -1,17 +1,14 @@
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
 
-import {TranslateModule} from '@ngx-translate/core';
-import {UiSwitchModule} from 'ngx-ui-switch';
-
-import {AccessControlArrayFormComponent} from './access-control-array-form/access-control-array-form.component';
-import {SharedModule} from '../shared.module';
-import {
-  ItemAccessControlSelectBitstreamsModalComponent
-} from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
-import {AccessControlFormContainerComponent} from './access-control-form-container.component';
-import {NgbDatepickerModule} from '@ng-bootstrap/ng-bootstrap';
-import {ToDatePipe} from './access-control-array-form/to-date.pipe';
+import { SharedModule } from '../shared.module';
+import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
+import { ToDatePipe } from './access-control-array-form/to-date.pipe';
+import { AccessControlFormContainerComponent } from './access-control-form-container.component';
+import { ItemAccessControlSelectBitstreamsModalComponent } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
 
 @NgModule({
   imports: [
@@ -19,13 +16,13 @@ import {ToDatePipe} from './access-control-array-form/to-date.pipe';
     SharedModule,
     TranslateModule,
     UiSwitchModule,
-    NgbDatepickerModule
+    NgbDatepickerModule,
   ],
   declarations: [
     AccessControlFormContainerComponent,
     AccessControlArrayFormComponent,
     ItemAccessControlSelectBitstreamsModalComponent,
-    ToDatePipe
+    ToDatePipe,
   ],
   exports: [ AccessControlFormContainerComponent, AccessControlArrayFormComponent ],
 })
diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts
index 16d05edeb7..9539e63e39 100644
--- a/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts
+++ b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts
@@ -2,13 +2,13 @@ import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { BulkAccessControlService } from './bulk-access-control.service';
 import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { Process } from '../../process-page/processes/process.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { NotificationsService } from '../notifications/notifications.service';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { Process } from '../../process-page/processes/process.model';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { BulkAccessControlService } from './bulk-access-control.service';
 
 describe('BulkAccessControlService', () => {
   let service: BulkAccessControlService;
@@ -22,23 +22,23 @@ describe('BulkAccessControlService', () => {
         'startDate': {
           'year': 2026,
           'month': 5,
-          'day': 31
+          'day': 31,
         },
-        'endDate': null
-      }
+        'endDate': null,
+      },
     ],
     'state': {
       'item': {
         'toggleStatus': true,
-        'accessMode': 'replace'
+        'accessMode': 'replace',
       },
       'bitstream': {
         'toggleStatus': false,
         'accessMode': '',
         'changesLimit': '',
-        'selectedBitstreams': []
-      }
-    }
+        'selectedBitstreams': [],
+      },
+    },
   };
 
   beforeEach(() => {
@@ -46,13 +46,13 @@ describe('BulkAccessControlService', () => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       providers: [
         BulkAccessControlService,
         { provide: ScriptDataService, useValue: spy },
         { provide: NotificationsService, useValue: NotificationsServiceStub },
-      ]
+      ],
     });
     service = TestBed.inject(BulkAccessControlService);
     scriptServiceSpy = TestBed.inject(ScriptDataService) as jasmine.SpyObj<ScriptDataService>;
diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.ts
index 6fb6b62532..f3c284e358 100644
--- a/src/app/shared/access-control-form-container/bulk-access-control.service.ts
+++ b/src/app/shared/access-control-form-container/bulk-access-control.service.ts
@@ -1,19 +1,18 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
 
 import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
-import { AccessControlFormState } from './access-control-form-container-intial-state';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { RemoteData } from '../../core/data/remote-data';
-import { Process } from '../../process-page/processes/process.model';
-import { isNotEmpty } from '../empty.util';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { isNotEmpty } from '../empty.util';
 import { NotificationsService } from '../notifications/notifications.service';
+import { AccessControlFormState } from './access-control-form-container-intial-state';
 
 export interface BulkAccessPayload {
   state: AccessControlFormState;
@@ -30,7 +29,7 @@ export class BulkAccessControlService {
     private notificationsService: NotificationsService,
     private router: Router,
     private scriptService: ScriptDataService,
-    private translationService: TranslateService
+    private translationService: TranslateService,
   ) {}
 
   /**
@@ -63,7 +62,7 @@ export class BulkAccessControlService {
     console.log('execute', { uuids, file });
 
     const params: ProcessParameter[] = [
-      { name: '-f', value: file.name }
+      { name: '-f', value: file.name },
     ];
     uuids.forEach((uuid) => {
       params.push({ name: '-u', value: uuid });
@@ -86,7 +85,7 @@ export class BulkAccessControlService {
           this.notificationsService.error(title, content);
           return false;
         }
-      })
+      }),
     );
   }
 }
@@ -96,7 +95,7 @@ export class BulkAccessControlService {
  * @param payload
  */
 export const convertToBulkAccessControlFileModel = (payload: { state: AccessControlFormState, bitstreamAccess: AccessCondition[], itemAccess: AccessCondition[] }): BulkAccessControlFileModel => {
-  let finalPayload: BulkAccessControlFileModel = {};
+  const finalPayload: BulkAccessControlFileModel = {};
 
   const itemEnabled = payload.state.item.toggleStatus;
   const bitstreamEnabled = payload.state.bitstream.toggleStatus;
@@ -104,7 +103,7 @@ export const convertToBulkAccessControlFileModel = (payload: { state: AccessCont
   if (itemEnabled) {
     finalPayload.item = {
       mode: payload.state.item.accessMode,
-      accessConditions: payload.itemAccess
+      accessConditions: payload.itemAccess,
     };
   }
 
@@ -119,7 +118,7 @@ export const convertToBulkAccessControlFileModel = (payload: { state: AccessCont
     finalPayload.bitstream = {
       constraints,
       mode: payload.state.bitstream.accessMode,
-      accessConditions: payload.bitstreamAccess
+      accessConditions: payload.bitstreamAccess,
     };
   }
 
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
index f60d9a70e7..d79375f18c 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
@@ -1,4 +1,7 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 
 import { ItemAccessControlSelectBitstreamsModalComponent } from './item-access-control-select-bitstreams-modal.component';
 
@@ -8,9 +11,9 @@ xdescribe('ItemAccessControlSelectBitstreamsModalComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ ItemAccessControlSelectBitstreamsModalComponent ]
+      declarations: [ ItemAccessControlSelectBitstreamsModalComponent ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
index 617803a0c4..d63232aeff 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -1,24 +1,29 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
 import { PaginatedList } from 'src/app/core/data/paginated-list.model';
 import { RemoteData } from 'src/app/core/data/remote-data';
 import { Bitstream } from 'src/app/core/shared/bitstream.model';
 import { Context } from 'src/app/core/shared/context.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { Item } from '../../../core/shared/item.model';
+
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { TranslateService } from '@ngx-translate/core';
-import { hasValue } from '../../empty.util';
+import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../empty.util';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 
 export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams';
 
 @Component({
   selector: 'ds-item-access-control-select-bitstreams-modal',
   templateUrl: './item-access-control-select-bitstreams-modal.component.html',
-  styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ]
+  styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ],
 })
 export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
 
@@ -37,7 +42,7 @@ export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
     private bitstreamService: BitstreamDataService,
     protected paginationService: PaginationService,
     protected translateService: TranslateService,
-    public activeModal: NgbActiveModal
+    public activeModal: NgbActiveModal,
   ) { }
 
   ngOnInit() {
@@ -52,7 +57,7 @@ export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
   }
 
   loadForPage(page: number) {
-    this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page}, false)
+    this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page }, false)
       .pipe(
         getFirstCompletedRemoteData(),
       )
diff --git a/src/app/shared/alert/aletr-type.ts b/src/app/shared/alert/alert-type.ts
similarity index 100%
rename from src/app/shared/alert/aletr-type.ts
rename to src/app/shared/alert/alert-type.ts
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 1a70081367..907edae24b 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,3 +1,9 @@
-.close:focus {
-  outline: none !important;
+.close {
+  opacity: 0.75;
+  &:focus {
+    outline: none !important;
+  }
+}
+button.close {
+  opacity: 0.6;
 }
diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts
index 21e4d197b7..0ab860ed30 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -1,14 +1,25 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { TranslateModule } from '@ngx-translate/core';
 
-import { AlertComponent } from './alert.component';
 import { createTestComponent } from '../testing/utils.test';
-import { AlertType } from './aletr-type';
+import { AlertComponent } from './alert.component';
+import { AlertType } from './alert-type';
 
 describe('AlertComponent test suite', () => {
 
@@ -22,17 +33,17 @@ describe('AlertComponent test suite', () => {
         BrowserModule,
         CommonModule,
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         AlertComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         ChangeDetectorRef,
-        AlertComponent
+        AlertComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -104,7 +115,7 @@ describe('AlertComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 93535d2057..90bef5cec3 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,8 +1,18 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { trigger } from '@angular/animations';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
 
-import { AlertType } from './aletr-type';
-import { fadeOutLeave, fadeOutState } from '../animations/fade';
+import {
+  fadeOutLeave,
+  fadeOutState,
+} from '../animations/fade';
+import { AlertType } from './alert-type';
 
 /**
  * This component allow to create div that uses the Bootstrap's Alerts component.
@@ -13,10 +23,10 @@ import { fadeOutLeave, fadeOutState } from '../animations/fade';
   animations: [
     trigger('enterLeave', [
       fadeOutLeave, fadeOutState,
-    ])
+    ]),
   ],
   templateUrl: './alert.component.html',
-  styleUrls: ['./alert.component.scss']
+  styleUrls: ['./alert.component.scss'],
 })
 export class AlertComponent {
 
diff --git a/src/app/shared/animations/bgColor.ts b/src/app/shared/animations/bgColor.ts
index 91fd3116b1..f117656836 100644
--- a/src/app/shared/animations/bgColor.ts
+++ b/src/app/shared/animations/bgColor.ts
@@ -1,11 +1,12 @@
 import {
   animate,
   animateChild,
-  group, query,
+  group,
+  query,
   state,
   style,
   transition,
-  trigger
+  trigger,
 } from '@angular/animations';
 
 const startStyle = style({ backgroundColor: '{{ startColor }}' });
@@ -21,6 +22,6 @@ export const bgColor = trigger('bgColor',
           query('@*', animateChild()),
           animate('200ms'),
 
-        ]
-      ))
+        ],
+      )),
   ]);
diff --git a/src/app/shared/animations/fade.ts b/src/app/shared/animations/fade.ts
index 187a482746..1c61fd4624 100644
--- a/src/app/shared/animations/fade.ts
+++ b/src/app/shared/animations/fade.ts
@@ -1,34 +1,40 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fadeInState = state('fadeIn', style({opacity: 1}));
+export const fadeInState = state('fadeIn', style({ opacity: 1 }));
 export const fadeInEnter =  transition('* => fadeIn', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 const fadeEnter =  transition(':enter', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 
-export const fadeOutState = state('fadeOut', style({opacity: 0}));
+export const fadeOutState = state('fadeOut', style({ opacity: 0 }));
 export const fadeOutLeave = transition('fadeIn => fadeOut', [
   style({ opacity: 1 }),
-  animate(400, style({ opacity: 0 }))
+  animate(400, style({ opacity: 0 })),
 ]);
 const fadeLeave =  transition(':leave', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 
 export const fadeIn = trigger('fadeIn', [
-  fadeEnter
+  fadeEnter,
 ]);
 
 export const fadeOut = trigger('fadeOut', [
-  fadeLeave
+  fadeLeave,
 ]);
 
 export const fadeInOut = trigger('fadeInOut', [
   fadeEnter,
-  fadeLeave
+  fadeLeave,
 ]);
diff --git a/src/app/shared/animations/focus.ts b/src/app/shared/animations/focus.ts
index ec9c5020ce..f0f3a1f95d 100644
--- a/src/app/shared/animations/focus.ts
+++ b/src/app/shared/animations/focus.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const focusShadow = trigger('focusShadow', [
 
@@ -6,7 +12,7 @@ export const focusShadow = trigger('focusShadow', [
 
   state('blur', style({ boxShadow: 'none' })),
 
-  transition('focus <=> blur', [animate('250ms')])
+  transition('focus <=> blur', [animate('250ms')]),
 ]);
 
 export const focusBackground = trigger('focusBackground', [
@@ -15,5 +21,5 @@ export const focusBackground = trigger('focusBackground', [
 
   state('blur', style({ backgroundColor: 'transparent' })),
 
-  transition('focus <=> blur', [animate('250ms')])
+  transition('focus <=> blur', [animate('250ms')]),
 ]);
diff --git a/src/app/shared/animations/fromBottom.ts b/src/app/shared/animations/fromBottom.ts
index e2c6f44728..ca6c68299a 100644
--- a/src/app/shared/animations/fromBottom.ts
+++ b/src/app/shared/animations/fromBottom.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromBottomInState = state('fromBottomIn', style({opacity: 1, transform: 'translateY(0)'}));
+export const fromBottomInState = state('fromBottomIn', style({ opacity: 1, transform: 'translateY(0)' }));
 export const fromBottomEnter = transition('* => fromBottomIn', [
-  style({opacity: 0, transform: 'translateY(5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateY(5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromBottomOutState = state('fromBottomOut', style({opacity: 0, transform: 'translateY(-5%)'}));
+export const fromBottomOutState = state('fromBottomOut', style({ opacity: 0, transform: 'translateY(-5%)' }));
 export const fromBottomLeave = transition('fromBottomIn => fromBottomOut', [
-  style({opacity: 1, transform: 'translateY(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateY(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromBottomIn = trigger('fromBottomIn', [
-  fromBottomEnter
+  fromBottomEnter,
 ]);
 
 export const fromBottomOut = trigger('fromBottomOut', [
-  fromBottomLeave
+  fromBottomLeave,
 ]);
 
 export const fromBottomInOut = trigger('fromBottomInOut', [
   fromBottomEnter,
-  fromBottomLeave
+  fromBottomLeave,
 ]);
diff --git a/src/app/shared/animations/fromLeft.ts b/src/app/shared/animations/fromLeft.ts
index 07fe5bcde5..7524c66437 100644
--- a/src/app/shared/animations/fromLeft.ts
+++ b/src/app/shared/animations/fromLeft.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromLeftInState = state('fromLeftIn', style({opacity: 1, transform: 'translateX(0)'}));
+export const fromLeftInState = state('fromLeftIn', style({ opacity: 1, transform: 'translateX(0)' }));
 export const fromLeftEnter = transition('* => fromLeftIn', [
-  style({opacity: 0, transform: 'translateX(-5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateX(-5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromLeftOutState = state('fromLeftOut', style({opacity: 0, transform: 'translateX(5%)'}));
+export const fromLeftOutState = state('fromLeftOut', style({ opacity: 0, transform: 'translateX(5%)' }));
 export const fromLeftLeave = transition('fromLeftIn => fromLeftOut', [
-  style({opacity: 1, transform: 'translateX(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateX(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromLeftIn = trigger('fromLeftIn', [
-  fromLeftEnter
+  fromLeftEnter,
 ]);
 
 export const fromLeftOut = trigger('fromLeftOut', [
-  fromLeftLeave
+  fromLeftLeave,
 ]);
 
 export const fromLeftInOut = trigger('fromLeftInOut', [
   fromLeftEnter,
-  fromLeftLeave
+  fromLeftLeave,
 ]);
diff --git a/src/app/shared/animations/fromRight.ts b/src/app/shared/animations/fromRight.ts
index 10b36d12ec..d9a20cb76f 100644
--- a/src/app/shared/animations/fromRight.ts
+++ b/src/app/shared/animations/fromRight.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromRightInState = state('fromRightIn', style({opacity: 1, transform: 'translateX(0)'}));
+export const fromRightInState = state('fromRightIn', style({ opacity: 1, transform: 'translateX(0)' }));
 export const fromRightEnter = transition('* => fromRightIn', [
-  style({opacity: 0, transform: 'translateX(5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateX(5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromRightOutState = state('fromRightOut', style({opacity: 0, transform: 'translateX(-5%)'}));
+export const fromRightOutState = state('fromRightOut', style({ opacity: 0, transform: 'translateX(-5%)' }));
 export const fromRightLeave = transition('fromRightIn => fromRightOut', [
-  style({opacity: 1, transform: 'translateX(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateX(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromRightIn = trigger('fromRightIn', [
-  fromRightEnter
+  fromRightEnter,
 ]);
 
 export const fromRightOut = trigger('fromRightOut', [
-  fromRightLeave
+  fromRightLeave,
 ]);
 
 export const fromRightInOut = trigger('fromRightInOut', [
   fromRightEnter,
-  fromRightLeave
+  fromRightLeave,
 ]);
diff --git a/src/app/shared/animations/fromTop.ts b/src/app/shared/animations/fromTop.ts
index a33beed163..3a5aa983b4 100644
--- a/src/app/shared/animations/fromTop.ts
+++ b/src/app/shared/animations/fromTop.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromTopInState = state('fromTopIn', style({opacity: 1, transform: 'translateY(0)'}));
+export const fromTopInState = state('fromTopIn', style({ opacity: 1, transform: 'translateY(0)' }));
 export const fromTopEnter = transition('* => fromTopIn', [
-  style({opacity: 0, transform: 'translateY(-5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateY(-5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromTopOutState = state('fromTopOut', style({opacity: 0, transform: 'translateY(5%)'}));
+export const fromTopOutState = state('fromTopOut', style({ opacity: 0, transform: 'translateY(5%)' }));
 export const fromTopLeave = transition('fromTopIn => fromTopOut', [
-  style({opacity: 1, transform: 'translateY(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateY(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromTopIn = trigger('fromTopIn', [
-  fromTopEnter
+  fromTopEnter,
 ]);
 
 export const fromTopOut = trigger('fromTopOut', [
-  fromTopLeave
+  fromTopLeave,
 ]);
 
 export const fromTopInOut = trigger('fromTopInOut', [
   fromTopEnter,
-  fromTopLeave
+  fromTopLeave,
 ]);
diff --git a/src/app/shared/animations/overlay.ts b/src/app/shared/animations/overlay.ts
index 15d6bf79de..42d8097336 100644
--- a/src/app/shared/animations/overlay.ts
+++ b/src/app/shared/animations/overlay.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const overlay = trigger('overlay', [
 
@@ -6,5 +12,5 @@ export const overlay = trigger('overlay', [
 
   state('hide', style({ opacity: 0 })),
 
-  transition('show <=> hide', animate(250))
+  transition('show <=> hide', animate(250)),
 ]);
diff --git a/src/app/shared/animations/push.ts b/src/app/shared/animations/push.ts
index 124e3289e7..6af617fe79 100644
--- a/src/app/shared/animations/push.ts
+++ b/src/app/shared/animations/push.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const pushInOut = trigger('pushInOut', [
 
diff --git a/src/app/shared/animations/rotate.ts b/src/app/shared/animations/rotate.ts
index d6337d4b3d..1952e57201 100644
--- a/src/app/shared/animations/rotate.ts
+++ b/src/app/shared/animations/rotate.ts
@@ -1,28 +1,34 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const rotateInState = state('rotateIn', style({ opacity: 1, transform: 'rotate(0deg)' }));
 export const rotateEnter = transition('* => rotateIn', [
   style({ opacity: 0, transform: 'rotate(5deg)' }),
-  animate('400ms ease-in-out')
+  animate('400ms ease-in-out'),
 ]);
 
 export const rotateOutState = state('rotateOut', style({ opacity: 0, transform: 'rotate(5deg)' }));
 export const rotateLeave = transition('rotateIn => rotateOut', [
   style({ opacity: 1, transform: 'rotate(0deg)' }),
-  animate('400ms ease-in-out')
+  animate('400ms ease-in-out'),
 ]);
 
 export const rotateIn = trigger('rotateIn', [
-  rotateEnter
+  rotateEnter,
 ]);
 
 export const rotateOut = trigger('rotateOut', [
-  rotateLeave
+  rotateLeave,
 ]);
 
 export const rotateInOut = trigger('rotateInOut', [
   rotateEnter,
-  rotateLeave
+  rotateLeave,
 ]);
 
 const expandedStyle = { transform: 'rotate(90deg)' };
@@ -33,7 +39,7 @@ export const rotate = trigger('rotate',
     state('expanded', style(expandedStyle)),
     state('collapsed', style(collapsedStyle)),
     transition('expanded <=> collapsed', [
-      animate('200ms')
-    ])
+      animate('200ms'),
+    ]),
 
   ]);
diff --git a/src/app/shared/animations/scale.ts b/src/app/shared/animations/scale.ts
index ca749ceeef..0b317dd8ba 100644
--- a/src/app/shared/animations/scale.ts
+++ b/src/app/shared/animations/scale.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const scaleInState = state('scaleIn', style({opacity: 1, transform: 'scale(1)'}));
+export const scaleInState = state('scaleIn', style({ opacity: 1, transform: 'scale(1)' }));
 export const scaleEnter =  transition('* => scaleIn', [
-  style({opacity: 0, transform: 'scale(0)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'scale(0)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const scaleOutState = state('scaleOut', style({opacity: 0, transform: 'scale(0)'}));
+export const scaleOutState = state('scaleOut', style({ opacity: 0, transform: 'scale(0)' }));
 export const scaleLeave = transition('scaleIn => scaleOut', [
-  style({opacity: 1, transform: 'scale(1)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 1, transform: 'scale(1)' }),
+  animate('400ms ease-in-out'),
 ]);
 
 export const scaleIn = trigger('scaleIn', [
-  scaleEnter
+  scaleEnter,
 ]);
 
 export const scaleOut = trigger('scaleOut', [
-  scaleLeave
+  scaleLeave,
 ]);
 
 export const scaleInOut = trigger('scaleInOut', [
   scaleEnter,
-  scaleLeave
+  scaleLeave,
 ]);
diff --git a/src/app/shared/animations/shrink.ts b/src/app/shared/animations/shrink.ts
index 28f1d2a567..6469a7efda 100644
--- a/src/app/shared/animations/shrink.ts
+++ b/src/app/shared/animations/shrink.ts
@@ -1,13 +1,19 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const shrinkInOut = trigger('shrinkInOut', [
-  state('in', style({height: '100%', opacity: 1})),
+  state('in', style({ height: '100%', opacity: 1 })),
   transition('* => void', [
-    style({height: '!', opacity: 1}),
-    animate(200, style({height: 0, opacity: 0}))
+    style({ height: '!', opacity: 1 }),
+    animate(200, style({ height: 0, opacity: 0 })),
   ]),
   transition('void => *', [
-    style({height: 0, opacity: 0}),
-    animate(200, style({height: '*', opacity: 1}))
-  ])
+    style({ height: 0, opacity: 0 }),
+    animate(200, style({ height: '*', opacity: 1 })),
+  ]),
 ]);
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 310ddbbfde..92e5084d81 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -1,4 +1,11 @@
-import { animate, animateChild, group, query, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  group,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const slide = trigger('slide', [
   state('expanded', style({ height: '*' })),
@@ -7,75 +14,65 @@ export const slide = trigger('slide', [
   state('*', style({ height: '*' })),
   transition(':enter', [animate('200ms')]),
   transition(':leave', [animate('200ms')]),
-  transition('expanded <=> collapsed', animate(250))
+  transition('expanded <=> collapsed', animate(250)),
 ]);
 
 export const slideMobileNav = trigger('slideMobileNav', [
 
-  state('expanded', style({ height: 'auto', 'min-height': '100vh' })),
+  state('expanded', style({ height: '*', minHeight: '*' })),
 
-  state('collapsed', style({ height: 0 })),
+  state('collapsed', style({ height: 0, minHeight: 0 })),
 
-  transition('expanded <=> collapsed', animate('300ms'))
+  transition('expanded <=> collapsed', animate('300ms')),
 ]);
 
-const collapsedStyle = style({ marginLeft: '-{{ sidebarWidth }}' });
-const expandedStyle = style({ marginLeft: '0' });
-const options = { params: { sidebarWidth: '*' } };
+const collapsedSidebarStyle = style({ maxWidth: '{{collapsedWidth}}' });
+const expandedSidebarStyle = style({ maxWidth: '{{expandedWidth}}' });
+const unpinnedSidebarPageStyle = style({ paddingLeft: '{{collapsedWidth}}' });
+const pinnedSidebarPageStyle = style({ paddingLeft: '{{expandedWidth}}' });
+const hiddenSidebarPageStyle = style({ paddingLeft: '0' });
+const options = { params: { collapsedWidth: '*', expandedWidth: '*' } };
+const animation = '300ms ease-in-out';
 
 export const slideSidebar = trigger('slideSidebar', [
-
-  transition('expanded => collapsed',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', expandedStyle, options),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', collapsedStyle))
-      ],
-    )),
-
-  transition('collapsed => expanded',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', collapsedStyle),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', expandedStyle), options)
-      ]
-    ))
+  state('collapsed', collapsedSidebarStyle, options),
+  state('expanded', expandedSidebarStyle, options),
+  transition('expanded => collapsed', animate(animation, collapsedSidebarStyle)),
+  transition('collapsed => expanded', animate(animation, expandedSidebarStyle)),
 ]);
 
 export const slideSidebarPadding = trigger('slideSidebarPadding', [
-  state('hidden', style({ paddingLeft: 0 })),
-  state('shown', style({ paddingLeft: '{{ collapsedSidebarWidth }}' }), { params: { collapsedSidebarWidth: '*' } }),
-  state('expanded', style({ paddingLeft: '{{ totalSidebarWidth }}' }), { params: { totalSidebarWidth: '*' } }),
-  transition('hidden <=> shown', [animate('200ms')]),
-  transition('hidden <=> expanded', [animate('200ms')]),
-  transition('shown <=> expanded', [animate('200ms')]),
+  state('hidden', hiddenSidebarPageStyle),
+  state('unpinned', unpinnedSidebarPageStyle, options),
+  state('pinned', pinnedSidebarPageStyle, options),
+  transition('hidden <=> unpinned', animate(animation)),
+  transition('hidden <=> pinned', animate(animation)),
+  transition('unpinned <=> pinned', animate(animation)),
 ]);
 
 export const expandSearchInput = trigger('toggleAnimation', [
   state('collapsed', style({
-    width: '30px',
-    opacity: '0'
+    width: '0',
+    opacity: '0',
   })),
   state('expanded', style({
     width: '250px',
-    opacity: '1'
+    opacity: '1',
   })),
   transition('* => collapsed', group([
     animate('300ms ease-in-out', style({
-      width: '30px'
+      width: '30px',
     })),
     animate('300ms ease-in', style({
-      opacity: '0'
-    }))
+      opacity: '0',
+    })),
   ])),
   transition('* => expanded', group([
     animate('300ms ease-out', style({
-      opacity: '1'
+      opacity: '1',
     })),
     animate('300ms ease-in-out', style({
-      width: '250px'
-    }))
-  ]))
+      width: '250px',
+    })),
+  ])),
 ]);
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 05f502afa1..98749da7b5 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,37 +1,52 @@
-<ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
-  <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
+<div class="navbar-nav mr-auto" *ngIf="(isMobile$ | async) !== true; else mobileButtons" data-test="auth-nav">
+  <div *ngIf="(isAuthenticated | async) !== true && (showAuth | async)"
+      class="nav-item"
       (click)="$event.stopPropagation();">
-    <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" class="dropdownLogin px-1" [attr.aria-label]="'nav.login' |translate"
+    <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
          (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
+         role="menuitem"
+         aria-haspopup="menu"
+         aria-controls="loginDropdownMenu"
+         [attr.aria-expanded]="loginDrop.isOpen()"
          ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
-      <div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+           role="menu"
            [attr.aria-label]="'nav.login' | translate">
-        <ds-log-in
-          [isStandalonePage]="false"></ds-log-in>
+        <ds-themed-log-in
+          [isStandalonePage]="false"></ds-themed-log-in>
       </div>
     </div>
-  </li>
-  <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a routerLink="/login" routerLinkActive="active" class="loginLink px-1">
+  </div>
+  <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
+    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);"
+         role="menuitem"
+         [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
+         aria-controls="user-menu-dropdown"
+         (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
+         class="dropdownLogout px-1"
+         [attr.data-test]="'user-menu' | dsBrowserOnly"
+         ngbDropdownToggle>
+        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+      <div id="logoutDropdownMenu" ngbDropdownMenu>
+        <ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<ng-template #mobileButtons>
+  <div data-test="auth-nav">
+    <a *ngIf="(isAuthenticated | async) !== true" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
       {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
     </a>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" role="button" [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate" class="dropdownLogout px-1" [attr.data-test]="'user-menu' | dsBrowserOnly" ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <div class="logoutDropdownMenu" ngbDropdownMenu [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate">
-        <ds-user-menu></ds-user-menu>
-      </div>
-    </div>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
       <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
       <span class="sr-only">(current)</span>
     </a>
-  </li>
-</ul>
-
+  </div>
+</ng-template>
 
+<!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
index 40e9113b00..84e4916eff 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
@@ -1,10 +1,10 @@
-.loginDropdownMenu, .logoutDropdownMenu {
+#loginDropdownMenu, #logoutDropdownMenu {
   min-width: 330px;
   z-index: 1002;
 }
 
-.loginDropdownMenu {
-  min-height: 260px;
+#loginDropdownMenu {
+  min-height: 75px;
 }
 
 .dropdown-item.active, .dropdown-item:active,
@@ -19,3 +19,12 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdownLogin, .dropdownLogout {
+  &:not(:focus-visible).active,
+  &:not(:focus-visible):active,
+  &:not(:focus-visible).active:focus,
+  &:not(:focus-visible):active:focus {
+    box-shadow: unset;
+  }
+}
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 58a1edfabd..f14979ecba 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -1,21 +1,35 @@
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Store, StoreModule } from '@ngrx/store';
-
-import { authReducer, AuthState } from '../../core/auth/auth.reducer';
-import { EPersonMock } from '../testing/eperson.mock';
-import { TranslateModule } from '@ngx-translate/core';
-import { AppState } from '../../app.reducer';
-import { AuthNavMenuComponent } from './auth-nav-menu.component';
-import { HostWindowServiceStub } from '../testing/host-window-service.stub';
-import { HostWindowService } from '../host-window.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
-import { AuthService } from '../../core/auth/auth.service';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
+
+import { AppState } from '../../app.reducer';
+import {
+  authReducer,
+  AuthState,
+} from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
+import { HostWindowService } from '../host-window.service';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { EPersonMock } from '../testing/eperson.mock';
+import { HostWindowServiceStub } from '../testing/host-window-service.stub';
+import { AuthNavMenuComponent } from './auth-nav-menu.component';
 
 describe('AuthNavMenuComponent', () => {
 
@@ -30,13 +44,13 @@ describe('AuthNavMenuComponent', () => {
   let authService: AuthService;
 
   let routerState = {
-    url: '/home'
+    url: '/home',
   };
 
   function serviceInit() {
     authService = jasmine.createSpyObj('authService', {
       getAuthenticatedUserFromStore: of(EPersonMock),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
   }
 
@@ -46,7 +60,7 @@ describe('AuthNavMenuComponent', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     authState = {
       authenticated: true,
@@ -55,7 +69,7 @@ describe('AuthNavMenuComponent', () => {
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
   }
 
@@ -72,22 +86,23 @@ describe('AuthNavMenuComponent', () => {
           StoreModule.forRoot(authReducer, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
+          NgbDropdownModule,
         ],
         declarations: [
           AuthNavMenuComponent,
-          BrowserOnlyMockPipe
+          BrowserOnlyMockPipe,
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
         ],
         schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
+          CUSTOM_ELEMENTS_SCHEMA,
+        ],
       })
         .compileComponents();
 
@@ -99,7 +114,7 @@ describe('AuthNavMenuComponent', () => {
     describe('when route is /login and user is not authenticated', () => {
       beforeEach(inject([Store], (store: Store<AppState>) => {
         routerState = {
-          url: '/login'
+          url: '/login',
         };
         store
           .subscribe((state) => {
@@ -117,10 +132,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
       afterEach(() => {
@@ -137,7 +152,7 @@ describe('AuthNavMenuComponent', () => {
     describe('when route is /logout and user is authenticated', () => {
       beforeEach(inject([Store], (store: Store<AppState>) => {
         routerState = {
-          url: '/logout'
+          url: '/logout',
         };
         store
           .subscribe((state) => {
@@ -155,10 +170,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
@@ -179,7 +194,7 @@ describe('AuthNavMenuComponent', () => {
 
         beforeEach(inject([Store], (store: Store<AppState>) => {
           routerState = {
-            url: '/home'
+            url: '/home',
           };
           store
             .subscribe((state) => {
@@ -197,10 +212,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -210,7 +225,7 @@ describe('AuthNavMenuComponent', () => {
         });
 
         it('should render login dropdown menu', () => {
-          const loginDropdownMenu = deNavMenuItem.query(By.css('div.loginDropdownMenu'));
+          const loginDropdownMenu = deNavMenuItem.query(By.css('div#loginDropdownMenu'));
           expect(loginDropdownMenu.nativeElement).toBeDefined();
         });
       });
@@ -218,7 +233,7 @@ describe('AuthNavMenuComponent', () => {
       describe('when user is authenticated', () => {
         beforeEach(inject([Store], (store: Store<AppState>) => {
           routerState = {
-            url: '/home'
+            url: '/home',
           };
           store
             .subscribe((state) => {
@@ -236,10 +251,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -248,7 +263,7 @@ describe('AuthNavMenuComponent', () => {
           component = null;
         });
         it('should render UserMenuComponent component', () => {
-          const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-user-menu'));
+          const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-themed-user-menu'));
           expect(logoutDropdownMenu.nativeElement).toBeDefined();
         });
       });
@@ -267,21 +282,21 @@ describe('AuthNavMenuComponent', () => {
           StoreModule.forRoot(authReducer, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [
-          AuthNavMenuComponent
+          AuthNavMenuComponent,
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
         ],
         schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
+          CUSTOM_ELEMENTS_SCHEMA,
+        ],
       })
         .compileComponents();
 
@@ -309,11 +324,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -322,7 +334,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render login link', () => {
-        const loginDropdownMenu = deNavMenuItem.query(By.css('.loginLink'));
+        const loginDropdownMenu = deNavMenu.query(By.css('.loginLink'));
         expect(loginDropdownMenu.nativeElement).toBeDefined();
       });
     });
@@ -345,11 +357,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -358,7 +367,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render logout link', inject([Store], (store: Store<AppState>) => {
-        const logoutDropdownMenu = deNavMenuItem.query(By.css('a.logoutLink'));
+        const logoutDropdownMenu = deNavMenu.query(By.css('a.logoutLink'));
         expect(logoutDropdownMenu.nativeElement).toBeDefined();
       }));
     });
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index 37a45e1b20..878ffa9e03 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,23 +1,48 @@
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-
-import { filter, map } from 'rxjs/operators';
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterReducerState } from '@ngrx/router-store';
-import { select, Store } from '@ngrx/store';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { fadeInOut, fadeOut } from '../animations/fade';
-import { HostWindowService } from '../host-window.service';
-import { AppState, routerStateSelector } from '../../app.reducer';
-import { isNotUndefined } from '../empty.util';
-import { isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
+import {
+  AppState,
+  routerStateSelector,
+} from '../../app.reducer';
+import {
+  AuthService,
+  LOGIN_ROUTE,
+  LOGOUT_ROUTE,
+} from '../../core/auth/auth.service';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from '../../core/auth/selectors';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { AuthService, LOGIN_ROUTE, LOGOUT_ROUTE } from '../../core/auth/auth.service';
+import {
+  fadeInOut,
+  fadeOut,
+} from '../animations/fade';
+import { isNotUndefined } from '../empty.util';
+import { HostWindowService } from '../host-window.service';
 
 @Component({
   selector: 'ds-auth-nav-menu',
   templateUrl: './auth-nav-menu.component.html',
   styleUrls: ['./auth-nav-menu.component.scss'],
-  animations: [fadeInOut, fadeOut]
+  animations: [fadeInOut, fadeOut],
 })
 export class AuthNavMenuComponent implements OnInit {
   /**
@@ -32,7 +57,7 @@ export class AuthNavMenuComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   public showAuth = observableOf(false);
 
@@ -42,9 +67,9 @@ export class AuthNavMenuComponent implements OnInit {
 
   constructor(private store: Store<AppState>,
               private windowService: HostWindowService,
-              private authService: AuthService
+              private authService: AuthService,
   ) {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit(): void {
@@ -60,8 +85,8 @@ export class AuthNavMenuComponent implements OnInit {
       select(routerStateSelector),
       filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state)),
       map((router: RouterReducerState) => (!router.state.url.startsWith(LOGIN_ROUTE)
-        && !router.state.url.startsWith(LOGOUT_ROUTE))
-      )
+        && !router.state.url.startsWith(LOGOUT_ROUTE)),
+      ),
     );
   }
 }
diff --git a/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
index 14ea45d236..c0a1f465ae 100644
--- a/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../theme-support/themed.component';
 import { AuthNavMenuComponent } from './auth-nav-menu.component';
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
new file mode 100644
index 0000000000..02953d3f5b
--- /dev/null
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -0,0 +1,37 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { UserMenuComponent } from './user-menu.component';
+
+/**
+ * This component represents the user nav menu.
+ */
+@Component({
+  selector: 'ds-themed-user-menu',
+  templateUrl: './../../theme-support/themed.component.html',
+  styleUrls: [],
+})
+export class ThemedUserMenuComponent extends ThemedComponent<UserMenuComponent>{
+
+  /**
+   * The input flag to show user details in navbar expandable menu
+   */
+  @Input() inExpandableNavbar: boolean;
+
+  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+
+  protected getComponentName(): string {
+    return 'UserMenuComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import((`../../../../themes/${themeName}/app/shared/auth-nav-menu/user-menu/user-menu.component`));
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./user-menu.component');
+  }
+}
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 85b9d8aece..a6d4188f92 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,15 +1,32 @@
 <ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
-<div *ngIf="!(loading$ | async)">
-  <span class="dropdown-item-text" [class.pl-0]="inExpandableNavbar">
+<ul *ngIf="(loading$ | async) !== true" class="user-menu" role="menu"
+    [ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
+    [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
+  <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
     {{dsoNameService.getName(user$ | async)}}<br>
     <span class="text-muted">{{(user$ | async)?.email}}</span>
-  </span>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[profileRoute]" routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[mydspaceRoute]" routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[subscriptionsRoute]" routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
-
-  <div class="dropdown-divider"></div>
-  <ds-log-out *ngIf="!inExpandableNavbar" data-test="log-out-component"></ds-log-out>
-</div>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[profileRoute]"
+       routerLinkActive="active">{{'nav.profile' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[mydspaceRoute]"
+       routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[subscriptionsRoute]"
+       routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
+  </li>
+  <ng-container *ngIf="!inExpandableNavbar">
+    <li class="dropdown-divider" aria-hidden="true"></li>
+    <li class="ds-menu-item-wrapper" role="presentation">
+      <ds-log-out data-test="log-out-component"></ds-log-out>
+    </li>
+  </ng-container>
+</ul>
 
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
index e69de29bb2..8fa0019bf1 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
@@ -0,0 +1,45 @@
+:host {
+  ul.user-menu  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+
+    &.user-menu-dropdown {
+      .ds-menu-item-wrapper {
+        a.ds-menu-item, &.username-email-wrapper {
+          padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-dropdown-padding);
+        }
+
+        a.ds-menu-item {
+          display: block;
+          color: var(--ds-expandable-navbar-link-color);
+          &:hover {
+            color: var(--ds-expandable-navbar-link-color-hover);
+            background-color: var(--ds-user-menu-dropdown-link-background-hover);
+          }
+        }
+      }
+    }
+
+    &.user-menu-mobile {
+      .ds-menu-item-wrapper {
+        padding-top: var(--ds-user-menu-item-vertical-padding);
+        padding-bottom: var(--ds-user-menu-item-vertical-padding);
+      }
+
+      .ds-menu-item {
+        display: inline-block;
+      }
+
+      .ds-menu-item, .ds-menu-toggler-wrapper {
+        color: var(--ds-expandable-navbar-link-color) !important;
+
+        &:hover, &:focus {
+          color: var(--ds-expandable-navbar-link-background-hover) !important;
+        }
+      }
+
+    }
+  }
+
+}
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index 5576b942b3..20f8657211 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -1,20 +1,36 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { UserMenuComponent } from './user-menu.component';
-import { authReducer, AuthState } from '../../../core/auth/auth.reducer';
-import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
-import { EPersonMock } from '../../testing/eperson.mock';
-import { AppState } from '../../../app.reducer';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { cold } from 'jasmine-marbles';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AuthService } from '../../../core/auth/auth.service';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
 
+import { AppState } from '../../../app.reducer';
+import {
+  authReducer,
+  AuthState,
+} from '../../../core/auth/auth.reducer';
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { UserMenuComponent } from './user-menu.component';
+
 describe('UserMenuComponent', () => {
 
   let component: UserMenuComponent;
@@ -26,7 +42,7 @@ describe('UserMenuComponent', () => {
 
   function serviceInit() {
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: of(EPersonMock)
+      getAuthenticatedUserFromStore: of(EPersonMock),
     });
   }
 
@@ -38,7 +54,7 @@ describe('UserMenuComponent', () => {
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     authStateLoading = {
       authenticated: true,
@@ -47,7 +63,7 @@ describe('UserMenuComponent', () => {
       loading: true,
       authToken: null,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
   }
 
@@ -58,25 +74,25 @@ describe('UserMenuComponent', () => {
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
       ],
       declarations: [
-        UserMenuComponent
+        UserMenuComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
   }));
@@ -112,11 +128,11 @@ describe('UserMenuComponent', () => {
       expect(component).toBeDefined();
 
       expect(component.loading$).toBeObservable(cold('b', {
-        b: true
+        b: true,
       }));
 
       expect(component.user$).toBeObservable(cold('(c|)', {
-        c: EPersonMock
+        c: EPersonMock,
       }));
 
       expect(deUserMenu).toBeNull();
@@ -140,7 +156,7 @@ describe('UserMenuComponent', () => {
 
       fixture.detectChanges();
 
-      deUserMenu = fixture.debugElement.query(By.css('div'));
+      deUserMenu = fixture.debugElement.query(By.css('ul#user-menu-dropdown'));
     }));
 
     afterEach(() => {
@@ -151,11 +167,11 @@ describe('UserMenuComponent', () => {
       expect(component).toBeDefined();
 
       expect(component.loading$).toBeObservable(cold('b', {
-        b: false
+        b: false,
       }));
 
       expect(component.user$).toBeObservable(cold('(c|)', {
-        c: EPersonMock
+        c: EPersonMock,
       }));
 
       expect(deUserMenu).toBeDefined();
@@ -164,7 +180,7 @@ describe('UserMenuComponent', () => {
     it('should display user name and email', () => {
       const username = 'User Test';
       const email = 'test@test.com';
-      const span = deUserMenu.query(By.css('.dropdown-item-text'));
+      const span = deUserMenu.query(By.css('.username-email-wrapper'));
       expect(span).toBeDefined();
       expect(span.nativeElement.innerHTML).toContain(username);
       expect(span.nativeElement.innerHTML).toContain(email);
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index dcf12fb47b..28edd2b5b9 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,15 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
 
-import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { AppState } from '../../../app.reducer';
-import { isAuthenticationLoading } from '../../../core/auth/selectors';
-import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
+import {
+  getProfileModuleRoute,
+  getSubscriptionsModuleRoute,
+} from '../../../app-routing-paths';
 import { AuthService } from '../../../core/auth/auth.service';
-import { getProfileModuleRoute, getSubscriptionsModuleRoute } from '../../../app-routing-paths';
+import { isAuthenticationLoading } from '../../../core/auth/selectors';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
 
 /**
  * This component represents the user nav menu.
@@ -17,7 +26,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-user-menu',
   templateUrl: './user-menu.component.html',
-  styleUrls: ['./user-menu.component.scss']
+  styleUrls: ['./user-menu.component.scss'],
 })
 export class UserMenuComponent implements OnInit {
 
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index d6a0005173..7d7e726659 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,6 +1,7 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h3 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h3>
-  <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
+  <h1 *ngIf="displayTitle">{{title | translate}}</h1>
+  <ds-starts-with-loader [paginationId]="paginationConfig?.id" [startsWithOptions]="startsWithOptions" [type]="type">
+  </ds-starts-with-loader>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
         <ds-themed-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-themed-results-back-button>
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 9317a68007..d171eb7d01 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -1,58 +1,67 @@
-import { BrowseByComponent } from './browse-by.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { Item } from '../../core/shared/item.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { GroupDataService } from '../../core/eperson/group-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import {
-  ListableObjectComponentLoaderComponent
-} from '../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { RouteService } from '../../core/services/route.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { ITEM } from '../../core/shared/item.resource-type';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import {
-  BrowseEntryListElementComponent
-} from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { HostWindowService } from '../host-window.service';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import {
   DEFAULT_CONTEXT,
   listableObjectComponent,
 } from '../object-collection/shared/listable-object/listable-object.decorator';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { ITEM } from '../../core/shared/item.resource-type';
-import { ThemeService } from '../theme-support/theme.service';
+import { ListableObjectComponentLoaderComponent } from '../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { BrowseEntryListElementComponent } from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
-import { HostWindowServiceStub } from '../testing/host-window-service.stub';
-import { HostWindowService } from '../host-window.service';
-import { RouteService } from '../../core/services/route.service';
-import { routeServiceStub } from '../testing/route-service.stub';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { createPaginatedList } from '../testing/utils.test';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { getMockThemeService } from '../mocks/theme-service.mock';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { SharedModule } from '../shared.module';
-import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
-import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+import { HostWindowServiceStub } from '../testing/host-window-service.stub';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { routeServiceStub } from '../testing/route-service.stub';
+import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
+import { createPaginatedList } from '../testing/utils.test';
+import { ThemeService } from '../theme-support/theme.service';
+import { BrowseByComponent } from './browse-by.component';
 
-@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
+@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'dspace')
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
-  selector: '',
-  template: ''
+  selector: 'ds-browse-entry-list-element',
+  template: '',
 })
 class MockThemedBrowseEntryListElementComponent {
 }
@@ -61,28 +70,6 @@ describe('BrowseByComponent', () => {
   let comp: BrowseByComponent;
   let fixture: ComponentFixture<BrowseByComponent>;
 
-  const mockItems = [
-    Object.assign(new Item(), {
-      id: 'fakeId-1',
-      metadata: [
-        {
-          key: 'dc.title',
-          value: 'First Fake Title'
-        }
-      ]
-    }),
-    Object.assign(new Item(), {
-      id: 'fakeId-2',
-      metadata: [
-        {
-          key: 'dc.title',
-          value: 'Second Fake Title'
-        }
-      ]
-    })
-  ];
-  const mockItemsRD$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockItems));
-
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
     findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
@@ -90,31 +77,31 @@ describe('BrowseByComponent', () => {
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   const paginationConfig = Object.assign(new PaginationComponentOptions(), {
     id: 'test-pagination',
     currentPage: 1,
     pageSizeOptions: [5, 10, 15, 20],
-    pageSize: 15
+    pageSize: 15,
   });
   const paginationService = new PaginationServiceStub(paginationConfig);
 
   let themeService;
 
   beforeEach(waitForAsync(() => {
-    themeService = getMockThemeService('dspace');
-    TestBed.configureTestingModule({
+    themeService = getMockThemeService('base');
+    void TestBed.configureTestingModule({
       imports: [
         BrowseByRoutingModule,
         AccessControlRoutingModule,
@@ -124,11 +111,11 @@ describe('BrowseByComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [BrowseByComponent],
       providers: [
@@ -139,11 +126,11 @@ describe('BrowseByComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         { provide: MockThemedBrowseEntryListElementComponent },
         { provide: ThemeService, useValue: themeService },
-        { provide: RouteService, useValue: routeServiceStub},
+        { provide: RouteService, useValue: routeServiceStub },
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
     fixture = TestBed.createComponent(BrowseByComponent);
     comp = fixture.componentInstance;
@@ -200,39 +187,39 @@ describe('BrowseByComponent', () => {
     });
 
     describe('when theme is base', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         themeService.getThemeName.and.returnValue('base');
         themeService.getThemeName$.and.returnValue(observableOf('base'));
         fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
       });
 
       it('should use the base component to render browse entries', () => {
-        waitForAsync(() => {
-          const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
-          expect(componentLoaders.length).toEqual(browseEntries.length);
-          componentLoaders.forEach((componentLoader) => {
-            const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
-            expect(browseEntry.componentInstance).toBeInstanceOf(BrowseEntryListElementComponent);
-          });
+        const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
+        expect(componentLoaders.length).toEqual(browseEntries.length);
+        componentLoaders.forEach((componentLoader) => {
+          const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
+          expect(browseEntry.componentInstance).toBeInstanceOf(BrowseEntryListElementComponent);
         });
       });
     });
 
-    describe('when theme is custom', () => {
-      beforeEach(() => {
-        themeService.getThemeName.and.returnValue('custom');
-        themeService.getThemeName$.and.returnValue(observableOf('custom'));
+    describe('when theme is dspace', () => {
+      beforeEach(async () => {
+        themeService.getThemeName.and.returnValue('dspace');
+        themeService.getThemeName$.and.returnValue(observableOf('dspace'));
+        fixture.detectChanges();
+        await fixture.whenStable();
         fixture.detectChanges();
       });
 
       it('should use the themed component to render browse entries', () => {
-        waitForAsync(() => {
-          const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
-          expect(componentLoaders.length).toEqual(browseEntries.length);
-          componentLoaders.forEach((componentLoader) => {
-            const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
-            expect(browseEntry.componentInstance).toBeInstanceOf(MockThemedBrowseEntryListElementComponent);
-          });
+        const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
+        expect(componentLoaders.length).toEqual(browseEntries.length);
+        componentLoaders.forEach((componentLoader) => {
+          const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
+          expect(browseEntry.componentInstance).toBeInstanceOf(MockThemedBrowseEntryListElementComponent);
         });
       });
     });
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 0dc20033f8..e24e410dec 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,18 +1,39 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { fadeIn, fadeInOut } from '../animations/fade';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-import { getStartsWithComponent, StartsWithType } from '../starts-with/starts-with-decorator';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { RouteService } from '../../core/services/route.service';
-import { map } from 'rxjs/operators';
-import { hasValue } from '../empty.util';
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { RouteService } from '../../core/services/route.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../animations/fade';
+import { hasValue } from '../empty.util';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { StartsWithType } from '../starts-with/starts-with-decorator';
 
 @Component({
   selector: 'ds-browse-by',
@@ -20,13 +41,13 @@ import { TranslateService } from '@ngx-translate/core';
   templateUrl: './browse-by.component.html',
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component to display a browse-by page for any ListableObject
  */
-export class BrowseByComponent implements OnInit, OnDestroy {
+export class BrowseByComponent implements OnInit, OnChanges, OnDestroy {
 
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
@@ -39,9 +60,10 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   @Input() title: string;
 
   /**
-   * The parent name
+   * Whether the title should be displayed
    */
-  @Input() parentname: string;
+  @Input() displayTitle = true;
+
   /**
    * The list of objects to display
    */
@@ -66,7 +88,7 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   /**
    * The list of options to render for the StartsWith component
    */
-  @Input() startsWithOptions = [];
+  @Input() startsWithOptions: (string | number)[] = [];
 
   /**
    * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
@@ -98,16 +120,6 @@ export class BrowseByComponent implements OnInit, OnDestroy {
    */
   @Output() sortDirectionChange = new EventEmitter<SortDirection>();
 
-  /**
-   * An object injector used to inject the startsWithOptions to the switchable StartsWith component
-   */
-  objectInjector: Injector;
-
-  /**
-   * Declare SortDirection enumeration to use it in the template
-   */
-  public sortDirections = SortDirection;
-
   /**
    * Observable that tracks if the back button should be displayed based on the path parameters
    */
@@ -141,7 +153,7 @@ export class BrowseByComponent implements OnInit, OnDestroy {
    */
   back = () => {
     const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
-    this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
+    this.paginationService.updateRoute(this.paginationConfig.id, { page: page }, { [this.paginationConfig.id + '.return']: null, value: null, startsWith: null });
   };
 
   /**
@@ -158,44 +170,19 @@ export class BrowseByComponent implements OnInit, OnDestroy {
     this.next.emit(true);
   }
 
-  /**
-   * Change the page size
-   * @param size
-   */
-  doPageSizeChange(size) {
-    this.paginationService.updateRoute(this.paginationConfig.id,{pageSize: size});
-  }
-
-  /**
-   * Change the sort direction
-   * @param direction
-   */
-  doSortDirectionChange(direction) {
-    this.paginationService.updateRoute(this.paginationConfig.id,{sortDirection: direction});
-  }
-
-  /**
-   * Get the switchable StartsWith component dependant on the type
-   */
-  getStartsWithComponent() {
-    return getStartsWithComponent(this.type);
-  }
-
   ngOnInit(): void {
-    this.objectInjector = Injector.create({
-      providers: [
-        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
-        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
-      ],
-      parent: this.injector
-    });
-
     const startsWith$ = this.routeService.getQueryParameterValue('startsWith');
     const value$ = this.routeService.getQueryParameterValue('value');
 
     this.shouldDisplayResetButton$ = observableCombineLatest([startsWith$, value$]).pipe(
-      map(([startsWith, value]) => hasValue(startsWith) || hasValue(value))
+      map(([startsWith, value]) => hasValue(startsWith) || hasValue(value)),
     );
+  }
+
+  ngOnChanges(): void {
+    if (this.sub) {
+      this.sub.unsubscribe();
+    }
     this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
index ae42576e9b..d41733dbfd 100644
--- a/src/app/shared/browse-by/shared-browse-by.module.ts
+++ b/src/app/shared/browse-by/shared-browse-by.module.ts
@@ -1,15 +1,22 @@
-import { NgModule } from '@angular/core';
-import { BrowseByComponent } from './browse-by.component';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared.module';
-import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
-import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import { NgModule } from '@angular/core';
+
 import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
+import { SharedModule } from '../shared.module';
+import { BrowseByComponent } from './browse-by.component';
+import { ThemedBrowseByComponent } from './themed-browse-by.component';
+
+const DECLARATIONS = [
+  BrowseByComponent,
+  ThemedBrowseByComponent,
+];
 
 @NgModule({
   declarations: [
-    BrowseByComponent,
-],
+    ...DECLARATIONS,
+  ],
   imports: [
     ResultsBackButtonModule,
     BrowseByRoutingModule,
@@ -18,8 +25,8 @@ import { AccessControlRoutingModule } from '../../access-control/access-control-
     SharedModule,
   ],
   exports: [
-    BrowseByComponent,
-    SharedModule,
-  ]
+    ...DECLARATIONS,
+  ],
 })
-export class SharedBrowseByModule { }
+export class SharedBrowseByModule {
+}
diff --git a/src/app/shared/browse-by/themed-browse-by.component.ts b/src/app/shared/browse-by/themed-browse-by.component.ts
new file mode 100644
index 0000000000..95809ad9b0
--- /dev/null
+++ b/src/app/shared/browse-by/themed-browse-by.component.ts
@@ -0,0 +1,85 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { StartsWithType } from '../starts-with/starts-with-decorator';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { BrowseByComponent } from './browse-by.component';
+
+/**
+ * Themed wrapper for {@link BrowseByComponent}
+ */
+@Component({
+  selector: 'ds-themed-browse-by',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedBrowseByComponent extends ThemedComponent<BrowseByComponent> {
+
+  @Input() title: string;
+
+  @Input() displayTitle: boolean;
+
+  @Input() objects$: Observable<RemoteData<PaginatedList<ListableObject>>>;
+
+  @Input() paginationConfig: PaginationComponentOptions;
+
+  @Input() sortConfig: SortOptions;
+
+  @Input() type: StartsWithType;
+
+  @Input() startsWithOptions: (string | number)[];
+
+  @Input() showPaginator: boolean;
+
+  @Input() hideGear: boolean;
+
+  @Output() prev: EventEmitter<boolean> = new EventEmitter();
+
+  @Output() next: EventEmitter<boolean> = new EventEmitter();
+
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter();
+
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof BrowseByComponent & keyof this)[] = [
+    'title',
+    'displayTitle',
+    'objects$',
+    'paginationConfig',
+    'sortConfig',
+    'type',
+    'startsWithOptions',
+    'showPaginator',
+    'hideGear',
+    'prev',
+    'next',
+    'pageSizeChange',
+    'sortDirectionChange',
+  ];
+
+  protected getComponentName(): string {
+    return 'BrowseByComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/browse-by/browse-by.component.ts`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./browse-by.component');
+  }
+
+}
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 470291373f..c4e5acfb4b 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2">
+<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2 my-2">
   <input type="search"
          class="form-control w-100"
          (click)="$event.stopPropagation();"
@@ -6,9 +6,9 @@
          [formControl]="searchField"
          #searchFieldEl>
 </div>
-<div class="dropdown-divider"></div>
-<ul class="scrollable-menu p-0"
-     aria-labelledby="dropdownMenuButton"
+<div class="dropdown-divider m-0"></div>
+<ul class="scrollable-menu p-0 m-0"
+    role="menu"
      (scroll)="onScroll($event)"
      infiniteScroll
      [infiniteScrollDistance]="1.5"
@@ -18,12 +18,13 @@
      [scrollWindow]="false"
      (scrolled)="onScrollDown()">
 
-  <li class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
+  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length === 0 && (isLoading | async) !== true">
     {{'submission.sections.general.no-collection' | translate}}
   </li>
   <ng-container *ngIf="searchListCollection?.length > 0">
     <li *ngFor="let listItem of searchListCollection"
             class="dropdown-item collection-item"
+            role="menuitem"
             title="{{ listItem.collection.name }}"
             (click)="onSelect(listItem)">
       <div class="list-unstyled mb-0">
@@ -34,9 +35,10 @@
       </div>
     </li>
   </ng-container>
-  <button class="dropdown-item disabled" *ngIf="(isLoading | async)">
-    <ds-themed-loading message="{{'loading.default' | translate}}">
-    </ds-themed-loading>
-  </button>
-
+  <li *ngIf="(isLoading | async)">
+    <button class="dropdown-item disabled">
+      <ds-themed-loading message="{{'loading.default' | translate}}">
+      </ds-themed-loading>
+    </button>
+  </li>
 </ul>
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
index 907a111900..8a28a3ff7e 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.scss
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
@@ -4,7 +4,8 @@
   overflow-x: hidden;
 }
 
-.collection-item {
+li:not(:last-of-type), .dropdown-divider {
+  border-top: none;
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
index 2dc1ee433c..5edd550665 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
@@ -1,25 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, ElementRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  ElementRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { CollectionDropdownComponent } from './collection-dropdown.component';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Collection } from '../../core/shared/collection.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { MockElementRef } from '../testing/element-ref.mock';
+import { CollectionDropdownComponent } from './collection-dropdown.component';
 
 const community: Community = Object.assign(new Community(), {
   id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
   uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-  name: 'Community 1'
+  name: 'Community 1',
 });
 
 const collections: Collection[] = [
@@ -30,9 +40,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 1'
+        value: 'Community 1-Collection 1',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
@@ -41,9 +51,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 2'
+        value: 'Community 1-Collection 2',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
@@ -52,9 +62,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 3'
+        value: 'Community 1-Collection 3',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
@@ -63,9 +73,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 4'
+        value: 'Community 1-Collection 4',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: 'a5159760-f362-4659-9e81-e3253ad91ede',
@@ -74,24 +84,24 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 5'
+        value: 'Community 1-Collection 5',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
-  })
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
+  }),
 ];
 
 const listElementMock = {
   communities: [
     {
       id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-      name: 'Community 1'
-    }
+      name: 'Community 1',
+    },
   ],
   collection: {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
     uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
-    name: 'Collection 3'
-  }
+    name: 'Collection 3',
+  },
 };
 
 describe('CollectionDropdownComponent', () => {
@@ -102,7 +112,7 @@ describe('CollectionDropdownComponent', () => {
 
   const collectionDataServiceMock: any = jasmine.createSpyObj('CollectionDataService', {
     getAuthorizedCollection: jasmine.createSpy('getAuthorizedCollection'),
-    getAuthorizedCollectionByEntityType: jasmine.createSpy('getAuthorizedCollectionByEntityType')
+    getAuthorizedCollectionByEntityType: jasmine.createSpy('getAuthorizedCollectionByEntityType'),
   });
 
   const paginatedCollection = buildPaginatedList(new PageInfo(), collections);
@@ -117,17 +127,17 @@ describe('CollectionDropdownComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [CollectionDropdownComponent],
       providers: [
         { provide: CollectionDataService, useValue: collectionDataServiceMock },
         { provide: ElementRef, useClass: MockElementRef },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -241,7 +251,7 @@ describe('CollectionDropdownComponent', () => {
 
     const expectedTheOnlySelectable = {
       communities: [ { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Community 1', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88' } ],
-      collection: { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Collection 1' }
+      collection: { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Collection 1' },
     };
 
     expect(component.theOnlySelectable.emit).toHaveBeenCalledWith(expectedTheOnlySelectable);
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index 713b32fabe..415560cc3b 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -7,25 +7,40 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  Output
+  Output,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-
-import { BehaviorSubject, from as observableFrom, Observable, of as observableOf, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map, mergeMap, reduce, startWith, switchMap, take } from 'rxjs/operators';
-
-import { hasValue } from '../empty.util';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { Community } from '../../core/shared/community.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { Collection } from '../../core/shared/collection.model';
-import { followLink } from '../utils/follow-link-config.model';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+  BehaviorSubject,
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  mergeMap,
+  reduce,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { hasValue } from '../empty.util';
+import { followLink } from '../utils/follow-link-config.model';
 
 /**
  * An interface to represent a collection entry
@@ -47,7 +62,7 @@ export interface CollectionListEntry {
 @Component({
   selector: 'ds-collection-dropdown',
   templateUrl: './collection-dropdown.component.html',
-  styleUrls: ['./collection-dropdown.component.scss']
+  styleUrls: ['./collection-dropdown.component.scss'],
 })
 export class CollectionDropdownComponent implements OnInit, OnDestroy {
 
@@ -151,18 +166,18 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.isLoading.next(false);
     this.subs.push(this.searchField.valueChanges.pipe(
-        debounceTime(500),
-        distinctUntilChanged(),
-        startWith('')
-      ).subscribe(
-        (next) => {
-          if (hasValue(next) && next !== this.currentQuery) {
-            this.resetPagination();
-            this.currentQuery = next;
-            this.populateCollectionList(this.currentQuery, this.currentPage);
-          }
+      debounceTime(500),
+      distinctUntilChanged(),
+      startWith(''),
+    ).subscribe(
+      (next) => {
+        if (hasValue(next) && next !== this.currentQuery) {
+          this.resetPagination();
+          this.currentQuery = next;
+          this.populateCollectionList(this.currentQuery, this.currentPage);
         }
-      ));
+      },
+    ));
     // Workaround for prevent the scroll of main page when this component is placed in a dialog
     setTimeout(() => this.el.nativeElement.querySelector('input').focus(), 0);
   }
@@ -207,52 +222,52 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
     // Set the pagination info
     const findOptions: FindListOptions = {
       elementsPerPage: 10,
-      currentPage: page
+      currentPage: page,
     };
     let searchListService$: Observable<RemoteData<PaginatedList<Collection>>>;
     if (this.entityType) {
       searchListService$ = this.collectionDataService
-      .getAuthorizedCollectionByEntityType(
-        query,
-        this.entityType,
-        findOptions,
-        true,
-        followLink('parentCommunity'));
+        .getAuthorizedCollectionByEntityType(
+          query,
+          this.entityType,
+          findOptions,
+          true,
+          followLink('parentCommunity'));
     } else {
       searchListService$ = this.collectionDataService
-      .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity'));
+        .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity'));
     }
     this.searchListCollection$ = searchListService$.pipe(
-        getFirstCompletedRemoteData(),
-        switchMap((collectionsRD: RemoteData<PaginatedList<Collection>>) => {
-          this.searchComplete.emit();
-          if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) {
-            if (this.searchListCollection.length >= collectionsRD.payload.totalElements) {
-              this.hasNextPage = false;
-            }
-            this.emitSelectionEvents(collectionsRD);
-            return observableFrom(collectionsRD.payload.page).pipe(
-              mergeMap((collection: Collection) => collection.parentCommunity.pipe(
-                getFirstSucceededRemoteDataPayload(),
-                map((community: Community) => ({
-                    communities: [{ id: community.id, name: this.dsoNameService.getName(community) }],
-                    collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) }
-                  })
-                ))),
-              reduce((acc: any, value: any) => [...acc, value], []),
-            );
-          } else {
+      getFirstCompletedRemoteData(),
+      switchMap((collectionsRD: RemoteData<PaginatedList<Collection>>) => {
+        this.searchComplete.emit();
+        if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) {
+          if (this.searchListCollection.length >= collectionsRD.payload.totalElements) {
             this.hasNextPage = false;
-            return observableOf([]);
           }
-        })
-        );
+          this.emitSelectionEvents(collectionsRD);
+          return observableFrom(collectionsRD.payload.page).pipe(
+            mergeMap((collection: Collection) => collection.parentCommunity.pipe(
+              getFirstSucceededRemoteDataPayload(),
+              map((community: Community) => ({
+                communities: [{ id: community.id, name: this.dsoNameService.getName(community) }],
+                collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) },
+              }),
+              ))),
+            reduce((acc: any, value: any) => [...acc, value], []),
+          );
+        } else {
+          this.hasNextPage = false;
+          return observableOf([]);
+        }
+      }),
+    );
     this.subs.push(
       this.searchListCollection$.subscribe((list: CollectionListEntry[]) => {
         this.searchListCollection.push(...list);
         this.hideShowLoader(false);
         this.changeDetectorRef.detectChanges();
-      })
+      }),
     );
   }
 
@@ -300,11 +315,11 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
       const collection = collections.payload.page[0];
       collections.payload.page[0].parentCommunity.pipe(
         getFirstSucceededRemoteDataPayload(),
-        take(1)
+        take(1),
       ).subscribe((community: Community) => {
         this.theOnlySelectable.emit({
           communities: [{ id: community.id, name: this.dsoNameService.getName(community), uuid: community.id }],
-          collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) }
+          collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) },
         });
       });
     }
diff --git a/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts b/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts
index 3fb338186f..6ecb6aeff8 100644
--- a/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts
@@ -1,6 +1,15 @@
-import { CollectionDropdownComponent, CollectionListEntry } from './collection-dropdown.component';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { ThemedComponent } from '../theme-support/themed.component';
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import {
+  CollectionDropdownComponent,
+  CollectionListEntry,
+} from './collection-dropdown.component';
 
 @Component({
   selector: 'ds-themed-collection-dropdown',
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index 5d7b092f74..c79dba42b7 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,13 +1,13 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-12 d-inline-block">
-      <label>{{type.value + '.edit.logo.label' | translate}}</label>
+    <div class="col-12 d-inline-block mb-1">
+      <span>{{type.value + '.edit.logo.label' | translate}}</span>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
       <div class="col-12 d-inline-block alert" [ngClass]="{'alert-danger': markLogoForDeletion}" id="logo-section" *ngIf="logo">
         <div class="row">
           <div class="col-8 d-inline-block">
-            <ds-comcol-page-logo [logo]="logo"></ds-comcol-page-logo>
+            <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
           </div>
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
@@ -27,6 +27,7 @@
       </div>
       <div *ngIf="!logo" class="col-12 d-inline-block">
         <ds-uploader  *ngIf="initializedUploaderOptions | async"
+                      [ariaLabel]="type.value + '.browse.logo'"
                       [dropMsg]="type.value + '.edit.logo.upload'"
                       [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
                       [enableDragOverDocument]="true"
@@ -42,7 +43,7 @@
          [formModel]="formModel"
          [displayCancel]="false"
          (submitForm)="onSubmit()">
-  <button before (click)="back.emit()" class="btn btn-outline-secondary">
-    <i class="fas fa-arrow-left"></i> {{ type.value + '.edit.return' | translate }}
+  <button before (click)="back.emit()" class="btn btn-outline-secondary" type="button">
+    <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
   </button>
 </ds-form>
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
index 3f74f05118..07daad2849 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -1,12 +1,25 @@
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RequestService } from '../../../../core/data/request.service';
@@ -15,11 +28,13 @@ import { Community } from '../../../../core/shared/community.model';
 import { hasValue } from '../../../empty.util';
 import { AuthServiceMock } from '../../../mocks/auth.service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { VarDirective } from '../../../utils/var.directive';
 import { ComColFormComponent } from './comcol-form.component';
-import { Operation } from 'fast-json-patch';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<any>;
@@ -35,7 +50,7 @@ describe('ComColFormComponent', () => {
         return new UntypedFormGroup(controls);
       }
       return undefined;
-    }
+    },
   };
   const dcTitle = 'dc.title';
   const dcAbstract = 'dc.description.abstract';
@@ -46,22 +61,22 @@ describe('ComColFormComponent', () => {
     new DynamicInputModel({
       id: 'title',
       name: dcTitle,
-      value: newTitleMD[dcTitle][0].value
+      value: newTitleMD[dcTitle][0].value,
     }),
     new DynamicInputModel({
       id: 'abstract',
       name: dcAbstract,
-      value: abstractMD[dcAbstract][0].value
-    })
+      value: abstractMD[dcAbstract][0].value,
+    }),
   ];
 
   const logo = {
-    id: 'logo'
+    id: 'logo',
   };
   const logoEndpoint = 'rest/api/logo/endpoint';
   const dsoService = Object.assign({
     getLogoEndpoint: () => observableOf(logoEndpoint),
-    deleteLogo: () => createSuccessfulRemoteDataObject$({})
+    deleteLogo: () => createSuccessfulRemoteDataObject$({}),
   });
   const notificationsService = new NotificationsServiceStub();
 
@@ -70,10 +85,10 @@ describe('ComColFormComponent', () => {
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
   const requestServiceStub = jasmine.createSpyObj('requestService', {
-    removeByHrefSubstring: {}
+    removeByHrefSubstring: {},
   });
   const objectCacheStub = jasmine.createSpyObj('objectCache', {
-    remove: {}
+    remove: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -86,16 +101,16 @@ describe('ComColFormComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         { provide: AuthService, useValue: new AuthServiceMock() },
         { provide: RequestService, useValue: requestServiceStub },
-        { provide: ObjectCacheService, useValue: objectCacheStub }
+        { provide: ObjectCacheService, useValue: objectCacheStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   describe('when the dso doesn\'t contain an ID (newly created)', () => {
     beforeEach(() => {
       initComponent(Object.assign(new Community(), {
-        _links: { self: { href: 'community-self' } }
+        _links: { self: { href: 'community-self' } },
       }));
     });
 
@@ -135,23 +150,23 @@ describe('ComColFormComponent', () => {
         expect(comp.submitForm.emit).toHaveBeenCalledWith(
           {
             dso: Object.assign({}, comp.dso, {
-                metadata: {
-                  'dc.title': [{
-                    value: 'New Community Title',
-                    language: null,
-                  }],
-                  'dc.description.abstract': [{
-                    value: 'Community description',
-                    language: null,
-                  }],
-                },
-                type: Community.type,
-              }
+              metadata: {
+                'dc.title': [{
+                  value: 'New Community Title',
+                  language: null,
+                }],
+                'dc.description.abstract': [{
+                  value: 'Community description',
+                  language: null,
+                }],
+              },
+              type: Community.type,
+            },
             ),
             uploader: undefined,
             deleteLogo: false,
             operations: operations,
-          }
+          },
         );
       });
     });
@@ -193,7 +208,7 @@ describe('ComColFormComponent', () => {
         initComponent(Object.assign(new Community(), {
           id: 'community-id',
           logo: createSuccessfulRemoteDataObject$(undefined),
-          _links: { self: { href: 'community-self' } }
+          _links: { self: { href: 'community-self' } },
         }));
       });
 
@@ -214,7 +229,7 @@ describe('ComColFormComponent', () => {
           _links: {
             self: { href: 'community-self' },
             logo: { href: 'community-logo' },
-          }
+          },
         }));
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
index 631a9f0b19..ff51445ec2 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,9 +1,27 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import { FileUploader } from 'ng2-file-upload';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+
 import { AuthService } from '../../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
@@ -13,15 +31,20 @@ import { RestRequestMethod } from '../../../../core/data/rest-request-method';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
-import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { UploaderOptions } from '../../../upload/uploader/uploader-options.model';
-import { UploaderComponent } from '../../../upload/uploader/uploader.component';
-import { Operation } from 'fast-json-patch';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../core/shared/metadata.models';
 import { NoContent } from '../../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { UploaderComponent } from '../../../upload/uploader/uploader.component';
+import { UploaderOptions } from '../../../upload/uploader/uploader-options.model';
 
 /**
  * A form for creating and editing Communities or Collections
@@ -29,7 +52,7 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 @Component({
   selector: 'ds-comcol-form',
   styleUrls: ['./comcol-form.component.scss'],
-  templateUrl: './comcol-form.component.html'
+  templateUrl: './comcol-form.component.html',
 })
 export class ComColFormComponent<T extends Collection | Community> implements OnInit, OnDestroy {
 
@@ -73,7 +96,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
    * @type {UploaderOptions}
    */
   uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
-    autoUpload: false
+    autoUpload: false,
   });
 
   /**
@@ -131,7 +154,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
       this.formModel.forEach(
         (fieldModel: DynamicInputModel) => {
           fieldModel.value = this.dso.firstMetadataValue(fieldModel.name);
-        }
+        },
       );
       this.formGroup = this.formService.createFormGroup(this.formModel);
 
@@ -145,7 +168,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
         this.subs.push(
           observableCombineLatest([
             this.dsoService.getLogoEndpoint(this.dso.id),
-            this.dso.logo
+            this.dso.logo,
           ]).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
             this.uploadFilesOptions.url = href;
             this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
@@ -154,7 +177,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
               this.uploadFilesOptions.method = RestRequestMethod.PUT;
             }
             this.initializedUploaderOptions.next(true);
-          })
+          }),
         );
       } else {
         // Set a placeholder URL to not break the uploader component. This will be replaced once the object is created.
@@ -171,17 +194,17 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   onSubmit() {
     if (this.markLogoForDeletion && hasValue(this.dso.id) && hasValue(this.dso._links.logo)) {
       this.dsoService.deleteLogo(this.dso).pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((response: RemoteData<NoContent>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.title'),
-            this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.content')
+            this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.content'),
           );
         } else {
           this.notificationsService.error(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.error.title'),
-            response.errorMessage
+            response.errorMessage,
           );
         }
         this.dso.logo = undefined;
@@ -194,7 +217,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     this.formModel.forEach((fieldModel: DynamicInputModel) => {
       const value: MetadataValue = {
         value: fieldModel.value as string,
-        language: null
+        language: null,
       } as any;
       if (formMetadata.hasOwnProperty(fieldModel.name)) {
         formMetadata[fieldModel.name].push(value);
@@ -206,9 +229,9 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     const updatedDSO = Object.assign({}, this.dso, {
       metadata: {
         ...this.dso.metadata,
-        ...formMetadata
+        ...formMetadata,
       },
-      type: Community.type
+      type: Community.type,
     });
 
     const operations: Operation[] = [];
@@ -246,7 +269,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
             fieldModel.errorMessages[key] = this.translate.instant(this.type.value + this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
           });
         }
-      }
+      },
     );
   }
 
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
index f4c05344fa..072eec4b79 100644
--- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
@@ -1,21 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { RouteService } from '../../../../core/services/route.service';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CreateComColPageComponent } from './create-comcol-page.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { RequestService } from '../../../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { Community } from '../../../../core/shared/community.model';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { CreateComColPageComponent } from './create-comcol-page.component';
 
 describe('CreateComColPageComponent', () => {
   let comp: CreateComColPageComponent<any>;
@@ -41,9 +49,9 @@ describe('CreateComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
+        value: 'test community',
       }],
-      _links: {}
+      _links: {},
     });
 
     parentCommunity = Object.assign(new Community(), {
@@ -51,18 +59,18 @@ describe('CreateComColPageComponent', () => {
       id: 'a20da287-e174-466a-9926-f66as300d399',
       metadata: [{
         key: 'dc.title',
-        value: 'parent community'
+        value: 'parent community',
       }],
-      _links: {}
+      _links: {},
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
+        value: 'new community',
       }],
-      _links: {}
+      _links: {},
     });
 
     communityDataServiceStub = {
@@ -70,22 +78,22 @@ describe('CreateComColPageComponent', () => {
         uuid: uuid,
         metadata: [{
           key: 'dc.title',
-          value: community.name
-        }]
+          value: community.name,
+        }],
       })),
       create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
       getLogoEndpoint: () => observableOf(logoEndpoint),
       findByHref: () => null,
       refreshCache: () => {
         return;
-      }
+      },
     };
 
     routeServiceStub = {
-      getQueryParameterValue: (param) => observableOf(community.uuid)
+      getQueryParameterValue: (param) => observableOf(community.uuid),
     };
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     requestServiceStub = jasmine.createSpyObj('RequestService', {
@@ -104,9 +112,9 @@ describe('CreateComColPageComponent', () => {
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: routerStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: requestServiceStub }
+        { provide: RequestService, useValue: requestServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -131,20 +139,20 @@ describe('CreateComColPageComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           _links: {},
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
@@ -174,22 +182,22 @@ describe('CreateComColPageComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           _links: {},
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [
-              {}
+              {},
             ],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index 9034bffe8e..de90df6084 100644
--- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -1,28 +1,39 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { mergeMap, take } from 'rxjs/operators';
+import {
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { RouteService } from '../../../../core/services/route.service';
-import { Community } from '../../../../core/shared/community.model';
-import { getFirstSucceededRemoteDataPayload, } from '../../../../core/shared/operators';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { RequestParam } from '../../../../core/cache/models/request-param.model';
 import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Collection } from '../../../../core/shared/collection.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../../core/shared/community.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
 
 /**
  * Component representing the create page for communities and collections
  */
 @Component({
   selector: 'ds-create-comcol',
-  template: ''
+  template: '',
 })
 export class CreateComColPageComponent<TDomain extends Collection | Community> implements OnInit {
   /**
@@ -58,7 +69,7 @@ export class CreateComColPageComponent<TDomain extends Collection | Community> i
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
 
   }
@@ -83,10 +94,10 @@ export class CreateComColPageComponent<TDomain extends Collection | Community> i
     this.parentUUID$.pipe(
       take(1),
       mergeMap((uuid: string) => {
-      const params = uuid ? [new RequestParam('parent', uuid)] : [];
-      return this.dsoDataService.create(dso, ...params)
-        .pipe(getFirstSucceededRemoteDataPayload()
-        );
+        const params = uuid ? [new RequestParam('parent', uuid)] : [];
+        return this.dsoDataService.create(dso, ...params)
+          .pipe(getFirstSucceededRemoteDataPayload(),
+          );
       }))
       .subscribe((dsoRD: TDomain) => {
         if (isNotUndefined(dsoRD)) {
diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
index 1040e31c57..05fea7eb9f 100644
--- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
@@ -1,19 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DeleteComColPageComponent } from './delete-comcol-page.component';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { createFailedRemoteDataObject$, createNoContentRemoteDataObject$ } from '../../../remote-data.utils';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { Community } from '../../../../core/shared/community.model';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createNoContentRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { DeleteComColPageComponent } from './delete-comcol-page.component';
 
 describe('DeleteComColPageComponent', () => {
   let comp: DeleteComColPageComponent<any>;
@@ -41,16 +55,16 @@ describe('DeleteComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
-      }]
+        value: 'new community',
+      }],
     });
 
     parentCommunity = Object.assign(new Community(), {
@@ -58,8 +72,8 @@ describe('DeleteComColPageComponent', () => {
       id: 'a20da287-e174-466a-9926-f66as300d399',
       metadata: [{
         key: 'dc.title',
-        value: 'parent community'
-      }]
+        value: 'parent community',
+      }],
     });
 
     dsoDataService = jasmine.createSpyObj(
@@ -70,15 +84,15 @@ describe('DeleteComColPageComponent', () => {
       });
 
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     routeStub = {
-      data: observableOf(community)
+      data: observableOf(community),
     };
 
     translateServiceStub = jasmine.createSpyObj('TranslateService', {
-      instant: jasmine.createSpy('instant')
+      instant: jasmine.createSpy('instant'),
     });
 
   }
@@ -94,7 +108,7 @@ describe('DeleteComColPageComponent', () => {
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: TranslateService, useValue: translateServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -117,10 +131,10 @@ describe('DeleteComColPageComponent', () => {
           uuid: validUUID,
           metadata: [{
             key: 'dc.title',
-            value: 'test'
-          }]
+            value: 'test',
+          }],
         }),
-        _links: {}
+        _links: {},
       };
 
       data2 = {
@@ -128,20 +142,20 @@ describe('DeleteComColPageComponent', () => {
           uuid: invalidUUID,
           metadata: [{
             key: 'dc.title',
-            value: 'test'
-          }]
+            value: 'test',
+          }],
         }),
         _links: {},
         uploader: {
           options: {
-            url: ''
+            url: '',
           },
           queue: [],
           /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
           uploadAll: () => {
-          }
+          },
           /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-        }
+        },
       };
     });
 
@@ -178,8 +192,8 @@ describe('DeleteComColPageComponent', () => {
         uuid: validUUID,
         metadata: [{
           key: 'dc.title',
-          value: 'test'
-        }]
+          value: 'test',
+        }],
       });
     });
 
diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
index c56d0e02ae..b855b2ea5d 100644
--- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
@@ -1,23 +1,36 @@
-import { Component, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { first, map } from 'rxjs/operators';
-import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { NoContent } from '../../../../core/shared/NoContent.model';
-import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { Community } from '../../../../core/shared/community.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../notifications/notifications.service';
 
 /**
  * Component representing the delete page for communities and collections
  */
 @Component({
   selector: 'ds-delete-comcol',
-  template: ''
+  template: '',
 })
 export class DeleteComColPageComponent<TDomain extends Community | Collection> implements OnInit {
   /**
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
index ef69e82c8c..5c2a34d407 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
@@ -1,20 +1,28 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { ComColDataService } from '../../../../../core/data/comcol-data.service';
 import { Community } from '../../../../../core/shared/community.model';
 import { NotificationsService } from '../../../../notifications/notifications.service';
-import { SharedModule } from '../../../../shared.module';
-import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../remote-data.utils';
+import { SharedModule } from '../../../../shared.module';
+import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
 
 describe('ComColMetadataComponent', () => {
@@ -36,34 +44,34 @@ describe('ComColMetadataComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
-      }]
+        value: 'new community',
+      }],
     });
 
     communityDataServiceStub = {
       update: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
       patch: () => null,
-      getLogoEndpoint: () => observableOf(logoEndpoint)
+      getLogoEndpoint: () => observableOf(logoEndpoint),
     };
 
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(community)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(community),
+        }),
+      },
     };
 
   }
@@ -76,9 +84,9 @@ describe('ComColMetadataComponent', () => {
         { provide: ComColDataService, useValue: communityDataServiceStub },
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,12 +118,12 @@ describe('ComColMetadataComponent', () => {
           dso: new Community(),
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
           },
           deleteLogo: false,
@@ -156,21 +164,21 @@ describe('ComColMetadataComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [
-              {}
+              {},
             ],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
index d59030251d..6d024d2499 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -1,21 +1,37 @@
-import { Component, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, take } from 'rxjs/operators';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
-import { hasValue, isEmpty } from '../../../../empty.util';
-import { ResourceType } from '../../../../../core/shared/resource-type';
-import { ComColDataService } from '../../../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Community } from '../../../../../core/shared/community.model';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { ComColDataService } from '../../../../../core/data/comcol-data.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../../../../../core/shared/operators';
+import { ResourceType } from '../../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
 
 @Component({
   selector: 'ds-comcol-metadata',
-  template: ''
+  template: '',
 })
 export class ComcolMetadataComponent<TDomain extends Community | Collection> implements OnInit {
   /**
@@ -37,7 +53,7 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
     protected router: Router,
     protected route: ActivatedRoute,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
   ) {
   }
 
@@ -63,19 +79,18 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
     }
 
     if (!isEmpty(event.operations)) {
-      this.dsoDataService.patch(event.dso, event.operations).pipe(getFirstCompletedRemoteData())
-        .subscribe(async (response: RemoteData<DSpaceObject>) => {
-          if (response.hasSucceeded) {
-            if (!newLogo && !deleteLogo) {
-              await this.router.navigate([this.frontendURL + event.dso.uuid]);
-            }
-            this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
-          } else if (response.statusCode === 403) {
-            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
-          } else {
-            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
-          }
-        });
+      this.dsoDataService.patch(event.dso, event.operations).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((response: RemoteData<DSpaceObject>) => {
+        if (response.hasSucceeded) {
+          this.router.navigate([this.frontendURL + event.dso.uuid]);  // todo: ok not to await this?
+          this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
+        } else if (response.statusCode === 403) {
+          this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
+        } else {
+          this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
+        }
+      });
     }
   }
 
@@ -85,9 +100,9 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
   navigateToHomePage() {
     this.dsoRD$.pipe(
       getFirstSucceededRemoteData(),
-      take(1)
+      take(1),
     ).subscribe((dsoRD: RemoteData<TDomain>) => {
       this.router.navigate([this.frontendURL + dsoRD.payload.id]);
-      });
+    });
   }
 }
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 1e1f3d8209..2b82ef4d5f 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -3,9 +3,9 @@
   <div class="card-body d-flex flex-column"
        *ngVar="group$ | async as group">
 
-    <h5 class="w-100">
+    <h2 class="h4 w-100">
       {{ roleName$ | async }}
-    </h5>
+    </h2>
 
     <div class="mt-2 mb-2">
       <ds-alert [type]="'alert-info'" >{{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.description' | translate}}</ds-alert>
@@ -13,10 +13,10 @@
 
     <div class="d-flex flex-md-row justify-content-between flex-column">
       <div class="w-100 d-flex align-items-center">
-        <ds-themed-loading *ngIf="!(groupRD$ | async)"></ds-themed-loading>
+        <ds-themed-loading *ngIf="groupRD$ | async | dsHasNoValue"></ds-themed-loading>
         <div *ngIf="hasNoGroup$ | async">
           {{'comcol-role.edit.no-group' | translate}}
-        </div>
+        </div>V
         <div *ngIf="hasAnonymousGroup$ | async">
           {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
         </div>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
index 00efc3ccaa..b47ded070c 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
@@ -1,19 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ComcolRoleComponent } from './comcol-role.component';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RequestService } from '../../../../../core/data/request.service';
-import { of as observableOf } from 'rxjs';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ComcolModule } from '../../../comcol.module';
-import { NotificationsService } from '../../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { RequestService } from '../../../../../core/data/request.service';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../remote-data.utils';
+import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
+import { ComcolModule } from '../../../comcol.module';
+import { ComcolRoleComponent } from './comcol-role.component';
 
 describe('ComcolRoleComponent', () => {
 
@@ -31,7 +42,7 @@ describe('ComcolRoleComponent', () => {
   const groupService = {
     findByHref: jasmine.createSpy('findByHref'),
     createComcolGroup: jasmine.createSpy('createComcolGroup').and.returnValue(observableOf({})),
-    deleteComcolGroup: jasmine.createSpy('deleteComcolGroup').and.returnValue(observableOf({}))
+    deleteComcolGroup: jasmine.createSpy('deleteComcolGroup').and.returnValue(observableOf({})),
   };
 
   beforeEach(waitForAsync(() => {
@@ -40,16 +51,16 @@ describe('ComcolRoleComponent', () => {
         ComcolModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: GroupDataService, useValue: groupService },
         { provide: RequestService, useValue: requestService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents().then(() => {
       groupService.findByHref.and.callFake((link) => {
         if (link === 'test role link') {
@@ -128,7 +139,7 @@ describe('ComcolRoleComponent', () => {
 
     beforeEach(() => {
       group = {
-        name: 'Anonymous'
+        name: 'Anonymous',
       };
       statusCode = 200;
       comp.comcolRole = comcolRole;
@@ -162,7 +173,7 @@ describe('ComcolRoleComponent', () => {
 
     beforeEach(() => {
       group = {
-        name: 'custom group name'
+        name: 'custom group name',
       };
       statusCode = 200;
       comp.comcolRole = comcolRole;
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 5ae22d754e..5a304ae9ec 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -1,20 +1,38 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Group } from '../../../../../core/eperson/models/group.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
-import { Collection } from '../../../../../core/shared/collection.model';
-import { filter, map, switchMap } from 'rxjs/operators';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../../../core/shared/operators';
-import { RequestService } from '../../../../../core/data/request.service';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { HALLink } from '../../../../../core/shared/hal-link.model';
-import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
-import { hasNoValue, hasValue } from '../../../../empty.util';
-import { NoContent } from '../../../../../core/shared/NoContent.model';
-import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestService } from '../../../../../core/data/request.service';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { Group } from '../../../../../core/eperson/models/group.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { HALLink } from '../../../../../core/shared/hal-link.model';
+import { NoContent } from '../../../../../core/shared/NoContent.model';
+import {
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData,
+} from '../../../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
 
 /**
  * Component for managing a community or collection role.
@@ -22,7 +40,7 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 @Component({
   selector: 'ds-comcol-role',
   styleUrls: ['./comcol-role.component.scss'],
-  templateUrl: './comcol-role.component.html'
+  templateUrl: './comcol-role.component.html',
 })
 export class ComcolRoleComponent implements OnInit {
 
@@ -30,7 +48,7 @@ export class ComcolRoleComponent implements OnInit {
    * The community or collection to manage.
    */
   @Input()
-  dso: Community | Collection;
+    dso: Community | Collection;
 
   /**
    * The role to manage
@@ -105,7 +123,7 @@ export class ComcolRoleComponent implements OnInit {
    */
   create() {
     this.groupService.createComcolGroup(this.dso, this.comcolRole.name, this.groupLink).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
 
       if (rd.hasSucceeded) {
@@ -114,9 +132,9 @@ export class ComcolRoleComponent implements OnInit {
       } else {
         this.notificationsService.error(
           this.roleName$.pipe(
-            switchMap(role => this.translateService.get('comcol-role.edit.create.error.title', { role }))
+            switchMap(role => this.translateService.get('comcol-role.edit.create.error.title', { role })),
           ),
-          `${rd.statusCode} ${rd.errorMessage}`
+          `${rd.statusCode} ${rd.errorMessage}`,
         );
       }
     });
@@ -127,7 +145,7 @@ export class ComcolRoleComponent implements OnInit {
    */
   delete() {
     this.groupService.deleteComcolGroup(this.groupLink).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<NoContent>) => {
       if (rd.hasSucceeded) {
         this.groupService.clearGroupsRequests();
@@ -135,9 +153,9 @@ export class ComcolRoleComponent implements OnInit {
       } else {
         this.notificationsService.error(
           this.roleName$.pipe(
-            switchMap(role => this.translateService.get('comcol-role.edit.delete.error.title', { role }))
+            switchMap(role => this.translateService.get('comcol-role.edit.delete.error.title', { role })),
           ),
-          rd.errorMessage
+          rd.errorMessage,
         );
       }
     });
@@ -157,7 +175,7 @@ export class ComcolRoleComponent implements OnInit {
         } else {
           return undefined;
         }
-      })
+      }),
     );
 
     this.editGroupLink$ = this.group$.pipe(
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index 819d080f89..a8ca674c26 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -2,11 +2,12 @@
   <div class="row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom">
-        <h2>{{ type + '.edit.head' | translate }}</h2>
-        <div>
+        <h1>{{ type + '.edit.head' | translate }}</h1>
+        <div class="my-auto">
           <a class="btn btn-danger"
-             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'">
-            <i class="fas fa-trash"></i> {{type + '.edit.delete' | translate}}</a>
+             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
+             data-test="delete-button">
+            <i class="fas fa-trash" aria-hidden="true"></i> {{type + '.edit.delete' | translate}}</a>
         </div>
       </div>
       <div class="pt-2">
@@ -14,7 +15,8 @@
           <li *ngFor="let page of pages" class="nav-item">
             <a class="nav-link"
                [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]">
+               [routerLink]="['./' + page]"
+               [attr.data-test]="page">
               {{ type + '.edit.tabs.' + page + '.head' | translate}}
             </a>
           </li>
@@ -25,7 +27,7 @@
           </div>
           <div class="col-12 text-right">
             <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
-              <i class="fas fa-arrow-left"></i> {{ type + '.edit.return' | translate }}
+              <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
             </a>
           </div>
         </div>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
index d3d936c9f7..965b9cae65 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
@@ -1,13 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
-import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SharedModule } from '../../../shared.module';
 import { EditComColPageComponent } from './edit-comcol-page.component';
 
 describe('EditComColPageComponent', () => {
@@ -24,37 +32,37 @@ describe('EditComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     routerStub = {
       navigate: (commands) => commands,
       events: observableOf({}),
-      url: 'mockUrl'
+      url: 'mockUrl',
     };
 
     routeStub = {
       data: observableOf({
-        dso: community
+        dso: community,
       }),
       routeConfig: {
         children: [
           {
             path: 'mockUrl',
             data: {
-              hideReturnButton: false
-            }
-          }
-        ]
+              hideReturnButton: false,
+            },
+          },
+        ],
       },
       snapshot: {
         firstChild: {
           routeConfig: {
-            path: 'mockUrl'
-          }
-        }
-      }
+            path: 'mockUrl',
+          },
+        },
+      },
     };
 
   }
@@ -67,7 +75,7 @@ describe('EditComColPageComponent', () => {
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
index e4d6c9c8a7..269330e6a4 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
@@ -1,19 +1,24 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotEmpty } from '../../../empty.util';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { isNotEmpty } from '../../../empty.util';
 
 /**
  * Component representing the edit page for communities and collections
  */
 @Component({
   selector: 'ds-edit-comcol',
-  template: ''
+  template: '',
 })
 export class EditComColPageComponent<TDomain extends DSpaceObject> implements OnInit {
   /**
@@ -43,7 +48,7 @@ export class EditComColPageComponent<TDomain extends DSpaceObject> implements On
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     this.router.events.subscribe(() => this.initPageParamsByRoute());
   }
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index 504d9f4bcd..b0d72f4a72 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,13 +1,17 @@
-<h2 class="comcol-browse-label h5">{{'browse.comcol.head' | translate}}</h2>
-<nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
+<h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
+<nav *ngIf="(allOptions$ | async) as allOptions" class="comcol-browse mb-4" aria-label="Browse Community or Collection">
   <div class="d-none d-sm-block">
 
-    <div class="list-group list-group-horizontal">
+    <div class="list-group list-group-horizontal" role="tablist">
       <a *ngFor="let option of allOptions"
+         [attr.aria-current]="(currentOption$ | async)?.id === option.id"
          class="list-group-item"
+         role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
-         routerLinkActive="active">{{ option.label | translate }}</a>
+         [class.active]="(currentOption$ | async)?.id === option.id">
+        {{ option.label | translate }}
+      </a>
     </div>
   </div>
 
@@ -15,10 +19,12 @@
     <select name="browse-type"
             class="form-control"
             aria-label="Browse Community or Collection"
-            (ngModelChange)="onSelectChange($event)" [ngModel]="currentOptionId$ | async">
+            (change)="onSelectChange($event)">
       <option *ngFor="let option of allOptions"
-              [ngValue]="option.id"
-              [attr.selected]="(currentOptionId$ | async) === option.id ? 'selected' : null">{{ option.label | translate }}</option>
+              [value]="option.id"
+              [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
+        {{ option.label | translate }}
+      </option>
     </select>
   </div>
 </nav>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 0527d283f0..920ca07f99 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,14 +1,32 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  EventType,
+  Router,
+  Scroll,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
 import { BrowseService } from '../../../core/browse/browse.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 export interface ComColPageNavOption {
   id: string;
@@ -24,64 +42,94 @@ export interface ComColPageNavOption {
 @Component({
   selector: 'ds-comcol-page-browse-by',
   styleUrls: ['./comcol-page-browse-by.component.scss'],
-  templateUrl: './comcol-page-browse-by.component.html'
+  templateUrl: './comcol-page-browse-by.component.html',
 })
-export class ComcolPageBrowseByComponent implements OnInit {
+export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
   /**
    * The ID of the Community or Collection
    */
   @Input() id: string;
   @Input() contentType: string;
 
-  allOptions: ComColPageNavOption[];
+  allOptions$: Observable<ComColPageNavOption[]>;
 
-  currentOptionId$: Observable<string>;
+  currentOption$: BehaviorSubject<ComColPageNavOption> = new BehaviorSubject(undefined);
+
+  subs: Subscription[] = [];
 
   constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private browseService: BrowseService
+    public router: Router,
+    private browseService: BrowseService,
   ) {
   }
 
   ngOnInit(): void {
-    this.browseService.getBrowseDefinitions()
-      .pipe(getFirstCompletedRemoteData<PaginatedList<BrowseDefinition>>())
-      .subscribe((browseDefListRD: RemoteData<PaginatedList<BrowseDefinition>>) => {
+    this.allOptions$ = this.browseService.getBrowseDefinitions().pipe(
+      getFirstCompletedRemoteData(),
+      map((browseDefListRD: RemoteData<PaginatedList<BrowseDefinition>>) => {
+        const allOptions: ComColPageNavOption[] = [];
         if (browseDefListRD.hasSucceeded) {
-          this.allOptions = browseDefListRD.payload.page
-            .map((config: BrowseDefinition) => ({
-              id: config.id,
-              label: `browse.comcol.by.${config.id}`,
-              routerLink: `/browse/${config.id}`,
-              params: { scope: this.id }
-            }));
-
+          let comColRoute: string;
           if (this.contentType === 'collection') {
-            this.allOptions = [{
-              id: this.id,
-              label: 'collection.page.browse.recent.head',
-              routerLink: getCollectionPageRoute(this.id)
-            }, ...this.allOptions];
+            comColRoute = getCollectionPageRoute(this.id);
+            allOptions.push({
+              id: 'search',
+              label: 'collection.page.browse.search.head',
+              routerLink: comColRoute,
+            });
           } else if (this.contentType === 'community') {
-            this.allOptions = [{
-              id: this.id,
+            comColRoute = getCommunityPageRoute(this.id);
+            allOptions.push({
+              id: 'search',
+              label: 'collection.page.browse.search.head',
+              routerLink: comColRoute,
+            });
+            allOptions.push({
+              id: 'comcols',
               label: 'community.all-lists.head',
-              routerLink: getCommunityPageRoute(this.id)
-            }, ...this.allOptions];
+              routerLink: `${comColRoute}/subcoms-cols`,
+            });
+          }
+
+          allOptions.push(...browseDefListRD.payload.page.map((config: BrowseDefinition) => ({
+            id: `browse_${config.id}`,
+            label: `browse.comcol.by.${config.id}`,
+            routerLink: `${comColRoute}/browse/${config.id}`,
+          })));
+        }
+        return allOptions;
+      }),
+    );
+
+    this.subs.push(combineLatest([
+      this.allOptions$,
+      this.router.events,
+    ]).subscribe(([navOptions, scrollEvent]: [ComColPageNavOption[], Scroll]) => {
+      if (scrollEvent.type === EventType.Scroll) {
+        for (const option of navOptions) {
+          if (option.routerLink === scrollEvent.routerEvent.urlAfterRedirects.split('?')[0]) {
+            this.currentOption$.next(option);
           }
         }
-      });
-
-    this.currentOptionId$ = this.route.params.pipe(
-      map((params: Params) => params.id)
-    );
+      }
+    }));
   }
 
-  onSelectChange(newId: string) {
-    const selectedOption = this.allOptions
-      .find((option: ComColPageNavOption) => option.id === newId);
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
 
-    this.router.navigate([selectedOption.routerLink], { queryParams: selectedOption.params });
+  onSelectChange(event: any): void {
+    this.allOptions$.pipe(
+      take(1),
+    ).subscribe((allOptions: ComColPageNavOption[]) => {
+      for (const option of allOptions) {
+        if (option.id === event.target.value) {
+          this.currentOption$.next(option[0]);
+          void this.router.navigate([option.routerLink], { queryParams: option.params });
+          break;
+        }
+      }
+    });
   }
 }
diff --git a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
index 08a13eddf8..f0ed56db71 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
@@ -1,6 +1,10 @@
-import { Component, Input } from '@angular/core';
-import { ComcolPageBrowseByComponent } from './comcol-page-browse-by.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../../theme-support/themed.component';
+import { ComcolPageBrowseByComponent } from './comcol-page-browse-by.component';
 
 /**
  * Themed wrapper for ComcolPageBrowseByComponent
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 841b45dd39..015a82f285 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 /**
  * This component renders any content inside of this component.
@@ -9,7 +12,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'ds-comcol-page-content',
   styleUrls: ['./comcol-page-content.component.scss'],
-  templateUrl: './comcol-page-content.component.html'
+  templateUrl: './comcol-page-content.component.html',
 })
 export class ComcolPageContentComponent {
 
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 552854a0c0..01a71ab142 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="content" class="content-with-optional-title mb-2">
-    <h2 class="d-inline-block h6" *ngIf="title">{{ title | translate }}</h2>
-    <div class="d-inline-block px-2"><a href="{{getHandle()}}">{{getHandle()}}</a></div>
-</div>
+<p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
+  <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
+  <a [href]="getHandle()">{{getHandle()}}</a>
+</p>
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
index 5d7bac26c7..e69de29bb2 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
@@ -1,5 +0,0 @@
-div {
-  word-break: break-word;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-}
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
index a06bf4a1e5..19a2da4514 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
@@ -1,6 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
 const handle = 'http://localhost:4000/handle/123456789/2';
@@ -12,7 +17,7 @@ describe('ComcolPageHandleComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ComcolPageHandleComponent]
+      declarations: [ComcolPageHandleComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 2ce49ebea2..95d7a29641 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,8 @@
-import { Component, Injectable, Input } from '@angular/core';
+import {
+  Component,
+  Injectable,
+  Input,
+} from '@angular/core';
 
 /**
  * This component builds a URL from the value of "handle"
@@ -7,7 +11,7 @@ import { Component, Injectable, Input } from '@angular/core';
 @Component({
   selector: 'ds-comcol-page-handle',
   styleUrls: ['./comcol-page-handle.component.scss'],
-  templateUrl: './comcol-page-handle.component.html'
+  templateUrl: './comcol-page-handle.component.html',
 })
 
 @Injectable()
diff --git a/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
index e7a7caf7be..fbb32649f3 100644
--- a/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
@@ -1,4 +1,8 @@
-import {Component, Input} from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
@@ -14,10 +18,10 @@ import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
 export class ThemedComcolPageHandleComponent extends ThemedComponent<ComcolPageHandleComponent> {
 
-// Optional title
+  // Optional title
   @Input() title: string;
 
-// The value of "handle"
+  // The value of "handle"
   @Input() content: string;
 
   inAndOutputNames: (keyof ComcolPageHandleComponent & keyof this)[] = ['title', 'content'];
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
index cbf984a349..7188141598 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-comcol-page-header',
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index 057c358223..cb3feecbe5 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo mb-3">
-    <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
index e69de29bb2..db6e7daecf 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
@@ -0,0 +1,4 @@
+img {
+  max-width: var(--ds-comcol-logo-max-width);
+  max-height: var(--ds-comcol-logo-max-height);
+}
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
index a9761bfd5f..b871c45ee3 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Bitstream } from '../../../core/shared/bitstream.model';
 
diff --git a/src/app/shared/comcol/comcol.module.ts b/src/app/shared/comcol/comcol.module.ts
index efbcedf2c6..36bfb5b43f 100644
--- a/src/app/shared/comcol/comcol.module.ts
+++ b/src/app/shared/comcol/comcol.module.ts
@@ -1,21 +1,25 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
-import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
-import { ThemedComcolPageHandleComponent} from './comcol-page-handle/themed-comcol-page-handle.component';
+import { NgModule } from '@angular/core';
 
-import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
+import { BrowseByModule } from '../../browse-by/browse-by.module';
+import { FormModule } from '../form/form.module';
+import { SearchModule } from '../search/search.module';
+import { SharedModule } from '../shared.module';
+import { UploadModule } from '../upload/upload.module';
 import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
 import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
-import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
+import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
-import { SharedModule } from '../shared.module';
-import { FormModule } from '../form/form.module';
-import { UploadModule } from '../upload/upload.module';
+import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
+import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
+import { ThemedComcolPageHandleComponent } from './comcol-page-handle/themed-comcol-page-handle.component';
+import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
+import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
+import { ComcolBrowseByComponent } from './sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from './sections/comcol-search-section/comcol-search-section.component';
 
 const COMPONENTS = [
   ComcolPageContentComponent,
@@ -29,22 +33,26 @@ const COMPONENTS = [
   ComcolPageBrowseByComponent,
   ThemedComcolPageBrowseByComponent,
   ComcolRoleComponent,
-  ThemedComcolPageHandleComponent
+  ThemedComcolPageHandleComponent,
+  ComcolBrowseByComponent,
+  ComcolSearchSectionComponent,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     FormModule,
     SharedModule,
     UploadModule,
+    BrowseByModule,
+    SearchModule,
   ],
   exports: [
     ...COMPONENTS,
     UploadModule,
-  ]
+  ],
 })
 export class ComcolModule { }
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html
new file mode 100644
index 0000000000..bfe6840d72
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html
@@ -0,0 +1,4 @@
+<ds-browse-by-switcher [browseByType]="browseByType$ | async"
+                       [displayTitle]="false"
+                       [scope]="scope$ | async">
+</ds-browse-by-switcher>
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html
rename to src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.scss
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
new file mode 100644
index 0000000000..e5b8c2dbbb
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
@@ -0,0 +1,73 @@
+// eslint-disable-next-line max-classes-per-file
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+
+import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { ComcolBrowseByComponent } from './comcol-browse-by.component';
+
+@rendersBrowseBy('ComcolBrowseByComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="ComcolBrowseByComponent"></span>',
+})
+class BrowseByTestComponent {
+}
+
+class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
+  getRenderType(): BrowseByDataType {
+    return 'ComcolBrowseByComponent' as BrowseByDataType;
+  }
+}
+
+describe('ComcolBrowseByComponent', () => {
+  let component: ComcolBrowseByComponent;
+  let fixture: ComponentFixture<ComcolBrowseByComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    themeService = getMockThemeService();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        ComcolBrowseByComponent,
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ComcolBrowseByComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the correct browse section based on the route browseDefinition', () => {
+    activatedRoute.testData = {
+      browseDefinition: new TestBrowseByPageBrowseDefinition(),
+    };
+
+    fixture.detectChanges();
+
+    expect(component).toBeTruthy();
+    expect(fixture.debugElement.query(By.css('#ComcolBrowseByComponent'))).not.toBeNull();
+  });
+});
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
new file mode 100644
index 0000000000..0712632318
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
@@ -0,0 +1,43 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+
+@Component({
+  selector: 'ds-comcol-browse-by',
+  templateUrl: './comcol-browse-by.component.html',
+  styleUrls: ['./comcol-browse-by.component.scss'],
+})
+export class ComcolBrowseByComponent implements OnInit {
+
+  browseByType$: Observable<BrowseByDataType>;
+
+  scope$: Observable<string>;
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Fetch the correct browse-by component by using the relevant config from the route data
+   */
+  ngOnInit(): void {
+    this.browseByType$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+    );
+    this.scope$ = this.route.data.pipe(
+      map((data: Data) => data.scope),
+    );
+  }
+
+}
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html
new file mode 100644
index 0000000000..7c97dabf43
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html
@@ -0,0 +1,7 @@
+<ds-themed-search
+  [configuration]="(comcol$ | async)?.type"
+  [showSidebar]="showSidebar$ | async"
+  [showScopeSelector]="false"
+  [hideScopeInUrl]="true"
+  [scope]="(comcol$ | async)?.id">
+</ds-themed-search>
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.scss b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts
new file mode 100644
index 0000000000..9a64cbc59d
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ComcolSearchSectionComponent } from './comcol-search-section.component';
+
+describe('ComcolSearchSectionComponent', () => {
+  let component: ComcolSearchSectionComponent;
+  let fixture: ComponentFixture<ComcolSearchSectionComponent>;
+
+  let route: ActivatedRouteStub;
+
+  beforeEach(async () => {
+    route = new ActivatedRouteStub();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        ComcolSearchSectionComponent,
+      ],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: route },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ComcolSearchSectionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts
new file mode 100644
index 0000000000..7e68610045
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts
@@ -0,0 +1,59 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../empty.util';
+
+/**
+ * The search tab on community & collection pages
+ */
+@Component({
+  selector: 'ds-comcol-search-section',
+  templateUrl: './comcol-search-section.component.html',
+  styleUrls: ['./comcol-search-section.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class ComcolSearchSectionComponent implements OnInit {
+
+  comcol$: Observable<Community | Collection>;
+
+  showSidebar$: Observable<boolean>;
+
+  constructor(
+    @Inject(APP_CONFIG) public appConfig: AppConfig,
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.comcol$ = this.route.data.pipe(
+      map((data: Data) => (data.dso as RemoteData<Community | Collection>).payload),
+    );
+    this.showSidebar$ = this.comcol$.pipe(
+      map((comcol: Community | Collection) => hasValue(comcol) && this.appConfig[comcol.type as any].searchSection.showSidebar),
+    );
+  }
+
+}
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
index 02434b1fa1..ff82f5bc83 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -1,18 +1,18 @@
 <div>
-  <div class="modal-header">{{ headerLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+  <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
     <button type="button" class="close" (click)="close()" aria-label="Close">
       <span aria-hidden="true">×</span>
     </button>
   </div>
   <div class="modal-body">
-    <p>{{ infoLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}</p>
+    <p>{{ infoLabel | translate:{ dsoName: name } }}</p>
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-outline-secondary" (click)="cancelPressed()" aria-label="Cancel">
-      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
     </button>
   </div>
 </div>
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index d899dd8ef8..a9b70632a5 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -1,8 +1,18 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+
 import { ConfirmationModalComponent } from './confirmation-modal.component';
 
 describe('ConfirmationModalComponent', () => {
@@ -17,9 +27,9 @@ describe('ConfirmationModalComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ConfirmationModalComponent],
       providers: [
-        { provide: NgbActiveModal, useValue: modalStub }
+        { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -75,7 +85,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component, 'close');
       debugElement.query(By.css('button.close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -91,7 +101,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component.response, 'emit');
       debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -110,7 +120,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component.response, 'emit');
       debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 46eb4cedc5..53db9ce402 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -1,7 +1,10 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-confirmation-modal',
@@ -18,17 +21,16 @@ export class ConfirmationModalComponent {
    */
   @Input() brandColor = 'primary';
 
-  @Input() dso: DSpaceObject;
+  @Input() name: string;
 
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
   constructor(
     protected activeModal: NgbActiveModal,
-    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
index 081fb1050f..7e481ed574 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -1,14 +1,26 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf, BehaviorSubject } from 'rxjs';
-import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
-import { ContextHelpService } from '../context-help.service';
-import { ContextHelp } from '../context-help.model';
-import { Component, Input, DebugElement } from '@angular/core';
-import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
-import { PlacementDir } from './placement-dir.model';
+import {
+  Component,
+  DebugElement,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { ContextHelp } from '../context-help.model';
+import { ContextHelpService } from '../context-help.service';
+import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
+import { PlacementDir } from './placement-dir.model';
 
 @Component({
   template: `
@@ -23,7 +35,7 @@ import { By } from '@angular/platform-browser';
       [dontParseLinks]="dontParseLinks"
     >
     </ds-context-help-wrapper>
-  `
+  `,
 })
 class TemplateComponent {
   @Input() content: string;
@@ -35,11 +47,11 @@ class TemplateComponent {
 
 const messages = {
   lorem: 'lorem ipsum dolor sit amet',
-  linkTest: 'This is text, [this](https://dspace.lyrasis.org/) is a link, and [so is this](https://google.com/)'
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org/) is a link, and [so is this](https://google.com/)',
 };
 const exampleContextHelp: ContextHelp = {
   id: 'test-tooltip',
-  isTooltipVisible: false
+  isTooltipVisible: false,
 };
 
 describe('ContextHelpWrapperComponent', () => {
@@ -68,7 +80,7 @@ describe('ContextHelpWrapperComponent', () => {
       'toggleIcons',
       'toggleTooltip',
       'showTooltip',
-      'hideTooltip'
+      'hideTooltip',
     ]);
 
     TestBed.configureTestingModule({
@@ -77,7 +89,7 @@ describe('ContextHelpWrapperComponent', () => {
         { provide: TranslateService, useValue: translateService },
         { provide: ContextHelpService, useValue: contextHelpService },
       ],
-      declarations: [ TemplateComponent, ContextHelpWrapperComponent ]
+      declarations: [ TemplateComponent, ContextHelpWrapperComponent ],
     }).compileComponents();
   }));
 
@@ -145,7 +157,7 @@ describe('ContextHelpWrapperComponent', () => {
 
       it('should display the tooltip', () => {
         expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
-        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
         fixture.detectChanges();
         expect(wrapperComponent.tooltip.open).toHaveBeenCalled();
         expect(wrapperComponent.tooltip.close).toHaveBeenCalledTimes(0);
@@ -155,7 +167,7 @@ describe('ContextHelpWrapperComponent', () => {
 
       it('should correctly display links', () => {
         templateComponent.content = 'linkTest';
-        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
         fixture.detectChanges();
         const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
           .nativeElement
@@ -183,7 +195,7 @@ describe('ContextHelpWrapperComponent', () => {
       it('should not display links if specified not to', () => {
         templateComponent.dontParseLinks = true;
         templateComponent.content = 'linkTest';
-        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
         fixture.detectChanges();
 
 
@@ -209,7 +221,7 @@ describe('ContextHelpWrapperComponent', () => {
 
         it('should close the tooltip', () => {
           expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
-          getContextHelp$.next({...exampleContextHelp, isTooltipVisible: false});
+          getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: false });
           fixture.detectChanges();
           expect(wrapperComponent.tooltip.close).toHaveBeenCalled();
         });
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index e170d522b5..a8f6925b45 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,13 +1,30 @@
-import { Component, Input, OnInit, TemplateRef, OnDestroy, ViewChild } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, Subscription, BehaviorSubject, combineLatest } from 'rxjs';
-import { map, distinctUntilChanged, mergeMap } from 'rxjs/operators';
-import { PlacementDir } from './placement-dir.model';
-import { ContextHelpService } from '../context-help.service';
-import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import { hasValueOperator } from '../empty.util';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
+
 import { ContextHelp } from '../context-help.model';
+import { ContextHelpService } from '../context-help.service';
+import { hasValueOperator } from '../empty.util';
+import { PlacementDir } from './placement-dir.model';
 
 type ParsedContent = (string | {href: string, text: string})[];
 
@@ -65,16 +82,16 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
 
   constructor(
     private translateService: TranslateService,
-    private contextHelpService: ContextHelpService
+    private contextHelpService: ContextHelpService,
   ) { }
 
   ngOnInit() {
     this.parsedContent$ = combineLatest([
       this.content$.pipe(distinctUntilChanged(), mergeMap(translateKey => this.translateService.get(translateKey))),
-      this.dontParseLinks$.pipe(distinctUntilChanged())
+      this.dontParseLinks$.pipe(distinctUntilChanged()),
     ]).pipe(
       map(([text, dontParseLinks]) =>
-        dontParseLinks ? [text] : this.parseLinks(text))
+        dontParseLinks ? [text] : this.parseLinks(text)),
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
   }
@@ -101,7 +118,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
 
         this.tooltip.hidden.subscribe(() => {
           this.contextHelpService.hideTooltip(this.id);
-        })
+        }),
       ];
     }
   }
@@ -153,7 +170,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
       const match = substring.match(parseRegexp);
       return match === null
         ? substring
-        : ({href: match[2], text: match[1]});
+        : ({ href: match[2], text: match[1] });
     });
   }
 
diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts
index a4892758ff..de4d8afecc 100644
--- a/src/app/shared/context-help.actions.ts
+++ b/src/app/shared/context-help.actions.ts
@@ -1,8 +1,9 @@
 /* eslint-disable max-classes-per-file */
 
 import { Action } from '@ngrx/store';
-import { type } from './ngrx/type';
+
 import { ContextHelp } from './context-help.model';
+import { type } from './ngrx/type';
 
 export const ContextHelpActionTypes = {
   'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'),
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
index 326251da51..a0ed860522 100644
--- a/src/app/shared/context-help.directive.spec.ts
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -1,15 +1,29 @@
-import { Component, Input } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf, BehaviorSubject } from 'rxjs';
-import { ContextHelpDirective, ContextHelpDirectiveInput } from './context-help.directive';
-import { TranslateService } from '@ngx-translate/core';
-import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-import { ContextHelpService } from './context-help.service';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  ContextHelpDirective,
+  ContextHelpDirectiveInput,
+} from './context-help.directive';
 import { ContextHelp } from './context-help.model';
+import { ContextHelpService } from './context-help.service';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 
 @Component({
-  template: `<div *dsContextHelp="contextHelpParams()">some text</div>`
+  template: `<div *dsContextHelp="contextHelpParams()">some text</div>`,
 })
 class TestComponent {
   @Input() content = '';
@@ -19,18 +33,18 @@ class TestComponent {
       content: this.content,
       id: this.id,
       iconPlacement: 'left',
-      tooltipPlacement: ['bottom']
+      tooltipPlacement: ['bottom'],
     };
   }
 }
 
 const messages = {
   lorem: 'lorem ipsum dolor sit amet',
-  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)',
 };
 const exampleContextHelp: ContextHelp = {
   id: 'test-tooltip',
-  isTooltipVisible: false
+  isTooltipVisible: false,
 };
 describe('ContextHelpDirective', () => {
   let component: TestComponent;
@@ -50,16 +64,16 @@ describe('ContextHelpDirective', () => {
       'toggleIcons',
       'toggleTooltip',
       'showTooltip',
-      'hideTooltip'
+      'hideTooltip',
     ]);
 
     TestBed.configureTestingModule({
       imports: [NgbTooltipModule],
       providers: [
         { provide: TranslateService, useValue: translateService },
-        { provide: ContextHelpService, useValue: contextHelpService }
+        { provide: ContextHelpService, useValue: contextHelpService },
       ],
-      declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective]
+      declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 41d6daec21..b5a5739348 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -1,17 +1,18 @@
 import {
-  ComponentFactoryResolver,
   ComponentRef,
   Directive,
   Input,
   OnChanges,
+  OnDestroy,
   TemplateRef,
   ViewContainerRef,
-  OnDestroy
 } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+
+import { ContextHelpService } from './context-help.service';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 import { PlacementDir } from './context-help-wrapper/placement-dir.model';
-import { ContextHelpService } from './context-help.service';
+import { hasValue } from './empty.util';
 
 export interface ContextHelpDirectiveInput {
   content: string;
@@ -43,29 +44,30 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
   constructor(
     private templateRef: TemplateRef<any>,
     private viewContainerRef: ViewContainerRef,
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private contextHelpService: ContextHelpService
+    private contextHelpService: ContextHelpService,
   ) {}
 
   ngOnChanges() {
     this.clearMostRecentId();
     this.mostRecentId = this.dsContextHelp.id;
-    this.contextHelpService.add({id: this.dsContextHelp.id, isTooltipVisible: false});
+    this.contextHelpService.add({ id: this.dsContextHelp.id, isTooltipVisible: false });
 
     if (this.wrapper === undefined) {
-      const factory
-        = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
-      this.wrapper = this.viewContainerRef.createComponent(factory);
+      this.wrapper = this.viewContainerRef.createComponent(ContextHelpWrapperComponent);
     }
-    this.wrapper.instance.templateRef = this.templateRef;
-    this.wrapper.instance.content = this.dsContextHelp.content;
-    this.wrapper.instance.id = this.dsContextHelp.id;
-    this.wrapper.instance.tooltipPlacement = this.dsContextHelp.tooltipPlacement;
-    this.wrapper.instance.iconPlacement = this.dsContextHelp.iconPlacement;
+    this.wrapper.setInput('templateRef', this.templateRef);
+    this.wrapper.setInput('content', this.dsContextHelp.content);
+    this.wrapper.setInput('id', this.dsContextHelp.id);
+    this.wrapper.setInput('tooltipPlacement', this.dsContextHelp.tooltipPlacement);
+    this.wrapper.setInput('iconPlacement', this.dsContextHelp.iconPlacement);
   }
 
   ngOnDestroy() {
     this.clearMostRecentId();
+    if (hasValue(this.wrapper)) {
+      this.wrapper.destroy();
+      this.wrapper = undefined;
+    }
   }
 
   private clearMostRecentId(): void {
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index 3e0d40c25d..ef0686d2a6 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -1,5 +1,8 @@
+import {
+  ContextHelpAction,
+  ContextHelpActionTypes,
+} from './context-help.actions';
 import { ContextHelp } from './context-help.model';
-import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions';
 
 export interface ContextHelpModels {
   [id: string]: ContextHelp;
@@ -10,20 +13,20 @@ export interface ContextHelpState {
   models: ContextHelpModels;
 }
 
-const initialState: ContextHelpState = {allIconsVisible: false, models: {}};
+const initialState: ContextHelpState = { allIconsVisible: false, models: {} };
 
 export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
   switch (action.type) {
     case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
-      return {...state, allIconsVisible: !state.allIconsVisible};
+      return { ...state, allIconsVisible: !state.allIconsVisible };
     }
     case ContextHelpActionTypes.CONTEXT_HELP_ADD: {
-      const newModels = {...state.models, [action.model.id]: action.model};
-      return {...state, models: newModels};
+      const newModels = { ...state.models, [action.model.id]: action.model };
+      return { ...state, models: newModels };
     }
     case ContextHelpActionTypes.CONTEXT_HELP_REMOVE: {
-      const {[action.id]: _, ...remainingModels} = state.models;
-      return {...state, models: remainingModels};
+      const { [action.id]: _, ...remainingModels } = state.models;
+      return { ...state, models: remainingModels };
     }
     case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP: {
       return modifyTooltipVisibility(state, action.id, v => !v);
@@ -41,8 +44,8 @@ export function contextHelpReducer(state: ContextHelpState = initialState, actio
 }
 
 function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean): ContextHelpState {
-  const {[id]: matchingModel, ...otherModels} = state.models;
-  const modifiedModel = {...matchingModel, isTooltipVisible: modify(matchingModel.isTooltipVisible)};
-  const newModels = {...otherModels, [id]: modifiedModel};
-  return {...state, models: newModels};
+  const { [id]: matchingModel, ...otherModels } = state.models;
+  const modifiedModel = { ...matchingModel, isTooltipVisible: modify(matchingModel.isTooltipVisible) };
+  const newModels = { ...otherModels, [id]: modifiedModel };
+  return { ...state, models: newModels };
 }
diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts
index f06e700210..55bd9c9c38 100644
--- a/src/app/shared/context-help.service.spec.ts
+++ b/src/app/shared/context-help.service.spec.ts
@@ -1,22 +1,28 @@
 import { TestBed } from '@angular/core/testing';
-
-import { ContextHelpService } from './context-help.service';
-import { StoreModule, Store } from '@ngrx/store';
-import { appReducers, storeModuleConfig } from '../app.reducer';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { TestScheduler } from 'rxjs/testing';
 
+import {
+  appReducers,
+  storeModuleConfig,
+} from '../app.reducer';
+import { ContextHelpService } from './context-help.service';
+
 describe('ContextHelpService', () => {
   let service: ContextHelpService;
   let store;
   let testScheduler;
   const booleans = { f: false, t: true };
-  const mkContextHelp = (id: string) => ({ 0: {id, isTooltipVisible: false}, 1: {id, isTooltipVisible: true} });
+  const mkContextHelp = (id: string) => ({ 0: { id, isTooltipVisible: false }, 1: { id, isTooltipVisible: true } });
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(appReducers, storeModuleConfig)
-      ]
+        StoreModule.forRoot(appReducers, storeModuleConfig),
+      ],
     });
   });
 
@@ -31,7 +37,7 @@ describe('ContextHelpService', () => {
   });
 
   it('toggleIcons calls should be observable in shouldShowIcons$', () => {
-    testScheduler.run(({cold, expectObservable}) => {
+    testScheduler.run(({ cold, expectObservable }) => {
       const toggles = cold('-xxxxx');
       toggles.subscribe((_) => service.toggleIcons());
       expectObservable(service.shouldShowIcons$()).toBe('ftftft', booleans);
@@ -39,15 +45,15 @@ describe('ContextHelpService', () => {
   });
 
   it('add and remove calls should be observable in getContextHelp$', () => {
-    testScheduler.run(({cold, expectObservable}) => {
+    testScheduler.run(({ cold, expectObservable }) => {
       const modifications = cold('-abAcCB', {
-        a: () => service.add({id: 'a', isTooltipVisible: false}),
-        b: () => service.add({id: 'b', isTooltipVisible: false}),
-        c: () => service.add({id: 'c', isTooltipVisible: false}),
+        a: () => service.add({ id: 'a', isTooltipVisible: false }),
+        b: () => service.add({ id: 'b', isTooltipVisible: false }),
+        c: () => service.add({ id: 'c', isTooltipVisible: false }),
         A: () => service.remove('a'), B: () => service.remove('b'), C: () => service.remove('c'),
       });
       modifications.subscribe(mod => mod());
-      const match = (id) => ({ 0: undefined, 1: {id, isTooltipVisible: false} });
+      const match = (id) => ({ 0: undefined, 1: { id, isTooltipVisible: false } });
       expectObservable(service.getContextHelp$('a')).toBe('01-0---', match('a'));
       expectObservable(service.getContextHelp$('b')).toBe('0-1---0', match('b'));
       expectObservable(service.getContextHelp$('c')).toBe('0---10-', match('c'));
@@ -55,9 +61,9 @@ describe('ContextHelpService', () => {
   });
 
   it('toggleTooltip calls should be observable in getContextHelp$', () => {
-    service.add({id: 'a', isTooltipVisible: false});
-    service.add({id: 'b', isTooltipVisible: false});
-    testScheduler.run(({cold, expectObservable}) => {
+    service.add({ id: 'a', isTooltipVisible: false });
+    service.add({ id: 'b', isTooltipVisible: false });
+    testScheduler.run(({ cold, expectObservable }) => {
       const toggles = cold('-aaababbabba');
       toggles.subscribe(id => service.toggleTooltip(id));
       expectObservable(service.getContextHelp$('a')).toBe('0101-0--1--0', mkContextHelp('a'));
@@ -66,10 +72,10 @@ describe('ContextHelpService', () => {
   });
 
   it('hideTooltip and showTooltip calls should be observable in getContextHelp$', () => {
-    service.add({id: 'a', isTooltipVisible: false});
-    testScheduler.run(({cold, expectObservable}) => {
+    service.add({ id: 'a', isTooltipVisible: false });
+    testScheduler.run(({ cold, expectObservable }) => {
       const hideShowCalls = cold('-shssshhs', {
-        s: () => service.showTooltip('a'), h: () => service.hideTooltip('a')
+        s: () => service.showTooltip('a'), h: () => service.hideTooltip('a'),
       });
       hideShowCalls.subscribe(fn => fn());
       expectObservable(service.getContextHelp$('a')).toBe('010111001', mkContextHelp('a'));
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
index f10f258be9..c07c5ae8d7 100644
--- a/src/app/shared/context-help.service.ts
+++ b/src/app/shared/context-help.service.ts
@@ -1,36 +1,46 @@
 import { Injectable } from '@angular/core';
-import { ContextHelp } from './context-help.model';
-import { Store, createFeatureSelector, createSelector, select, MemoizedSelector } from '@ngrx/store';
-import { ContextHelpState, ContextHelpModels } from './context-help.reducer';
 import {
-  ContextHelpToggleIconsAction,
-  ContextHelpAddAction,
-  ContextHelpRemoveAction,
-  ContextHelpShowTooltipAction,
-  ContextHelpHideTooltipAction,
-  ContextHelpToggleTooltipAction
-} from './context-help.actions';
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import {
+  ContextHelpAddAction,
+  ContextHelpHideTooltipAction,
+  ContextHelpRemoveAction,
+  ContextHelpShowTooltipAction,
+  ContextHelpToggleIconsAction,
+  ContextHelpToggleTooltipAction,
+} from './context-help.actions';
+import { ContextHelp } from './context-help.model';
+import {
+  ContextHelpModels,
+  ContextHelpState,
+} from './context-help.reducer';
+
 const contextHelpStateSelector =
   createFeatureSelector<ContextHelpState>('contextHelp');
 const allIconsVisibleSelector = createSelector(
   contextHelpStateSelector,
-  (state: ContextHelpState): boolean => state.allIconsVisible
+  (state: ContextHelpState): boolean => state.allIconsVisible,
 );
 const contextHelpSelector =
   (id: string): MemoizedSelector<ContextHelpState, ContextHelp> => createSelector(
     contextHelpStateSelector,
-    (state: ContextHelpState) => state.models[id]
+    (state: ContextHelpState) => state.models[id],
   );
 const allContextHelpSelector = createSelector(
   contextHelpStateSelector,
-  ((state: ContextHelpState) => state.models)
+  ((state: ContextHelpState) => state.models),
 );
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ContextHelpService {
   constructor(private store: Store<ContextHelpState>) { }
diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
index 7fd72b54b3..953734d38c 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -1,23 +1,30 @@
 import { TestBed } from '@angular/core/testing';
-import { BrowserKlaroService, COOKIE_MDFIELD } from './browser-klaro.service';
-import { getMockTranslateService } from '../mocks/translate.service.mock';
-import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../core/cache/response.models';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { TranslateService } from '@ngx-translate/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { CookieService } from '../../core/services/cookie.service';
 import { getTestScheduler } from 'jasmine-marbles';
-import { MetadataValue } from '../../core/shared/metadata.models';
 import clone from 'lodash/clone';
 import cloneDeep from 'lodash/cloneDeep';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { ANONYMOUS_STORAGE_NAME_KLARO } from './klaro-configuration';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { AuthService } from '../../core/auth/auth.service';
+import { RestResponse } from '../../core/cache/response.models';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { CookieService } from '../../core/services/cookie.service';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { getMockTranslateService } from '../mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import {
+  BrowserKlaroService,
+  COOKIE_MDFIELD,
+} from './browser-klaro.service';
+import { ANONYMOUS_STORAGE_NAME_KLARO } from './klaro-configuration';
+
 describe('BrowserKlaroService', () => {
   const trackingIdProp = 'google.analytics.key';
   const trackingIdTestValue = 'mock-tracking-id';
@@ -48,17 +55,17 @@ describe('BrowserKlaroService', () => {
 
   beforeEach(() => {
     user = Object.assign(new EPerson(), {
-      uuid: 'test-user'
+      uuid: 'test-user',
     });
 
     translateService = getMockTranslateService();
     ePersonService = jasmine.createSpyObj('ePersonService', {
       createPatchFromCache: observableOf([]),
-      patch: observableOf(new RestResponse(true, 200, 'Ok'))
+      patch: observableOf(new RestResponse(true, 200, 'Ok')),
     });
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      getAuthenticatedUserFromStore: observableOf(user)
+      getAuthenticatedUserFromStore: observableOf(user),
     });
     configurationDataService = createConfigSuccessSpy(recaptchaValue);
     findByPropertyName = configurationDataService.findByPropertyName;
@@ -66,7 +73,7 @@ describe('BrowserKlaroService', () => {
       get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
-      }
+      },
     });
 
     TestBed.configureTestingModule({
@@ -74,7 +81,7 @@ describe('BrowserKlaroService', () => {
         BrowserKlaroService,
         {
           provide: TranslateService,
-          useValue: translateService
+          useValue: translateService,
         },
         {
           provide: EPersonDataService,
@@ -82,17 +89,17 @@ describe('BrowserKlaroService', () => {
         },
         {
           provide: AuthService,
-          useValue: authService
+          useValue: authService,
         },
         {
           provide: CookieService,
-          useValue: cookieService
+          useValue: cookieService,
         },
         {
           provide: ConfigurationDataService,
-          useValue: configurationDataService
-        }
-      ]
+          useValue: configurationDataService,
+        },
+      ],
     });
     service = TestBed.inject(BrowserKlaroService);
     appName = 'testName';
@@ -104,16 +111,16 @@ describe('BrowserKlaroService', () => {
         zz: {
           purposes: {},
           test: {
-            testeritis: testKey
-          }
-        }
+            testeritis: testKey,
+          },
+        },
       },
       services: [{
         name: appName,
-        purposes: [purpose]
+        purposes: [purpose],
       }, {
         name: googleAnalytics,
-        purposes: [purpose]
+        purposes: [purpose],
       }],
 
     };
@@ -327,7 +334,7 @@ describe('BrowserKlaroService', () => {
           ...new ConfigurationProperty(),
           name: trackingIdProp,
           values: [googleAnalytics],
-        })
+        }),
       );
       service.initialize();
       expect(service.klaroConfig.services).toContain(jasmine.objectContaining({ name: googleAnalytics }));
@@ -342,8 +349,8 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: googleAnalytics,
               values: [],
-              }
-            )
+            },
+            ),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -352,7 +359,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
 
       service.initialize();
@@ -362,7 +369,7 @@ describe('BrowserKlaroService', () => {
       configurationDataService.findByPropertyName =
         jasmine.createSpy()
           .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
-            createFailedRemoteDataObject$('Error while loading GA')
+            createFailedRemoteDataObject$('Error while loading GA'),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -371,7 +378,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
       service.initialize();
       expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
@@ -380,7 +387,7 @@ describe('BrowserKlaroService', () => {
       configurationDataService.findByPropertyName =
         jasmine.createSpy()
           .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
-            createSuccessfulRemoteDataObject$(null)
+            createSuccessfulRemoteDataObject$(null),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -389,7 +396,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
       service.initialize();
       expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 2b09c0bf15..f673a41736 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -1,21 +1,41 @@
-import { Inject, Injectable, InjectionToken } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { environment } from '../../../environments/environment';
-import { map, switchMap, take } from 'rxjs/operators';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { KlaroService } from './klaro.service';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { CookieService } from '../../core/services/cookie.service';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { Operation } from 'fast-json-patch';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
-import { ANONYMOUS_STORAGE_NAME_KLARO, klaroConfiguration } from './klaro-configuration';
-import { Operation } from 'fast-json-patch';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../../core/auth/auth.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
+import { CookieService } from '../../core/services/cookie.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
+import { KlaroService } from './klaro.service';
+import {
+  ANONYMOUS_STORAGE_NAME_KLARO,
+  klaroConfiguration,
+} from './klaro-configuration';
 
 /**
  * Metadata field to store a user's cookie consent preferences in
@@ -50,7 +70,7 @@ const LAZY_KLARO = new InjectionToken<Promise<any>>(
   {
     providedIn: 'root',
     factory: async () => (await import('klaro/dist/klaro-no-translations')),
-  }
+  },
 );
 
 /**
@@ -102,13 +122,13 @@ export class BrowserKlaroService extends KlaroService {
     const hideRegistrationVerification$ = this.configService.findByPropertyName(this.REGISTRATION_VERIFICATION_ENABLED_KEY).pipe(
       getFirstCompletedRemoteData(),
       map((remoteData) =>
-        !remoteData.hasSucceeded || !remoteData.payload || isEmpty(remoteData.payload.values) || remoteData.payload.values[0].toLowerCase() !== 'true'
+        !remoteData.hasSucceeded || !remoteData.payload || isEmpty(remoteData.payload.values) || remoteData.payload.values[0].toLowerCase() !== 'true',
       ),
     );
 
     const servicesToHide$: Observable<string[]> = observableCombineLatest([hideGoogleAnalytics$, hideRegistrationVerification$]).pipe(
       map(([hideGoogleAnalytics, hideRegistrationVerification]) => {
-        let servicesToHideArray: string[] = [];
+        const servicesToHideArray: string[] = [];
         if (hideGoogleAnalytics) {
           servicesToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
@@ -116,7 +136,7 @@ export class BrowserKlaroService extends KlaroService {
           servicesToHideArray.push(CAPTCHA_NAME);
         }
         return servicesToHideArray;
-      })
+      }),
     );
 
     this.translateService.setDefaultLang(environment.defaultLanguage);
@@ -163,7 +183,7 @@ export class BrowserKlaroService extends KlaroService {
           storageName = this.getStorageName(user.uuid);
         }
         return this.cookieService.get(storageName);
-      })
+      }),
     );
   }
 
@@ -198,7 +218,7 @@ export class BrowserKlaroService extends KlaroService {
           }
           return observableOf(undefined);
         }),
-        take(1)
+        take(1),
       );
   }
 
@@ -230,7 +250,7 @@ export class BrowserKlaroService extends KlaroService {
    * Show the cookie consent form
    */
   showSettings() {
-    this.lazyKlaro.then(({show}) => show(this.klaroConfig));
+    this.lazyKlaro.then(({ show }) => show(this.klaroConfig));
   }
 
   /**
@@ -240,7 +260,7 @@ export class BrowserKlaroService extends KlaroService {
     this.klaroConfig.services.forEach((app) => {
       this.klaroConfig.translations.zz[app.name] = {
         title: this.getTitleTranslation(app.name),
-        description: this.getDescriptionTranslation(app.name)
+        description: this.getDescriptionTranslation(app.name),
       };
       app.purposes.forEach((purpose) => {
         this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
@@ -298,12 +318,12 @@ export class BrowserKlaroService extends KlaroService {
       .pipe(
         take(1),
         switchMap((operations: Operation[]) => {
-            if (isNotEmpty(operations)) {
-              return this.ePersonService.patch(user, operations);
-            }
-            return observableOf(undefined);
+          if (isNotEmpty(operations)) {
+            return this.ePersonService.patch(user, operations);
           }
-        )
+          return observableOf(undefined);
+        },
+        ),
       ).subscribe();
   }
 
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index a41b641dec..da3125b7eb 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -1,7 +1,13 @@
+import {
+  IMPERSONATING_COOKIE,
+  REDIRECT_COOKIE,
+} from '../../core/auth/auth.service';
 import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
-import { IMPERSONATING_COOKIE, REDIRECT_COOKIE } from '../../core/auth/auth.service';
+import {
+  CAPTCHA_COOKIE,
+  CAPTCHA_NAME,
+} from '../../core/google-recaptcha/google-recaptcha.service';
 import { LANG_COOKIE } from '../../core/locale/locale.service';
-import { CAPTCHA_COOKIE, CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
 
 /**
  * Cookie for has_agreed_end_user
@@ -22,7 +28,7 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
 export const klaroConfiguration: any = {
   storageName: ANONYMOUS_STORAGE_NAME_KLARO,
 
-  privacyPolicy: '/info/privacy',
+  privacyPolicy: './info/privacy',
 
   /*
   Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
@@ -67,7 +73,7 @@ export const klaroConfiguration: any = {
       close: 'cookies.consent.close',
       consentModal: {
         title: 'cookies.consent.content-modal.title',
-        description: 'cookies.consent.content-modal.description'
+        description: 'cookies.consent.content-modal.description',
       },
       consentNotice: {
         changeDescription: 'cookies.consent.update',
@@ -80,11 +86,11 @@ export const klaroConfiguration: any = {
       poweredBy: 'Powered by Klaro!',
       privacyPolicy: {
         name: 'cookies.consent.content-modal.privacy-policy.name',
-        text: 'cookies.consent.content-modal.privacy-policy.text'
+        text: 'cookies.consent.content-modal.privacy-policy.text',
       },
       purposeItem: {
         service: 'cookies.consent.content-modal.service',
-        services: 'cookies.consent.content-modal.services'
+        services: 'cookies.consent.content-modal.services',
       },
       purposes: {
       },
@@ -92,20 +98,20 @@ export const klaroConfiguration: any = {
       service: {
         disableAll: {
           description: 'cookies.consent.app.disable-all.description',
-          title: 'cookies.consent.app.disable-all.title'
+          title: 'cookies.consent.app.disable-all.title',
         },
         optOut: {
           description: 'cookies.consent.app.opt-out.description',
-          title: 'cookies.consent.app.opt-out.title'
+          title: 'cookies.consent.app.opt-out.title',
         },
         purpose: 'cookies.consent.app.purpose',
         purposes: 'cookies.consent.app.purposes',
         required: {
           title: 'cookies.consent.app.required.title',
-          description: 'cookies.consent.app.required.description'
-        }
-      }
-    }
+          description: 'cookies.consent.app.required.description',
+        },
+      },
+    },
   },
   services: [
     {
@@ -115,16 +121,16 @@ export const klaroConfiguration: any = {
       cookies: [
         TOKENITEM,
         IMPERSONATING_COOKIE,
-        REDIRECT_COOKIE
-      ]
+        REDIRECT_COOKIE,
+      ],
     },
     {
       name: 'preferences',
       purposes: ['functional'],
       required: true,
       cookies: [
-        LANG_COOKIE
-      ]
+        LANG_COOKIE,
+      ],
     },
     {
       name: 'acknowledgement',
@@ -132,8 +138,8 @@ export const klaroConfiguration: any = {
       required: true,
       cookies: [
         [/^klaro-.+$/],
-        HAS_AGREED_END_USER
-      ]
+        HAS_AGREED_END_USER,
+      ],
     },
     {
       name: GOOGLE_ANALYTICS_KLARO_KEY,
@@ -184,11 +190,11 @@ export const klaroConfiguration: any = {
       required: false,
       cookies: [
         [/^klaro-.+$/],
-        CAPTCHA_COOKIE
+        CAPTCHA_COOKIE,
       ],
       onAccept: `window.refreshCaptchaScript?.call()`,
       onDecline: `window.refreshCaptchaScript?.call()`,
       onlyOnce: true,
-    }
+    },
   ],
 };
diff --git a/src/app/shared/cookies/klaro.service.ts b/src/app/shared/cookies/klaro.service.ts
index d54fed8b30..9e28d6ead7 100644
--- a/src/app/shared/cookies/klaro.service.ts
+++ b/src/app/shared/cookies/klaro.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
 
 /**
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
new file mode 100644
index 0000000000..b1056cdf18
--- /dev/null
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -0,0 +1,55 @@
+<div *ngIf="(this.submitted$ | async) !== true; else waiting">
+  <div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header">
+    {{ 'item.qa.withdrawn.modal.header' | translate }}
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <div class="form-group">
+      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
+                                              : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
+      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
+                                              : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
+      <textarea class="form-control" id="reason"
+                rows="6"
+                [(ngModel)]="reason"
+                placeholder="{{ this.canWithdraw ? ('qa-withdrown.modal.form.summary.placeholder' | translate)
+                                                 : ('qa-reinstate.modal.form.summary.placeholder' | translate) }}"
+                name="message"></textarea>
+    </div>
+  </div>
+  <div class="modal-footer space-children-mr">
+    <button class="btn btn-outline-secondary btn-sm ml-0"
+            type="button"
+            (click)="onModalClose()"
+            title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
+      <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
+    </button>
+    <button class="btn btn-success btn-sm ml-0"
+            type="submit"
+            (click)="onModalSubmit()"
+            title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
+      <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
+                                                             : ('qa-reinstate.create.modal.button.confirm' | translate) }}
+    </button>
+  </div>
+</div>
+
+<ng-template #waiting>
+  <div class="modal-header">{{'item.qa.withdrawn.modal.submitted.header' | translate}}</div>
+  <div class="modal-body">
+    <div class="d-flex justify-content-center">
+      <ds-loading [showMessage]="false"></ds-loading>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #reinstateHeader>
+  <div *ngIf="!this.canWithdraw" class="modal-header">
+    {{'item.qa.reinstate.modal.header' | translate}}
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
new file mode 100644
index 0000000000..6fb0963511
--- /dev/null
+++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
@@ -0,0 +1,79 @@
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { BehaviorSubject } from 'rxjs';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ModalBeforeDismiss } from '../interfaces/modal-before-dismiss.interface';
+
+@Component({
+  selector: 'ds-item-withdrawn-reinstate-modal',
+  templateUrl: './item-withdrawn-reinstate-modal.component.html',
+  styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'],
+})
+/**
+ * Represents a modal component for withdrawing or reinstating an item.
+ * Implements the ModalBeforeDismiss interface.
+ */
+export class ItemWithdrawnReinstateModalComponent implements ModalBeforeDismiss {
+
+  /**
+   * The reason for withdrawing or reinstating a suggestion.
+   */
+  reason: string;
+  /**
+   * Indicates whether the item can be withdrawn.
+   */
+  canWithdraw: boolean;
+  /**
+   * BehaviorSubject that represents the submitted state.
+   * Emits a boolean value indicating whether the form has been submitted or not.
+   */
+  submitted$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  /**
+   * Event emitter for creating a QA event.
+   * @event createQAEvent
+   */
+  @Output() createQAEvent: EventEmitter<string> = new EventEmitter<string>();
+
+  constructor(
+    protected activeModal: NgbActiveModal,
+    protected authorizationService: AuthorizationDataService,
+  ) {}
+
+  /**
+   * Closes the modal.
+   */
+  onModalClose() {
+    this.activeModal.close();
+  }
+
+  /**
+   * Determines whether the modal can be dismissed.
+   * @returns {boolean} True if the modal can be dismissed, false otherwise.
+   */
+  beforeDismiss(): boolean {
+    // prevent the modal from being dismissed after version creation is initiated
+    return !this.submitted$.getValue();
+  }
+
+  /**
+   * Handles the submission of the modal form.
+   * Emits the reason for withdrawal or reinstatement through the createQAEvent output.
+   */
+  onModalSubmit() {
+    this.submitted$.next(true);
+    this.createQAEvent.emit(this.reason);
+  }
+
+  /**
+   * Sets the withdrawal state of the component.
+   * @param state The new withdrawal state.
+   */
+  public setWithdraw(state: boolean) {
+    this.canWithdraw = state;
+  }
+}
diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts
index 4576ea497c..6f41fbf17c 100644
--- a/src/app/shared/date.util.spec.ts
+++ b/src/app/shared/date.util.spec.ts
@@ -1,107 +1,113 @@
-import { dateToString, dateToNgbDateStruct, dateToISOFormat, isValidDate, yearFromString } from './date.util';
+import {
+  dateToISOFormat,
+  dateToNgbDateStruct,
+  dateToString,
+  isValidDate,
+  yearFromString,
+} from './date.util';
 
 describe('Date Utils', () => {
 
-    describe('dateToISOFormat', () => {
-        it('should convert Date to YYYY-MM-DDThh:mm:ssZ string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            expect(dateToISOFormat(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03T00:00:00Z');
-        });
-        it('should convert Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
-            expect(dateToISOFormat('2022-06-03')).toEqual('2022-06-03T00:00:00Z');
-        });
-        it('should convert Month string to YYYY-MM-DDThh:mm:ssZ string', () => {
-            expect(dateToISOFormat('2022-06')).toEqual('2022-06-01T00:00:00Z');
-        });
-        it('should convert Year string to YYYY-MM-DDThh:mm:ssZ string', () => {
-            expect(dateToISOFormat('2022')).toEqual('2022-01-01T00:00:00Z');
-        });
-        it('should convert ISO Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
-            // NOTE: Time is always zeroed out as proven by this test.
-            expect(dateToISOFormat('2022-06-03T03:24:04Z')).toEqual('2022-06-03T00:00:00Z');
-        });
-        it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            const date = new Date(Date.UTC(2022, 5, 3));
-            expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z');
-        });
+  describe('dateToISOFormat', () => {
+    it('should convert Date to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToISOFormat(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03T00:00:00Z');
     });
+    it('should convert Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022-06-03')).toEqual('2022-06-03T00:00:00Z');
+    });
+    it('should convert Month string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022-06')).toEqual('2022-06-01T00:00:00Z');
+    });
+    it('should convert Year string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022')).toEqual('2022-01-01T00:00:00Z');
+    });
+    it('should convert ISO Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: Time is always zeroed out as proven by this test.
+      expect(dateToISOFormat('2022-06-03T03:24:04Z')).toEqual('2022-06-03T00:00:00Z');
+    });
+    it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      const date = new Date(Date.UTC(2022, 5, 3));
+      expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z');
+    });
+  });
 
-    describe('dateToString', () => {
-        it('should convert Date to YYYY-MM-DD string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            expect(dateToString(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03');
-        });
-        it('should convert Date with time to YYYY-MM-DD string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            expect(dateToString(new Date(Date.UTC(2022, 5, 3, 3, 24, 0)))).toEqual('2022-06-03');
-        });
-        it('should convert Month only to YYYY-MM-DD string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            expect(dateToString(new Date(Date.UTC(2022, 5)))).toEqual('2022-06-01');
-        });
-        it('should convert ISO Date to YYYY-MM-DD string', () => {
-            expect(dateToString(new Date('2022-06-03T03:24:00Z'))).toEqual('2022-06-03');
-        });
-        it('should convert NgbDateStruct to YYYY-MM-DD string', () => {
-            // NOTE: month is zero indexed which is why it increases by one
-            const date = new Date(Date.UTC(2022, 5, 3));
-            expect(dateToString(dateToNgbDateStruct(date))).toEqual('2022-06-03');
-        });
+  describe('dateToString', () => {
+    it('should convert Date to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03');
     });
+    it('should convert Date with time to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5, 3, 3, 24, 0)))).toEqual('2022-06-03');
+    });
+    it('should convert Month only to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5)))).toEqual('2022-06-01');
+    });
+    it('should convert ISO Date to YYYY-MM-DD string', () => {
+      expect(dateToString(new Date('2022-06-03T03:24:00Z'))).toEqual('2022-06-03');
+    });
+    it('should convert NgbDateStruct to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      const date = new Date(Date.UTC(2022, 5, 3));
+      expect(dateToString(dateToNgbDateStruct(date))).toEqual('2022-06-03');
+    });
+  });
 
 
-    describe('isValidDate', () => {
-        it('should return false for null', () => {
-            expect(isValidDate(null)).toBe(false);
-        });
-        it('should return false for empty string', () => {
-            expect(isValidDate('')).toBe(false);
-        });
-        it('should return false for text', () => {
-            expect(isValidDate('test')).toBe(false);
-        });
-        it('should return true for YYYY', () => {
-            expect(isValidDate('2022')).toBe(true);
-        });
-        it('should return true for YYYY-MM', () => {
-            expect(isValidDate('2022-12')).toBe(true);
-        });
-        it('should return true for YYYY-MM-DD', () => {
-            expect(isValidDate('2022-06-03')).toBe(true);
-        });
-        it('should return true for YYYY-MM-DDTHH:MM:SS', () => {
-            expect(isValidDate('2022-06-03T10:20:30')).toBe(true);
-        });
-        it('should return true for YYYY-MM-DDTHH:MM:SSZ', () => {
-            expect(isValidDate('2022-06-03T10:20:30Z')).toBe(true);
-        });
-        it('should return false for a month that does not exist', () => {
-            expect(isValidDate('2022-13')).toBe(false);
-        });
-        it('should return false for a day that does not exist', () => {
-            expect(isValidDate('2022-02-60')).toBe(false);
-        });
-        it('should return false for a time that does not exist', () => {
-            expect(isValidDate('2022-02-60T10:60:20')).toBe(false);
-        });
+  describe('isValidDate', () => {
+    it('should return false for null', () => {
+      expect(isValidDate(null)).toBe(false);
     });
+    it('should return false for empty string', () => {
+      expect(isValidDate('')).toBe(false);
+    });
+    it('should return false for text', () => {
+      expect(isValidDate('test')).toBe(false);
+    });
+    it('should return true for YYYY', () => {
+      expect(isValidDate('2022')).toBe(true);
+    });
+    it('should return true for YYYY-MM', () => {
+      expect(isValidDate('2022-12')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DD', () => {
+      expect(isValidDate('2022-06-03')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DDTHH:MM:SS', () => {
+      expect(isValidDate('2022-06-03T10:20:30')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DDTHH:MM:SSZ', () => {
+      expect(isValidDate('2022-06-03T10:20:30Z')).toBe(true);
+    });
+    it('should return false for a month that does not exist', () => {
+      expect(isValidDate('2022-13')).toBe(false);
+    });
+    it('should return false for a day that does not exist', () => {
+      expect(isValidDate('2022-02-60')).toBe(false);
+    });
+    it('should return false for a time that does not exist', () => {
+      expect(isValidDate('2022-02-60T10:60:20')).toBe(false);
+    });
+  });
 
-    describe('yearFromString', () => {
-        it('should return year from YYYY string', () => {
-            expect(yearFromString('2022')).toEqual(2022);
-        });
-        it('should return year from YYYY-MM string', () => {
-            expect(yearFromString('1970-06')).toEqual(1970);
-        });
-        it('should return year from YYYY-MM-DD string', () => {
-            expect(yearFromString('1914-10-23')).toEqual(1914);
-        });
-        it('should return year from YYYY-MM-DDTHH:MM:SSZ string', () => {
-            expect(yearFromString('1914-10-23T10:20:30Z')).toEqual(1914);
-        });
-        it('should return null if invalid date', () => {
-            expect(yearFromString('test')).toBeNull();
-        });
+  describe('yearFromString', () => {
+    it('should return year from YYYY string', () => {
+      expect(yearFromString('2022')).toEqual(2022);
     });
+    it('should return year from YYYY-MM string', () => {
+      expect(yearFromString('1970-06')).toEqual(1970);
+    });
+    it('should return year from YYYY-MM-DD string', () => {
+      expect(yearFromString('1914-10-23')).toEqual(1914);
+    });
+    it('should return year from YYYY-MM-DDTHH:MM:SSZ string', () => {
+      expect(yearFromString('1914-10-23T10:20:30Z')).toEqual(1914);
+    });
+    it('should return null if invalid date', () => {
+      expect(yearFromString('test')).toBeNull();
+    });
+  });
 });
diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index 5b74ed02d2..7450687ada 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -1,7 +1,8 @@
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
-import { formatInTimeZone }  from 'date-fns-tz';
 import { isValid } from 'date-fns';
+import { formatInTimeZone }  from 'date-fns-tz';
 import isObject from 'lodash/isObject';
+
 import { hasNoValue } from './empty.util';
 
 /**
@@ -73,7 +74,7 @@ export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
   return {
     year: date.getUTCFullYear(),
     month: date.getUTCMonth() + 1,
-    day: date.getUTCDate()
+    day: date.getUTCDate(),
   };
 }
 
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 5a15155d4f..c12ea61347 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -22,7 +22,7 @@
          class="dropdown-menu"
          id="dsSelectDropdownMenu"
          aria-labelledby="dsSelectMenuButton">
-      <div aria-labelledby="dropdownMenuButton">
+      <div>
         <ng-content select=".menu"></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/ds-select/ds-select.component.spec.ts b/src/app/shared/ds-select/ds-select.component.spec.ts
index fadc854873..22158ca10c 100644
--- a/src/app/shared/ds-select/ds-select.component.spec.ts
+++ b/src/app/shared/ds-select/ds-select.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsSelectComponent } from './ds-select.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DsSelectComponent } from './ds-select.component';
+
 describe('DsSelectComponent', () => {
   let component: DsSelectComponent;
   let fixture: ComponentFixture<DsSelectComponent>;
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index 26d1560c01..3c487af037 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -1,4 +1,9 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 /**
  * Component which represent a DSpace dropdown selector.
@@ -6,7 +11,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 @Component({
   selector: 'ds-select',
   templateUrl: './ds-select.component.html',
-  styleUrls: ['./ds-select.component.scss']
+  styleUrls: ['./ds-select.component.scss'],
 })
 export class DsSelectComponent {
 
@@ -14,23 +19,23 @@ export class DsSelectComponent {
    * An optional label for the dropdown selector.
    */
   @Input()
-  label: string;
+    label: string;
 
   /**
    * Whether the dropdown selector is disabled.
    */
   @Input()
-  disabled: boolean;
+    disabled: boolean;
 
   /**
    * Emits an event when the dropdown selector is opened or closed.
    */
   @Output()
-  toggled = new EventEmitter();
+    toggled = new EventEmitter();
 
   /**
    * Emits an event when the dropdown selector or closed.
    */
   @Output()
-  close = new EventEmitter();
+    close = new EventEmitter();
 }
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
index abfe618174..318a41ce25 100644
--- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
@@ -1,30 +1,50 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { MenuServiceStub } from '../testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component';
-import { MenuService } from '../menu/menu.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import flatten from 'lodash/flatten';
+import {
+  combineLatest,
+  map,
+  of as observableOf,
+} from 'rxjs';
+import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service';
+
+import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { MenuService } from '../menu/menu.service';
+import { MenuID } from '../menu/menu-id.model';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { MenuItemType } from '../menu/menu-item-type.model';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { MenuServiceStub } from '../testing/menu-service.stub';
+import { createPaginatedList } from '../testing/utils.test';
 import { DSOEditMenuResolver } from './dso-edit-menu.resolver';
 import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { Item } from '../../core/shared/item.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { MenuID } from '../menu/menu-id.model';
-import { MenuItemType } from '../menu/menu-item-type.model';
-import { TextMenuItemModel } from '../menu/menu-item/models/text.model';
-import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
-import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
-import { NotificationsService } from '../notifications/notifications.service';
+import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
 
 describe('DSOEditMenuResolver', () => {
 
   const MENU_STATE = {
-    id: 'some menu'
+    id: 'some menu',
   };
 
   let resolver: DSOEditMenuResolver;
@@ -36,73 +56,98 @@ describe('DSOEditMenuResolver', () => {
   let researcherProfileService;
   let notificationsService;
   let translate;
+  let dsoWithdrawnReinstateModalService;
+  let correctionsDataService;
 
-  const route = {
-    data: {
-      menu: {
-        'statistics': [{
-          id: 'statistics-dummy-1',
-          active: false,
-          visible: true,
-          model: null
-        }]
-      }
-    },
-    params: {id: 'test-uuid'},
+  const dsoRoute = (dso: DSpaceObject) => {
+    return {
+      data: {
+        menu: {
+          'statistics': [{
+            id: 'statistics-dummy-1',
+            active: false,
+            visible: true,
+            model: null,
+          }],
+        },
+      },
+      params: { id: dso.uuid },
+    };
   };
 
   const state = {
-    url: 'test-url'
+    url: 'test-url',
   };
 
-  const testObject = Object.assign(new Item(), {uuid: 'test-uuid', type: 'item', _links: {self: {href: 'self-link'}}});
+  const testCommunity: Community = Object.assign(new Community(), {
+    uuid: 'test-community-uuid',
+    type: 'community',
+    _links: { self: { href: 'self-link' } },
+  });
+  const testCollection: Collection = Object.assign(new Collection(), {
+    uuid: 'test-collection-uuid',
+    type: 'collection',
+    _links: { self: { href: 'self-link' } },
+  });
+  const testItem: Item = Object.assign(new Item(), {
+    uuid: 'test-item-uuid',
+    type: 'item',
+    _links: { self: { href: 'self-link' } },
+  });
+
+  let testObject: DSpaceObject;
+  let route;
 
   const dummySections1 = [{
     id: 'dummy-1',
     active: false,
     visible: true,
-    model: null
+    model: null,
   },
-    {
-      id: 'dummy-2',
-      active: false,
-      visible: true,
-      model: null
-    }];
+  {
+    id: 'dummy-2',
+    active: false,
+    visible: true,
+    model: null,
+  }];
 
   const dummySections2 = [{
     id: 'dummy-3',
     active: false,
     visible: true,
-    model: null
+    model: null,
   },
-    {
-      id: 'dummy-4',
-      active: false,
-      visible: true,
-      model: null
-    },
-    {
-      id: 'dummy-5',
-      active: false,
-      visible: true,
-      model: null
-    }];
+  {
+    id: 'dummy-4',
+    active: false,
+    visible: true,
+    model: null,
+  },
+  {
+    id: 'dummy-5',
+    active: false,
+    visible: true,
+    model: null,
+  }];
 
   beforeEach(waitForAsync(() => {
+    // test with Items unless specified otherwise
+    testObject = testItem;
+    route = dsoRoute(testItem);
+
     menuService = new MenuServiceStub();
     spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
 
     dSpaceObjectDataService = jasmine.createSpyObj('dSpaceObjectDataService', {
-      findById: createSuccessfulRemoteDataObject$(testObject)
+      findById: createSuccessfulRemoteDataObject$(testObject),
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     dsoVersioningModalService = jasmine.createSpyObj('dsoVersioningModalService', {
       isNewVersionButtonDisabled: observableOf(false),
       getVersioningTooltipMessage: observableOf('message'),
-      openCreateVersionModal: {}
+      openCreateVersionModal: {},
     });
     researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
       createFromExternalSourceAndReturnRelatedItemId: observableOf('mock-id'),
@@ -115,25 +160,35 @@ describe('DSOEditMenuResolver', () => {
       error: {},
     });
 
+    dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', {
+      openCreateWithdrawnReinstateModal: {},
+    });
+
+    correctionsDataService = jasmine.createSpyObj('correctionsDataService', {
+      findByItem: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
       declarations: [AdminSidebarComponent],
       providers: [
-        {provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService},
-        {provide: MenuService, useValue: menuService},
-        {provide: AuthorizationDataService, useValue: authorizationService},
-        {provide: DsoVersioningModalService, useValue: dsoVersioningModalService},
-        {provide: ResearcherProfileDataService, useValue: researcherProfileService},
-        {provide: TranslateService, useValue: translate},
-        {provide: NotificationsService, useValue: notificationsService},
+        { provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService },
+        { provide: MenuService, useValue: menuService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DsoVersioningModalService, useValue: dsoVersioningModalService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
+        { provide: TranslateService, useValue: translate },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService },
+        { provide: CorrectionTypeDataService, useValue: correctionsDataService },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
-          }
-        }
+            },
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     });
     resolver = TestBed.inject(DSOEditMenuResolver);
 
@@ -147,26 +202,27 @@ describe('DSOEditMenuResolver', () => {
   describe('resolve', () => {
     it('should create all menus when a dso is found based on the route id param', (done) => {
       spyOn(resolver, 'getDsoMenus').and.returnValue(
-        [observableOf(dummySections1), observableOf(dummySections2)]
+        [observableOf(dummySections1), observableOf(dummySections2)],
       );
       resolver.resolve(route as any, null).subscribe(resolved => {
         expect(resolved).toEqual(
           {
             ...route.data.menu,
             [MenuID.DSO_EDIT]: [
-              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'})),
-              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'}))
-            ]
-          }
+              ...dummySections1.map((menu) => Object.assign(menu, { id: menu.id + '-test-item-uuid' })),
+              ...dummySections2.map((menu) => Object.assign(menu, { id: menu.id + '-test-item-uuid' })),
+            ],
+          },
         );
-        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-uuid', true, false);
+        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-item-uuid', true, false);
         expect(resolver.getDsoMenus).toHaveBeenCalled();
         done();
       });
     });
+
     it('should create all menus when a dso is found based on the route scope query param when no id param is present', (done) => {
       spyOn(resolver, 'getDsoMenus').and.returnValue(
-        [observableOf(dummySections1), observableOf(dummySections2)]
+        [observableOf(dummySections1), observableOf(dummySections2)],
       );
       const routeWithScope = {
         data: {
@@ -175,12 +231,12 @@ describe('DSOEditMenuResolver', () => {
               id: 'statistics-dummy-1',
               active: false,
               visible: true,
-              model: null
-            }]
-          }
+              model: null,
+            }],
+          },
         },
         params: {},
-        queryParams: {scope: 'test-scope-uuid'},
+        queryParams: { scope: 'test-scope-uuid' },
       };
 
       resolver.resolve(routeWithScope as any, null).subscribe(resolved => {
@@ -188,72 +244,189 @@ describe('DSOEditMenuResolver', () => {
           {
             ...route.data.menu,
             [MenuID.DSO_EDIT]: [
-              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'})),
-              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'}))
-            ]
-          }
+              ...dummySections1.map((menu) => Object.assign(menu, { id: menu.id + '-test-scope-uuid' })),
+              ...dummySections2.map((menu) => Object.assign(menu, { id: menu.id + '-test-scope-uuid' })),
+            ],
+          },
         );
         expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-scope-uuid', true, false);
         expect(resolver.getDsoMenus).toHaveBeenCalled();
         done();
       });
     });
+
     it('should return the statistics menu when no dso is found', (done) => {
       (dSpaceObjectDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
 
       resolver.resolve(route as any, null).subscribe(resolved => {
         expect(resolved).toEqual(
           {
-            ...route.data.menu
-          }
+            ...route.data.menu,
+          },
         );
         done();
       });
     });
   });
+
   describe('getDsoMenus', () => {
-    it('should return as first part the item version, orcid and claim list ', (done) => {
-      const result = resolver.getDsoMenus(testObject, route, state);
-      result[0].subscribe((menuList) => {
-        expect(menuList.length).toEqual(3);
-        expect(menuList[0].id).toEqual('orcid-dso');
-        expect(menuList[0].active).toEqual(false);
-        // Visible should be false due to the item not being of type person
-        expect(menuList[0].visible).toEqual(false);
-        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
-
-        expect(menuList[1].id).toEqual('version-dso');
-        expect(menuList[1].active).toEqual(false);
-        expect(menuList[1].visible).toEqual(true);
-        expect(menuList[1].model.type).toEqual(MenuItemType.ONCLICK);
-        expect((menuList[1].model as TextMenuItemModel).text).toEqual('message');
-        expect(menuList[1].model.disabled).toEqual(false);
-        expect(menuList[1].icon).toEqual('code-branch');
-
-        expect(menuList[2].id).toEqual('claim-dso');
-        expect(menuList[2].active).toEqual(false);
-        // Visible should be false due to the item not being of type person
-        expect(menuList[2].visible).toEqual(false);
-        expect(menuList[2].model.type).toEqual(MenuItemType.ONCLICK);
-        expect((menuList[2].model as TextMenuItemModel).text).toEqual('item.page.claim.button');
-        done();
+    describe('for Communities', () => {
+      beforeEach(() => {
+        testObject = testCommunity;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testCommunity));
+        route = dsoRoute(testCommunity);
       });
 
+      it('should not return Item-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeFalsy();
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeFalsy();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeFalsy();
+
+          done();
+        });
+      });
+
+      it('should return Community/Collection-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeTruthy();
+          expect(subscribeEntry.active).toBeFalse();
+          expect(subscribeEntry.visible).toBeTrue();
+          expect(subscribeEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/communities/test-community-uuid/edit/metadata',
+          );
+          done();
+        });
+      });
     });
-    it('should return as second part the common list ', (done) => {
-      const result = resolver.getDsoMenus(testObject, route, state);
-      result[1].subscribe((menuList) => {
-        expect(menuList.length).toEqual(1);
-        expect(menuList[0].id).toEqual('edit-dso');
-        expect(menuList[0].active).toEqual(false);
-        expect(menuList[0].visible).toEqual(true);
-        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
-        expect((menuList[0].model as LinkMenuItemModel).text).toEqual('item.page.edit');
-        expect((menuList[0].model as LinkMenuItemModel).link).toEqual('/items/test-uuid/edit/metadata');
-        expect(menuList[0].icon).toEqual('pencil-alt');
-        done();
+
+    describe('for Collections', () => {
+      beforeEach(() => {
+        testObject = testCollection;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testCollection));
+        route = dsoRoute(testCollection);
       });
 
+      it('should not return Item-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeFalsy();
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeFalsy();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeFalsy();
+
+          done();
+        });
+      });
+
+      it('should return Community/Collection-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeTruthy();
+          expect(subscribeEntry.active).toBeFalse();
+          expect(subscribeEntry.visible).toBeTrue();
+          expect(subscribeEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/collections/test-collection-uuid/edit/metadata',
+          );
+          done();
+        });
+      });
+    });
+
+    describe('for Items', () => {
+      beforeEach(() => {
+        testObject = testItem;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testItem));
+        route = dsoRoute(testItem);
+      });
+
+      it('should return Item-specific entries', (done: DoneFn) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeTruthy();
+          expect(orcidEntry.active).toBeFalse();
+          expect(orcidEntry.visible).toBeFalse();
+          expect(orcidEntry.model.type).toEqual(MenuItemType.LINK);
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeTruthy();
+          expect(versionEntry.active).toBeFalse();
+          expect(versionEntry.visible).toBeTrue();
+          expect(versionEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          expect(versionEntry.model.disabled).toBeFalse();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeTruthy();
+          expect(claimEntry.active).toBeFalse();
+          expect(claimEntry.visible).toBeFalse();
+          expect(claimEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should not return Community/Collection-specific entries', (done: DoneFn) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeFalsy();
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done: DoneFn) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/items/test-item-uuid/edit/metadata',
+          );
+          done();
+        });
+      });
     });
   });
 });
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
index 80a69c2830..a40cabf6b0 100644
--- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
@@ -1,32 +1,60 @@
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { MenuService } from '../menu/menu.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { Injectable } from '@angular/core';
-import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
-import { Item } from '../../core/shared/item.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { map, switchMap } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getDSORoute } from '../../app-routing-paths';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
-import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { MenuService } from '../menu/menu.service';
 import { MenuID } from '../menu/menu-id.model';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model';
 import { MenuItemType } from '../menu/menu-item-type.model';
 import { MenuSection } from '../menu/menu-section.model';
-import { getDSORoute } from '../../app-routing-paths';
-import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { NotificationsService } from '../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import { SubscriptionModalComponent } from '../subscriptions/subscription-modal/subscription-modal.component';
+import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+  REQUEST_WITHDRAWN,
+} from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
 
 /**
  * Creates the menus for the dspace object pages
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection[] }> {
 
@@ -39,6 +67,8 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
     protected researcherProfileService: ResearcherProfileDataService,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
+    protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    private correctionTypeDataService: CorrectionTypeDataService,
   ) {
   }
 
@@ -66,14 +96,14 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
               map((menus) => {
                 return {
                   ...route.data?.menu,
-                  [MenuID.DSO_EDIT]: menus
+                  [MenuID.DSO_EDIT]: menus,
                 };
-              })
+              }),
             );
           } else {
-            return observableOf({...route.data?.menu});
+            return observableOf({ ...route.data?.menu });
           }
-        })
+        }),
       );
     }
   }
@@ -84,7 +114,8 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
   getDsoMenus(dso, route, state): Observable<MenuSection[]>[] {
     return [
       this.getItemMenu(dso),
-      this.getCommonMenu(dso, state)
+      this.getComColMenu(dso),
+      this.getCommonMenu(dso, state),
     ];
   }
 
@@ -104,13 +135,13 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
             model: {
               type: MenuItemType.LINK,
               text: this.getDsoType(dso) + '.page.edit',
-              link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString()
+              link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString(),
             } as LinkMenuItemModel,
             icon: 'pencil-alt',
-            index: 2
+            index: 2,
           },
         ];
-      })
+      }),
     );
   }
 
@@ -125,8 +156,11 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
         this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
         this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
         this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
+        this.correctionTypeDataService.findByItem(dso.uuid, false).pipe(
+          getFirstCompletedRemoteData(),
+          getRemoteDataPayload()),
       ]).pipe(
-        map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem]) => {
+        map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, correction]) => {
           const isPerson = this.getDsoType(dso) === 'person';
           return [
             {
@@ -136,10 +170,10 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
               model: {
                 type: MenuItemType.LINK,
                 text: 'item.page.orcid.tooltip',
-                link: new URLCombiner(getDSORoute(dso), 'orcid').toString()
+                link: new URLCombiner(getDSORoute(dso), 'orcid').toString(),
               } as LinkMenuItemModel,
               icon: 'orcid fab fa-lg',
-              index: 0
+              index: 0,
             },
             {
               id: 'version-dso',
@@ -151,10 +185,10 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
                 disabled: disableVersioning,
                 function: () => {
                   this.dsoVersioningModalService.openCreateVersionModal(dso);
-                }
+                },
               } as OnClickMenuItemModel,
               icon: 'code-branch',
-              index: 1
+              index: 1,
             },
             {
               id: 'claim-dso',
@@ -165,10 +199,71 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
                 text: 'item.page.claim.button',
                 function: () => {
                   this.claimResearcher(dso);
-                }
+                },
               } as OnClickMenuItemModel,
               icon: 'hand-paper',
-              index: 3
+              index: 3,
+            },
+            {
+              id: 'withdrawn-item',
+              active: false,
+              visible: dso.isArchived && correction?.page.some((c) => c.topic === REQUEST_WITHDRAWN),
+              model: {
+                type: MenuItemType.ONCLICK,
+                text:'item.page.withdrawn',
+                function: () => {
+                  this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-withdrawn', dso.isArchived);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'eye-slash',
+              index: 4,
+            },
+            {
+              id: 'reinstate-item',
+              active: false,
+              visible: dso.isWithdrawn && correction?.page.some((c) => c.topic === REQUEST_REINSTATE),
+              model: {
+                type: MenuItemType.ONCLICK,
+                text:'item.page.reinstate',
+                function: () => {
+                  this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-reinstate', dso.isArchived);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'eye',
+              index: 5,
+            },
+          ];
+        }),
+      );
+    } else {
+      return observableOf([]);
+    }
+  }
+
+  /**
+   * Get Community/Collection-specific menus
+   */
+  protected getComColMenu(dso): Observable<MenuSection[]> {
+    if (dso instanceof Community || dso instanceof Collection) {
+      return combineLatest([
+        this.authorizationService.isAuthorized(FeatureID.CanSubscribe, dso.self),
+      ]).pipe(
+        map(([canSubscribe]) => {
+          return [
+            {
+              id: 'subscribe',
+              active: false,
+              visible: canSubscribe,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: 'subscriptions.tooltip',
+                function: () => {
+                  const modalRef = this.modalService.open(SubscriptionModalComponent);
+                  modalRef.componentInstance.dso = dso;
+                },
+              } as OnClickMenuItemModel,
+              icon: 'bell',
+              index: 4,
             },
           ];
         }),
@@ -216,14 +311,15 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
   protected addDsoUuidToMenuIDs(menus, dso) {
     return menus.map((menu) => {
       Object.assign(menu, {
-        id: menu.id + '-' + dso.uuid
+        id: menu.id + '-' + dso.uuid,
       });
       if (hasValue(menu.parentID)) {
         Object.assign(menu, {
-          parentID: menu.parentID + '-' + dso.uuid
+          parentID: menu.parentID + '-' + dso.uuid,
         });
       }
       return menu;
     });
   }
+
 }
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
index 79ab35bd28..4ad4642804 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
@@ -1,16 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
 import { MenuService } from '../../../menu/menu.service';
 import { CSSVariableService } from '../../../sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
-import { Router } from '@angular/router';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
 import { RouterStub } from '../../../testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { Component } from '@angular/core';
 import { DsoEditMenuExpandableSectionComponent } from './dso-edit-menu-expandable-section.component';
-import { By } from '@angular/platform-browser';
-import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
 
 describe('DsoEditMenuExpandableSectionComponent', () => {
   let component: DsoEditMenuExpandableSectionComponent;
@@ -25,9 +30,9 @@ describe('DsoEditMenuExpandableSectionComponent', () => {
     model: {
       type: MenuItemType.TEXT,
       disabled: false,
-      text: 'text'
+      text: 'text',
     },
-    icon: iconString
+    icon: iconString,
   };
 
   beforeEach(waitForAsync(() => {
@@ -35,15 +40,15 @@ describe('DsoEditMenuExpandableSectionComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [DsoEditMenuExpandableSectionComponent, TestComponent],
       providers: [
-        {provide: 'sectionDataProvider', useValue: dummySection},
-        {provide: MenuService, useValue: menuService},
-        {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-        {provide: Router, useValue: new RouterStub()},
-      ]
+        { provide: 'sectionDataProvider', useValue: dummySection },
+        { provide: MenuService, useValue: menuService },
+        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+      ],
     }).overrideComponent(DsoEditMenuExpandableSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -69,7 +74,7 @@ describe('DsoEditMenuExpandableSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8e4a7008af..2f92049453 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -1,19 +1,23 @@
-import { Component, Inject, Injector } from '@angular/core';
-import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
-import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
-import { MenuService } from '../../../menu/menu.service';
+import {
+  Component,
+  Inject,
+  Injector,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { MenuID } from 'src/app/shared/menu/menu-id.model';
-import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { MenuID } from 'src/app/shared/menu/menu-id.model';
+import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
+import { MenuSection } from 'src/app/shared/menu/menu-section.model';
+import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
+
 import { hasValue } from '../../../empty.util';
+import { MenuService } from '../../../menu/menu.service';
 
 /**
  * Represents an expandable section in the dso edit menus
  */
 @Component({
-  /* tslint:disable:component-selector */
   selector: 'ds-dso-edit-menu-expandable-section',
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 16fda1caa8..bbc388a601 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -1,25 +1,21 @@
 <div *ngIf="!canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <a *ngIf="!section.model.disabled" class="d-flex flex-row flex-nowrap"
-       [routerLink]="itemModel.link"
-       href="javascript:void(0);">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
+    <a *ngIf="!section.model.disabled" class="btn btn-dark btn-sm"
+       [routerLink]="itemModel.link">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <div *ngIf="section.model.disabled" class="d-flex flex-row flex-nowrap">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
-    </div>
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
+    </button>
 </div>
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
             (click)="activate($event)">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
 </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
index f0815c5415..fbb90c5660 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
 import { MenuService } from '../../../menu/menu.service';
+import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model';
 import { CSSVariableService } from '../../../sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
-import { Router } from '@angular/router';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
 import { RouterStub } from '../../../testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { Component } from '@angular/core';
-import { By } from '@angular/platform-browser';
 import { DsoEditMenuSectionComponent } from './dso-edit-menu-section.component';
-import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model';
-import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
 
 function initAsync(dummySectionText: { visible: boolean; icon: string; active: boolean; model: { disabled: boolean; text: string; type: MenuItemType }; id: string }, menuService: MenuServiceStub) {
   beforeEach(waitForAsync(() => {
@@ -19,15 +24,15 @@ function initAsync(dummySectionText: { visible: boolean; icon: string; active: b
       imports: [TranslateModule.forRoot()],
       declarations: [DsoEditMenuSectionComponent, TestComponent],
       providers: [
-        {provide: 'sectionDataProvider', useValue: dummySectionText},
-        {provide: MenuService, useValue: menuService},
-        {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-        {provide: Router, useValue: new RouterStub()},
-      ]
+        { provide: 'sectionDataProvider', useValue: dummySectionText },
+        { provide: MenuService, useValue: menuService },
+        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+      ],
     }).overrideComponent(DsoEditMenuSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -46,9 +51,9 @@ describe('DsoEditMenuSectionComponent', () => {
     model: {
       type: MenuItemType.TEXT,
       disabled: false,
-      text: 'text'
+      text: 'text',
     },
-    icon: iconString
+    icon: iconString,
   };
   const dummySectionLink = {
     id: 'dummy',
@@ -58,9 +63,9 @@ describe('DsoEditMenuSectionComponent', () => {
       type: MenuItemType.LINK,
       disabled: false,
       text: 'text',
-      link: 'link'
+      link: 'link',
     },
-    icon: iconString
+    icon: iconString,
   };
 
   const dummySectionClick = {
@@ -71,9 +76,9 @@ describe('DsoEditMenuSectionComponent', () => {
       type: MenuItemType.ONCLICK,
       disabled: false,
       text: 'text',
-      function: () => 'test'
+      function: () => 'test',
     },
-    icon: iconString
+    icon: iconString,
   };
 
   describe('text model', () => {
@@ -96,7 +101,7 @@ describe('DsoEditMenuSectionComponent', () => {
     });
     describe('when the section model in a disabled link or text', () => {
       it('should show just the button', () => {
-        const textButton = fixture.debugElement.query(By.css('div div button'));
+        const textButton = fixture.debugElement.query(By.css('div a'));
         expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString);
       });
     });
@@ -144,7 +149,7 @@ describe('DsoEditMenuSectionComponent', () => {
 
   });
 
-  describe('link model', () => {
+  describe('when the section model in a non disabled link', () => {
     initAsync(dummySectionLink, menuService);
     beforeEach(() => {
       spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
@@ -154,11 +159,8 @@ describe('DsoEditMenuSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    describe('when the section model in a non disabled link', () => {
-      it('should show a link element with the button in it', () => {
-        const link = fixture.debugElement.query(By.css('a'));
-        expect(link.nativeElement.innerHTML).toContain('button');
-      });
+    it('should show the link element', () => {
+      expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
     });
 
   });
@@ -167,7 +169,7 @@ describe('DsoEditMenuSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index af3381ef71..c1e0095066 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -1,8 +1,14 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
-import { MenuService } from '../../../menu/menu.service';
+
 import { isNotEmpty } from '../../../empty.util';
+import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
 import { MenuSection } from '../../../menu/menu-section.model';
 
@@ -10,10 +16,9 @@ import { MenuSection } from '../../../menu/menu-section.model';
  * Represents a non-expandable section in the dso edit menus
  */
 @Component({
-  /* tslint:disable:component-selector */
   selector: 'ds-dso-edit-menu-section',
   templateUrl: './dso-edit-menu-section.component.html',
-  styleUrls: ['./dso-edit-menu-section.component.scss']
+  styleUrls: ['./dso-edit-menu-section.component.scss'],
 })
 @rendersSectionForMenu(MenuID.DSO_EDIT, false)
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
index 5616e8ea10..3b8adc35ef 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
@@ -1,21 +1,27 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-import { DsoEditMenuComponent } from './dso-edit-menu.component';
-import { MenuServiceStub } from '../../testing/menu-service.stub';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { MenuService } from '../../menu/menu.service';
 import { MenuItemModel } from '../../menu/menu-item/models/menu-item.model';
-import { ThemeService } from '../../theme-support/theme.service';
 import { getMockThemeService } from '../../mocks/theme-service.mock';
-
-
+import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { MenuServiceStub } from '../../testing/menu-service.stub';
+import { ThemeService } from '../../theme-support/theme.service';
 import { DsoPageModule } from '../dso-page.module';
+import { DsoEditMenuComponent } from './dso-edit-menu.component';
 
 describe('DsoEditMenuComponent', () => {
   let comp: DsoEditMenuComponent;
@@ -24,7 +30,7 @@ describe('DsoEditMenuComponent', () => {
   let authorizationService: AuthorizationDataService;
 
   const routeStub = {
-    children: []
+    children: [],
   };
 
   const section = {
@@ -36,13 +42,13 @@ describe('DsoEditMenuComponent', () => {
       disabled: false,
     } as MenuItemModel,
     icon: 'pencil-alt',
-    index: 1
+    index: 1,
   };
 
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     spyOn(menuService, 'getMenuTopSections').and.returnValue(observableOf([section]));
     TestBed.configureTestingModule({
@@ -50,13 +56,13 @@ describe('DsoEditMenuComponent', () => {
       declarations: [DsoEditMenuComponent],
       providers: [
         Injector,
-        {provide: MenuService, useValue: menuService},
-        {provide: AuthService, useClass: AuthServiceStub},
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: AuthorizationDataService, useValue: authorizationService},
-        {provide: ThemeService, useValue: getMockThemeService()},
+        { provide: MenuService, useValue: menuService },
+        { provide: AuthService, useClass: AuthServiceStub },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: ThemeService, useValue: getMockThemeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index ff4f957314..457940f426 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -1,10 +1,14 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+
 import { MenuComponent } from '../../menu/menu.component';
 import { MenuService } from '../../menu/menu.service';
-import { ActivatedRoute } from '@angular/router';
-import { ThemeService } from '../../theme-support/theme.service';
 import { MenuID } from '../../menu/menu-id.model';
+import { ThemeService } from '../../theme-support/theme.service';
 
 /**
  * Component representing the edit menu and other menus on the dspace object pages
@@ -26,7 +30,7 @@ export class DsoEditMenuComponent extends MenuComponent {
               protected injector: Injector,
               public authorizationService: AuthorizationDataService,
               public route: ActivatedRoute,
-              protected themeService: ThemeService
+              protected themeService: ThemeService,
   ) {
     super(menuService, injector, authorizationService, route, themeService);
   }
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
deleted file mode 100644
index 15135009fc..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<button *ngIf="isAuthorized$ | async" data-test="subscription-button"
-        (click)="openSubscriptionModal()"
-        [ngbTooltip]="'subscriptions.tooltip' | translate"
-        [title]="'subscriptions.tooltip' | translate"
-        [attr.aria-label]="'subscriptions.tooltip' | translate"
-        class="subscription-button btn btn-dark btn-sm">
-  <i class="fas fa-bell fa-fw"></i>
-</button>
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts
deleted file mode 100644
index 726854778d..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DsoPageSubscriptionButtonComponent } from './dso-page-subscription-button.component';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
-import { DebugElement } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { ITEM } from '../../../core/shared/item.resource-type';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-
-describe('DsoPageSubscriptionButtonComponent', () => {
-  let component: DsoPageSubscriptionButtonComponent;
-  let fixture: ComponentFixture<DsoPageSubscriptionButtonComponent>;
-  let de: DebugElement;
-
-  const authorizationService = jasmine.createSpyObj('authorizationService', {
-    isAuthorized: jasmine.createSpy('isAuthorized') // observableOf(true)
-  });
-
-  const mockItem = Object.assign(new Item(), {
-    id: 'fake-id',
-    uuid: 'fake-id',
-    handle: 'fake/handle',
-    lastModified: '2018',
-    type: ITEM,
-    _links: {
-      self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        NgbModalModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
-      ],
-      declarations: [ DsoPageSubscriptionButtonComponent ],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService },
-      ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageSubscriptionButtonComponent);
-    component = fixture.componentInstance;
-    de = fixture.debugElement;
-    component.dso = mockItem;
-  });
-
-  describe('when is authorized', () => {
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-
-    it('should display subscription button', () => {
-      expect(de.query(By.css(' [data-test="subscription-button"]'))).toBeTruthy();
-    });
-  });
-
-  describe('when is not authorized', () => {
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-
-    it('should not display subscription button', () => {
-      expect(de.query(By.css(' [data-test="subscription-button"]'))).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
deleted file mode 100644
index 54cd9e6bb0..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-
-@Component({
-  selector: 'ds-dso-page-subscription-button',
-  templateUrl: './dso-page-subscription-button.component.html',
-  styleUrls: ['./dso-page-subscription-button.component.scss']
-})
-/**
- * Display a button that opens the modal to manage subscriptions
- */
-export class DsoPageSubscriptionButtonComponent implements OnInit {
-
-  /**
-   * Whether the current user is authorized to edit the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean> = of(false);
-
-  /**
-   * Reference to NgbModal
-   */
-  public modalRef: NgbModalRef;
-
-  /**
-   * DSpaceObject that is being viewed
-   */
-  @Input() dso: DSpaceObject;
-
-  constructor(
-    protected authorizationService: AuthorizationDataService,
-    private modalService: NgbModal,
-  ) {
-  }
-
-  /**
-   * check if the current DSpaceObject can be subscribed by the user
-   */
-  ngOnInit(): void {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanSubscribe, this.dso.self);
-  }
-
-  /**
-   * Open the modal to subscribe to the related DSpaceObject
-   */
-  public openSubscriptionModal() {
-    this.modalRef = this.modalService.open(SubscriptionModalComponent);
-    this.modalRef.componentInstance.dso = this.dso;
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page.module.ts b/src/app/shared/dso-page/dso-page.module.ts
index d700b34e77..48a735156a 100644
--- a/src/app/shared/dso-page/dso-page.module.ts
+++ b/src/app/shared/dso-page/dso-page.module.ts
@@ -1,15 +1,15 @@
-import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {
+  NgbDropdownModule,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { DsoEditMenuExpandableSectionComponent } from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
 import { DsoEditMenuComponent } from '../dso-page/dso-edit-menu/dso-edit-menu.component';
-import {
-  DsoEditMenuSectionComponent
-} from '../dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component';
-import {
-  DsoEditMenuExpandableSectionComponent
-} from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
-import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { DsoEditMenuSectionComponent } from '../dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component';
 
 const COMPONENTS = [
   DsoEditMenuComponent,
@@ -33,7 +33,7 @@ const PROVIDERS = [
 
 @NgModule({
   imports: [
-    ...MODULES
+    ...MODULES,
   ],
   declarations: [
     ...COMPONENTS,
@@ -44,8 +44,8 @@ const PROVIDERS = [
     ...ENTRY_COMPONENTS,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 
 /**
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
index fc5c1dafc9..8f011580cf 100644
--- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
@@ -1,13 +1,17 @@
-import { DsoVersioningModalService } from './dso-versioning-modal.service';
 import { waitForAsync } from '@angular/core/testing';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Version } from '../../../core/shared/version.model';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { MetadataMap } from '../../../core/shared/metadata.models';
-import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { EMPTY, of as observableOf } from 'rxjs';
+import { Version } from '../../../core/shared/version.model';
+import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { DsoVersioningModalService } from './dso-versioning-modal.service';
 
 describe('DsoVersioningModalService', () => {
   let service: DsoVersioningModalService;
@@ -25,24 +29,24 @@ describe('DsoVersioningModalService', () => {
     relationships: createRelationshipsObservable(),
     _links: {
       self: {
-        href: 'item-href'
+        href: 'item-href',
       },
       version: {
-        href: 'version-href'
-      }
-    }
+        href: 'version-href',
+      },
+    },
   });
 
   beforeEach(waitForAsync(() => {
     modalService = jasmine.createSpyObj('modalService', {
-      open: {componentInstance: {firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY}}
+      open: { componentInstance: { firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY } },
     });
     versionService = jasmine.createSpyObj('versionService', {
       findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
     });
     versionHistoryService = jasmine.createSpyObj('versionHistoryService', {
       createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
-      hasDraftVersion$: observableOf(false)
+      hasDraftVersion$: observableOf(false),
     });
     itemVersionShared = jasmine.createSpyObj('itemVersionShared', ['notifyCreateNewVersion']);
     router = jasmine.createSpyObj('router', ['navigateByUrl']);
@@ -56,7 +60,7 @@ describe('DsoVersioningModalService', () => {
       itemVersionShared,
       router,
       workspaceItemDataService,
-      itemService
+      itemService,
     );
   }));
   describe('when onCreateNewVersion() is called', () => {
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
index 46792294dd..14161485eb 100644
--- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -1,27 +1,37 @@
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Version } from '../../../core/shared/version.model';
-import { map, startWith, switchMap, tap } from 'rxjs/operators';
-import { Item } from '../../../core/shared/item.model';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { VersionDataService } from '../../../core/data/version-data.service';
 import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { Router } from '@angular/router';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { Injectable } from '@angular/core';
-import { Observable, of } from 'rxjs';
-import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
+import { Item } from '../../../core/shared/item.model';
 import {
-  ItemVersionsSummaryModalComponent
-} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { Version } from '../../../core/shared/version.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
+import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
 
 /**
  * Service to take care of all the functionality related to the version creation modal
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DsoVersioningModalService {
 
diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
new file mode 100644
index 0000000000..c52b435af4
--- /dev/null
+++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
@@ -0,0 +1,99 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+import { Item } from 'src/app/core/shared/item.model';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/withdrawn-reinstate-modal.component';
+import { NotificationsService } from '../../notifications/notifications.service';
+
+export const REQUEST_WITHDRAWN = 'REQUEST/WITHDRAWN';
+export const REQUEST_REINSTATE = 'REQUEST/REINSTATE';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Service for managing the withdrawn/reinstate modal for a DSO.
+ */
+export class DsoWithdrawnReinstateModalService {
+
+  constructor(
+    protected router: Router,
+    protected modalService: NgbModal,
+    protected itemService: ItemDataService,
+    private notificationsService: NotificationsService,
+    protected authorizationService: AuthorizationDataService,
+    private translateService: TranslateService,
+    protected qaEventDataService: QualityAssuranceEventDataService,
+  ) {}
+
+  /**
+   * Open the create withdrawn modal for the provided dso
+   */
+  openCreateWithdrawnReinstateModal(dso: Item, correctionType: 'request-reinstate' | 'request-withdrawn', state: boolean): void {
+    const target = dso.id;
+    // Open modal
+    const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent);
+    (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setWithdraw(state);
+    (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).createQAEvent
+      .pipe(
+        take(1),
+      ).subscribe(
+        (reasone) => {
+          this.sendQARequest(target, correctionType, reasone);
+          activeModal.close();
+        },
+      );
+  }
+
+  /**
+   * Sends a quality assurance request.
+   *
+   * @param target - The target - the item's UUID.
+   * @param correctionType - The type of correction.
+   * @param reason - The reason for the request.
+   * Reloads the current page in order to update the withdrawn/reinstate button.
+   * and desplay a notification box.
+   */
+  sendQARequest(target: string, correctionType: 'request-reinstate' | 'request-withdrawn', reason: string): void {
+    this.qaEventDataService.postData(target, correctionType, '', reason)
+      .pipe (
+        getFirstCompletedRemoteData(),
+      )
+      .subscribe((res: RemoteData<QualityAssuranceEventObject>) => {
+        if (res.hasSucceeded) {
+          const message = (correctionType === 'request-withdrawn')
+            ? 'correction-type.manage-relation.action.notification.withdrawn'
+            : 'correction-type.manage-relation.action.notification.reinstate';
+
+          this.notificationsService.success(this.translateService.get(message));
+          this.authorizationService.invalidateAuthorizationsRequestCache();
+          this.reloadPage(true);
+        } else {
+          this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error'));
+        }
+      });
+  }
+
+  /**
+   * Reloads the current page or navigates to a specified URL.
+   * @param self - A boolean indicating whether to reload the current page (true) or navigate to a specified URL (false).
+   * @param urlToNavigateTo - The URL to navigate to if `self` is false.
+   * skipLocationChange:true means dont update the url to / when navigating
+   */
+  reloadPage(self: boolean, urlToNavigateTo?: string) {
+    const url = self ? this.router.url : urlToNavigateTo;
+    this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
+      this.router.navigate([`/${url}`]);
+    });
+  }
+}
+
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
index b46df8ff36..223d56f8ab 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
@@ -1,16 +1,21 @@
-import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { CollectionDataService } from '../../../../core/data/collection-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { createPaginatedList } from '../../../testing/utils.test';
 import { Collection } from '../../../../core/shared/collection.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { VarDirective } from '../../../utils/var.directive';
+import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
 
 describe('AuthorizedCollectionSelectorComponent', () => {
   let component: AuthorizedCollectionSelectorComponent;
@@ -23,11 +28,11 @@ describe('AuthorizedCollectionSelectorComponent', () => {
 
   beforeEach(waitForAsync(() => {
     collection = Object.assign(new Collection(), {
-      id: 'authorized-collection'
+      id: 'authorized-collection',
     });
     collectionService = jasmine.createSpyObj('collectionService', {
       getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection])),
-      getAuthorizedCollectionByEntityType: createSuccessfulRemoteDataObject$(createPaginatedList([collection]))
+      getAuthorizedCollectionByEntityType: createSuccessfulRemoteDataObject$(createPaginatedList([collection])),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['error']);
     TestBed.configureTestingModule({
@@ -38,7 +43,7 @@ describe('AuthorizedCollectionSelectorComponent', () => {
         { provide: CollectionDataService, useValue: collectionService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -52,10 +57,10 @@ describe('AuthorizedCollectionSelectorComponent', () => {
   describe('search', () => {
     describe('when has no entity type', () => {
       it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => {
-      component.search('', 1).subscribe((resultRD) => {
+        component.search('', 1).subscribe((resultRD) => {
           expect(collectionService.getAuthorizedCollection).toHaveBeenCalled();
-        expect(resultRD.payload.page.length).toEqual(1);
-        expect(resultRD.payload.page[0].indexableObject).toEqual(collection);
+          expect(resultRD.payload.page.length).toEqual(1);
+          expect(resultRD.payload.page[0].indexableObject).toEqual(collection);
           done();
         });
       });
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
index cc1f9822d6..973febf97d 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
@@ -1,27 +1,34 @@
-import { Component, Input } from '@angular/core';
-import { DSOSelectorComponent } from '../dso-selector.component';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { map } from 'rxjs/operators';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { SearchResult } from '../../../search/models/search-result.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-import { followLink } from '../../../utils/follow-link-config.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { hasValue } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Collection } from '../../../../core/shared/collection.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { DSOSelectorComponent } from '../dso-selector.component';
 
 @Component({
   selector: 'ds-authorized-collection-selector',
   styleUrls: ['../dso-selector.component.scss'],
-  templateUrl: '../dso-selector.component.html'
+  templateUrl: '../dso-selector.component.html',
 })
 /**
  * Component rendering a list of collections to select from
@@ -59,7 +66,7 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
     let searchListService$: Observable<RemoteData<PaginatedList<Collection>>> = null;
     const findOptions: FindListOptions = {
       currentPage: page,
-      elementsPerPage: this.defaultPagination.pageSize
+      elementsPerPage: this.defaultPagination.pageSize,
     };
 
     if (this.entityType) {
@@ -76,7 +83,7 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
       getFirstCompletedRemoteData(),
       map((rd) => Object.assign(new RemoteData(null, null, null, null), rd, {
         payload: hasValue(rd.payload) ? buildPaginatedList(rd.payload.pageInfo, rd.payload.page.map((col) => Object.assign(new CollectionSearchResult(), { indexableObject: col }))) : null,
-      }))
+      })),
     );
   }
 }
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index c4f5dbc4cd..97a5a554a0 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -2,6 +2,7 @@
     <input type="search"
            class="form-control"
            (click)="$event.stopPropagation();"
+           [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
            placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
            [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
@@ -16,7 +17,7 @@
     (scrolled)="onScrollDown()">
     <ng-container *ngIf="listEntries$ | async">
       <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="(listEntries$ | async).length == 0">
+              *ngIf="(listEntries$ | async).length === 0">
         {{'dso-selector.no-results' | translate: { type: typesString } }}
       </button>
       <button *ngFor="let listEntry of (listEntries$ | async)"
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index e2acd17bc0..c41a9beca2 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -1,17 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { DSOSelectorComponent } from './dso-selector.component';
-import { SearchService } from '../../../core/shared/search/search.service';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../core/shared/item.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { hasValue } from '../../empty.util';
-import { createPaginatedList } from '../../testing/utils.test';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { createPaginatedList } from '../../testing/utils.test';
+import { DSOSelectorComponent } from './dso-selector.component';
 
 describe('DSOSelectorComponent', () => {
   let component: DSOSelectorComponent;
@@ -43,7 +57,7 @@ describe('DSOSelectorComponent', () => {
       } else {
         return createSuccessfulRemoteDataObject$(createPaginatedList(nextPageResults));
       }
-    }
+    },
   };
 
   function createSearchResult(name: string): ItemSearchResult {
@@ -53,11 +67,11 @@ describe('DSOSelectorComponent', () => {
         metadata: {
           'dc.title': [
             {
-              value: `test result - ${name}`
-            }
-          ]
-        }
-      })
+              value: `test result - ${name}`,
+            },
+          ],
+        },
+      }),
     });
   }
 
@@ -73,7 +87,7 @@ describe('DSOSelectorComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -139,7 +153,7 @@ describe('DSOSelectorComponent', () => {
           }),
         }),
         null,
-        true
+        true,
       );
     });
 
@@ -153,7 +167,7 @@ describe('DSOSelectorComponent', () => {
           sort: null,
         }),
         null,
-        true
+        true,
       );
     });
   });
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 503e4c4412..58ce2ed3aa 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -7,48 +7,60 @@ import {
   OnInit,
   Output,
   QueryList,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators';
+import {
+  debounceTime,
+  map,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 
-import { SearchService } from '../../../core/shared/search/search.service';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { Context } from '../../../core/shared/context.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../empty.util';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { SearchResult } from '../../search/models/search-result.model';
-import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import {
-  ListableNotificationObject
-} from '../../object-list/listable-notification-object/listable-notification-object.model';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import { NotificationType } from '../../notifications/models/notification-type';
-import {
-  LISTABLE_NOTIFICATION_OBJECT
-} from '../../object-list/listable-notification-object/listable-notification-object.resource-type';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ListableNotificationObject } from '../../object-list/listable-notification-object/listable-notification-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from '../../object-list/listable-notification-object/listable-notification-object.resource-type';
+import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { SearchResult } from '../../search/models/search-result.model';
 
 @Component({
   selector: 'ds-dso-selector',
   styleUrls: ['./dso-selector.component.scss'],
-  templateUrl: './dso-selector.component.html'
+  templateUrl: './dso-selector.component.html',
 })
 
 /**
@@ -70,11 +82,16 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   @Input() types: DSpaceObjectType[];
 
-   /**
+  /**
    * The sorting options
    */
   @Input() sort: SortOptions;
 
+  /**
+   * The id that should be given to the input box, this is required for accessibility reasons
+   */
+  @Input() searchBoxId: string | null = null;
+
   // list of allowed selectable dsoTypes
   typesString: string;
 
@@ -165,9 +182,9 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
       this.input.valueChanges.pipe(
         debounceTime(this.debounceTime),
         startWith(''),
-        tap(() => this.currentPage$.next(1))
+        tap(() => this.currentPage$.next(1)),
       ),
-      this.currentPage$
+      this.currentPage$,
     ).pipe(
       switchMap(([currentDSOResult, query, page]: [PaginatedList<SearchResult<DSpaceObject>>, string, number]) => {
         this.loading = true;
@@ -182,15 +199,15 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
               // If no query is entered, filter out the current DSO from the results, as it'll be displayed at the start of the list already
               rd.payload.page = [
                 ...((isEmpty(query) && page === 1) ? currentDSOResult.page : []),
-                ...rd.payload.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId)
+                ...rd.payload.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId),
               ];
             } else if (rd.hasFailed) {
               this.notifcationsService.error(this.translate.instant('dso-selector.error.title', { type: this.typesString }), rd.errorMessage);
             }
             return rd;
-          })
+          }),
         );
-      })
+      }),
     ).subscribe((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => {
       this.updateList(rd);
     }));
@@ -228,20 +245,20 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
     // default sort is only used when there is not query
-    let efectiveSort = query ? null : this.sort;
+    const efectiveSort = query ? null : this.sort;
     return this.searchService.search(
       new PaginatedSearchOptions({
         query: query,
         dsoTypes: this.types,
         pagination: Object.assign({}, this.defaultPagination, {
-          currentPage: page
+          currentPage: page,
         }),
-        sort: efectiveSort
+        sort: efectiveSort,
       }),
       null,
       useCache,
     ).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
index a12f2587be..01ee6b966b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../../core/shared/community.model';
-import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 describe('CreateCollectionParentSelectorComponent', () => {
   let component: CreateCollectionParentSelectorComponent;
@@ -20,8 +31,8 @@ describe('CreateCollectionParentSelectorComponent', () => {
     'dc.title': [
       Object.assign(new MetadataValue(), {
         value: 'Community title',
-        language: undefined
-      })]
+        language: undefined,
+      })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -43,14 +54,14 @@ describe('CreateCollectionParentSelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index e0b7c1675b..ca8761b677 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,15 +1,29 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
 import {
-    getCollectionCreateRoute,
-    COLLECTION_PARENT_PARAMETER
-} from '../../../../collection-page/collection-page-routing-paths';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
 import { environment } from '../../../../../environments/environment';
+import {
+  COLLECTION_PARENT_PARAMETER,
+  getCollectionCreateRoute,
+} from '../../../../collection-page/collection-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 /**
  * Component to wrap a list of existing communities inside a modal
  * Used to choose a community from to create a new collection in
@@ -37,7 +51,7 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra
     const navigationExtras: NavigationExtras = {
       queryParams: {
         [COLLECTION_PARENT_PARAMETER]: dso.uuid,
-      }
+      },
     };
     this.router.navigate([getCollectionCreateRoute()], navigationExtras);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
index d90cd0ac0d..ced155cdda 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
@@ -1,28 +1,29 @@
-import {Component} from '@angular/core';
-import {CreateCollectionParentSelectorComponent} from './create-collection-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 /**
  * Themed wrapper for CreateCollectionParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-collection-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-collection-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateCollectionParentSelectorComponent
-    extends ThemedComponent<CreateCollectionParentSelectorComponent> {
+  extends ThemedComponent<CreateCollectionParentSelectorComponent> {
 
-    protected getComponentName(): string {
-        return 'CreateCollectionParentSelectorComponent';
-    }
+  protected getComponentName(): string {
+    return 'CreateCollectionParentSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./create-collection-parent-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./create-collection-parent-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a13be63880..8ae146b42c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
+        <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index 2d0a2a25de..fbf888ba60 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../../core/shared/community.model';
-import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 
 describe('CreateCommunityParentSelectorComponent', () => {
   let component: CreateCommunityParentSelectorComponent;
@@ -19,8 +30,8 @@ describe('CreateCommunityParentSelectorComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -42,14 +53,14 @@ describe('CreateCommunityParentSelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 77458d9802..900c88f708 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,19 +1,30 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { hasValue } from '../../../empty.util';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import {
+  COMMUNITY_PARENT_PARAMETER,
+  getCommunityCreateRoute,
+} from '../../../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { hasValue } from '../../../empty.util';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import {
-    getCommunityCreateRoute,
-    COMMUNITY_PARENT_PARAMETER
-} from '../../../../community-page/community-page-routing-paths';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
-import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a button - for top communities -
@@ -46,7 +57,7 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
       navigationExtras = {
         queryParams: {
           [COMMUNITY_PARENT_PARAMETER]: dso.uuid,
-        }
+        },
       };
     }
     this.router.navigate([getCommunityCreateRoute()], navigationExtras);
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
index 24bff97254..bbf9db5247 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {CreateCommunityParentSelectorComponent} from './create-community-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 
 /**
  * Themed wrapper for CreateCommunityParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-community-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-community-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateCommunityParentSelectorComponent
-    extends ThemedComponent<CreateCommunityParentSelectorComponent> {
-    protected getComponentName(): string {
-        return 'CreateCommunityParentSelectorComponent';
-    }
+  extends ThemedComponent<CreateCommunityParentSelectorComponent> {
+  protected getComponentName(): string {
+    return 'CreateCommunityParentSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./create-community-parent-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./create-community-parent-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 5fccd58f48..5288f08e02 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
                                        [entityType]="entityType"
                                        [types]="selectorTypes"
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
index 90bd07c52b..174fd402f4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 
 describe('CreateItemParentSelectorComponent', () => {
   let component: CreateItemParentSelectorComponent;
@@ -19,8 +30,8 @@ describe('CreateItemParentSelectorComponent', () => {
   collection.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Collection title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -41,14 +52,14 @@ describe('CreateItemParentSelectorComponent', () => {
                   dso: collectionRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index ed8a7b0780..1b7bcb308b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,11 +1,26 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+
 import { environment } from '../../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -16,7 +31,7 @@ import { environment } from '../../../../../environments/environment';
   selector: 'ds-create-item-parent-selector',
   // styleUrls: ['./create-item-parent-selector.component.scss'],
   // templateUrl: '../dso-selector-modal-wrapper.component.html',
-  templateUrl: './create-item-parent-selector.component.html'
+  templateUrl: './create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
@@ -41,7 +56,7 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo
     const navigationExtras: NavigationExtras = {
       queryParams: {
         ['collection']: dso.uuid,
-      }
+      },
     };
     if (this.entityType) {
       navigationExtras.queryParams.entityType = this.entityType;
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
index 49209ea63b..271c13b097 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
@@ -1,31 +1,35 @@
-import {Component, Input} from '@angular/core';
-import {CreateItemParentSelectorComponent} from './create-item-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 
 /**
  * Themed wrapper for CreateItemParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-item-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-item-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateItemParentSelectorComponent
-    extends ThemedComponent<CreateItemParentSelectorComponent> {
+  extends ThemedComponent<CreateItemParentSelectorComponent> {
     @Input() entityType: string;
 
     protected inAndOutputNames: (keyof CreateItemParentSelectorComponent & keyof this)[] = ['entityType'];
 
     protected getComponentName(): string {
-        return 'CreateItemParentSelectorComponent';
+      return 'CreateItemParentSelectorComponent';
     }
 
     protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component`);
+      return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component`);
     }
 
     protected importUnthemedComponent(): Promise<any> {
-        return import('./create-item-parent-selector.component');
+      return import('./create-item-parent-selector.component');
     }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 54044f5d79..6d3d45cb3d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index e2dbaaa0ff..63143e5299 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -1,17 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+  OnInit,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+} from '@angular/router';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { Component, DebugElement, NO_ERRORS_SCHEMA, OnInit } from '@angular/core';
+import { MockComponent } from 'ng-mocks';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../core/shared/item.model';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from './dso-selector-modal-wrapper.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute } from '@angular/router';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { By } from '@angular/platform-browser';
-import { DSOSelectorComponent } from '../dso-selector/dso-selector.component';
-import { MockComponent } from 'ng-mocks';
 import { MetadataValue } from '../../../core/shared/metadata.models';
+import { hasValue } from '../../empty.util';
 import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { DSOSelectorComponent } from '../dso-selector/dso-selector.component';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from './dso-selector-modal-wrapper.component';
 
 describe('DSOSelectorModalWrapperComponent', () => {
   let component: DSOSelectorModalWrapperComponent;
@@ -23,8 +40,8 @@ describe('DSOSelectorModalWrapperComponent', () => {
   item.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Item title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
 
   const itemRD = createSuccessfulRemoteDataObject(item);
@@ -45,11 +62,11 @@ describe('DSOSelectorModalWrapperComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
-          }
+            },
+          },
         },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -83,6 +100,20 @@ describe('DSOSelectorModalWrapperComponent', () => {
     });
   });
 
+  describe('selectObject with emit only', () => {
+    beforeEach(() => {
+      spyOn(component, 'navigate');
+      spyOn(component, 'close');
+      spyOn(component.select, 'emit');
+      component.emitOnly = true;
+      component.selectObject(item);
+    });
+    it('should call the close and navigate method on the component with the given DSO', () => {
+      expect(component.close).toHaveBeenCalled();
+      expect(component.select.emit).toHaveBeenCalledWith(item);
+    });
+  });
+
   describe('close', () => {
     beforeEach(() => {
       component.close();
@@ -113,11 +144,24 @@ describe('DSOSelectorModalWrapperComponent', () => {
       expect(component.close).toHaveBeenCalled();
     });
   });
+
+  describe('should find route data', () => {
+    beforeEach(() => {
+      spyOn(component, 'findRouteData');
+      component.ngOnInit();
+    });
+    it('should call the findRouteData method on the component', () => {
+      expect(component.findRouteData).toHaveBeenCalled();
+    });
+    it('should return undefined', () => {
+      expect(component.findRouteData((route) => hasValue(route.data), {} as unknown as ActivatedRouteSnapshot)).toEqual(undefined);
+    });
+  });
 });
 
 @Component({
   selector: 'ds-test-cmp',
-  templateUrl: './dso-selector-modal-wrapper.component.html'
+  templateUrl: './dso-selector-modal-wrapper.component.html',
 })
 class TestComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 3f81687c9f..51e520df18 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -1,11 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { hasValue, isNotEmpty } from '../../empty.util';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -21,7 +34,7 @@ export enum SelectorActionType {
  */
 @Component({
   selector: 'ds-dso-selector-modal',
-  template: ''
+  template: '',
 })
 export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
@@ -29,6 +42,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   @Input() dsoRD: RemoteData<DSpaceObject>;
 
+  /**
+   * Representing if component should emit value of selected entries or navigate
+   */
+  @Input() emitOnly = false;
+
   /**
    * Optional header to display above the selection list
    * Supports i18n keys
@@ -50,6 +68,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   action: SelectorActionType;
 
+  /**
+   * Event emitted when a DSO entry is selected if emitOnly is set to true
+   */
+  @Output() select: EventEmitter<DSpaceObject> = new EventEmitter<DSpaceObject>();
+
   /**
    * Default DSO ordering
    */
@@ -64,7 +87,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   ngOnInit(): void {
     const matchingRoute = this.findRouteData(
       (route: ActivatedRouteSnapshot) => hasValue(route.data.dso),
-      this.route.root.snapshot
+      this.route.root.snapshot,
     );
     if (hasValue(matchingRoute)) {
       this.dsoRD = matchingRoute.data.dso;
@@ -93,7 +116,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   selectObject(dso: DSpaceObject) {
     this.close();
-    this.navigate(dso);
+    if (this.emitOnly) {
+      this.select.emit(dso);
+    } else {
+      this.navigate(dso);
+    }
   }
 
   /**
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
index 142f5dcc11..5748e92937 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 
 describe('EditCollectionSelectorComponent', () => {
   let component: EditCollectionSelectorComponent;
@@ -19,8 +30,8 @@ describe('EditCollectionSelectorComponent', () => {
   collection.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Collection title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -42,14 +53,14 @@ describe('EditCollectionSelectorComponent', () => {
                   dso: collectionRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index fd54cd44ed..9df342a17a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,15 +1,25 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
-import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a list of existing collections inside a modal
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
index 999f466e75..f337cf4e8e 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditCollectionSelectorComponent} from './edit-collection-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 
 /**
  * Themed wrapper for EditCollectionSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-collection-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-collection-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditCollectionSelectorComponent
-    extends ThemedComponent<EditCollectionSelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditCollectionSelectorComponent';
-    }
+  extends ThemedComponent<EditCollectionSelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditCollectionSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-collection-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-collection-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
index 355ff61e08..75b64d8aef 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { EditCommunitySelectorComponent } from './edit-community-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditCommunitySelectorComponent } from './edit-community-selector.component';
 
 describe('EditCommunitySelectorComponent', () => {
   let component: EditCommunitySelectorComponent;
@@ -19,8 +30,8 @@ describe('EditCommunitySelectorComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -42,14 +53,14 @@ describe('EditCommunitySelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index cf2f97c6d3..b33f5bae9c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,15 +1,25 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
-import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a list of existing communities inside a modal
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
index e067803444..86b501ffda 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditCommunitySelectorComponent} from './edit-community-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditCommunitySelectorComponent } from './edit-community-selector.component';
 
 /**
  * Themed wrapper for EditCommunitySelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-community-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-community-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditCommunitySelectorComponent
-    extends ThemedComponent<EditCommunitySelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditCommunitySelectorComponent';
-    }
+  extends ThemedComponent<EditCommunitySelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditCommunitySelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-community-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-community-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..999a96e730 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
index a2891fc66f..de0844781b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EditItemSelectorComponent } from './edit-item-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Item } from '../../../../core/shared/item.model';
-import { RouterStub } from '../../../testing/router.stub';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditItemSelectorComponent } from './edit-item-selector.component';
 
 describe('EditItemSelectorComponent', () => {
   let component: EditItemSelectorComponent;
@@ -37,14 +48,14 @@ describe('EditItemSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index c1ae583908..08a18dee7f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,11 +1,21 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths';
+
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../../core/shared/item.model';
+import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing items inside a modal
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
index 6d3b5691c1..52f7809905 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditItemSelectorComponent} from './edit-item-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditItemSelectorComponent } from './edit-item-selector.component';
 
 /**
  * Themed wrapper for EditItemSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-item-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-item-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditItemSelectorComponent
-    extends ThemedComponent<EditItemSelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditItemSelectorComponent';
-    }
+  extends ThemedComponent<EditItemSelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditItemSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-item-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-item-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
index 18ec6007ea..c81eaef4ed 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
@@ -1,39 +1,61 @@
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NgModule,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import {
+  BATCH_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../remote-data.utils';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { ExportBatchSelectorComponent } from './export-batch-selector.component';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
 @NgModule({
-    imports: [NgbModalModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-            }
-        }),
-    ],
-    exports: [],
-    declarations: [ConfirmationModalComponent],
-    providers: []
+  imports: [NgbModalModule,
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderMock,
+      },
+    }),
+  ],
+  exports: [],
+  declarations: [ConfirmationModalComponent],
+  providers: [],
 })
 class ModelTestModule {
 }
@@ -53,7 +75,7 @@ describe('ExportBatchSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const mockCollection: Collection = Object.assign(new Collection(), {
@@ -64,10 +86,10 @@ describe('ExportBatchSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(mockItem);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
@@ -75,15 +97,15 @@ describe('ExportBatchSelectorComponent', () => {
   beforeEach(waitForAsync(() => {
     notificationService = new NotificationsServiceStub();
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
@@ -102,14 +124,14 @@ describe('ExportBatchSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -178,9 +200,9 @@ describe('ExportBatchSelectorComponent', () => {
     it('should invoke the Batch-export script with option --id uuid without option', () => {
       const parameterValues: ProcessParameter[] = [
         Object.assign(new ProcessParameter(), { name: '--id', value: mockCollection.uuid }),
-        Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' })
+        Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' }),
       ];
-        expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_EXPORT_SCRIPT_NAME, parameterValues, []);
+      expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_EXPORT_SCRIPT_NAME, parameterValues, []);
     });
     it('success notification is shown', () => {
       expect(scriptRequestSucceeded).toBeTrue();
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
index 0645e09029..645f8d95f6 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
@@ -1,25 +1,48 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  BATCH_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Process } from '../../../../process-page/processes/process.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -38,6 +61,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
               protected authorizationDataService: AuthorizationDataService,
+              protected dsoNameService: DSONameService,
               private modalService: NgbModal) {
     super(activeModal, route);
   }
@@ -49,7 +73,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-batch.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-batch.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-batch.cancel';
@@ -61,7 +85,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
           return startScriptSucceeded$.pipe(
             switchMap((r: boolean) => {
               return observableOf(r);
-            })
+            }),
           );
         } else {
           const modalRefExport = this.modalService.open(ExportBatchSelectorComponent);
@@ -83,7 +107,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
   private startScriptNotifyAndRedirect(dso: DSpaceObject): Observable<boolean> {
     const parameterValues: ProcessParameter[] = [
       Object.assign(new ProcessParameter(), { name: '--id', value: dso.uuid }),
-      Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' })
+      Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' }),
     ];
     return this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
       switchMap(() => {
@@ -105,7 +129,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
           this.notificationsService.error(title, content);
           return false;
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
index df3e4f095c..596fe19e4d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -1,11 +1,34 @@
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NgModule,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import {
+  METADATA_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
 import { Item } from '../../../../core/shared/item.model';
@@ -13,28 +36,27 @@ import { ProcessParameter } from '../../../../process-page/processes/process-par
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../remote-data.utils';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { ExportMetadataSelectorComponent } from './export-metadata-selector.component';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
 @NgModule({
-    imports: [NgbModalModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-            }
-        }),
-    ],
-    exports: [],
-    declarations: [ConfirmationModalComponent],
-    providers: []
+  imports: [NgbModalModule,
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderMock,
+      },
+    }),
+  ],
+  exports: [],
+  declarations: [ConfirmationModalComponent],
+  providers: [],
 })
 class ModelTestModule {
 }
@@ -54,7 +76,7 @@ describe('ExportMetadataSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const mockCollection: Collection = Object.assign(new Collection(), {
@@ -65,10 +87,10 @@ describe('ExportMetadataSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
 
   const mockCommunity = Object.assign(new Community(), {
@@ -78,10 +100,10 @@ describe('ExportMetadataSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-community-1'
-        }
-      ]
-    }
+          value: 'fake/test-community-1',
+        },
+      ],
+    },
   });
 
   const itemRD = createSuccessfulRemoteDataObject(mockItem);
@@ -90,15 +112,15 @@ describe('ExportMetadataSelectorComponent', () => {
   beforeEach(waitForAsync(() => {
     notificationService = new NotificationsServiceStub();
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
@@ -117,14 +139,14 @@ describe('ExportMetadataSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index d4b4314a99..3d8708072c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -1,26 +1,49 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  METADATA_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Process } from '../../../../process-page/processes/process.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -39,6 +62,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
               protected authorizationDataService: AuthorizationDataService,
+              protected dsoNameService: DSONameService,
               private modalService: NgbModal) {
     super(activeModal, route);
   }
@@ -50,7 +74,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection || dso instanceof Community) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata.cancel';
@@ -62,7 +86,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
           return startScriptSucceeded$.pipe(
             switchMap((r: boolean) => {
               return observableOf(r);
-            })
+            }),
           );
         } else {
           const modalRefExport = this.modalService.open(ExportMetadataSelectorComponent);
@@ -88,7 +112,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
     return this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
       switchMap((isAdmin) => {
         if (isAdmin) {
-          parameterValues.push(Object.assign(new ProcessParameter(), {name: '-a'}));
+          parameterValues.push(Object.assign(new ProcessParameter(), { name: '-a' }));
         }
         return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
       }),
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
index 6ed3bf28be..f2d755d277 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
@@ -1,8 +1,13 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ImportBatchSelectorComponent } from './import-batch-selector.component';
@@ -14,7 +19,7 @@ describe('ImportBatchSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
   const mockCollection: Collection = Object.assign(new Collection(), {
     id: 'test-collection-1-1',
@@ -24,10 +29,10 @@ describe('ImportBatchSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   beforeEach(waitForAsync(() => {
@@ -37,7 +42,7 @@ describe('ImportBatchSelectorComponent', () => {
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
index 4696e42e2d..a1f59161df 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
@@ -1,11 +1,23 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Collection } from '../../../../core/shared/collection.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -23,7 +35,7 @@ export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
    * An event fired when the modal is closed
    */
   @Output()
-  response = new EventEmitter<DSpaceObject>();
+    response = new EventEmitter<DSpaceObject>();
 
   constructor(protected activeModal: NgbActiveModal,
               protected route: ActivatedRoute) {
diff --git a/src/app/shared/empty.util.spec.ts b/src/app/shared/empty.util.spec.ts
index 94122990ae..0ec050baee 100644
--- a/src/app/shared/empty.util.spec.ts
+++ b/src/app/shared/empty.util.spec.ts
@@ -1,4 +1,8 @@
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+
 import {
   ensureArrayHasValue,
   hasNoValue,
@@ -9,8 +13,9 @@ import {
   isNotEmptyOperator,
   isNotNull,
   isNotUndefined,
-  isNull, isObjectEmpty,
-  isUndefined
+  isNull,
+  isObjectEmpty,
+  isUndefined,
 } from './empty.util';
 
 describe('Empty Utils', () => {
@@ -292,7 +297,7 @@ describe('Empty Utils', () => {
         c: true,
         d: undefined,
         e: 1,
-        f: {}
+        f: {},
       };
 
       const source$ = hot('abcdef', testData);
@@ -433,7 +438,7 @@ describe('Empty Utils', () => {
         e: 1,
         f: {},
         g: '',
-        h: ' '
+        h: ' ',
       };
 
       const source$ = hot('abcdefgh', testData);
@@ -492,7 +497,7 @@ describe('Empty Utils', () => {
         f: [],
         g: () => true,
         h: {},
-        i: ''
+        i: '',
       };
 
       const expectedData = Object.assign({}, sourceData, {
@@ -501,7 +506,7 @@ describe('Empty Utils', () => {
         e: [],
         g: [],
         h: [],
-        i: []
+        i: [],
       });
 
       const source$ = hot('abcdefghi', sourceData);
diff --git a/src/app/shared/empty.util.ts b/src/app/shared/empty.util.ts
index 355314550a..f1b9fd54c7 100644
--- a/src/app/shared/empty.util.ts
+++ b/src/app/shared/empty.util.ts
@@ -1,5 +1,8 @@
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
 /**
  * Returns true if the passed value is null.
@@ -196,9 +199,9 @@ export function isObjectEmpty(obj?: any): boolean {
   }
 
   for (const key in obj) {
-      if (obj.hasOwnProperty(key) && isNotEmpty(obj[key])) {
-        return false;
-      }
+    if (obj.hasOwnProperty(key) && isNotEmpty(obj[key])) {
+      return false;
+    }
   }
   return true;
 }
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index a4d539625f..374c589e3e 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -1,6 +1,5 @@
-<div
-    class="scrollable-menu"
-    aria-labelledby="dropdownMenuButton"
+<ul class="scrollable-menu list-unstyled mb-0"
+    role="menu"
     (scroll)="onScroll($event)"
     infiniteScroll
     [infiniteScrollDistance]="5"
@@ -9,20 +8,23 @@
     [fromRoot]="true"
     [scrollWindow]="false"
     (scrolled)="onScrollDown()">
-    <button class="dropdown-item disabled" *ngIf="searchListEntity?.length == 0 && !(isLoadingList | async)">
+  <li *ngIf="searchListEntity?.length === 0 && (isLoadingList | async) !== true">
+    <button class="dropdown-item disabled" role="menuitem">
       {{'submission.sections.general.no-entity' | translate}}
     </button>
-    <button *ngFor="let listItem of searchListEntity"
-            class="dropdown-item entity-item"
+  </li>
+  <li *ngFor="let listItem of searchListEntity" class="entity-item text-primary">
+    <button class="dropdown-item"
+            role="menuitem"
             title="{{ listItem.label }}"
             (click)="onSelect(listItem)">
-      <ul class="list-unstyled mb-0">
-        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
-      </ul>
+      <span class="text-truncate font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</span>
     </button>
-    <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
+  </li>
+  <li *ngIf="(isLoadingList | async)">
+    <button class="dropdown-item disabled" role="menuitem">
       <ds-themed-loading message="{{'loading.default' | translate}}">
       </ds-themed-loading>
     </button>
-
-</div>
+  </li>
+</ul>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.scss b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
index a5f43f359b..4f9ca62310 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.scss
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
@@ -1,5 +1,9 @@
-.list-item:active {
-  color: white !important;
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
 }
 
 .scrollable-menu {
@@ -8,7 +12,7 @@
   overflow-x: hidden;
 }
 
-.entity-item {
+li:not(:last-of-type) .dropdown-item {
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
index 13e6dbc9c5..8f4aa57723 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
@@ -1,13 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EntityDropdownComponent } from './entity-dropdown.component';
-import { getTestScheduler } from 'jasmine-marbles';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA, Pipe, PipeTransform } from '@angular/core';
-import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
+import { EntityDropdownComponent } from './entity-dropdown.component';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -21,36 +31,36 @@ const entities: ItemType[] = [
   Object.assign(new ItemType(), {
     id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     label: 'Entity_1',
-    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88'
+    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
   }),
   Object.assign(new ItemType(), {
     id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
     label: 'Entity_2',
-    uuid: 'UUID-59ee713b-ee53-4220-8c3f-9860dc84fe33'
+    uuid: 'UUID-59ee713b-ee53-4220-8c3f-9860dc84fe33',
   }),
   Object.assign(new ItemType(), {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
     label: 'Entity_3',
-    uuid: 'UUID-7127-415f-8919-55be34a6e9ed'
+    uuid: 'UUID-7127-415f-8919-55be34a6e9ed',
   }),
   Object.assign(new ItemType(), {
     id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
     label: 'Entity_4',
-    uuid: 'UUID-59da2ff0-9bf4-45bf-88be-e35abd33f304'
+    uuid: 'UUID-59da2ff0-9bf4-45bf-88be-e35abd33f304',
   }),
   Object.assign(new ItemType(), {
     id: 'a5159760-f362-4659-9e81-e3253ad91ede',
     label: 'Entity_5',
-    uuid: 'UUID-a5159760-f362-4659-9e81-e3253ad91ede'
+    uuid: 'UUID-a5159760-f362-4659-9e81-e3253ad91ede',
   }),
 ];
 
 const listElementMock: ItemType = Object.assign(
   new ItemType(), {
-  id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-  label: 'Entity_1',
-  uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88'
-}
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    label: 'Entity_1',
+    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  },
 );
 
 describe('EntityDropdownComponent', () => {
@@ -61,7 +71,7 @@ describe('EntityDropdownComponent', () => {
 
   const entityTypeServiceMock: any = jasmine.createSpyObj('EntityTypeService', {
     getAllAuthorizedRelationshipType: jasmine.createSpy('getAllAuthorizedRelationshipType'),
-    getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport')
+    getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport'),
   });
 
 
@@ -76,9 +86,9 @@ describe('EntityDropdownComponent', () => {
       declarations: [EntityDropdownComponent, MockTranslatePipe],
       providers: [
         { provide: EntityTypeDataService, useValue: entityTypeServiceMock },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -123,7 +133,7 @@ describe('EntityDropdownComponent', () => {
     scheduler.flush();
 
     spyOn(component, 'onSelect');
-    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2)'));
+    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2) button'));
     entityItem.triggerEventHandler('click', null);
 
     scheduler.schedule(() => fixture.detectChanges());
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index e009463dcd..f3fcf835f5 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -7,22 +7,31 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  Output
+  Output,
 } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { hasValue } from '../empty.util';
-import { reduce, startWith, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  reduce,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
 import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-entity-dropdown',
   templateUrl: './entity-dropdown.component.html',
-  styleUrls: ['./entity-dropdown.component.scss']
+  styleUrls: ['./entity-dropdown.component.scss'],
 })
 export class EntityDropdownComponent implements OnInit, OnDestroy {
   /**
@@ -89,7 +98,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
     private entityTypeService: EntityTypeDataService,
-    private el: ElementRef
+    private el: ElementRef,
   ) { }
 
   /**
@@ -154,7 +163,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
     // Set the pagination info
     const findOptions: FindListOptions = {
       elementsPerPage: 10,
-      currentPage: page
+      currentPage: page,
     };
     let searchListEntity$;
     if (this.isSubmission) {
@@ -163,21 +172,21 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
       searchListEntity$ = this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions);
     }
     this.searchListEntity$ = searchListEntity$.pipe(
-        getFirstSucceededRemoteWithNotEmptyData(),
-        switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => {
-          if ( (this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements ) {
-            this.hasNextPage = false;
-          }
-          return entityType.payload.page;
-        }),
-        reduce((acc: any, value: any) => [...acc, value], []),
-        startWith([])
+      getFirstSucceededRemoteWithNotEmptyData(),
+      switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => {
+        if ( (this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements ) {
+          this.hasNextPage = false;
+        }
+        return entityType.payload.page;
+      }),
+      reduce((acc: any, value: any) => [...acc, value], []),
+      startWith([]),
     );
     this.subs.push(
       this.searchListEntity$.subscribe(
         (next) => { this.searchListEntity.push(...next); }, undefined,
-        () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); }
-      )
+        () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); },
+      ),
     );
   }
 
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
index 8c5fc88137..cbf72950f7 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
@@ -1,26 +1,38 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import uniqueId from 'lodash/uniqueId';
+import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { createTestComponent } from '../testing/utils.test';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
-import { RequestService } from '../../core/data/request.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { getMockRequestService } from '../mocks/request.service.mock';
-import { EpersonGroupListComponent, SearchEvent } from './eperson-group-list.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { EPersonMock } from '../testing/eperson.mock';
 import { GroupMock } from '../testing/group-mock';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { createTestComponent } from '../testing/utils.test';
+import {
+  EpersonGroupListComponent,
+  SearchEvent,
+} from './eperson-group-list.component';
 
 describe('EpersonGroupListComponent test suite', () => {
   let comp: EpersonGroupListComponent;
@@ -42,8 +54,8 @@ describe('EpersonGroupListComponent test suite', () => {
       searchByScope: jasmine.createSpy('searchByScope'),
     },
     {
-      linkPath: 'epersons'
-    }
+      linkPath: 'epersons',
+    },
   );
 
   const mockGroupService = jasmine.createSpyObj('groupService',
@@ -53,8 +65,8 @@ describe('EpersonGroupListComponent test suite', () => {
       searchGroups: jasmine.createSpy('searchGroups'),
     },
     {
-      linkPath: 'groups'
-    }
+      linkPath: 'groups',
+    },
   );
 
   const epersonPaginatedList = buildPaginatedList(new PageInfo(), [EPersonMock, EPersonMock]);
@@ -69,11 +81,11 @@ describe('EpersonGroupListComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         EpersonGroupListComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: EPersonDataService, useValue: mockEpersonService },
@@ -82,11 +94,11 @@ describe('EpersonGroupListComponent test suite', () => {
         { provide: PaginationService, useValue: paginationService },
         EpersonGroupListComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -156,7 +168,7 @@ describe('EpersonGroupListComponent test suite', () => {
 
       expect(compAsAny.list$.value).toEqual(epersonPaginatedListRD);
       expect(comp.getList()).toBeObservable(cold('a', {
-        a: epersonPaginatedListRD
+        a: epersonPaginatedListRD,
       }));
     });
 
@@ -172,7 +184,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next(EPersonMock.id);
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
     });
 
@@ -180,7 +192,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next('');
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
     });
   });
@@ -226,7 +238,7 @@ describe('EpersonGroupListComponent test suite', () => {
 
       expect(compAsAny.list$.value).toEqual(groupPaginatedListRD);
       expect(comp.getList()).toBeObservable(cold('a', {
-        a: groupPaginatedListRD
+        a: groupPaginatedListRD,
       }));
     });
 
@@ -242,7 +254,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next(EPersonMock.id);
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
     });
 
@@ -250,7 +262,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next('');
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
     });
 
@@ -258,7 +270,7 @@ describe('EpersonGroupListComponent test suite', () => {
       const options: PaginationComponentOptions = comp.paginationOptions;
       const event: SearchEvent = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp, 'updateList');
       comp.onSearch(event);
@@ -271,7 +283,7 @@ describe('EpersonGroupListComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
index 7cad7a9783..879a1ad687 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
@@ -1,25 +1,39 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import uniqueId from 'lodash/uniqueId';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { hasValue, isNotEmpty } from '../empty.util';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { EPERSON } from '../../core/eperson/models/eperson.resource-type';
-import { GROUP } from '../../core/eperson/models/group.resource-type';
-import { ResourceType } from '../../core/shared/resource-type';
+import { getDataServiceFor } from '../../core/data/base/data-service.decorator';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
-import { fadeInOut } from '../animations/fade';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { EPERSON } from '../../core/eperson/models/eperson.resource-type';
+import { GROUP } from '../../core/eperson/models/group.resource-type';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { getDataServiceFor } from '../../core/data/base/data-service.decorator';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { fadeInOut } from '../animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 export interface SearchEvent {
   scope: string;
@@ -31,8 +45,8 @@ export interface SearchEvent {
   styleUrls: ['./eperson-group-list.component.scss'],
   templateUrl: './eperson-group-list.component.html',
   animations: [
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component that shows a list of eperson or group
@@ -96,7 +110,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
   private pageConfigSub: Subscription;
 
   /**
-   * Initialize instance variables and inject the properly DataService
+   * Initialize instance variables and inject the properly UpdateDataServiceImpl
    *
    * @param {DSONameService} dsoNameService
    * @param {Injector} parentInjector
@@ -113,7 +127,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
     const provider = getDataServiceFor(resourceType);
     this.dataService = Injector.create({
       providers: [],
-      parent: this.parentInjector
+      parent: this.parentInjector,
     }).get(provider);
     this.paginationOptions.id = uniqueId('egl');
     this.paginationOptions.pageSize = 5;
@@ -150,7 +164,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
    */
   isSelected(entry: DSpaceObject): Observable<boolean> {
     return this.entrySelectedId.asObservable().pipe(
-      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id)
+      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id),
     );
   }
 
@@ -174,22 +188,22 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
     }
     this.pageConfigSub = this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
       .subscribe((paginationOptions) => {
-    const options: FindListOptions = Object.assign({}, new FindListOptions(), {
+        const options: FindListOptions = Object.assign({}, new FindListOptions(), {
           elementsPerPage: paginationOptions.pageSize,
-          currentPage: paginationOptions.currentPage
-    });
+          currentPage: paginationOptions.currentPage,
+        });
 
-    const search$: Observable<RemoteData<PaginatedList<DSpaceObject>>> = this.isListOfEPerson ?
-      (this.dataService as EPersonDataService).searchByScope(scope, query, options) :
-      (this.dataService as GroupDataService).searchGroups(query, options);
+        const search$: Observable<RemoteData<PaginatedList<DSpaceObject>>> = this.isListOfEPerson ?
+          (this.dataService as EPersonDataService).searchByScope(scope, query, options) :
+          (this.dataService as GroupDataService).searchGroups(query, options);
 
-    this.subs.push(search$.pipe(getFirstCompletedRemoteData())
-      .subscribe((list: RemoteData<PaginatedList<DSpaceObject>>) => {
-        if (hasValue(this.list$)) {
-          this.list$.next(list);
-        }
-      })
-    );
+        this.subs.push(search$.pipe(getFirstCompletedRemoteData())
+          .subscribe((list: RemoteData<PaginatedList<DSpaceObject>>) => {
+            if (hasValue(this.list$)) {
+              this.list$.next(list);
+            }
+          }),
+        );
       });
   }
 
diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
index e88f08a131..d4710fdd8d 100644
--- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
@@ -1,12 +1,23 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { createTestComponent } from '../../testing/utils.test';
-import { EpersonSearchBoxComponent } from './eperson-search-box.component';
 import { SearchEvent } from '../eperson-group-list.component';
+import { EpersonSearchBoxComponent } from './eperson-search-box.component';
 
 describe('EpersonSearchBoxComponent test suite', () => {
   let comp: EpersonSearchBoxComponent;
@@ -20,19 +31,19 @@ describe('EpersonSearchBoxComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         EpersonSearchBoxComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         UntypedFormBuilder,
-        EpersonSearchBoxComponent
+        EpersonSearchBoxComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -89,12 +100,12 @@ describe('EpersonSearchBoxComponent test suite', () => {
     it('should emit new search event', () => {
       const data = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
 
       const event: SearchEvent = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp.search, 'emit');
 
@@ -108,7 +119,7 @@ describe('EpersonSearchBoxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
index 4689d29a8c..2873248c10 100644
--- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
@@ -1,10 +1,13 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
-
 import { Subscription } from 'rxjs';
 
-import { SearchEvent } from '../eperson-group-list.component';
 import { isNotNull } from '../../empty.util';
+import { SearchEvent } from '../eperson-group-list.component';
 
 /**
  * A component used to show a search box for epersons.
@@ -57,7 +60,7 @@ export class EpersonSearchBoxComponent {
   submit(data: any) {
     const event: SearchEvent = {
       scope: isNotNull(data) ? data.scope : 'metadata',
-      query: isNotNull(data) ? data.query : ''
+      query: isNotNull(data) ? data.query : '',
     };
 
     this.search.emit(event);
diff --git a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
index b4c663902d..3b64315190 100644
--- a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
@@ -1,12 +1,23 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { createTestComponent } from '../../testing/utils.test';
-import { GroupSearchBoxComponent } from './group-search-box.component';
 import { SearchEvent } from '../eperson-group-list.component';
+import { GroupSearchBoxComponent } from './group-search-box.component';
 
 describe('GroupSearchBoxComponent test suite', () => {
   let comp: GroupSearchBoxComponent;
@@ -20,19 +31,19 @@ describe('GroupSearchBoxComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         GroupSearchBoxComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         UntypedFormBuilder,
-        GroupSearchBoxComponent
+        GroupSearchBoxComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -88,12 +99,12 @@ describe('GroupSearchBoxComponent test suite', () => {
 
     it('should emit new search event', () => {
       const data = {
-        query: 'test'
+        query: 'test',
       };
 
       const event: SearchEvent = {
         scope: '',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp.search, 'emit');
 
@@ -107,7 +118,7 @@ describe('GroupSearchBoxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
index 154bee2d07..5735a63017 100644
--- a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
@@ -1,10 +1,13 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
-
 import { Subscription } from 'rxjs';
 
-import { SearchEvent } from '../eperson-group-list.component';
 import { isNotNull } from '../../empty.util';
+import { SearchEvent } from '../eperson-group-list.component';
 
 /**
  * A component used to show a search box for groups.
@@ -55,7 +58,7 @@ export class GroupSearchBoxComponent {
   submit(data: any) {
     const event: SearchEvent = {
       scope: '',
-      query: isNotNull(data) ? data.query : ''
+      query: isNotNull(data) ? data.query : '',
     };
     this.search.emit(event);
   }
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index f8483ac7aa..0d4610426a 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-
 import { ErrorComponent } from './error.component';
 
 describe('ErrorComponent (inline template)', () => {
@@ -21,12 +27,12 @@ describe('ErrorComponent (inline template)', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ErrorComponent], // declare the test component
-      providers: [TranslateService]
+      providers: [TranslateService],
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index 9a6b0660bb..2c45c875f0 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -1,14 +1,16 @@
-import { Component, Input } from '@angular/core';
-
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-
 import { Subscription } from 'rxjs';
-import { AlertType } from '../alert/aletr-type';
+
+import { AlertType } from '../alert/alert-type';
 
 @Component({
   selector: 'ds-error',
   styleUrls: ['./error.component.scss'],
-  templateUrl: './error.component.html'
+  templateUrl: './error.component.html',
 })
 export class ErrorComponent {
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 8ebe622a5b..d649c0ad4e 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,5 +1,5 @@
 <a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
-  <span *ngIf="!(canDownload$ |async)" class="pr-1"><i class="fas fa-lock"></i></span>
+  <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts
index 61e9ecb4aa..e70563b3fd 100644
--- a/src/app/shared/file-download-link/file-download-link.component.spec.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FileDownloadLinkComponent } from './file-download-link.component';
-import { Bitstream } from '../../core/shared/bitstream.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+
 import { getBitstreamModuleRoute } from '../../app-routing-paths';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { cold, getTestScheduler } from 'jasmine-marbles';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
 import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub';
+import { FileDownloadLinkComponent } from './file-download-link.component';
 
 describe('FileDownloadLinkComponent', () => {
   let component: FileDownloadLinkComponent;
@@ -23,28 +32,31 @@ describe('FileDownloadLinkComponent', () => {
 
   function init() {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: cold('-a', {a: true})
+      isAuthorized: cold('-a', { a: true }),
     });
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
-        self: {href: 'obj-selflink'}
-      }
+        self: { href: 'obj-selflink' },
+      },
     });
     item = Object.assign(new Item(), {
       uuid: 'itemUuid',
       _links: {
-        self: {href: 'obj-selflink'}
-      }
+        self: { href: 'obj-selflink' },
+      },
     });
   }
 
   function initTestbed() {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub],
       providers: [
-        {provide: AuthorizationDataService, useValue: authorizationService},
-      ]
+        { provide: AuthorizationDataService, useValue: authorizationService },
+      ],
     })
       .compileComponents();
   }
@@ -66,8 +78,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: true}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: true }));
 
         });
         it('should init the component', () => {
@@ -85,9 +97,9 @@ describe('FileDownloadLinkComponent', () => {
           init();
           (authorizationService.isAuthorized as jasmine.Spy).and.callFake((featureId, object) => {
             if (featureId === FeatureID.CanDownload) {
-              return cold('-a', {a: false});
+              return cold('-a', { a: false });
             }
-            return cold('-a', {a: true});
+            return cold('-a', { a: true });
           });
           initTestbed();
         }));
@@ -99,8 +111,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: false}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
 
         });
         it('should init the component', () => {
@@ -116,7 +128,7 @@ describe('FileDownloadLinkComponent', () => {
         beforeEach(waitForAsync(() => {
           scheduler = getTestScheduler();
           init();
-          (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(cold('-a', {a: false}));
+          (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(cold('-a', { a: false }));
           initTestbed();
         }));
         beforeEach(() => {
@@ -127,8 +139,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: false}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
 
         });
         it('should init the component', () => {
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index a79a71b634..9ea79c8d3c 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,17 +1,32 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  getBitstreamDownloadRoute,
+  getBitstreamRequestACopyRoute,
+} from '../../app-routing-paths';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { map } from 'rxjs/operators';
-import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
 
 @Component({
   selector: 'ds-file-download-link',
   templateUrl: './file-download-link.component.html',
-  styleUrls: ['./file-download-link.component.scss']
+  styleUrls: ['./file-download-link.component.scss'],
 })
 /**
  * Component displaying a download link
@@ -56,7 +71,7 @@ export class FileDownloadLinkComponent implements OnInit {
       this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       const canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       this.bitstreamPath$ = observableCombineLatest([this.canDownload$, canRequestACopy$]).pipe(
-        map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy))
+        map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy)),
       );
     } else {
       this.bitstreamPath$ = observableOf(this.getBitstreamDownloadPath());
@@ -74,7 +89,7 @@ export class FileDownloadLinkComponent implements OnInit {
   getBitstreamDownloadPath() {
     return {
       routerLink: getBitstreamDownloadRoute(this.bitstream),
-      queryParams: {}
+      queryParams: {},
     };
   }
 }
diff --git a/src/app/shared/file-download-link/themed-file-download-link.component.ts b/src/app/shared/file-download-link/themed-file-download-link.component.ts
index 4e619b8f28..b2746151d7 100644
--- a/src/app/shared/file-download-link/themed-file-download-link.component.ts
+++ b/src/app/shared/file-download-link/themed-file-download-link.component.ts
@@ -1,8 +1,12 @@
-import { ThemedComponent } from '../theme-support/themed.component';
-import { Component, Input } from '@angular/core';
-import { FileDownloadLinkComponent } from './file-download-link.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { FileDownloadLinkComponent } from './file-download-link.component';
 
 @Component({
   selector: 'ds-themed-file-download-link',
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 9e1f1d48aa..606db29db3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -45,7 +45,9 @@
       <button class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.lookup-help' | translate}}"
+              [attr.aria-label]="'form.lookup-help' | translate"
               placement="top"
+              data-test="lookup-button"
               (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index b77ee9950c..9aa7cf57d5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -1,11 +1,24 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement, NgZone, SimpleChange } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+  NgZone,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
 import {
   DynamicCheckboxGroupModel,
   DynamicCheckboxModel,
@@ -25,7 +38,9 @@ import {
   DynamicSliderModel,
   DynamicSwitchModel,
   DynamicTextAreaModel,
-  DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR
+  DynamicTimePickerModel,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
 import {
   DynamicNGBootstrapCalendarComponent,
@@ -35,58 +50,58 @@ import {
   DynamicNGBootstrapRadioGroupComponent,
   DynamicNGBootstrapSelectComponent,
   DynamicNGBootstrapTextAreaComponent,
-  DynamicNGBootstrapTimePickerComponent
+  DynamicNGBootstrapTimePickerComponent,
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-
-import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
-} from './ds-dynamic-form-control-container.component';
-import { SharedModule } from '../../../shared.module';
-import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
-import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
-import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
-import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
-import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model';
-import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DynamicTagModel } from './models/tag/dynamic-tag.model';
-import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model';
-import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model';
-import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model';
-import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
-import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
-import { DsDynamicListComponent } from './models/list/dynamic-list.component';
-import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
-import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
-import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
-import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
-import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Store } from '@ngrx/store';
-import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
-import { Item } from '../../../../core/shared/item.model';
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { FormService } from '../../form.service';
-import { SubmissionService } from '../../../../submission/submission.service';
-import { FormBuilderService } from '../form-builder.service';
+import { TranslateModule } from '@ngx-translate/core';
 import { NgxMaskModule } from 'ngx-mask';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { SubmissionService } from '../../../../submission/submission.service';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { FormService } from '../../form.service';
+import { FormBuilderService } from '../form-builder.service';
+import {
+  DsDynamicFormControlContainerComponent,
+  dsDynamicFormControlMapFn,
+} from './ds-dynamic-form-control-container.component';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
+import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
+import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
+import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
+import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model';
+import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './models/list/dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
+import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
+import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model';
+import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
+import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model';
+import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
+import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
+import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
+import { DynamicTagModel } from './models/tag/dynamic-tag.model';
 
 function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
   return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
     getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
     matchesCondition: jasmine.createSpy('matchesCondition'),
-    subscribeRelations: jasmine.createSpy('subscribeRelations')
+    subscribeRelations: jasmine.createSpy('subscribeRelations'),
   });
 }
 
@@ -94,7 +109,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
     name: 'type_programme',
-    closed: false
+    closed: false,
   };
   const formModel = [
     new DynamicCheckboxModel({ id: 'checkbox' }),
@@ -111,7 +126,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     new DynamicSelectModel({
       id: 'select',
       options: [{ value: 'One' }, { value: 'Two' }],
-      value: 'One'
+      value: 'One',
     }),
     new DynamicSliderModel({ id: 'slider' }),
     new DynamicSwitchModel({ id: 'switch' }),
@@ -126,8 +141,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       typeBindRelations: [{
         match: MATCH_VISIBLE,
         operator: OR_OPERATOR,
-        when: [{id: 'dc.type', value: 'Book'}]
-      }]
+        when: [{ id: 'dc.type', value: 'Book' }],
+      }],
     }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
@@ -135,14 +150,14 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicTagModel({
       id: 'tag',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicListCheckboxGroupModel({
       id: 'checkboxList',
@@ -167,24 +182,24 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       submissionScope: '',
       repeatable: false,
       metadataFields: [],
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
-    new DynamicDsDatePickerModel({ id: 'datepicker' }),
+    new DynamicDsDatePickerModel({ id: 'datepicker', repeatable: false }),
     new DynamicLookupModel({
       id: 'lookup',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicLookupNameModel({
       id: 'lookupName',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
-    new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false })
+    new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false }),
   ];
   const testModel = formModel[8];
   let formGroup: UntypedFormGroup;
@@ -200,8 +215,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     TestBed.overrideModule(BrowserDynamicTestingModule, {
 
       set: {
-        entryComponents: [DynamicNGBootstrapInputComponent]
-      }
+        entryComponents: [DynamicNGBootstrapInputComponent],
+      },
     });
 
     TestBed.configureTestingModule({
@@ -231,13 +246,13 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         {
           provide: SubmissionObjectDataService,
           useValue: {
-            findById: () => observableOf(createSuccessfulRemoteDataObject(testWSI))
-          }
+            findById: () => observableOf(createSuccessfulRemoteDataObject(testWSI)),
+          },
         },
         { provide: NgZone, useValue: new NgZone({}) },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents().then(() => {
 
       fixture = TestBed.createComponent(DsDynamicFormControlContainerComponent);
@@ -261,7 +276,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     component.ngOnChanges({
 
       group: new SimpleChange(null, component.group, true),
-      model: new SimpleChange(null, component.model, true)
+      model: new SimpleChange(null, component.model, true),
     });
 
     fixture.detectChanges();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index ff5a119b6f..8ac7ea02c3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -4,7 +4,8 @@ import {
   Component,
   ComponentFactoryResolver,
   ContentChildren,
-  EventEmitter, Inject,
+  EventEmitter,
+  Inject,
   Input,
   NgZone,
   OnChanges,
@@ -15,10 +16,16 @@ import {
   SimpleChanges,
   Type,
   ViewChild,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
-import { UntypedFormArray, UntypedFormGroup } from '@angular/forms';
-
+import {
+  UntypedFormArray,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
@@ -53,73 +60,93 @@ import {
   DynamicNGBootstrapRadioGroupComponent,
   DynamicNGBootstrapSelectComponent,
   DynamicNGBootstrapTextAreaComponent,
-  DynamicNGBootstrapTimePickerComponent
+  DynamicNGBootstrapTimePickerComponent,
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  find,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
-import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
-import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
-import { hasNoValue, hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
-import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME } from './models/lookup/dynamic-lookup-name.model';
-import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
-import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
-import { DsDynamicListComponent } from './models/list/dynamic-list.component';
-import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
-import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
-import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
-import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
-import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
-import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
-import { find, map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { SearchResult } from '../../../search/models/search-result.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { AppState } from '../../../../app.reducer';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
-import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
-import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../core/shared/item.model';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import {
+  MetadataValue,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../../core/shared/metadata.models';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getPaginatedListPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../app.reducer';
-import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
-import { FormService } from '../../form.service';
-import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
-import { SubmissionService } from '../../../../submission/submission.service';
-import { followLink } from '../../../utils/follow-link-config.model';
+import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
-import { RelationshipOptions } from '../models/relationship-options.model';
-import { FormBuilderService } from '../form-builder.service';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { SubmissionService } from '../../../../submission/submission.service';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../../empty.util';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { followLink } from '../../../utils/follow-link-config.model';
 import { itemLinksToFollow } from '../../../utils/relation-query.utils';
+import { FormService } from '../../form.service';
+import { FormBuilderService } from '../form-builder.service';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../models/relationship-options.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
+import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
+import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
+import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
+import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
+import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
+import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './models/list/dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
+import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME } from './models/lookup/dynamic-lookup-name.model';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
+import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
+import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
+import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
 
 export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
   switch (model.type) {
@@ -133,9 +160,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
       return (model instanceof DynamicListCheckboxGroupModel) ? DsDynamicListComponent : DynamicNGBootstrapCheckboxGroupComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER:
-      const datepickerModel = model as DynamicDatePickerModel;
-
-      return datepickerModel.inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
+      return (model as DynamicDatePickerModel).inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_GROUP:
       return DsDynamicFormGroupComponent;
@@ -191,7 +216,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
   selector: 'ds-dynamic-form-control-container',
   styleUrls: ['./ds-dynamic-form-control-container.component.scss'],
   templateUrl: './ds-dynamic-form-control-container.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
@@ -292,11 +317,11 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               true,
               followLink('leftItem'),
               followLink('rightItem'),
-              followLink('relationshipType')
+              followLink('relationshipType'),
             );
             relationshipsRD$.pipe(
               getFirstSucceededRemoteDataPayload(),
-              getPaginatedListPayload()
+              getPaginatedListPayload(),
             ).subscribe((relationships: Relationship[]) => {
               // set initial namevariants for pre-existing relationships
               relationships.forEach((relationship: Relationship) => {
@@ -313,7 +338,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               getFirstSucceededRemoteData(),
               map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((i) => Object.assign(new ItemSearchResult(), { indexableObject: i }))),
             );
-          })
+          }),
         ).subscribe((relatedItems: SearchResult<Item>[]) => this.selectableListService.select(this.listId, relatedItems));
         this.subs.push(subscription);
       }
@@ -329,8 +354,8 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
           true,
           true,
           ... itemLinksToFollow(this.fetchThumbnail)).pipe(
-            getAllSucceededRemoteData(),
-            getRemoteDataPayload());
+          getAllSucceededRemoteData(),
+          getRemoteDataPayload());
         this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
           switchMap(([item, relationship]: [Item, Relationship]) =>
             relationship.leftItem.pipe(
@@ -339,9 +364,9 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               map((leftItem: Item) => {
                 return new ReorderableRelationship(relationship, leftItem.uuid !== item.uuid, this.store, this.model.submissionId);
               }),
-            )
+            ),
           ),
-          startWith(undefined)
+          startWith(undefined),
         );
       }
     }
@@ -425,7 +450,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    */
   openLookup() {
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
-      size: 'lg'
+      size: 'lg',
     });
 
     if (hasValue(this.model.value)) {
@@ -434,7 +459,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         context: this.context,
         control: this.control,
         model: this.model,
-        type: DynamicFormControlEventType.Focus
+        type: DynamicFormControlEventType.Focus,
       } as DynamicFormControlEvent);
 
       this.change.emit({
@@ -442,7 +467,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         context: this.context,
         control: this.control,
         model: this.model,
-        type: DynamicFormControlEventType.Change
+        type: DynamicFormControlEventType.Change,
       } as DynamicFormControlEvent);
     }
 
@@ -502,7 +527,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     const submissionObject$ = this.submissionObjectService
       .findById(this.model.submissionId, true, true, followLink('item'), followLink('collection')).pipe(
         getAllSucceededRemoteData(),
-        getRemoteDataPayload()
+        getRemoteDataPayload(),
       );
 
     this.item$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index 45511d6941..8ce98b4eb1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -6,23 +6,24 @@ import {
   Input,
   Output,
   QueryList,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormComponent,
+  DynamicFormComponentService,
   DynamicFormControlContainerComponent,
   DynamicFormControlEvent,
   DynamicFormControlModel,
   DynamicFormLayout,
-  DynamicFormComponentService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+
 import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-control-container.component';
 
 @Component({
   selector: 'ds-dynamic-form',
-  templateUrl: './ds-dynamic-form.component.html'
+  templateUrl: './ds-dynamic-form.component.html',
 })
 export class DsDynamicFormComponent extends DynamicFormComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
index 12b2409bf2..a54e379cac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -1,23 +1,31 @@
-import {inject, TestBed} from '@angular/core/testing';
-
+import { Injector } from '@angular/core';
 import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+} from '@angular/forms';
+import {
+  DISABLED_MATCHER_PROVIDER,
   DynamicFormControlRelation,
   DynamicFormRelationService,
+  HIDDEN_MATCHER,
+  HIDDEN_MATCHER_PROVIDER,
   MATCH_VISIBLE,
   OR_OPERATOR,
-  HIDDEN_MATCHER,
-  HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER, DISABLED_MATCHER_PROVIDER,
+  REQUIRED_MATCHER_PROVIDER,
 } from '@ng-dynamic-forms/core';
 
+import { getMockFormBuilderService } from '../../../mocks/form-builder-service.mock';
 import {
-  mockInputWithTypeBindModel, MockRelationModel
+  mockInputWithTypeBindModel,
+  MockRelationModel,
 } from '../../../mocks/form-models.mock';
-import {DsDynamicTypeBindRelationService} from './ds-dynamic-type-bind-relation.service';
-import {FormFieldMetadataValueObject} from '../models/form-field-metadata-value.model';
-import {UntypedFormControl, ReactiveFormsModule} from '@angular/forms';
-import {FormBuilderService} from '../form-builder.service';
-import {getMockFormBuilderService} from '../../../mocks/form-builder-service.mock';
-import {Injector} from '@angular/core';
+import { FormBuilderService } from '../form-builder.service';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 
 describe('DSDynamicTypeBindRelationService test suite', () => {
   let service: DsDynamicTypeBindRelationService;
@@ -31,30 +39,30 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
         { provide: DynamicFormRelationService },
-        DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER
-      ]
+        DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER,
+      ],
     }).compileComponents().then();
   });
 
   beforeEach(inject([DsDynamicTypeBindRelationService, DynamicFormRelationService],
     (relationService: DsDynamicTypeBindRelationService,
-     formRelationService: DynamicFormRelationService,
+      formRelationService: DynamicFormRelationService,
     ) => {
-    service = relationService;
-    dynamicFormRelationService = formRelationService;
-  }));
+      service = relationService;
+      dynamicFormRelationService = formRelationService;
+    }));
 
   describe('Test getTypeBindValue method', () => {
     it('Should get type bind "boundType" from the given metadata object value', () => {
-        const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
-          'boundType', null, null, 'Bound Type'
-        );
-        const bindType = service.getTypeBindValue(mockMetadataValueObject);
-        expect(bindType).toBe('boundType');
+      const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
+        'boundType', null, null, 'Bound Type',
+      );
+      const bindType = service.getTypeBindValue(mockMetadataValueObject);
+      expect(bindType).toBe('boundType');
     });
     it('Should get type authority key "bound-auth-key" from the given metadata object value', () => {
       const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
-        'boundType', null, 'bound-auth-key', 'Bound Type'
+        'boundType', null, 'bound-auth-key', 'Bound Type',
       );
       const bindType = service.getTypeBindValue(mockMetadataValueObject);
       expect(bindType).toBe('bound-auth-key');
@@ -132,12 +140,12 @@ function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormCo
   configuredTypeBindValues.forEach((value) => {
     bindValues.push({
       id: 'dc.type',
-      value: value
+      value: value,
     });
   });
   return [{
     match: MATCH_VISIBLE,
     operator: OR_OPERATOR,
-    when: bindValues
+    when: bindValues,
   }];
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index d5e735ed1a..baf673db6c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -1,9 +1,10 @@
-import { Inject, Injectable, Injector, Optional } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+  Injector,
+  Optional,
+} from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-
-import { Subscription } from 'rxjs';
-import { startWith } from 'rxjs/operators';
-
 import {
   AND_OPERATOR,
   DYNAMIC_MATCHERS,
@@ -11,11 +12,17 @@ import {
   DynamicFormControlMatcher,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  DynamicFormRelationService, MATCH_VISIBLE,
-  OR_OPERATOR
+  DynamicFormRelationService,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
+import { Subscription } from 'rxjs';
+import { startWith } from 'rxjs/operators';
 
-import {hasNoValue, hasValue} from '../../../empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
@@ -183,8 +190,9 @@ export class DsDynamicTypeBindRelationService {
         const initValue = (hasNoValue(relatedModel.value) || typeof relatedModel.value === 'string') ? relatedModel.value :
           (Array.isArray(relatedModel.value) ? relatedModel.value : relatedModel.value.value);
 
-        const valueChanges = relatedModel.valueChanges.pipe(
-          startWith(initValue)
+        const updateSubject = (relatedModel.type === 'CHECKBOX_GROUP' ? relatedModel.valueUpdates : relatedModel.valueChanges);
+        const valueChanges = updateSubject.pipe(
+          startWith(initValue),
         );
 
         // Build up the subscriptions to watch for changes;
@@ -217,13 +225,13 @@ export class DsDynamicTypeBindRelationService {
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
         id: 'dc.type',
-        value: value
+        value: value,
       });
     });
     return [{
       match: MATCH_VISIBLE,
       operator: OR_OPERATOR,
-      when: bindValues
+      when: bindValues,
     }];
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 62d34a8625..001e0bc339 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
     <span class="mr-auto text-contents">
-        <ng-container *ngIf="!(metadataRepresentation$ | async)">
+        <ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
             <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(metadataRepresentation$ | async)">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
index b5af2a8843..e0efc6d0ea 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
@@ -1,23 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import {
-  ExistingMetadataListElementComponent,
-  ReorderableRelationship
-} from './existing-metadata-list-element.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../testing/translate-loader.mock';
 import { SubmissionService } from '../../../../../submission/submission.service';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionServiceStub } from '../../../../testing/submission-service.stub';
+import { TranslateLoaderMock } from '../../../../testing/translate-loader.mock';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import {
+  ExistingMetadataListElementComponent,
+  ReorderableRelationship,
+} from './existing-metadata-list-element.component';
 
 describe('ExistingMetadataListElementComponent', () => {
   let component: ExistingMetadataListElementComponent;
@@ -52,14 +59,14 @@ describe('ExistingMetadataListElementComponent', () => {
       relationshipType: 'isPublicationOfAuthor',
       filter: 'test.filter',
       searchConfiguration: 'personConfiguration',
-      nameVariants: true
+      nameVariants: true,
     });
     relatedItem = Object.assign(new Item(), { uuid: uuid2 });
     leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
     rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
     relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
     relationshipService = {
-      updatePlace: () => observableOf({})
+      updatePlace: () => observableOf({}),
     } as any;
 
     relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
@@ -76,9 +83,9 @@ describe('ExistingMetadataListElementComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ExistingMetadataListElementComponent],
       providers: [
@@ -86,7 +93,7 @@ describe('ExistingMetadataListElementComponent', () => {
         { provide: Store, useValue: store },
         { provide: SubmissionService, useValue: submissionServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index aa50133e8a..38e5f6454f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -1,26 +1,47 @@
 /* eslint-disable max-classes-per-file */
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { DynamicFormArrayGroupModel } from '@ng-dynamic-forms/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
+
 import { AppState } from '../../../../../app.reducer';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { MetadataRepresentation } from '../../../../../core/shared/metadata-representation/metadata-representation.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer';
+import { SubmissionService } from '../../../../../submission/submission.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { DynamicConcatModel } from '../models/ds-dynamic-concat.model';
 import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { SubmissionService } from '../../../../../submission/submission.service';
-import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer';
 
 /**
  * Abstract class that defines objects that can be reordered
@@ -67,7 +88,7 @@ export class ReorderableFormFieldMetadataValue extends Reorderable {
     public control: UntypedFormControl,
     public group: DynamicFormArrayGroupModel,
     oldIndex?: number,
-    newIndex?: number
+    newIndex?: number,
   ) {
     super(oldIndex, newIndex);
     this.metadataValue = metadataValue;
@@ -136,7 +157,7 @@ export class ReorderableRelationship extends Reorderable {
 @Component({
   selector: 'ds-existing-metadata-list-element',
   templateUrl: './existing-metadata-list-element.component.html',
-  styleUrls: ['./existing-metadata-list-element.component.scss']
+  styleUrls: ['./existing-metadata-list-element.component.scss'],
 })
 export class ExistingMetadataListElementComponent implements OnInit, OnChanges, OnDestroy   {
   @Input() listId: string;
@@ -156,7 +177,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
   constructor(
     private selectableListService: SelectableListService,
     private store: Store<AppState>,
-    private submissionService: SubmissionService
+    private submissionService: SubmissionService,
   ) {
   }
 
@@ -174,7 +195,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
       this.subs.push(item$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       ).subscribe((item: Item) => {
         this.relatedItem = item;
         const relationMD: MetadataValue = this.submissionItem.firstMetadata(this.relationshipOptions.metadataField, { value: this.relatedItem.uuid });
@@ -183,7 +204,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
 
           const nextValue = Object.assign(
             new ItemMetadataRepresentation(metadataRepresentationMD),
-            this.relatedItem
+            this.relatedItem,
           );
           this.metadataRepresentation$.next(nextValue);
         }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index 64ace2296e..5a5bd2ff2a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
     <div class="flex-grow-1 mr-auto">
-        <ng-container *ngIf="!(relatedItem$ | async)">
+        <ng-container *ngIf="(relatedItem$ | async) === undefined">
             <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(relatedItem$ | async)">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
index 5a53599f91..5dc0a5894e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
@@ -1,19 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { ExistingRelationListElementComponent } from './existing-relation-list-element.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { of as observableOf } from 'rxjs';
-import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionService } from '../../../../../submission/submission.service';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionServiceStub } from '../../../../testing/submission-service.stub';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { ExistingRelationListElementComponent } from './existing-relation-list-element.component';
 
 describe('ExistingRelationListElementComponent', () => {
   let component: ExistingRelationListElementComponent;
@@ -47,14 +51,14 @@ describe('ExistingRelationListElementComponent', () => {
       relationshipType: 'isPublicationOfAuthor',
       filter: 'test.filter',
       searchConfiguration: 'personConfiguration',
-      nameVariants: true
+      nameVariants: true,
     });
     relatedItem = Object.assign(new Item(), { uuid: uuid2 });
     leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
     rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
     relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
     relationshipService = {
-      updatePlace: () => observableOf({})
+      updatePlace: () => observableOf({}),
     } as any;
 
     relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
@@ -69,9 +73,9 @@ describe('ExistingRelationListElementComponent', () => {
       providers: [
         { provide: SelectableListService, useValue: selectionService },
         { provide: Store, useValue: store },
-        { provide: SubmissionService, useClass: SubmissionServiceStub }
+        { provide: SubmissionService, useClass: SubmissionServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
index c3a8b157a6..53a83bb318 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -1,19 +1,38 @@
 /* eslint-disable max-classes-per-file */
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { filter } from 'rxjs/operators';
+
 import { AppState } from '../../../../../app.reducer';
 import { Item } from '../../../../../core/shared/item.model';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { SubmissionService } from '../../../../../submission/submission.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
-import { SubmissionService } from '../../../../../submission/submission.service';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
 
 /**
  * Abstract class that defines objects that can be reordered
@@ -53,7 +72,7 @@ export abstract class Reorderable {
 @Component({
   selector: 'ds-existing-relation-list-element',
   templateUrl: './existing-relation-list-element.component.html',
-  styleUrls: ['./existing-relation-list-element.component.scss']
+  styleUrls: ['./existing-relation-list-element.component.scss'],
 })
 export class ExistingRelationListElementComponent implements OnInit, OnChanges, OnDestroy {
   @Input() listId: string;
@@ -74,7 +93,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
   constructor(
     private selectableListService: SelectableListService,
     private submissionService: SubmissionService,
-    private store: Store<AppState>
+    private store: Store<AppState>,
   ) {
   }
 
@@ -92,7 +111,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
       this.subs.push(item$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       ).subscribe((item: Item) => {
         this.relatedItem$.next(item);
       }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 9d48bdac21..40cbc38a48 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -1,5 +1,11 @@
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import { Component, EventEmitter, Input, Output, QueryList } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormArrayComponent,
@@ -10,8 +16,9 @@ import {
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicTemplateDirective
+  DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
@@ -19,7 +26,7 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 @Component({
   selector: 'ds-dynamic-form-array',
   templateUrl: './dynamic-form-array.component.html',
-  styleUrls: ['./dynamic-form-array.component.scss']
+  styleUrls: ['./dynamic-form-array.component.scss'],
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
@@ -62,14 +69,14 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
         index,
         arrayModel: this.model,
         model: this.model.groups[index].group[0],
-        control: (this.control as any).controls[index]
+        control: (this.control as any).controls[index],
       }, 'move');
     }
   }
 
   update(event: any, index: number) {
     const $event = Object.assign({}, event, {
-      context: { index: index - 1}
+      context: { index: index - 1 },
     });
 
     this.onChange($event);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index ed117a5021..5beb8d52da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
+<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
@@ -14,7 +14,7 @@
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
   <label class="form-check-label custom-control-label" [for]="bindId && model.id">
-    <span [innerHTML]="model.label"
+    <span [innerHTML]="model.label | translate"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
index e69de29bb2..206ad17492 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
@@ -0,0 +1,16 @@
+div.custom-switch {
+  &.custom-control-right {
+    margin-left: 0;
+    margin-right: 0;
+
+    &::after {
+      right: -1.5rem;
+      left: auto;
+    }
+
+    &::before {
+      right: -2.35rem;
+      left: auto;
+    }
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
index ceb498fe56..106569af00 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
@@ -1,11 +1,24 @@
-import { DynamicFormsCoreModule, DynamicFormService } from '@ng-dynamic-forms/core';
-import { UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { DynamicCustomSwitchModel } from './custom-switch.model';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  DynamicFormsCoreModule,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { CustomSwitchComponent } from './custom-switch.component';
+import { DynamicCustomSwitchModel } from './custom-switch.model';
 
 describe('CustomSwitchComponent', () => {
 
@@ -20,11 +33,12 @@ describe('CustomSwitchComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        TranslateModule.forRoot(),
         ReactiveFormsModule,
         NoopAnimationsModule,
-        DynamicFormsCoreModule.forRoot()
+        DynamicFormsCoreModule.forRoot(),
       ],
-      declarations: [CustomSwitchComponent]
+      declarations: [CustomSwitchComponent],
 
     }).compileComponents().then(() => {
       fixture = TestBed.createComponent(CustomSwitchComponent);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
index 47780e66f6..bf166e92b8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
@@ -1,8 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { DynamicNGBootstrapCheckboxComponent } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
 import { DynamicCustomSwitchModel } from './custom-switch.model';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
index 97cf71c4a0..4a7e7a22be 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
@@ -2,7 +2,7 @@ import {
   DynamicCheckboxModel,
   DynamicCheckboxModelConfig,
   DynamicFormControlLayout,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH = 'CUSTOM_SWITCH';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
index c0d1c83bf9..9bd7bfe4ae 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
@@ -1,10 +1,24 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicDatePickerModel, DynamicFormsCoreModule, DynamicFormService } from '@ng-dynamic-forms/core';
+import {
+  DynamicDatePickerModel,
+  DynamicFormsCoreModule,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+
 import { DsDatePickerInlineComponent } from './dynamic-date-picker-inline.component';
 
 describe('DsDatePickerInlineComponent test suite', () => {
@@ -25,9 +39,9 @@ describe('DsDatePickerInlineComponent test suite', () => {
         ReactiveFormsModule,
         NoopAnimationsModule,
         NgbDatepickerModule,
-        DynamicFormsCoreModule.forRoot()
+        DynamicFormsCoreModule.forRoot(),
       ],
-      declarations: [DsDatePickerInlineComponent]
+      declarations: [DsDatePickerInlineComponent],
 
     }).compileComponents().then(() => {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 2eb6e9291c..a6f0c45a7c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -1,17 +1,26 @@
-import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { NgbDatepicker, NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbDatepicker,
+  NgbDatepickerConfig,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicDatePickerModel,
   DynamicFormControlComponent,
   DynamicFormControlLayout,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
-  templateUrl: './dynamic-date-picker-inline.component.html'
+  templateUrl: './dynamic-date-picker-inline.component.html',
 })
 export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 1046dd6b2d..3bf02c4abd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -1,10 +1,10 @@
 <div>
   <fieldset class="d-flex">
-    <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
+    <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
       {{model.placeholder}} <span *ngIf="model.required">*</span>
     </legend>
     <ds-number-picker
-      tabindex="1"
+      tabindex="0"
       [id]="model.id + '_year'"
       [disabled]="model.disabled"
       [min]="minYear"
@@ -21,7 +21,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="2"
+      tabindex="0"
       [id]="model.id + '_month'"
       [min]="minMonth"
       [max]="maxMonth"
@@ -37,7 +37,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="3"
+      tabindex="0"
       [id]="model.id + '_day'"
       [min]="minDay"
       [max]="maxDay"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index ffc36008c6..0fcdb518cf 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -1,22 +1,39 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  Renderer2,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 
-import { DsDatePickerComponent } from './date-picker.component';
-import { DynamicDsDatePickerModel } from './date-picker.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
-
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { DsDatePickerComponent } from './date-picker.component';
+import { DynamicDsDatePickerModel } from './date-picker.model';
 
 export const DATE_TEST_GROUP = new UntypedFormGroup({
-  date: new UntypedFormControl()
+  date: new UntypedFormControl(),
 });
 
 export const DATE_TEST_MODEL_CONFIG = {
@@ -28,7 +45,8 @@ export const DATE_TEST_MODEL_CONFIG = {
   placeholder: 'Date',
   readOnly: false,
   required: true,
-  toggleIcon: 'fas fa-calendar'
+  repeatable: false,
+  toggleIcon: 'fas fa-calendar',
 };
 
 describe('DsDatePickerComponent test suite', () => {
@@ -39,12 +57,17 @@ describe('DsDatePickerComponent test suite', () => {
   let dateFixture: ComponentFixture<DsDatePickerComponent>;
   let html;
 
+  const renderer2: Renderer2 = {
+    selectRootElement: jasmine.createSpy('selectRootElement'),
+    querySelector: jasmine.createSpy('querySelector'),
+  } as unknown as Renderer2;
+
   // waitForAsync beforeEach
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
       imports: [
-        NgbModule
+        NgbModule,
       ],
       declarations: [
         DsDatePickerComponent,
@@ -54,9 +77,10 @@ describe('DsDatePickerComponent test suite', () => {
         ChangeDetectorRef,
         DsDatePickerComponent,
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
+        { provide: Renderer2, useValue: renderer2 },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -108,7 +132,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set year and enable month field when year field is entered', () => {
         const event = {
           field: 'year',
-          value: '1983'
+          value: '1983',
         };
         dateComp.onChange(event);
 
@@ -120,7 +144,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set month and enable day field when month field is entered', () => {
         const event = {
           field: 'month',
-          value: '11'
+          value: '11',
         };
 
         dateComp.year = '1983';
@@ -138,7 +162,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set day when day field is entered', () => {
         const event = {
           field: 'day',
-          value: '18'
+          value: '18',
         };
 
         dateComp.year = '1983';
@@ -195,7 +219,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should disable month and day fields when year field is canceled', () => {
         const event = {
           field: 'year',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -209,7 +233,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should disable day field when month field is canceled', () => {
         const event = {
           field: 'month',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -223,7 +247,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should not disable day field when day field is canceled', () => {
         const event = {
           field: 'day',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -233,6 +257,102 @@ describe('DsDatePickerComponent test suite', () => {
         expect(dateComp.disabledMonth).toBeFalsy();
         expect(dateComp.disabledDay).toBeFalsy();
       });
+
+      it('should move focus on month field when on year field and tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null,
+        };
+        const event1 = {
+          field: 'month',
+          value: null,
+        };
+        dateComp.onChange(event);
+        dateComp.onChange(event1);
+
+        const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`));
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+
+        yearElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(yearElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+      }));
+
+      it('should move focus on day field when on month field and tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null,
+        };
+        dateComp.onChange(event);
+
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+        const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`));
+
+        monthElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(dayElement.nativeElement);
+      }));
+
+      it('should move focus on month field when on day field and shift tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null,
+        };
+        dateComp.onChange(event);
+
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+        const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`));
+
+        dayElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(dayElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+      }));
+
+      it('should move focus on year field when on month field and shift tab pressed', fakeAsync(() => {
+        const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`));
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+
+        monthElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(yearElement.nativeElement);
+      }));
+
     });
   });
 
@@ -241,7 +361,7 @@ describe('DsDatePickerComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 8d5ce5b48e..cb8cc0eaf9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -1,12 +1,26 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+  Renderer2,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { DynamicDsDatePickerModel } from './date-picker.model';
-import { hasValue } from '../../../../../empty.util';
 import {
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import isEqual from 'lodash/isEqual';
+
+import { hasValue } from '../../../../../empty.util';
+import { DynamicDsDatePickerModel } from './date-picker.model';
+
+export type DatePickerFieldType = '_year' | '_month' | '_day';
 
 export const DS_DATE_PICKER_SEPARATOR = '-';
 
@@ -50,8 +64,12 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   disabledMonth = true;
   disabledDay = true;
 
+  private readonly fields: DatePickerFieldType[] = ['_year', '_month', '_day'];
+
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
+              private renderer: Renderer2,
+              @Inject(DOCUMENT) private _document: Document,
   ) {
     super(layoutService, validationService);
   }
@@ -80,8 +98,7 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
       }
     }
 
-    this.maxYear = this.initialYear + 100;
-
+    this.maxYear = now.getUTCFullYear() + 100;
   }
 
   onBlur(event) {
@@ -166,6 +183,67 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
     this.change.emit(value);
   }
 
+  /**
+   * Listen to keydown Tab event.
+   * Get the active element and blur it, in order to focus the next input field.
+   */
+  @HostListener('keydown.tab', ['$event'])
+  onTabKeydown(event: KeyboardEvent) {
+    event.preventDefault();
+    const activeElement: Element = this._document.activeElement;
+    (activeElement as any).blur();
+    const index = this.selectedFieldIndex(activeElement);
+    if (index < 0) {
+      return;
+    }
+    const fieldToFocusOn = index + 1;
+    if (fieldToFocusOn < this.fields.length) {
+      this.focusInput(this.fields[fieldToFocusOn]);
+    }
+  }
+
+  @HostListener('keydown.shift.tab', ['$event'])
+  onShiftTabKeyDown(event: KeyboardEvent) {
+    event.preventDefault();
+    const activeElement: Element = this._document.activeElement;
+    (activeElement as any).blur();
+    const index = this.selectedFieldIndex(activeElement);
+    const fieldToFocusOn = index - 1;
+    if (fieldToFocusOn >= 0) {
+      this.focusInput(this.fields[fieldToFocusOn]);
+    }
+  }
+
+  private selectedFieldIndex(activeElement: Element): number {
+    return this.fields.findIndex(field => isEqual(activeElement.id, this.model.id.concat(field)));
+  }
+
+  /**
+   * Focus the input field for the given type
+   * based on the model id.
+   * Used to focus the next input field
+   * in case of a disabled field.
+   * @param type DatePickerFieldType
+   */
+  focusInput(type: DatePickerFieldType) {
+    const field = this._document.getElementById(this.model.id.concat(type));
+    if (field) {
+
+      if (hasValue(this.year) && isEqual(type, '_year')) {
+        this.disabledMonth = true;
+        this.disabledDay = true;
+      }
+      if (hasValue(this.year) && isEqual(type, '_month')) {
+        this.disabledMonth = false;
+      } else if (hasValue(this.month) && isEqual(type, '_day')) {
+        this.disabledDay = false;
+      }
+      setTimeout(() => {
+        this.renderer.selectRootElement(field).focus();
+      }, 100);
+    }
+  }
+
   onFocus(event) {
     this.focus.emit(event);
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 5af9b2bd32..1d828318cb 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -4,17 +4,25 @@ import {
   DynamicFormControlLayout,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import {BehaviorSubject, Subject} from 'rxjs';
-import {isEmpty, isNotUndefined} from '../../../../../empty.util';
-import {MetadataValue} from '../../../../../../core/shared/metadata.models';
+import {
+  BehaviorSubject,
+  Subject,
+} from 'rxjs';
+
+import { MetadataValue } from '../../../../../../core/shared/metadata.models';
+import {
+  isEmpty,
+  isNotUndefined,
+} from '../../../../../empty.util';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
 
 export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
   legend?: string;
   typeBindRelations?: DynamicFormControlRelation[];
+  repeatable: boolean;
 }
 
 /**
@@ -37,7 +45,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     this.metadataValue = (config as any).metadataValue;
     this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
     this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
-
+    this.repeatable = config.repeatable;
     // This was a subscription, then an async setTimeout, but it seems unnecessary
     const parentModel = this.getRootParent(this);
     if (parentModel && isNotUndefined(parentModel.hidden)) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index a25ad4d231..b1ce551255 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -1,17 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule } from '@angular/forms';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
-import { DsDynamicDisabledComponent } from './dynamic-disabled.component';
-import { DynamicDisabledModel } from './dynamic-disabled.model';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { DsDynamicDisabledComponent } from './dynamic-disabled.component';
+import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 describe('DsDynamicDisabledComponent', () => {
   let comp: DsDynamicDisabledComponent;
@@ -29,7 +42,7 @@ describe('DsDynamicDisabledComponent', () => {
       submissionId: '1234',
       id: 'disabledInput',
       name: 'disabledInput',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     });
     group = new UntypedFormGroup({
       disabledInput: new UntypedFormControl(),
@@ -45,7 +58,7 @@ describe('DsDynamicDisabledComponent', () => {
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 222ad51049..dbedcb59cd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -1,7 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
-import { DynamicFormControlComponent, DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlComponent,
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
@@ -10,7 +18,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
  */
 @Component({
   selector: 'ds-dynamic-disabled',
-  templateUrl: './dynamic-disabled.component.html'
+  templateUrl: './dynamic-disabled.component.html',
 })
 /**
  * Component for displaying a form input with a disabled property
@@ -27,7 +35,7 @@ export class DsDynamicDisabledComponent extends DynamicFormControlComponent {
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
index 381810dc62..5902a7cc3d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
@@ -1,5 +1,12 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DISABLED = 'EMPTY';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
index dc7c796648..fc59c58574 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
@@ -3,16 +3,18 @@ import {
   DynamicFormControlRelation,
   DynamicFormGroupModel,
   DynamicFormGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-
 import { Subject } from 'rxjs';
 
-import { hasNoValue, isNotEmpty } from '../../../../empty.util';
-import { DsDynamicInputModel } from './ds-dynamic-input.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
 
 export const CONCAT_GROUP_SUFFIX = '_CONCAT_GROUP';
 export const CONCAT_FIRST_INPUT_SUFFIX = '_CONCAT_FIRST_INPUT';
@@ -86,7 +88,6 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   }
 
   set value(value: string | FormFieldMetadataValueObject) {
-    let values;
     let tempValue: string;
 
     if (typeof value === 'string') {
@@ -97,15 +98,19 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     if (hasNoValue(tempValue)) {
       tempValue = '';
     }
-    values = [...tempValue.split(this.separator), null].map((v) =>
+
+    // todo: this used to be valid, but results in a type error now -- REMEMBER TO INVESTIGATE!
+    const values = [...tempValue.split(this.separator), null].map((v) =>
       Object.assign(new FormFieldMetadataValueObject(), value, { display: v, value: v }));
 
     if (values[0].value) {
+      // @ts-ignore
       (this.get(0) as DsDynamicInputModel).value = values[0];
     } else {
       (this.get(0) as DsDynamicInputModel).value = undefined;
     }
     if (values[1].value) {
+      // @ts-ignore
       (this.get(1) as DsDynamicInputModel).value = values[1];
     } else {
       (this.get(1) as DsDynamicInputModel).value = undefined;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index 3c6abaa851..e239099bc4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -3,13 +3,13 @@ import {
   DynamicFormControlRelation,
   DynamicInputModel,
   DynamicInputModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import {Subject} from 'rxjs';
+import { Subject } from 'rxjs';
 
-import { LanguageCode } from '../../models/form-field-language-value.model';
 import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import {hasValue} from '../../../../empty.util';
+import { hasValue } from '../../../../empty.util';
+import { LanguageCode } from '../../models/form-field-language-value.model';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
index c7fc3f2f2b..71b82f17b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
@@ -2,12 +2,12 @@ import {
   DynamicFormControlLayout,
   DynamicFormGroupModel,
   DynamicFormGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel } from './ds-dynamic-input.model';
 import { Subject } from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
 
 export const QUALDROP_GROUP_SUFFIX = '_QUALDROP_GROUP';
 export const QUALDROP_METADATA_SUFFIX = '_QUALDROP_METADATA';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index 52364df45e..9549a3e82d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -3,10 +3,11 @@ import {
   DynamicFormArrayModelConfig,
   DynamicFormControlLayout,
   DynamicFormControlRelation,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import { RelationshipOptions } from '../../models/relationship-options.model';
+
 import { hasValue } from '../../../../empty.util';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
index 00d385edef..532acf720a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
@@ -1,5 +1,13 @@
-import { DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from './ds-dynamic-input.model';
+import {
+  DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from './ds-dynamic-input.model';
 
 export interface DsDynamicTextAreaModelConfig extends DsDynamicInputModelConfig {
   cols?: number;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
index f19b660295..c846f053ef 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
@@ -1,27 +1,34 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
 import {
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { isNotEmpty } from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DsDynamicInputModel } from './ds-dynamic-input.model';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
 
 /**
  * An abstract class to be extended by form components that handle vocabulary
  */
 @Component({
   selector: 'ds-dynamic-vocabulary',
-  template: ''
+  template: '',
 })
 export abstract class DsDynamicVocabularyComponent extends DynamicFormControlComponent {
 
@@ -36,7 +43,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
 
   protected constructor(protected vocabularyService: VocabularyService,
                         protected layoutService: DynamicFormLayoutService,
-                        protected validationService: DynamicFormValidationService
+                        protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -50,8 +57,9 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
 
   /**
    * Retrieves the init form value from model
+   * @param preserveConfidence if the original model confidence value should be used after retrieving the vocabulary's entry
    */
-  getInitValueFromModel(): Observable<FormFieldMetadataValueObject> {
+  getInitValueFromModel(preserveConfidence = false): Observable<FormFieldMetadataValueObject> {
     let initValue$: Observable<FormFieldMetadataValueObject>;
     if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject) && !this.model.value.hasAuthorityToGenerate()) {
       let initEntry$: Observable<VocabularyEntry>;
@@ -63,15 +71,20 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
       initValue$ = initEntry$.pipe(map((initEntry: VocabularyEntry) => {
         if (isNotEmpty(initEntry)) {
           // Integrate FormFieldMetadataValueObject with retrieved information
-          return new FormFieldMetadataValueObject(
+          const formField = new FormFieldMetadataValueObject(
             initEntry.value,
             null,
             initEntry.authority,
             initEntry.display,
             (this.model.value as any).place,
             null,
-            initEntry.otherInformation || null
+            initEntry.otherInformation || null,
           );
+          // Preserve the original confidence
+          if (preserveConfidence) {
+            formField.confidence = (this.model.value as any).confidence;
+          }
+          return formField;
         } else {
           return this.model.value as any;
         }
@@ -85,8 +98,8 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
           this.model.value.display,
           0,
           null,
-          this.model.value.otherInformation || null
-        )
+          this.model.value.otherInformation || null,
+        ),
       );
     } else {
       initValue$ = observableOf(new FormFieldMetadataValueObject(this.model.value));
@@ -131,7 +144,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
       elementsPerPage: elementsPerPage,
       currentPage: currentPage,
       totalElements: totalElements,
-      totalPages: totalPages
+      totalPages: totalPages,
     });
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index cfd1bc293c..45b6daa588 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -1,4 +1,11 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, QueryList } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlComponent,
@@ -10,13 +17,13 @@ import {
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicTemplateDirective
+  DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
 
 @Component({
   selector: 'ds-dynamic-form-group',
   templateUrl: './dynamic-form-group.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
index ba7074a2a8..9fa2ead2a6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
@@ -1,11 +1,11 @@
-import { Subject } from 'rxjs';
 import {
   DynamicCheckboxGroupModel,
   DynamicFormControlLayout,
   DynamicFormControlRelation,
   DynamicFormGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
+import { Subject } from 'rxjs';
 
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
index 0a32498173..d6ab989cd5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
@@ -2,11 +2,12 @@ import {
   DynamicFormControlLayout,
   DynamicRadioGroupModel,
   DynamicRadioGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
+
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { hasValue } from '../../../../../empty.util';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 
 export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any> {
   vocabularyOptions: VocabularyOptions;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
index 51ce584bb1..6ed94d239c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
@@ -1,42 +1,54 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import {
   DynamicFormControlLayout,
   DynamicFormLayoutService,
   DynamicFormsCoreModule,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 
-import { DsDynamicListComponent } from './dynamic-list.component';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { FormBuilderService } from '../../../form-builder.service';
+import { DsDynamicListComponent } from './dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 
 export const LAYOUT_TEST = {
   element: {
-    group: ''
-  }
+    group: '',
+  },
 } as DynamicFormControlLayout;
 
 export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'type_programme',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   id: 'listCheckbox',
@@ -45,13 +57,13 @@ export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
   placeholder: 'Programme',
   readOnly: false,
   required: false,
-  repeatable: true
+  repeatable: true,
 };
 
 export const LIST_RADIO_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'type_programme',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   id: 'listRadio',
@@ -60,7 +72,7 @@ export const LIST_RADIO_TEST_MODEL_CONFIG = {
   placeholder: 'Programme',
   readOnly: false,
   required: false,
-  repeatable: false
+  repeatable: false,
 };
 
 describe('DsDynamicListComponent test suite', () => {
@@ -83,7 +95,7 @@ describe('DsDynamicListComponent test suite', () => {
         DynamicFormsNGBootstrapUIModule,
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
       ],
       declarations: [
         DsDynamicListComponent,
@@ -96,9 +108,9 @@ describe('DsDynamicListComponent test suite', () => {
         FormBuilderService,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -138,7 +150,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = new UntypedFormGroup({
           listCheckbox: new UntypedFormGroup({}),
-          listRadio: new UntypedFormGroup({})
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
         listFixture.detectChanges();
@@ -186,7 +198,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = new UntypedFormGroup({
           listCheckbox: new UntypedFormGroup({}),
-          listRadio: new UntypedFormGroup({})
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
         modelValue = [Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 })];
@@ -226,7 +238,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = new UntypedFormGroup({
           listCheckbox: new UntypedFormGroup({}),
-          listRadio: new UntypedFormGroup({})
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListRadioGroupModel(LIST_RADIO_TEST_MODEL_CONFIG, LAYOUT_TEST);
         listFixture.detectChanges();
@@ -262,7 +274,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = new UntypedFormGroup({
           listCheckbox: new UntypedFormGroup({}),
-          listRadio: new UntypedFormGroup({})
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListRadioGroupModel(LIST_RADIO_TEST_MODEL_CONFIG, LAYOUT_TEST);
         modelValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
@@ -287,13 +299,13 @@ describe('DsDynamicListComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
   group: UntypedFormGroup = new UntypedFormGroup({
     listCheckbox: new UntypedFormGroup({}),
-    listRadio: new UntypedFormGroup({})
+    listRadio: new UntypedFormGroup({}),
   });
 
   model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index aa62e5b40d..7e4594c3e7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,22 +1,37 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UntypedFormGroup, ValidatorFn, ValidationErrors, AbstractControl } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormGroup,
+  ValidationErrors,
+  ValidatorFn,
+} from '@angular/forms';
 import {
   DynamicCheckboxModel,
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 import findKey from 'lodash/findKey';
 
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { FormBuilderService } from '../../../form-builder.service';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 
 export interface ListItem {
   id: string;
@@ -31,7 +46,7 @@ export interface ListItem {
 @Component({
   selector: 'ds-dynamic-list',
   styleUrls: ['./dynamic-list.component.scss'],
-  templateUrl: './dynamic-list.component.html'
+  templateUrl: './dynamic-list.component.html',
 })
 export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
 
@@ -49,7 +64,7 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
               private cdr: ChangeDetectorRef,
               private formBuilderService: FormBuilderService,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -113,10 +128,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
       const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1
+        elementsPerPage: 9999, currentPage: 1,
       } as PageInfo);
       this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
         let groupCounter = 0;
         let itemsPerGroup = 0;
@@ -130,17 +145,17 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
             (v) => v.value === option.value));
 
           const item: ListItem = {
-            id: value,
+            id: `${this.model.id}_${value}`,
             label: option.display,
             value: checked,
-            index: key
+            index: key,
           };
           if (this.model.repeatable) {
             this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
           } else {
             (this.model as DynamicListRadioGroupModel).options.push({
               label: item.label,
-              value: option
+              value: option,
             });
           }
           tempList.push(item);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
index 64590ec9e0..a9fc6fc429 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
@@ -1,5 +1,12 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DynamicLookupModel, DynamicLookupModelConfig } from './dynamic-lookup.model';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from './dynamic-lookup.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME = 'LOOKUP_NAME';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c624c46d2d..89e7af9aa6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -88,7 +88,6 @@
        aria-expanded="false"
        [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         aria-labelledby="scrollableDropdownMenuButton"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"
@@ -96,7 +95,7 @@
          [scrollWindow]="false">
 
       <button class="dropdown-item disabled"
-              *ngIf="optionsList && optionsList.length == 0"
+              *ngIf="optionsList && optionsList.length === 0"
               (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
       </button>
       <button class="dropdown-item lookup-item"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2fea4fc985..f506655f84 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -1,36 +1,58 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { of as observableOf } from 'rxjs';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicLookupComponent } from './dynamic-lookup.component';
-import { DynamicLookupModel, DynamicLookupModelConfig } from './dynamic-lookup.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
-import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
+import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicLookupComponent } from './dynamic-lookup.component';
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from './dynamic-lookup.model';
+import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
     name: 'RPAuthority',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -46,13 +68,13 @@ let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'RPAuthority',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -68,12 +90,12 @@ let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 let LOOKUP_TEST_GROUP = new UntypedFormGroup({
   lookup: new UntypedFormControl(),
-  lookupName: new UntypedFormControl()
+  lookupName: new UntypedFormControl(),
 });
 
 describe('Dynamic Lookup component', () => {
@@ -81,7 +103,7 @@ describe('Dynamic Lookup component', () => {
     LOOKUP_TEST_MODEL_CONFIG = {
       vocabularyOptions: {
         name: 'RPAuthority',
-        closed: false
+        closed: false,
       } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
@@ -97,13 +119,13 @@ describe('Dynamic Lookup component', () => {
       value: undefined,
       metadataFields: [],
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     };
 
     LOOKUP_NAME_TEST_MODEL_CONFIG = {
       vocabularyOptions: {
         name: 'RPAuthority',
-        closed: false
+        closed: false,
       } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
@@ -119,12 +141,12 @@ describe('Dynamic Lookup component', () => {
       value: undefined,
       metadataFields: [],
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     };
 
     LOOKUP_TEST_GROUP = new UntypedFormGroup({
       lookup: new UntypedFormControl(),
-      lookupName: new UntypedFormControl()
+      lookupName: new UntypedFormControl(),
     });
 
   }
@@ -147,22 +169,22 @@ describe('Dynamic Lookup component', () => {
         InfiniteScrollModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDynamicLookupComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
-        ObjNgFor
+        ObjNgFor,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
         DsDynamicLookupComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }));
 
@@ -261,7 +283,7 @@ describe('Dynamic Lookup component', () => {
           const selectedValue = Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'one',
-            value: 1
+            value: 1,
           });
           spyOn(lookupComp.change, 'emit');
           lookupComp.firstInputValue = 'test';
@@ -309,7 +331,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: null,
             value: 'test',
-            display: 'testDisplay'
+            display: 'testDisplay',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
           (lookupComp.model as any).value = new FormFieldMetadataValueObject('test', null, null, 'testDisplay');
@@ -350,7 +372,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: 'test001',
             value: 'test',
-            display: 'testDisplay'
+            display: 'testDisplay',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
           lookupComp.model.value = new FormFieldMetadataValueObject('test', null, 'test001', 'testDisplay');
@@ -435,12 +457,12 @@ describe('Dynamic Lookup component', () => {
             Object.assign(new VocabularyEntry(), {
               authority: 1,
               display: 'Name, Lastname',
-              value: 1
+              value: 1,
             }),
             Object.assign(new VocabularyEntry(), {
               authority: 2,
               display: 'NameTwo, LastnameTwo',
-              value: 2
+              value: 2,
             }),
           ];
           let de = lookupFixture.debugElement.queryAll(By.css('button'));
@@ -448,7 +470,7 @@ describe('Dynamic Lookup component', () => {
           const selectedValue = Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'Name, Lastname',
-            value: 1
+            value: 1,
           });
           spyOn(lookupComp.change, 'emit');
           vocabularyServiceStub.setNewPayload(payload);
@@ -479,7 +501,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: null,
             value: 'Name, Lastname',
-            display: 'Name, Lastname'
+            display: 'Name, Lastname',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
           (lookupComp.model as any).value = new FormFieldMetadataValueObject('Name, Lastname', null, null, 'Name, Lastname');
@@ -522,7 +544,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: 'test001',
             value: 'Name, Lastname',
-            display: 'Name, Lastname'
+            display: 'Name, Lastname',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
           lookupComp.model.value = new FormFieldMetadataValueObject('Name, Lastname', null, 'test001', 'Name, Lastname');
@@ -560,7 +582,7 @@ describe('Dynamic Lookup component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 63545f45d2..fafda83ebd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,24 +1,44 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
-
-import { of as observableOf, Subscription } from 'rxjs';
-import { catchError, distinctUntilChanged } from 'rxjs/operators';
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { hasValue, isEmpty, isNotEmpty } from '../../../../../empty.util';
-import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  distinctUntilChanged,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
+import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
 
 /**
  * Component representing a lookup or lookup-name input field
@@ -26,7 +46,7 @@ import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 @Component({
   selector: 'ds-dynamic-lookup',
   styleUrls: ['./dynamic-lookup.component.scss'],
-  templateUrl: './dynamic-lookup.component.html'
+  templateUrl: './dynamic-lookup.component.html',
 })
 export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
 
@@ -49,7 +69,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
   constructor(protected vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -159,7 +179,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
         this.pageInfo.elementsPerPage,
         this.pageInfo.currentPage + 1,
         this.pageInfo.totalElements,
-        this.pageInfo.totalPages
+        this.pageInfo.totalPages,
       );
       this.search();
     }
@@ -199,7 +219,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
     if (isNotEmpty(this.getCurrentValue())) {
       const newValue = Object.assign(new VocabularyEntry(), this.model.value, {
         display: this.getCurrentValue(),
-        value: this.getCurrentValue()
+        value: this.getCurrentValue(),
       });
       this.updateModel(newValue);
     } else {
@@ -221,14 +241,14 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
       this.getCurrentValue(),
       false,
       this.model.vocabularyOptions,
-      this.pageInfo
+      this.pageInfo,
     ).pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() =>
         observableOf(buildPaginatedList(
           new PageInfo(),
-          []
-        ))
+          [],
+        )),
       ),
       distinctUntilChanged())
       .subscribe((list: PaginatedList<VocabularyEntry>) => {
@@ -237,7 +257,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
           list.pageInfo.elementsPerPage,
           list.pageInfo.currentPage,
           list.pageInfo.totalElements,
-          list.pageInfo.totalPages
+          list.pageInfo.totalPages,
         );
         this.loading = false;
         this.cdr.detectChanges();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
index 20b1eccefe..bc8d2e9630 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP = 'LOOKUP';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 3c19ecda13..5463b06827 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -20,9 +20,9 @@
   </ul>
 </ng-template>
 
-<div *ngIf="!(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
-  <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-  <i *ngIf="!searching"
+<div *ngIf="(isHierarchicalVocabulary() | async) !== true" class="position-relative right-addon">
+  <i *ngIf="searching || loadingInitialValue" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+  <i *ngIf="!searching && !loadingInitialValue"
      dsAuthorityConfidenceState
      class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
      aria-hidden="true"
@@ -32,6 +32,7 @@
          class="form-control"
          [attr.aria-labelledby]="'label_' + model.id"
          [attr.autoComplete]="model.autoComplete"
+         [attr.aria-label]="model.label | translate"
          [class.is-invalid]="showErrorMessages"
          [id]="model.id"
          [inputFormatter]="formatter"
@@ -58,6 +59,7 @@
   <input class="form-control"
          [attr.aria-labelledby]="'label_' + model.id"
          [attr.autoComplete]="model.autoComplete"
+         [attr.aria-label]="model.label | translate"
          [class.is-invalid]="showErrorMessages"
          [class.tree-input]="!model.readOnly"
          [id]="id"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
index 69520aba63..4185c3b4c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
@@ -1,35 +1,56 @@
 /* eslint-disable max-classes-per-file */
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { CdkTreeModule } from '@angular/cdk/tree';
-
-import { TestScheduler } from 'rxjs/testing';
-import { getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
-import { DynamicOneboxModel } from './dynamic-onebox.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
-import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
-import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
+import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
+import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
 
 export let ONEBOX_TEST_GROUP;
 
@@ -41,7 +62,7 @@ export class MockNgbModalRef {
   componentInstance = {
     vocabularyOptions: undefined,
     preloadLevel: undefined,
-    selectedItem: undefined
+    selectedItem: undefined,
   };
   result: Promise<any> = new Promise((resolve, reject) => resolve(true));
 }
@@ -54,7 +75,7 @@ function init() {
   ONEBOX_TEST_MODEL_CONFIG = {
     vocabularyOptions: {
       closed: false,
-      name: 'vocabulary'
+      name: 'vocabulary',
     } as VocabularyOptions,
     disabled: false,
     id: 'onebox',
@@ -65,7 +86,7 @@ function init() {
     readOnly: false,
     required: false,
     repeatable: false,
-    value: undefined
+    value: undefined,
   };
 }
 
@@ -89,12 +110,12 @@ describe('DsDynamicOneboxComponent test suite', () => {
     type: 'vocabulary',
     _links: {
       self: {
-        url: 'self'
+        url: 'self',
       },
       entries: {
-        url: 'entries'
-      }
-    }
+        url: 'entries',
+      },
+    },
   };
 
   const hierarchicalVocabulary = {
@@ -106,12 +127,12 @@ describe('DsDynamicOneboxComponent test suite', () => {
     type: 'vocabulary',
     _links: {
       self: {
-        url: 'self'
+        url: 'self',
       },
       entries: {
-        url: 'entries'
-      }
-    }
+        url: 'entries',
+      },
+    },
   };
 
   // waitForAsync beforeEach
@@ -123,7 +144,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         open: jasmine.createSpy('open'),
         close: jasmine.createSpy('close'),
         dismiss: jasmine.createSpy('dismiss'),
-      }
+      },
     );
     init();
     TestBed.configureTestingModule({
@@ -134,14 +155,14 @@ describe('DsDynamicOneboxComponent test suite', () => {
         NgbModule,
         ReactiveFormsModule,
         TranslateModule.forRoot(),
-        CdkTreeModule
+        CdkTreeModule,
       ],
       declarations: [
         DsDynamicOneboxComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
-        VocabularyTreeviewComponent
+        VocabularyTreeviewComponent,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
@@ -149,9 +170,9 @@ describe('DsDynamicOneboxComponent test suite', () => {
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
-        { provide: NgbModal, useValue: modal }
+        { provide: NgbModal, useValue: modal },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
 
   });
@@ -262,7 +283,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -275,7 +296,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -288,7 +309,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -310,7 +331,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: null,
           value: 'test',
-          display: 'testDisplay'
+          display: 'testDisplay',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -347,7 +368,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: 'test001',
           value: 'test001',
-          display: 'test'
+          display: 'test',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -419,7 +440,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: null,
           value: 'test',
-          display: 'testDisplay'
+          display: 'testDisplay',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -453,7 +474,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 2ff4256404..3712dc25a3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -1,7 +1,29 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbTypeahead,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+  Subject,
+  Subscription,
+} from 'rxjs';
 import {
   catchError,
   debounceTime,
@@ -11,27 +33,30 @@ import {
   merge,
   switchMap,
   take,
-  tap
+  tap,
 } from 'rxjs/operators';
-import { Observable, of as observableOf, Subject, Subscription } from 'rxjs';
-import { NgbModal, NgbModalRef, NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
 
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DynamicOneboxModel } from './dynamic-onebox.model';
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
 import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
-import {
-  PaginatedList,
-  buildPaginatedList
-} from '../../../../../../core/data/paginated-list.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { Vocabulary } from '../../../../../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../empty.util';
 import { VocabularyTreeviewModalComponent } from '../../../../vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
 
 /**
  * Component representing a onebox input field.
@@ -40,7 +65,7 @@ import { VocabularyTreeviewModalComponent } from '../../../../vocabulary-treevie
 @Component({
   selector: 'ds-dynamic-onebox',
   styleUrls: ['./dynamic-onebox.component.scss'],
-  templateUrl: './dynamic-onebox.component.html'
+  templateUrl: './dynamic-onebox.component.html',
 })
 export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnInit {
 
@@ -55,6 +80,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
 
   pageInfo: PageInfo = new PageInfo();
   searching = false;
+  loadingInitialValue = false;
   searchFailed = false;
   hideSearchingWhenUnsubscribed$ = new Observable(() => () => this.changeSearchingStatus(false));
   click$ = new Subject<string>();
@@ -70,7 +96,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
               protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
               protected modalService: NgbModal,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -107,14 +133,14 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
               this.searchFailed = true;
               return observableOf(buildPaginatedList(
                 new PageInfo(),
-                []
+                [],
               ));
             }));
         }
       }),
       map((list: PaginatedList<VocabularyEntry>) => list.page),
       tap(() => this.changeSearchingStatus(false)),
-      merge(this.hideSearchingWhenUnsubscribed$)
+      merge(this.hideSearchingWhenUnsubscribed$),
     );
   };
 
@@ -128,11 +154,11 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
 
     this.vocabulary$ = this.vocabularyService.findVocabularyById(this.model.vocabularyOptions.name).pipe(
       getFirstSucceededRemoteDataPayload(),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
 
     this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
-      map((result: Vocabulary) => result.hierarchical)
+      map((result: Vocabulary) => result.hierarchical),
     );
 
     this.subs.push(this.group.get(this.model.id).valueChanges.pipe(
@@ -151,6 +177,15 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
     this.cdr.detectChanges();
   }
 
+  /**
+   * Changes the loadingInitialValue status
+   * @param status
+   */
+  changeLoadingInitialValueStatus(status: boolean) {
+    this.loadingInitialValue = status;
+    this.cdr.detectChanges();
+  }
+
   /**
    * Checks if configured vocabulary is Hierarchical or not
    */
@@ -185,8 +220,13 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
       // prevent on blur propagation if typeahed suggestions are showed
       event.preventDefault();
       event.stopImmediatePropagation();
-      // set focus on input again, this is to avoid to lose changes when no suggestion is selected
-      (event.target as HTMLInputElement).focus();
+      // update the value with the searched text if the user hasn't selected any suggestion
+      if (!this.model.vocabularyOptions.closed && isNotEmpty(this.inputValue)) {
+        if (isNotNull(this.inputValue) && this.model.value !== this.inputValue) {
+          this.dispatchUpdate(this.inputValue);
+        }
+        this.inputValue = null;
+      }
     }
   }
 
@@ -223,7 +263,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
     event.stopImmediatePropagation();
     this.subs.push(this.vocabulary$.pipe(
       map((vocabulary: Vocabulary) => vocabulary.preloadLevel),
-      take(1)
+      take(1),
     ).subscribe((preloadLevel) => {
       const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewModalComponent, { size: 'lg', windowClass: 'treeview' });
       modalRef.componentInstance.vocabularyOptions = this.model.vocabularyOptions;
@@ -257,8 +297,10 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
   setCurrentValue(value: any, init = false): void {
     let result: string;
     if (init) {
-      this.getInitValueFromModel()
+      this.changeLoadingInitialValueStatus(true);
+      this.getInitValueFromModel(true)
         .subscribe((formValue: FormFieldMetadataValueObject) => {
+          this.changeLoadingInitialValueStatus(false);
           this.currentValue = formValue;
           this.cdr.detectChanges();
         });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
index 4b973e3058..bce1dc5f19 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_ONEBOX = 'ONEBOX';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 05f443aad5..e661c458b6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -1,4 +1,4 @@
-<a *ngIf="!(formCollapsed | async)"
+<a *ngIf="(formCollapsed | async) !== true"
    class="close position-relative"
    ngbTooltip="{{'form.group-collapse-help' | translate}}"
    placement="left">
@@ -16,7 +16,7 @@
 </a>
 
 <div class="pt-2" [ngClass]="{'border-top': !showErrorMessages, 'border border-danger': showErrorMessages}">
-  <div *ngIf="!(formCollapsed | async)" class="pl-2 row"  @shrinkInOut>
+  <div *ngIf="(formCollapsed | async) !== true" class="pl-2 row"  @shrinkInOut>
     <ds-form #formRef="formComponent"
              class="col-sm-12 col-md-8 col-lg-9 col-xl-10 pl-0"
              [formId]="formId"
@@ -28,7 +28,7 @@
              (dfFocus)="onFocus($event)"></ds-form>
 
 
-    <div *ngIf="!(formCollapsed | async)" class="col p-0 m-0 d-flex justify-content-center align-items-center">
+    <div *ngIf="(formCollapsed | async) !== true" class="col p-0 m-0 d-flex justify-content-center align-items-center">
 
         <button type="button"
                 class="btn btn-link"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index feca7f95c6..9a4eb78015 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -1,30 +1,52 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 
-import { DsDynamicRelationGroupComponent } from './dynamic-relation-group.components';
-import { DynamicRelationGroupModel, DynamicRelationGroupModelConfig } from './dynamic-relation-group.model';
+import { storeModuleConfig } from '../../../../../../app.reducer';
+import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
 import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
-import { FormFieldModel } from '../../../models/form-field.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { FormService } from '../../../../form.service';
-import { FormComponent } from '../../../../form.component';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { StoreMock } from '../../../../../testing/store.mock';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { Chips } from '../../../../chips/models/chips.model';
+import { FormComponent } from '../../../../form.component';
+import { FormService } from '../../../../form.service';
+import { FormBuilderService } from '../../../form-builder.service';
+import { FormFieldModel } from '../../../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicInputModel } from '../ds-dynamic-input.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { StoreMock } from '../../../../../testing/store.mock';
-import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
-import { storeModuleConfig } from '../../../../../../app.reducer';
+import { DsDynamicRelationGroupComponent } from './dynamic-relation-group.components';
+import {
+  DynamicRelationGroupModel,
+  DynamicRelationGroupModelConfig,
+} from './dynamic-relation-group.model';
 
 export let FORM_GROUP_TEST_MODEL_CONFIG;
 
@@ -48,9 +70,9 @@ function init() {
         selectableMetadata: [{
           controlledVocabulary: 'RPAuthority',
           closed: false,
-          metadata: 'dc.contributor.author'
+          metadata: 'dc.contributor.author',
         }],
-      } as FormFieldModel]
+      } as FormFieldModel],
     } as FormRowModel, {
       fields: [{
         hints: 'Enter the affiliation of the author.',
@@ -62,9 +84,9 @@ function init() {
         selectableMetadata: [{
           controlledVocabulary: 'OUAuthority',
           closed: false,
-          metadata: 'local.contributor.affiliation'
-        }]
-      } as FormFieldModel]
+          metadata: 'local.contributor.affiliation',
+        }],
+      } as FormFieldModel],
     } as FormRowModel],
     submissionId,
     id: 'dc_contributor_author',
@@ -80,7 +102,7 @@ function init() {
     validators: { required: null },
     repeatable: false,
     metadataFields: [],
-    hasSelectableMetadata: false
+    hasSelectableMetadata: false,
   } as DynamicRelationGroupModelConfig;
 
   FORM_GROUP_TEST_GROUP = new UntypedFormGroup({
@@ -113,7 +135,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         ReactiveFormsModule,
         NgbModule,
         StoreModule.forRoot({}, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
@@ -129,9 +151,9 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         FormComponent,
         FormService,
         { provide: VocabularyService, useValue: new VocabularyServiceStub() },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -201,7 +223,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       (model2 as any).value = new FormFieldMetadataValueObject('test affiliation');
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupFixture.detectChanges();
 
@@ -245,7 +267,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       groupComp.model = new DynamicRelationGroupModel(FORM_GROUP_TEST_MODEL_CONFIG);
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupComp.model.value = modelValue;
       groupFixture.detectChanges();
@@ -280,7 +302,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author modify'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupFixture.detectChanges();
 
@@ -315,7 +337,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index 7fdfb61b74..afe0defa7d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,35 +1,58 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-
-import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { filter, map, mergeMap, scan } from 'rxjs/operators';
 import {
   DynamicFormControlComponent,
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
 import isEqual from 'lodash/isEqual';
 import isObject from 'lodash/isObject';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
-import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
-import { FormService } from '../../../../form.service';
-import { FormComponent } from '../../../../form.component';
-import { Chips } from '../../../../chips/models/chips.model';
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
-import { shrinkInOut } from '../../../../../animations/shrink';
-import { ChipsItem } from '../../../../chips/models/chips-item.model';
-import { hasOnlyEmptyProperties } from '../../../../../object.util';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { environment } from '../../../../../../../environments/environment';
-import { PLACEHOLDER_PARENT_METADATA } from '../../ds-dynamic-form-constants';
+import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { shrinkInOut } from '../../../../../animations/shrink';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../empty.util';
+import { hasOnlyEmptyProperties } from '../../../../../object.util';
+import { Chips } from '../../../../chips/models/chips.model';
+import { ChipsItem } from '../../../../chips/models/chips-item.model';
+import { FormComponent } from '../../../../form.component';
+import { FormService } from '../../../../form.service';
+import { FormBuilderService } from '../../../form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { PLACEHOLDER_PARENT_METADATA } from '../../ds-dynamic-form-constants';
+import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
 
 /**
  * Component representing a group input field
@@ -38,7 +61,7 @@ import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabul
   selector: 'ds-dynamic-relation-group',
   styleUrls: ['./dynamic-relation-group.component.scss'],
   templateUrl: './dynamic-relation-group.component.html',
-  animations: [shrinkInOut]
+  animations: [shrinkInOut],
 })
 export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent implements OnDestroy, OnInit {
 
@@ -65,7 +88,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
               private formService: FormService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -237,15 +260,15 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
                 const model = this.formBuilderService.findById(fieldId, this.formModel);
                 return$ = this.vocabularyService.findEntryDetailById(
                   valueObj[fieldName].authority,
-                  (model as any).vocabularyOptions.name
+                  (model as any).vocabularyOptions.name,
                 ).pipe(
                   getFirstSucceededRemoteDataPayload(),
                   map((entryDetail: VocabularyEntryDetail) => Object.assign(
                     new FormFieldMetadataValueObject(),
                     valueObj[fieldName],
                     {
-                      otherInformation: entryDetail.otherInformation
-                    })
+                      otherInformation: entryDetail.otherInformation,
+                    }),
                   ));
               } else {
                 return$ = observableOf(valueObj[fieldName]);
@@ -260,11 +283,11 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
         mergeMap((valueListObj: Observable<any>, index: number) => {
           return valueListObj.pipe(
             map((valueObj: any) => ({
-                index: index, value: valueObj.reduce(
-                (acc: any, value: any) => Object.assign({}, acc, value)
-                )
-              })
-            )
+              index: index, value: valueObj.reduce(
+                (acc: any, value: any) => Object.assign({}, acc, value),
+              ),
+            }),
+            ),
           );
         }),
         scan((acc: any[], valueObj: any) => {
@@ -275,7 +298,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
           }
           return acc;
         }, []),
-        filter((modelValues: any[]) => (this.model.value as any[]).length === modelValues.length)
+        filter((modelValues: any[]) => (this.model.value as any[]).length === modelValues.length),
       ).subscribe((modelValue) => {
         this.model.value = modelValue;
         this.initChips(modelValue);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
index 8b5ba1f796..d88c29d148 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
@@ -1,8 +1,18 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
-import { isEmpty, isNull } from '../../../../../empty.util';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
+import {
+  isEmpty,
+  isNull,
+} from '../../../../../empty.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../../ds-dynamic-form-constants';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 /**
  * Dynamic Group Model configuration interface
@@ -41,7 +51,7 @@ export class DynamicRelationGroupModel extends DsDynamicInputModel {
     this.value = value;
   }
 
-/*  get value() {
+  /*  get value() {
     return (isEmpty(this.value)) ? null : this.value
   }*/
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 6e2d29b789..544b41ac52 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -2,14 +2,15 @@
   <div class="position-relative right-addon"
        role="combobox"
        [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'">
+       [attr.aria-owns]="'combobox_' + id + '_listbox'"
+       [attr.aria-expanded]="sdRef.isOpen()"
+       [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
        <i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
           aria-hidden="true"></i>
        <i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
           aria-hidden="true"></i>
     <input class="form-control"
            [attr.aria-controls]="'combobox_' + id + '_listbox'"
-           [attr.aria-activedescendant]="'combobox_' + id + '_selected'"
            [attr.aria-label]="model.placeholder"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
@@ -26,10 +27,8 @@
            (keydown)="selectOnKeyDown($event, sdRef)">
   </div>
 
-  <div ngbDropdownMenu
+  <div #dropdownMenu ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
-       aria-haspopup="true"
-       aria-expanded="false"
        [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
          role="listbox"
@@ -41,11 +40,12 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList"
-              (click)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
+      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
+              [class.active]="i === selectedIndex"
+              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
               title="{{ listEntry.display }}" role="option"
-              [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+              [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 0fe617e231..1f3b7aa624 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -1,25 +1,48 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  mockDynamicFormLayoutService,
+  mockDynamicFormValidationService,
+} from '../../../../../testing/dynamic-form-mock-services';
+import {
+  createTestComponent,
+  hasClass,
+} from '../../../../../testing/utils.test';
 import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DsDynamicScrollableDropdownComponent } from './dynamic-scrollable-dropdown.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent, hasClass } from '../../../../../testing/utils.test';
-import {
-  mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
-} from '../../../../../testing/dynamic-form-mock-services';
 
 export const SD_TEST_GROUP = new UntypedFormGroup({
   dropdown: new UntypedFormControl(),
@@ -28,7 +51,7 @@ export const SD_TEST_GROUP = new UntypedFormGroup({
 export const SD_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     closed: false,
-    name: 'common_iso_languages'
+    name: 'common_iso_languages',
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -43,7 +66,7 @@ export const SD_TEST_MODEL_CONFIG = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 describe('Dynamic Dynamic Scrollable Dropdown component', () => {
@@ -68,7 +91,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         InfiniteScrollModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDynamicScrollableDropdownComponent,
@@ -79,9 +102,9 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         DsDynamicScrollableDropdownComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -159,14 +182,15 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.form-control'));
         let btnEl = de.nativeElement;
 
-        btnEl.click();
+        const mousedownEvent = new MouseEvent('mousedown');
+
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
         btnEl = de[0].nativeElement;
 
-        btnEl.click();
-
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         expect((scrollableDropdownComp.model as any).value).toEqual(selectedValue);
@@ -215,7 +239,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index a4ca210193..e90ffb0b81 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -1,23 +1,42 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
-
-import { Observable, of as observableOf } from 'rxjs';
-import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
-import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { isEmpty } from '../../../../../empty.util';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  distinctUntilChanged,
+  map,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
-import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 
 /**
  * Component representing a dropdown input field
@@ -25,9 +44,11 @@ import { FormFieldMetadataValueObject } from '../../../models/form-field-metadat
 @Component({
   selector: 'ds-dynamic-scrollable-dropdown',
   styleUrls: ['./dynamic-scrollable-dropdown.component.scss'],
-  templateUrl: './dynamic-scrollable-dropdown.component.html'
+  templateUrl: './dynamic-scrollable-dropdown.component.html',
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
+  @ViewChild('dropdownMenu', { read: ElementRef }) dropdownMenu: ElementRef;
+
   @Input() bindId = true;
   @Input() group: UntypedFormGroup;
   @Input() model: DynamicScrollableDropdownModel;
@@ -40,11 +61,14 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public loading = false;
   public pageInfo: PageInfo;
   public optionsList: any;
+  public inputText: string = null;
+  public selectedIndex = 0;
+  public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
   constructor(protected vocabularyService: VocabularyService,
               protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -54,34 +78,36 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   ngOnInit() {
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      catchError(() => observableOf(buildPaginatedList(
-        new PageInfo(),
-        []
-        ))
-      ))
-      .subscribe((list: PaginatedList<VocabularyEntry>) => {
-        this.optionsList = list.page;
-        if (this.model.value) {
-          this.setCurrentValue(this.model.value, true);
-        }
-
-        this.updatePageInfo(
-          list.pageInfo.elementsPerPage,
-          list.pageInfo.currentPage,
-          list.pageInfo.totalElements,
-          list.pageInfo.totalPages
-        );
-        this.cdr.detectChanges();
-      });
-
+    this.loadOptions(true);
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
   }
 
+  loadOptions(fromInit: boolean) {
+    this.loading = true;
+    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
+      tap(() => this.loading = false),
+    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+      this.optionsList = list.page;
+      if (fromInit && this.model.value) {
+        this.setCurrentValue(this.model.value, true);
+      }
+
+      this.updatePageInfo(
+        list.pageInfo.elementsPerPage,
+        list.pageInfo.currentPage,
+        list.pageInfo.totalElements,
+        list.pageInfo.totalPages,
+      );
+      this.selectedIndex = 0;
+      this.cdr.detectChanges();
+    });
+  }
+
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
@@ -94,10 +120,30 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   openDropdown(sdRef: NgbDropdown) {
     if (!this.model.readOnly) {
       this.group.markAsUntouched();
+      this.inputText = null;
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions(false);
       sdRef.open();
     }
   }
 
+  navigateDropdown(event: KeyboardEvent) {
+    if (event.key === 'ArrowDown') {
+      this.selectedIndex = Math.min(this.selectedIndex + 1, this.optionsList.length - 1);
+    } else if (event.key === 'ArrowUp') {
+      this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
+    }
+    this.scrollToSelected();
+  }
+
+  scrollToSelected() {
+    const dropdownItems = this.dropdownMenu.nativeElement.querySelectorAll('.dropdown-item');
+    const selectedItem = dropdownItems[this.selectedIndex];
+    if (selectedItem) {
+      selectedItem.scrollIntoView({ block: 'nearest' });
+    }
+  }
+
   /**
    * KeyDown handler to allow toggling the dropdown via keyboard
    * @param event KeyboardEvent
@@ -106,15 +152,56 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   selectOnKeyDown(event: KeyboardEvent, sdRef: NgbDropdown) {
     const keyName = event.key;
 
-    if (keyName === ' ' || keyName === 'Enter') {
+    if (keyName === 'Enter') {
       event.preventDefault();
       event.stopPropagation();
-      sdRef.toggle();
+      if (sdRef.isOpen()) {
+        this.onSelect(this.optionsList[this.selectedIndex]);
+        sdRef.close();
+      } else {
+        sdRef.open();
+      }
     } else if (keyName === 'ArrowDown' || keyName === 'ArrowUp') {
-      this.openDropdown(sdRef);
+      event.preventDefault();
+      event.stopPropagation();
+      this.navigateDropdown(event);
+    } else if (keyName === 'Backspace') {
+      this.removeKeyFromInput();
+    } else if (this.isAcceptableKey(keyName)) {
+      this.addKeyToInput(keyName);
     }
   }
 
+  addKeyToInput(keyName: string) {
+    if (this.inputText === null) {
+      this.inputText = '';
+    }
+    this.inputText += keyName;
+    // When a new key is added, we need to reset the page info
+    this.updatePageInfo(this.model.maxOptions, 1);
+    this.loadOptions(false);
+  }
+
+  removeKeyFromInput() {
+    if (this.inputText !== null) {
+      this.inputText = this.inputText.slice(0, -1);
+      if (this.inputText === '') {
+        this.inputText = null;
+      }
+      this.loadOptions(false);
+    }
+  }
+
+
+  isAcceptableKey(keyPress: string): boolean {
+    // allow all letters and numbers
+    if (keyPress.length === 1 && keyPress.match(/^[a-zA-Z0-9]*$/)) {
+      return true;
+    }
+    // Some other characters like space, dash, etc should be allowed as well
+    return this.acceptableKeys.includes(keyPress);
+  }
+
   /**
    * Loads any new entries
    */
@@ -125,14 +212,14 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.elementsPerPage,
         this.pageInfo.currentPage + 1,
         this.pageInfo.totalElements,
-        this.pageInfo.totalPages
+        this.pageInfo.totalPages,
       );
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
-          []
-          ))
+          [],
+        )),
         ),
         tap(() => this.loading = false))
         .subscribe((list: PaginatedList<VocabularyEntry>) => {
@@ -141,7 +228,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
             list.pageInfo.elementsPerPage,
             list.pageInfo.currentPage,
             list.pageInfo.totalElements,
-            list.pageInfo.totalPages
+            list.pageInfo.totalPages,
           );
           this.cdr.detectChanges();
         });
@@ -168,7 +255,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
 
     if (init) {
       result = this.getInitValueFromModel().pipe(
-        map((formValue: FormFieldMetadataValueObject) => formValue.display)
+        map((formValue: FormFieldMetadataValueObject) => formValue.display),
       );
     } else {
       if (isEmpty(value)) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index a9974717e4..870cd12cf6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -1,6 +1,14 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
index a6a4c45170..c64bc38604 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
@@ -1,33 +1,55 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  NgbModule,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { of as observableOf } from 'rxjs';
 
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { NgbModule, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
-
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicTagComponent } from './dynamic-tag.component';
-import { DynamicTagModel } from './dynamic-tag.model';
-import { Chips } from '../../../../chips/models/chips.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { Chips } from '../../../../chips/models/chips.model';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicTagComponent } from './dynamic-tag.component';
+import { DynamicTagModel } from './dynamic-tag.model';
 
 function createKeyUpEvent(key: number) {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   const event = {
     keyCode: key, preventDefault: () => {
     }, stopPropagation: () => {
-    }
+    },
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   spyOn(event, 'preventDefault');
@@ -46,7 +68,7 @@ function init() {
   TAG_TEST_MODEL_CONFIG = {
     vocabularyOptions: {
       closed: false,
-      name: 'common_iso_languages'
+      name: 'common_iso_languages',
     } as VocabularyOptions,
     disabled: false,
     id: 'tag',
@@ -56,7 +78,7 @@ function init() {
     placeholder: 'Keywords',
     readOnly: false,
     required: false,
-    repeatable: false
+    repeatable: false,
   };
 }
 
@@ -91,9 +113,9 @@ describe('DsDynamicTagComponent test suite', () => {
         DsDynamicTagComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -152,17 +174,17 @@ describe('DsDynamicTagComponent test suite', () => {
 
       it('should select a results entry properly', fakeAsync(() => {
         modelValue = [
-          Object.assign(new VocabularyEntry(), { authority: 1, display: 'Name, Lastname', value: 1 })
+          Object.assign(new VocabularyEntry(), { authority: 1, display: 'Name, Lastname', value: 1 }),
         ];
         const event: NgbTypeaheadSelectItemEvent = {
           item: Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'Name, Lastname',
-            value: 1
+            value: 1,
           }),
           preventDefault: () => {
             return;
-          }
+          },
         };
         spyOn(tagComp.change, 'emit');
 
@@ -287,7 +309,7 @@ describe('DsDynamicTagComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 4abb68a53b..392d25e363 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -1,25 +1,52 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
-
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { catchError, debounceTime, distinctUntilChanged, map, merge, switchMap, tap } from 'rxjs/operators';
-import { NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
-import isEqual from 'lodash/isEqual';
-
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DynamicTagModel } from './dynamic-tag.model';
-import { Chips } from '../../../../chips/models/chips.model';
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { environment } from '../../../../../../../environments/environment';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  NgbTypeahead,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import isEqual from 'lodash/isEqual';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  merge,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../../../../environments/environment';
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { Chips } from '../../../../chips/models/chips.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicTagModel } from './dynamic-tag.model';
 
 /**
  * Component representing a tag input field
@@ -27,7 +54,7 @@ import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 @Component({
   selector: 'ds-dynamic-tag',
   styleUrls: ['./dynamic-tag.component.scss'],
-  templateUrl: './dynamic-tag.component.html'
+  templateUrl: './dynamic-tag.component.html',
 })
 export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implements OnInit {
 
@@ -53,7 +80,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
   constructor(protected vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -83,12 +110,24 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
               this.searchFailed = true;
               return observableOf(buildPaginatedList(
                 new PageInfo(),
-                []
+                [],
               ));
             }));
         }
       }),
       map((list: PaginatedList<VocabularyEntry>) => list.page),
+      // Add user input as last item of the list
+      map((list: VocabularyEntry[]) => {
+        if (list && list.length > 0) {
+          if (isNotEmpty(this.currentValue)) {
+            const vocEntry = new VocabularyEntry();
+            vocEntry.display = this.currentValue;
+            vocEntry.value = this.currentValue;
+            list.push(vocEntry);
+          }
+        }
+        return list;
+      }),
       tap(() => this.changeSearchingStatus(false)),
       merge(this.hideSearchingWhenUnsubscribed));
 
@@ -139,7 +178,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
    * @param event The value to emit.
    */
   onBlur(event: Event) {
-    if (isNotEmpty(this.currentValue) && !this.instance.isPopupOpen()) {
+    if (isNotEmpty(this.currentValue) && (!this.model.hasAuthority || !this.instance.isPopupOpen())) {
       this.addTagsToChips();
     }
     this.blur.emit(event);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
index 86dc1ff73a..2c7e2c5670 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_TAG = 'TAG';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b72a8722ae..f98b55cd4c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -9,7 +9,7 @@
     <ds-themed-loading *ngIf="!item || !collection"></ds-themed-loading>
     <ng-container *ngIf="item && collection">
         <ul ngbNav #nav="ngbNav" class="nav-tabs">
-            <li ngbNavItem>
+            <li ngbNavItem role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-search-tab
@@ -31,7 +31,7 @@
                     </ds-themed-dynamic-lookup-relation-search-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index">
+            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)[idx] } }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-external-source-tab
@@ -42,13 +42,14 @@
                             [collection]="collection"
                             [relationship]="relationshipOptions"
                             [context]="context"
+                            [query]="query"
                             [externalSource]="source"
                             (importedObject)="imported($event)"
                             class="d-block pt-3">
                     </ds-themed-dynamic-lookup-relation-external-source-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngIf="!isEditRelationship">
+            <li ngbNavItem *ngIf="!isEditRelationship" role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
                 <ng-template ngbNavContent>
                     <ds-dynamic-lookup-relation-selection-tab
@@ -76,13 +77,13 @@
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+              [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+            [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9d57296f82..376116bfe9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -1,29 +1,47 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  DebugElement,
+  NgZone,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, NgZone, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf, Subscription } from 'rxjs';
-import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
-import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { Item } from '../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { AddRelationshipAction, RemoveRelationshipAction } from './relationship.actions';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../../../search/models/paginated-search-options.model';
-import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { createPaginatedList } from '../../../../testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Collection } from '../../../../../core/shared/collection.model';
-import { By } from '@angular/platform-browser';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../search/models/paginated-search-options.model';
+import { createPaginatedList } from '../../../../testing/utils.test';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
+import {
+  AddRelationshipAction,
+  RemoveRelationshipAction,
+} from './relationship.actions';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -51,13 +69,13 @@ describe('DsDynamicLookupRelationModalComponent', () => {
     Object.assign(new ExternalSource(), {
       id: 'orcidV2',
       name: 'orcidV2',
-      hierarchical: false
+      hierarchical: false,
     }),
     Object.assign(new ExternalSource(), {
       id: 'sherpaPublisher',
       name: 'sherpaPublisher',
-      hierarchical: false
-    })
+      hierarchical: false,
+    }),
   ];
   const totalLocal = 10;
   const totalExternal = 8;
@@ -81,21 +99,21 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       relationshipType: 'isAuthorOfPublication',
       nameVariants: true,
       searchConfiguration: 'personConfig',
-      externalSources: ['orcidV2', 'sherpaPublisher']
+      externalSources: ['orcidV2', 'sherpaPublisher'],
     });
     nameVariant = 'Doe, J.';
     metadataField = 'dc.contributor.author';
     pSearchOptions = new PaginatedSearchOptions({});
     externalSourceService = jasmine.createSpyObj('externalSourceService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(externalSources)),
-      findById: createSuccessfulRemoteDataObject$(externalSources[0])
+      findById: createSuccessfulRemoteDataObject$(externalSources[0]),
     });
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
       getTotalLocalResults: observableOf(totalLocal),
-      getTotalExternalResults: observableOf(totalExternal)
+      getTotalExternalResults: observableOf(totalExternal),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      aggregate: createSuccessfulRemoteDataObject$(externalSources)
+      aggregate: createSuccessfulRemoteDataObject$(externalSources),
     });
     submissionId = '1234';
   }
@@ -108,16 +126,16 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: LookupRelationService, useValue: lookupRelationService },
         {
-          provide: SelectableListService, useValue: selectableListService
+          provide: SelectableListService, useValue: selectableListService,
         },
         {
-          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
+          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) },
         },
         { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
@@ -125,13 +143,13 @@ describe('DsDynamicLookupRelationModalComponent', () => {
           provide: Store, useValue: {
             // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
             dispatch: () => {
-            }
-          }
+            },
+          },
         },
         { provide: NgZone, useValue: new NgZone({}) },
-        NgbActiveModal
+        NgbActiveModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 446497a74f..d3a4c347d4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,34 +1,61 @@
-import { Component, EventEmitter, NgZone, OnDestroy, OnInit, Output } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, Subscription, BehaviorSubject } from 'rxjs';
+import {
+  Component,
+  EventEmitter,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
-import { map, skip, switchMap, take } from 'rxjs/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
-import { ListableObject } from '../../../../object-collection/shared/listable-object.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { SearchResult } from '../../../../search/models/search-result.model';
+import { Store } from '@ngrx/store';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  skip,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AppState } from '../../../../../app.reducer';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../../../core/cache/models/request-param.model';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
+import { FindListOptions } from '../../../../../core/data/find-list-options.model';
+import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
+import { ListableObject } from '../../../../object-collection/shared/listable-object.model';
+import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { SearchResult } from '../../../../search/models/search-result.model';
+import { followLink } from '../../../../utils/follow-link-config.model';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 import {
   AddRelationshipAction,
   RemoveRelationshipAction,
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../../app.reducer';
-import { Context } from '../../../../../core/shared/context.model';
-import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
-import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
-import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -37,9 +64,9 @@ import { RelationshipType } from '../../../../../core/shared/item-relationships/
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -170,9 +197,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   }
 
   ngOnInit(): void {
-    if (!!this.currentItemIsLeftItem$) {
+    if (this.currentItemIsLeftItem$) {
       this.currentItemIsLeftItem$.subscribe((isLeft) => {
         this.isLeft = isLeft;
+        this.label = this.relationshipType.leftwardType;
       });
     }
 
@@ -180,7 +208,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       .getSelectableList(this.listId)
       .pipe(map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : []));
     this.selection$.pipe(take(1)).subscribe((selection) =>
-      selection.map((s: SearchResult<Item>) => this.addNameVariantSubscription(s))
+      selection.map((s: SearchResult<Item>) => this.addNameVariantSubscription(s)),
     );
     if (this.relationshipOptions.nameVariants === 'true') {
       this.context = Context.EntitySearchModalWithNameVariants;
@@ -195,12 +223,25 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
             source,
             true,
             true,
-            followLink('entityTypes')
+            followLink('entityTypes'),
           );
-        })
+        }),
       ).pipe(
-        getAllSucceededRemoteDataPayload()
+        getAllSucceededRemoteDataPayload(),
       );
+    } else {
+      const findListOptions = Object.assign({}, new FindListOptions(), {
+        elementsPerPage: 5,
+        currentPage: 1,
+        searchParams: [
+          new RequestParam('entityType', this.relationshipOptions.relationshipType),
+        ],
+      });
+      this.externalSourcesRD$ = this.externalSourceService.searchBy('findByEntityType', findListOptions,
+        true, true, followLink('entityTypes'))
+        .pipe(getFirstSucceededRemoteDataPayload(), map((r: PaginatedList<ExternalSource>) => {
+          return r.page;
+        }));
     }
 
     this.setTotals();
@@ -220,25 +261,25 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.zone.runOutsideAngular(
       () => {
         const obs: Observable<any[]> = observableCombineLatest([...selectableObjects.map((sri: SearchResult<Item>) => {
-            this.addNameVariantSubscription(sri);
-            return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid)
-              .pipe(
-                take(1),
-                map((nameVariant: string) => {
-                  return {
-                    item: sri.indexableObject,
-                    nameVariant
-                  };
-                })
-              );
-          })
+          this.addNameVariantSubscription(sri);
+          return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid)
+            .pipe(
+              take(1),
+              map((nameVariant: string) => {
+                return {
+                  item: sri.indexableObject,
+                  nameVariant,
+                };
+              }),
+            );
+        }),
         ]);
         obs
           .subscribe((arr: any[]) => {
             return arr.forEach((object: any) => {
               const addRelationshipAction = new AddRelationshipAction(this.item, object.item, this.relationshipOptions.relationshipType, this.submissionId, object.nameVariant);
               this.store.dispatch(addRelationshipAction);
-              }
+            },
             );
           });
       });
@@ -264,7 +305,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       () => selectableObjects.forEach((object) => {
         this.subMap[object.indexableObject.uuid].unsubscribe();
         this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
-      })
+      }),
     );
   }
 
@@ -283,12 +324,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   setTotals() {
     const externalSourcesAndOptions$ = observableCombineLatest([
       this.externalSourcesRD$,
-      this.searchConfigService.paginatedSearchOptions
+      this.searchConfigService.paginatedSearchOptions,
     ]);
 
     this.totalExternal$ = externalSourcesAndOptions$.pipe(
       switchMap(([sources, options]) =>
-        observableCombineLatest([...sources.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))]))
+        observableCombineLatest([...sources.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))])),
     );
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index cf8cb56577..29d28c92c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -23,9 +23,9 @@
         </ds-viewable-collection>
         <ds-themed-loading *ngIf="!entriesRD || entriesRD?.isLoading"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
-        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode != 400)"
+        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)"
                     message="{{'error.search-results' | translate}}"></ds-error>
-        <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.statusCode == 400" id="empty-external-entry-list">
+        <div *ngIf="entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400" id="empty-external-entry-list">
           {{ 'search.results.empty' | translate }}
         </div>
       </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
index cfffc5ddb7..b1ba312c6e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -1,36 +1,43 @@
 import {
-  DsDynamicLookupRelationExternalSourceTabComponent
-} from './dynamic-lookup-relation-external-source-tab.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../../../utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../../../core/shared/collection.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { of as observableOf, EMPTY } from 'rxjs';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
 import {
   createFailedRemoteDataObject$,
   createPendingRemoteDataObject$,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../../remote-data.utils';
-import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
-import { ExternalSource } from '../../../../../../core/shared/external-source.model';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { By } from '@angular/platform-browser';
-import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { Item } from '../../../../../../core/shared/item.model';
-import { Collection } from '../../../../../../core/shared/collection.model';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { createPaginatedList } from '../../../../../testing/utils.test';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
-import {
-  ThemedExternalSourceEntryImportModalComponent
-} from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
+import { createPaginatedList } from '../../../../../testing/utils.test';
+import { VarDirective } from '../../../../../utils/var.directive';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
 
 describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   let component: DsDynamicLookupRelationExternalSourceTabComponent;
@@ -45,7 +52,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
     id: 'orcidV2',
     name: 'orcidV2',
     hierarchical: false,
-    entityTypes: createSuccessfulRemoteDataObject$(createPaginatedList([itemType]))
+    entityTypes: createSuccessfulRemoteDataObject$(createPaginatedList([itemType])),
   } as ExternalSource;
   const externalEntries = [
     Object.assign({
@@ -55,10 +62,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0001'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0001',
+          },
+        ],
+      },
     }),
     Object.assign({
       id: '0001-0001-0001-0002',
@@ -67,10 +74,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0002'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0002',
+          },
+        ],
+      },
     }),
     Object.assign({
       id: '0001-0001-0001-0003',
@@ -79,11 +86,11 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0003'
-          }
-        ]
-      }
-    })
+            value: 'https://orcid.org/0001-0001-0001-0003',
+          },
+        ],
+      },
+    }),
   ] as ExternalSourceEntry[];
   const item = Object.assign(new Item(), { id: 'submission-item' });
   const collection = Object.assign(new Collection(), { id: 'submission-collection' });
@@ -92,10 +99,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
 
   function init() {
     pSearchOptions = new PaginatedSearchOptions({
-      query: 'test'
+      query: 'test',
     });
     externalSourceService = jasmine.createSpyObj('externalSourceService', {
-      getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries))
+      getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries)),
     });
     selectableListService = jasmine.createSpyObj('selectableListService', ['selectSingle']);
   }
@@ -108,14 +115,14 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: SelectableListService, useValue: selectableListService },
-        { provide: PaginationService, useValue: new PaginationServiceStub() }
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 601bd8cce8..398c4a8b94 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,30 +1,55 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ComponentRef } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import {
+  Component,
+  ComponentRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
 import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
-import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
-import { ExternalSource } from '../../../../../../core/shared/external-source.model';
-import { map, startWith, switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { Context } from '../../../../../../core/shared/context.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { fadeIn, fadeInOut } from '../../../../../animations/fade';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
-import { hasValue, hasValueOperator } from '../../../../../empty.util';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { Item } from '../../../../../../core/shared/item.model';
-import { Collection } from '../../../../../../core/shared/collection.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { Observable, Subscription } from 'rxjs';
+import { Collection } from '../../../../../../core/shared/collection.model';
+import { Context } from '../../../../../../core/shared/context.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../core/shared/item.model';
 import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
 import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../animations/fade';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../../../../empty.util';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-external-source-tab',
@@ -33,13 +58,13 @@ import { getFirstCompletedRemoteData } from '../../../../../../core/shared/opera
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
+      useClass: SearchConfigurationService,
+    },
   ],
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component rendering the tab content of an external source during submission lookup
@@ -75,6 +100,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    * The context to displaying lists for
    */
   @Input() context: Context;
+
+  /**
+   * The search query
+   */
+  @Input() query: string;
+
   @Input() repeatable: boolean;
   /**
    * Emit an event when an object has been imported (or selected from similar local entries)
@@ -86,7 +117,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -142,19 +173,23 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
       getFirstCompletedRemoteData(),
       map((entityTypesRD: RemoteData<PaginatedList<ItemType>>) => {
         return (entityTypesRD.hasSucceeded && entityTypesRD.payload.totalElements > 0) ? entityTypesRD.payload.page[0] : null;
-      })
+      }),
     ).subscribe((entityType: ItemType) => {
       this.relatedEntityType = entityType;
     });
 
     this.resetRoute();
     this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
-      switchMap((searchOptions: PaginatedSearchOptions) =>
-        this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined)))
+      switchMap((searchOptions: PaginatedSearchOptions) => {
+        if (searchOptions.query === '') {
+          searchOptions.query = this.query;
+        }
+        return this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined));
+      }),
     );
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
     this.importConfig = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
   }
 
@@ -165,12 +200,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
   import(entry) {
     this.modalRef = this.modalService.open(ThemedExternalSourceEntryImportModalComponent, {
       size: 'lg',
-      container: 'ds-dynamic-lookup-relation-modal'
+      container: 'ds-dynamic-lookup-relation-modal',
     });
 
     const modalComp$ = this.modalRef.componentInstance.compRef$.pipe(
       hasValueOperator(),
-      map((compRef: ComponentRef<ExternalSourceEntryImportModalComponent>) => compRef.instance)
+      map((compRef: ComponentRef<ExternalSourceEntryImportModalComponent>) => compRef.instance),
     );
 
     this.subs.push(modalComp$.subscribe((modalComp: ExternalSourceEntryImportModalComponent) => {
@@ -183,7 +218,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
     }));
 
     this.subs.push(modalComp$.pipe(
-      switchMap((modalComp: ExternalSourceEntryImportModalComponent) => modalComp.importedObject)
+      switchMap((modalComp: ExternalSourceEntryImportModalComponent) => modalComp.importedObject),
     ).subscribe((object) => {
       this.selectableListService.selectSingle(this.listId, object);
       this.importedObject.emit(object);
@@ -205,7 +240,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
   resetRoute() {
     this.paginationService.updateRoute(this.searchConfigService.paginationID, {
       page: 1,
-      pageSize: 5
+      pageSize: 5,
     });
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts
index c8711b6b47..f2bf9996cf 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts
@@ -1,20 +1,31 @@
-import { ExternalSourceEntryImportModalComponent, ImportType } from './external-source-entry-import-modal.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemDataService } from '../../../../../../../core/data/item-data.service';
 import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
+import { Collection } from '../../../../../../../core/shared/collection.model';
 import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model';
 import { Item } from '../../../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
-import { Collection } from '../../../../../../../core/shared/collection.model';
-import { RelationshipOptions } from '../../../../models/relationship-options.model';
-import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
-import { ItemDataService } from '../../../../../../../core/data/item-data.service';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
+import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../../remote-data.utils';
 import { createPaginatedList } from '../../../../../../testing/utils.test';
+import { RelationshipOptions } from '../../../../models/relationship-options.model';
+import {
+  ExternalSourceEntryImportModalComponent,
+  ImportType,
+} from './external-source-entry-import-modal.component';
 
 describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   let component: ExternalSourceEntryImportModalComponent;
@@ -33,10 +44,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
     metadata: {
       'dc.identifier.uri': [
         {
-          value: uri
-        }
-      ]
-    }
+          value: uri,
+        },
+      ],
+    },
   });
 
   const label = 'Author';
@@ -54,12 +65,12 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   function init() {
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
       getLocalResults: createSuccessfulRemoteDataObject$(createPaginatedList([searchResult1, searchResult2, searchResult3])),
-      removeLocalResultsCache: {}
+      removeLocalResultsCache: {},
     });
     selectService = jasmine.createSpyObj('selectService', ['deselectAll']);
     notificationsService = jasmine.createSpyObj('notificationsService', ['success']);
     itemService = jasmine.createSpyObj('itemService', {
-      importExternalSourceEntry: createSuccessfulRemoteDataObject$(importedItem)
+      importExternalSourceEntry: createSuccessfulRemoteDataObject$(importedItem),
     });
     modalStub = jasmine.createSpyObj('modal', ['close']);
   }
@@ -74,9 +85,9 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
         { provide: SelectableListService, useValue: selectService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: ItemDataService, useValue: itemService },
-        { provide: NgbActiveModal, useValue: modalStub }
+        { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index bf1f2f7e70..fcdf591014 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -1,30 +1,45 @@
-import { Component, EventEmitter, OnInit } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+} from '@angular/core';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../../../../../core/data/item-data.service';
+import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../../core/data/remote-data';
+import { Context } from '../../../../../../../core/shared/context.model';
 import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { ItemType } from '../../../../../../../core/shared/item-relationships/item-type.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
 import { Metadata } from '../../../../../../../core/shared/metadata.utils';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
-import { SearchResult } from '../../../../../../search/models/search-result.model';
-import { Item } from '../../../../../../../core/shared/item.model';
-import { RelationshipOptions } from '../../../../models/relationship-options.model';
-import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
-import { PaginatedSearchOptions } from '../../../../../../search/models/paginated-search-options.model';
-import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
-import { Context } from '../../../../../../../core/shared/context.model';
-import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
-import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model';
-import { ItemDataService } from '../../../../../../../core/data/item-data.service';
-import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../../core/shared/operators';
-import { switchMap, take } from 'rxjs/operators';
-import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
-import { NotificationsService } from '../../../../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { ItemType } from '../../../../../../../core/shared/item-relationships/item-type.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
+import { NotificationsService } from '../../../../../../notifications/notifications.service';
+import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
+import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../../../../search/models/paginated-search-options.model';
+import { SearchResult } from '../../../../../../search/models/search-result.model';
+import { RelationshipOptions } from '../../../../models/relationship-options.model';
 
 /**
  * The possible types of import for the external entry
@@ -40,7 +55,7 @@ export enum ImportType {
 @Component({
   selector: 'ds-external-source-entry-import-modal',
   styleUrls: ['./external-source-entry-import-modal.component.scss'],
-  templateUrl: './external-source-entry-import-modal.component.html'
+  templateUrl: './external-source-entry-import-modal.component.html',
 })
 /**
  * Component to display a modal window for importing an external source entry
@@ -223,13 +238,13 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
         return this.itemService.importExternalSourceEntry(this.externalSourceEntry, collectionListEntry.collection.id).pipe(
           getFirstSucceededRemoteData(),
           getRemoteDataPayload(),
-          take(1)
+          take(1),
         );
-      })
+      }),
     ).subscribe((item: Item) => {
       this.lookupRelationService.removeLocalResultsCache();
       const searchResult = Object.assign(new ItemSearchResult(), {
-        indexableObject: item
+        indexableObject: item,
       });
       this.notificationsService.success(this.translateService.get(this.labelPrefix + this.label + '.added.new-entity'));
       this.modalRef.close();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts
index 26e6097c2d..97e8877829 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts
@@ -1,7 +1,8 @@
-import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal.component';
-import { ThemedComponent } from '../../../../../../theme-support/themed.component';
 import { Component } from '@angular/core';
 
+import { ThemedComponent } from '../../../../../../theme-support/themed.component';
+import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal.component';
+
 @Component({
   selector: 'ds-themed-external-source-entry-import-modal',
   styleUrls: [],
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
index 637941ce5b..c2d83f11c6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,11 +1,17 @@
-import { ThemedComponent } from '../../../../../theme-support/themed.component';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { Context } from '../../../../../../core/shared/context.model';
-import { Item } from '../../../../../../core/shared/item.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { Collection } from '../../../../../../core/shared/collection.model';
+import { Context } from '../../../../../../core/shared/context.model';
 import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../../../../../theme-support/themed.component';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
 import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
 
 @Component({
@@ -15,7 +21,7 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-loo
 })
 export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
-    'item', 'collection', 'relationship', 'context', 'repeatable', 'importedObject', 'externalSource'];
+    'item', 'collection', 'relationship', 'context', 'query', 'repeatable', 'importedObject', 'externalSource'];
 
   @Input() label: string;
 
@@ -29,6 +35,8 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
 
   @Input() context: Context;
 
+  @Input() query: string;
+
   @Input() repeatable: boolean;
 
   @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
index e1cc49778e..59fd9feb77 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
@@ -2,9 +2,10 @@
 /**
  * The list of NameVariantAction type definitions
  */
-import { type } from '../../../../ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../../../../ngrx/type';
+
 export const NameVariantActionTypes = {
   SET_NAME_VARIANT: type('dspace/name-variant/SET_NAME_VARIANT'),
   REMOVE_NAME_VARIANT: type('dspace/name-variant/REMOVE_NAME_VARIANT'),
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
index cb4128ec46..41a63c73d1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
@@ -1,5 +1,9 @@
-import { RemoveNameVariantAction, SetNameVariantAction } from './name-variant.actions';
 import { Action } from '@ngrx/store';
+
+import {
+  RemoveNameVariantAction,
+  SetNameVariantAction,
+} from './name-variant.actions';
 import { nameVariantReducer } from './name-variant.reducer';
 
 class NullAction implements Action {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
index 9f93cf2dd1..a80bd4dc6c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
@@ -2,8 +2,12 @@
  * Represents the state of all lists containing name variants in the store
  */
 
-import { NameVariantAction, NameVariantActionTypes, SetNameVariantAction } from './name-variant.actions';
 import { hasValue } from '../../../../empty.util';
+import {
+  NameVariantAction,
+  NameVariantActionTypes,
+  SetNameVariantAction,
+} from './name-variant.actions';
 
 export interface NameVariantListsState {
   [listID: string]: NameVariantListState;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
index fb2271224b..7d21fcb1f6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
@@ -2,10 +2,11 @@
 /**
  * The list of RelationshipAction type definitions
  */
-import { type } from '../../../../ngrx/type';
 import { Action } from '@ngrx/store';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { type } from '../../../../ngrx/type';
 
 export const RelationshipActionTypes = {
   ADD_RELATIONSHIP: type('dspace/relationship/ADD_RELATIONSHIP'),
@@ -42,7 +43,7 @@ export class AddRelationshipAction implements Action {
     item2: Item,
     relationshipType: string,
     submissionId: string,
-    nameVariant?: string
+    nameVariant?: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
   }
@@ -73,7 +74,7 @@ export class UpdateRelationshipNameVariantAction implements Action {
     item2: Item,
     relationshipType: string,
     submissionId: string,
-    nameVariant?: string
+    nameVariant?: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
   }
@@ -126,7 +127,7 @@ export class RemoveRelationshipAction implements Action {
     item1: Item,
     item2: Item,
     relationshipType: string,
-    submissionId: string
+    submissionId: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId };
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
index a5b1b00d75..66684058cd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
@@ -1,29 +1,44 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Store } from '@ngrx/store';
-import { RelationshipEffects } from './relationship.effects';
-import { AddRelationshipAction, RelationshipActionTypes, RemoveRelationshipAction } from './relationship.actions';
-import { Item } from '../../../../../core/shared/item.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model';
-import { RestResponse } from '../../../../../core/cache/response.models';
-import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
-import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { NotificationsService } from '../../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { cold, hot } from 'jasmine-marbles';
-import { DEBOUNCE_TIME_OPERATOR } from '../../../../../core/shared/operators';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { last } from 'rxjs/operators';
 
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../../../core/cache/response.models';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { RequestService } from '../../../../../core/data/request.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { DEBOUNCE_TIME_OPERATOR } from '../../../../../core/shared/operators';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import {
+  AddRelationshipAction,
+  RelationshipActionTypes,
+  RemoveRelationshipAction,
+} from './relationship.actions';
+import { RelationshipEffects } from './relationship.effects';
+
 describe('RelationshipEffects', () => {
   let relationEffects: RelationshipEffects;
   let actions: Observable<any>;
@@ -65,19 +80,19 @@ describe('RelationshipEffects', () => {
 
     leftItem = Object.assign(new Item(), {
       uuid: testUUID1,
-      metadata: { 'dspace.entity.type': [leftTypeMD] }
+      metadata: { 'dspace.entity.type': [leftTypeMD] },
     });
 
     rightItem = Object.assign(new Item(), {
       uuid: testUUID2,
-      metadata: { 'dspace.entity.type': [rightTypeMD] }
+      metadata: { 'dspace.entity.type': [rightTypeMD] },
     });
 
     relationshipType = Object.assign(new RelationshipType(), {
       leftwardType: 'isAuthorOfPublication',
       rightwardType: 'isPublicationOfAuthor',
       leftType: createSuccessfulRemoteDataObject$(leftType),
-      rightType: createSuccessfulRemoteDataObject$(rightType)
+      rightType: createSuccessfulRemoteDataObject$(rightType),
     });
 
     relationship = Object.assign(new Relationship(),
@@ -86,27 +101,27 @@ describe('RelationshipEffects', () => {
         id: relationshipID,
         leftItem: createSuccessfulRemoteDataObject$(leftItem),
         rightItem: createSuccessfulRemoteDataObject$(rightItem),
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
       });
 
     mockRelationshipService = {
       getRelationshipByItemsAndLabel:
         () => observableOf(relationship),
       deleteRelationship: () => observableOf(new RestResponse(true, 200, 'OK')),
-      addRelationship: () => observableOf(new RestResponse(true, 200, 'OK'))
+      addRelationship: () => observableOf(new RestResponse(true, 200, 'OK')),
 
     };
     mockRelationshipTypeService = {
       getRelationshipTypeByLabelAndTypes:
-        () => observableOf(relationshipType)
+        () => observableOf(relationshipType),
     };
     notificationsService = jasmine.createSpyObj('notificationsService', ['error']);
     translateService = jasmine.createSpyObj('translateService', {
-      instant: 'translated-message'
+      instant: 'translated-message',
     });
     selectableListService = jasmine.createSpyObj('selectableListService', {
       findSelectedByCondition: observableOf({}),
-      deselectSingle: {}
+      deselectSingle: {},
     });
   }
 
@@ -120,9 +135,9 @@ describe('RelationshipEffects', () => {
         { provide: RelationshipDataService, useValue: mockRelationshipService },
         {
           provide: SubmissionObjectDataService, useValue: {
-            findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem())
+            findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem()),
           },
-          getHrefByID: () => observableOf('')
+          getHrefByID: () => observableOf(''),
         },
         { provide: Store, useValue: jasmine.createSpyObj('store', ['dispatch']) },
         { provide: ObjectCacheService, useValue: {} },
@@ -256,7 +271,7 @@ describe('RelationshipEffects', () => {
             actions = hot('--a-|', { a: action });
             const expected = cold('--b-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
-            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, '1234',);
+            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, '1234');
           });
         });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
index 2b9c1c2973..51b3b70136 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
@@ -1,38 +1,60 @@
-import { Inject, Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestService } from '../../../../../core/data/request.service';
+import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions';
+import { Item } from '../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  DEBOUNCE_TIME_OPERATOR,
+  getFirstSucceededRemoteData,
   getRemoteDataPayload,
-  getFirstSucceededRemoteData, DEBOUNCE_TIME_OPERATOR
 } from '../../../../../core/shared/operators';
+import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
+import { SubmissionState } from '../../../../../submission/submission.reducers';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { followLink } from '../../../../utils/follow-link-config.model';
 import {
   AddRelationshipAction,
   RelationshipAction,
   RelationshipActionTypes,
   UpdateRelationshipAction,
-  UpdateRelationshipNameVariantAction
+  UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { Item } from '../../../../../core/shared/item.model';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
-import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
-import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import { SubmissionState } from '../../../../../submission/submission.reducers';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions';
-import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { NotificationsService } from '../../../../notifications/notifications.service';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { TranslateService } from '@ngx-translate/core';
 
 const DEBOUNCE_TIME = 500;
 
@@ -61,42 +83,42 @@ export class RelationshipEffects {
   /**
    * Effect that makes sure all last fired RelationshipActions' types are stored in the map of this service, with the object uuid as their key
    */
-   mapLastActions$ = createEffect(() => this.actions$
+  mapLastActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.ADD_RELATIONSHIP, RelationshipActionTypes.REMOVE_RELATIONSHIP),
       map((action: RelationshipAction) => {
-          const { item1, item2, submissionId, relationshipType } = action.payload;
-          const identifier: string = this.createIdentifier(item1, item2, relationshipType);
-          if (hasNoValue(this.debounceMap[identifier])) {
-            this.initialActionMap[identifier] = action.type;
-            this.debounceMap[identifier] = new BehaviorSubject<string>(action.type);
-            this.debounceMap[identifier].pipe(
-              this.debounceTime(DEBOUNCE_TIME),
-              take(1)
-            ).subscribe(
-              (type) => {
-                if (this.initialActionMap[identifier] === type) {
-                  if (type === RelationshipActionTypes.ADD_RELATIONSHIP) {
-                    let nameVariant = (action as AddRelationshipAction).payload.nameVariant;
-                    if (hasValue(this.nameVariantUpdates[identifier])) {
-                      nameVariant = this.nameVariantUpdates[identifier];
-                      delete this.nameVariantUpdates[identifier];
-                    }
-                    this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
-                  } else {
-                    this.removeRelationship(item1, item2, relationshipType, submissionId);
+        const { item1, item2, submissionId, relationshipType } = action.payload;
+        const identifier: string = this.createIdentifier(item1, item2, relationshipType);
+        if (hasNoValue(this.debounceMap[identifier])) {
+          this.initialActionMap[identifier] = action.type;
+          this.debounceMap[identifier] = new BehaviorSubject<string>(action.type);
+          this.debounceMap[identifier].pipe(
+            this.debounceTime(DEBOUNCE_TIME),
+            take(1),
+          ).subscribe(
+            (type) => {
+              if (this.initialActionMap[identifier] === type) {
+                if (type === RelationshipActionTypes.ADD_RELATIONSHIP) {
+                  let nameVariant = (action as AddRelationshipAction).payload.nameVariant;
+                  if (hasValue(this.nameVariantUpdates[identifier])) {
+                    nameVariant = this.nameVariantUpdates[identifier];
+                    delete this.nameVariantUpdates[identifier];
                   }
+                  this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
+                } else {
+                  this.removeRelationship(item1, item2, relationshipType, submissionId);
                 }
-                delete this.debounceMap[identifier];
-                delete this.initialActionMap[identifier];
-
               }
-            );
-          } else {
-            this.debounceMap[identifier].next(action.type);
-          }
+              delete this.debounceMap[identifier];
+              delete this.initialActionMap[identifier];
+
+            },
+          );
+        } else {
+          this.debounceMap[identifier].next(action.type);
         }
-      )
+      },
+      ),
     ), { dispatch: false });
 
   /**
@@ -104,49 +126,49 @@ export class RelationshipEffects {
    * If the relationship is currently being added or removed, it will add the name variant to an update map so it will be sent with the next add request instead
    * Otherwise the update is done immediately
    */
-   updateNameVariantsActions$ = createEffect(() => this.actions$
+  updateNameVariantsActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.UPDATE_NAME_VARIANT),
       map((action: UpdateRelationshipNameVariantAction) => {
-          const { item1, item2, relationshipType, submissionId, nameVariant } = action.payload;
-          const identifier: string = this.createIdentifier(item1, item2, relationshipType);
-          const inProgress = hasValue(this.debounceMap[identifier]);
-          if (inProgress) {
-            this.nameVariantUpdates[identifier] = nameVariant;
-          } else {
-            this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant).pipe(
-              filter((relationshipRD: RemoteData<Relationship>) => hasValue(relationshipRD.payload)),
-              take(1)
-            ).subscribe((c) => {
-              this.updateAfterPatchSubmissionId = submissionId;
-              this.relationshipService.refreshRelationshipItemsInCache(item1);
-              this.relationshipService.refreshRelationshipItemsInCache(item2);
-            });
-          }
+        const { item1, item2, relationshipType, submissionId, nameVariant } = action.payload;
+        const identifier: string = this.createIdentifier(item1, item2, relationshipType);
+        const inProgress = hasValue(this.debounceMap[identifier]);
+        if (inProgress) {
+          this.nameVariantUpdates[identifier] = nameVariant;
+        } else {
+          this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant).pipe(
+            filter((relationshipRD: RemoteData<Relationship>) => hasValue(relationshipRD.payload)),
+            take(1),
+          ).subscribe((c) => {
+            this.updateAfterPatchSubmissionId = submissionId;
+            this.relationshipService.refreshRelationshipItemsInCache(item1);
+            this.relationshipService.refreshRelationshipItemsInCache(item2);
+          });
         }
-      )
+      },
+      ),
     ), { dispatch: false });
 
   /**
    * Save the latest submission ID, to make sure it's updated when the patch is finished
    */
-   updateRelationshipActions$ = createEffect(() => this.actions$
+  updateRelationshipActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.UPDATE_RELATIONSHIP),
       map((action: UpdateRelationshipAction) => {
         this.updateAfterPatchSubmissionId = action.payload.submissionId;
-      })
+      }),
     ), { dispatch: false });
 
   /**
    * Save the submission object with ID updateAfterPatchSubmissionId
    */
-   saveSubmissionSection = createEffect(() => this.actions$
+  saveSubmissionSection = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.EMPTY, JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
       filter(() => hasValue(this.updateAfterPatchSubmissionId)),
       switchMap(() => this.refreshWorkspaceItemInCache(this.updateAfterPatchSubmissionId)),
-      map((submissionObject) => new SaveSubmissionSectionFormSuccessAction(this.updateAfterPatchSubmissionId, [submissionObject], false))
+      map((submissionObject) => new SaveSubmissionSectionFormSuccessAction(this.updateAfterPatchSubmissionId, [submissionObject], false)),
     ));
 
   constructor(private actions$: Actions,
@@ -191,7 +213,7 @@ export class RelationshipEffects {
             const listId = `list-${submissionId}-${relationshipType}`;
             this.selectableListService.findSelectedByCondition(listId, (object: any) => hasValue(object.indexableObject) && object.indexableObject.uuid === item2.uuid).pipe(
               take(1),
-              hasValueOperator()
+              hasValueOperator(),
             ).subscribe((selected) => {
               this.selectableListService.deselectSingle(listId, selected);
             });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 17aafae5eb..12bc93ab0e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -22,7 +22,7 @@
                Checkboxes that are in the indeterminate state always switch to checked when clicked
                This seemed like the cleanest and clearest solution to solve this issue for now. -->
 
-          <input *ngIf="!allSelected && !(someSelected$ | async)"
+          <input *ngIf="!allSelected && (someSelected$ | async) !== true"
                  type="checkbox"
                  [indeterminate]="false"
                  (change)="selectAll()">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index f689743156..a9fb9235e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -1,26 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
 import { VarDirective } from '../../../../../utils/var.directive';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
-import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../../core/shared/item.model';
-import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
-import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
-import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
-import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
 
 
 describe('DsDynamicLookupRelationSearchTabComponent', () => {
@@ -44,19 +49,19 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
   let selectableListService;
   let lookupRelationService;
   const relationshipService = jasmine.createSpyObj('searchByItemsAndType',{
-    searchByItemsAndType: observableOf(relatedRelationships)
+    searchByItemsAndType: observableOf(relatedRelationships),
   });
 
   const relationshipType = {
-      'type': 'relationshiptype',
-      'id': 1,
-      'uuid': 'relationshiptype-1',
-      'leftwardType': 'isAuthorOfPublication',
-      'leftMaxCardinality': null,
-      'leftMinCardinality': 0,
-      'rightwardType': 'isPublicationOfAuthor',
-      'rightMaxCardinality': null,
-      'rightMinCardinality': 0,
+    'type': 'relationshiptype',
+    'id': 1,
+    'uuid': 'relationshiptype-1',
+    'leftwardType': 'isAuthorOfPublication',
+    'leftMaxCardinality': null,
+    'leftMinCardinality': 0,
+    'rightwardType': 'isPublicationOfAuthor',
+    'rightMaxCardinality': null,
+    'rightMinCardinality': 0,
   };
 
   function init() {
@@ -64,7 +69,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
       filter: 'filter',
       relationshipType: 'isAuthorOfPublication',
       nameVariants: true,
-      searchConfiguration: 'personConfig'
+      searchConfiguration: 'personConfig',
     });
     pSearchOptions = new PaginatedSearchOptions({});
     item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
@@ -80,11 +85,11 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
 
     results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
     searchResult = Object.assign(new SearchObjects(), {
-      page: [searchResult1, searchResult2, searchResult3]
+      page: [searchResult1, searchResult2, searchResult3],
     });
     selectableListService = jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']);
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
-      getLocalResults: createSuccessfulRemoteDataObject$(results)
+      getLocalResults: createSuccessfulRemoteDataObject$(results),
     });
     lookupRelationService.searchConfig = {};
   }
@@ -97,19 +102,19 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
       providers: [
         { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
         {
-          provide: SelectableListService, useValue: selectableListService
+          provide: SelectableListService, useValue: selectableListService,
         },
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: LookupRelationService, useValue: lookupRelationService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RelationshipDataService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService },
 
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 9452918a97..08cf2a155b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,28 +1,47 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { Item } from '../../../../../../core/shared/item.model';
-import { SearchResult } from '../../../../../search/models/search-result.model';
-import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { Observable, BehaviorSubject } from 'rxjs';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { hasValue } from '../../../../../empty.util';
-import { map, mapTo, switchMap, take, tap } from 'rxjs/operators';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../core/shared/operators';
-import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
-import { Context } from '../../../../../../core/shared/context.model';
-import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
-import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mapTo,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
-import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Context } from '../../../../../../core/shared/context.model';
 import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../../core/shared/operators';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../../../empty.util';
+import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
 
 
 @Component({
@@ -32,9 +51,9 @@ import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -133,7 +152,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   initialPagination = {
     page: 1,
-    pageSize: 5
+    pageSize: 5,
   };
 
   /**
@@ -207,7 +226,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectAllLoading = true;
     const fullPagination = Object.assign(new PaginationComponentOptions(), {
       currentPage: 1,
-      pageSize: 9999
+      pageSize: 9999,
     });
     const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
     const results$ = this.searchService.search<Item>(fullSearchConfig);
@@ -221,10 +240,10 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
           const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
           this.selectObject.emit(...filteredResults);
         }),
-        mapTo(results)
-      ))
+        mapTo(results),
+      )),
     ).subscribe((results) => {
-        this.selectableListService.select(this.listId, results);
+      this.selectableListService.select(this.listId, results);
     });
   }
 
@@ -239,30 +258,30 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
       relationType = this.relationshipType.leftwardType;
     }
     this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, relationType ,idOfItems ).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-      ).subscribe( (res: PaginatedList<Relationship>) => {
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ).subscribe( (res: PaginatedList<Relationship>) => {
 
-        let selectableObject = res.page.map( (relationship: any) => {
+      let selectableObject = res.page.map( (relationship: any) => {
 
-          let arrUrl = [];
-          if ( this.isLeft ) {
-            arrUrl = relationship._links.rightItem.href.split('/');
-          } else {
-            arrUrl = relationship._links.leftItem.href.split('/');
-          }
-          const uuid = arrUrl[ arrUrl.length - 1 ];
-
-          return this.getRelatedItem(uuid, resultListOfItems);
-        });
-
-        selectableObject = selectableObject.filter( (selObject) => {
-          return !this.getIfInRemove(selObject.indexableObject.uuid);
-        });
-
-        if ( selectableObject.length > 0 ) {
-          this.selectableListService.select(this.listId, selectableObject);
+        let arrUrl = [];
+        if ( this.isLeft ) {
+          arrUrl = relationship._links.rightItem.href.split('/');
+        } else {
+          arrUrl = relationship._links.leftItem.href.split('/');
         }
+        const uuid = arrUrl[ arrUrl.length - 1 ];
+
+        return this.getRelatedItem(uuid, resultListOfItems);
+      });
+
+      selectableObject = selectableObject.filter( (selObject) => {
+        return !this.getIfInRemove(selObject.indexableObject.uuid);
+      });
+
+      if ( selectableObject.length > 0 ) {
+        this.selectableListService.select(this.listId, selectableObject);
+      }
     });
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
index d44f8f84a0..1c9375ce23 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -1,15 +1,21 @@
-import { ThemedComponent } from '../../../../../theme-support/themed.component';
-import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+
 import { Context } from '../../../../../../core/shared/context.model';
-import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
-import { Item } from '../../../../../../core/shared/item.model';
-import { SearchResult } from '../../../../../search/models/search-result.model';
-import { SearchObjects } from '../../../../../search/models/search-objects.model';
 import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { ThemedComponent } from '../../../../../theme-support/themed.component';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
 
 @Component({
   selector: 'ds-themed-dynamic-lookup-relation-search-tab',
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
index 472a719b27..9dad2fb77f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
@@ -1,22 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../../../../utils/var.directive';
-import { Observable, of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../../core/shared/item.model';
-import { DsDynamicLookupRelationSelectionTabComponent } from './dynamic-lookup-relation-selection-tab.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { VarDirective } from '../../../../../utils/var.directive';
+import { DsDynamicLookupRelationSelectionTabComponent } from './dynamic-lookup-relation-selection-tab.component';
 
 describe('DsDynamicLookupRelationSelectionTabComponent', () => {
   let component: DsDynamicLookupRelationSelectionTabComponent;
@@ -51,17 +62,17 @@ describe('DsDynamicLookupRelationSelectionTabComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
+            paginatedSearchOptions: observableOf(pSearchOptions),
           },
         },
         {
-          provide: Router, useValue: router
+          provide: Router, useValue: router,
         },
         {
-          provide: PaginationService, useValue: new PaginationServiceStub()
-        }
+          provide: PaginationService, useValue: new PaginationServiceStub(),
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index a78bf8896c..e4454c4ea9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -1,18 +1,31 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { Observable } from 'rxjs';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { RemoteData } from '../../../../../../core/data/remote-data';
-import { map, switchMap, take } from 'rxjs/operators';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { Context } from '../../../../../../core/shared/context.model';
-import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Context } from '../../../../../../core/shared/context.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-selection-tab',
@@ -21,9 +34,9 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -75,7 +88,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -85,7 +98,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
 
   constructor(private router: Router,
               private searchConfigService: SearchConfigurationService,
-              private paginationService: PaginationService
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -109,12 +122,12 @@ export class DsDynamicLookupRelationSelectionTabComponent {
                   elementsPerPage: pagination.pageSize,
                   totalElements: selected.length,
                   currentPage: pagination.currentPage,
-                  totalPages: Math.ceil(selected.length / pagination.pageSize)
+                  totalPages: Math.ceil(selected.length / pagination.pageSize),
                 });
               return createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, selection));
-            })
+            }),
           );
-        })
+        }),
       );
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
   }
@@ -125,7 +138,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   resetRoute() {
     this.paginationService.updateRoute(this.searchConfigService.paginationID, {
       page: 1,
-      pageSize: 5
+      pageSize: 5,
     });
   }
 }
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index fd3588e73e..6cf3f709ab 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -1,11 +1,14 @@
-import { inject, TestBed } from '@angular/core/testing';
 import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  NG_ASYNC_VALIDATORS,
+  NG_VALIDATORS,
+  ReactiveFormsModule,
   UntypedFormArray,
   UntypedFormControl,
   UntypedFormGroup,
-  NG_ASYNC_VALIDATORS,
-  NG_VALIDATORS,
-  ReactiveFormsModule
 } from '@angular/forms';
 import {
   DynamicCheckboxGroupModel,
@@ -28,29 +31,30 @@ import {
   DynamicTextAreaModel,
   DynamicTimePickerModel,
 } from '@ng-dynamic-forms/core';
-import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
-import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
-import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
-import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
-import { DynamicOneboxModel } from './ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
-import { DynamicListRadioGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { FormFieldModel } from './models/form-field.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { FormBuilderService } from './form-builder.service';
-import { DynamicRowGroupModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
-import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
-import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
-import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
-import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
+import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRowGroupModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
+import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
+import { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
+import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
+import { DynamicOneboxModel } from './ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FormBuilderService } from './form-builder.service';
+import { FormFieldModel } from './models/form-field.model';
+import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
 
 describe('FormBuilderService test suite', () => {
 
@@ -88,13 +92,13 @@ describe('FormBuilderService test suite', () => {
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
         { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true },
-        { provide: ConfigurationDataService, useValue: configSpy }
-      ]
+        { provide: ConfigurationDataService, useValue: configSpy },
+      ],
     });
 
     const vocabularyOptions: VocabularyOptions = {
       name: 'type_programme',
-      closed: false
+      closed: false,
     };
 
     testModel = [
@@ -105,22 +109,22 @@ describe('FormBuilderService test suite', () => {
           options: [
             {
               label: 'Option 1',
-              value: 'option-1'
+              value: 'option-1',
             },
             {
               label: 'Option 2',
-              value: 'option-2'
-            }
+              value: 'option-2',
+            },
           ],
-          value: 'option-3'
-        }
+          value: 'option-3',
+        },
       ),
 
       new DynamicInputModel(
         {
           id: 'testInput',
           mask: '(000) 000-0000',
-        }
+        },
       ),
 
       new DynamicCheckboxGroupModel(
@@ -130,17 +134,17 @@ describe('FormBuilderService test suite', () => {
             new DynamicCheckboxModel(
               {
                 id: 'testCheckboxGroup1',
-                value: true
-              }
+                value: true,
+              },
             ),
             new DynamicCheckboxModel(
               {
                 id: 'testCheckboxGroup2',
-                value: true
-              }
-            )
-          ]
-        }
+                value: true,
+              },
+            ),
+          ],
+        },
       ),
 
       new DynamicRadioGroupModel<string>(
@@ -149,15 +153,15 @@ describe('FormBuilderService test suite', () => {
           options: [
             {
               label: 'Option 1',
-              value: 'option-1'
+              value: 'option-1',
             },
             {
               label: 'Option 2',
-              value: 'option-2'
-            }
+              value: 'option-2',
+            },
           ],
-          value: 'option-3'
-        }
+          value: 'option-3',
+        },
       ),
 
       new DynamicTextAreaModel({ id: 'testTextArea' }),
@@ -173,12 +177,12 @@ describe('FormBuilderService test suite', () => {
               new DynamicInputModel({ id: 'testFormArrayGroupInput' }),
               new DynamicFormArrayModel({
                 id: 'testNestedFormArray', groupFactory: () => [
-                  new DynamicInputModel({ id: 'testNestedFormArrayGroupInput' })
-                ]
-              })
+                  new DynamicInputModel({ id: 'testNestedFormArrayGroupInput' }),
+                ],
+              }),
             ];
-          }
-        }
+          },
+        },
       ),
 
       new DynamicFormGroupModel(
@@ -186,9 +190,9 @@ describe('FormBuilderService test suite', () => {
           id: 'testFormGroup',
           group: [
             new DynamicInputModel({ id: 'nestedTestInput' }),
-            new DynamicTextAreaModel({ id: 'nestedTestTextArea' })
-          ]
-        }
+            new DynamicTextAreaModel({ id: 'nestedTestTextArea' }),
+          ],
+        },
       ),
 
       new DynamicSliderModel({ id: 'testSlider' }),
@@ -221,7 +225,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: false
+        hasSelectableMetadata: false,
       }),
 
       new DynamicTagModel({
@@ -229,7 +233,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: false
+        hasSelectableMetadata: false,
       }),
 
       new DynamicListCheckboxGroupModel({
@@ -262,9 +266,9 @@ describe('FormBuilderService test suite', () => {
             selectableMetadata: [{
               controlledVocabulary: 'RPAuthority',
               closed: false,
-              metadata: 'dc.contributor.author'
-            }]
-          } as FormFieldModel]
+              metadata: 'dc.contributor.author',
+            }],
+          } as FormFieldModel],
         } as FormRowModel, {
           fields: [{
             hints: 'Enter the affiliation of the author.',
@@ -276,9 +280,9 @@ describe('FormBuilderService test suite', () => {
             selectableMetadata: [{
               controlledVocabulary: 'OUAuthority',
               closed: false,
-              metadata: 'local.contributor.affiliation'
-            }]
-          } as FormFieldModel]
+              metadata: 'local.contributor.affiliation',
+            }],
+          } as FormFieldModel],
         } as FormRowModel],
         mandatoryField: '',
         name: 'testRelationGroup',
@@ -287,17 +291,17 @@ describe('FormBuilderService test suite', () => {
         submissionScope: '',
         repeatable: false,
         metadataFields: [],
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
-      new DynamicDsDatePickerModel({ id: 'testDate' }),
+      new DynamicDsDatePickerModel({ id: 'testDate', repeatable: false }),
 
       new DynamicLookupModel({
         id: 'testLookup',
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
       new DynamicLookupNameModel({
@@ -305,7 +309,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
       new DynamicQualdropModel({ id: 'testCombobox', readOnly: false, required: false }),
@@ -320,7 +324,7 @@ describe('FormBuilderService test suite', () => {
           isDraggable: true,
           groupFactory: () => {
             return [
-              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
             ];
           },
           required: false,
@@ -328,7 +332,7 @@ describe('FormBuilderService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'Book' }]}]
+          typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
         },
       ),
 
@@ -337,8 +341,8 @@ describe('FormBuilderService test suite', () => {
         group: [
           new DynamicInputModel({ id: 'testConcatGroup_CONCAT_FIRST_INPUT' }),
           new DynamicInputModel({ id: 'testConcatGroup_CONCAT_SECOND_INPUT' }),
-        ]
-      } as any)
+        ],
+      } as any),
     ];
 
     testFormConfiguration = {
@@ -356,10 +360,10 @@ describe('FormBuilderService test suite', () => {
                 {
                   metadata: 'journal',
                   controlledVocabulary: 'JOURNALAuthority',
-                  closed: false
-                }
+                  closed: false,
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             } as FormFieldModel,
             {
               input: { type: 'onebox' },
@@ -369,10 +373,10 @@ describe('FormBuilderService test suite', () => {
               hints: ' Enter issue number.',
               selectableMetadata: [
                 {
-                  metadata: 'issue'
-                }
+                  metadata: 'issue',
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             } as FormFieldModel,
             {
               input: { type: 'name' },
@@ -382,12 +386,12 @@ describe('FormBuilderService test suite', () => {
               hints: 'Enter full name.',
               selectableMetadata: [
                 {
-                  metadata: 'name'
-                }
+                  metadata: 'name',
+                },
               ],
-              languageCodes: []
-            } as FormFieldModel
-          ]
+              languageCodes: [],
+            } as FormFieldModel,
+          ],
         } as FormRowModel,
         {
           fields: [
@@ -407,8 +411,8 @@ describe('FormBuilderService test suite', () => {
                 { metadata: 'dc.identifier.isbn', label: 'ISBN' },
                 { metadata: 'dc.identifier.doi', label: 'DOI' },
                 { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-                { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-              ]
+                { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+              ],
             }, {
               input: { type: 'onebox' },
               label: 'Publisher',
@@ -417,12 +421,12 @@ describe('FormBuilderService test suite', () => {
               hints: 'Enter the name of the publisher of the previously issued instance of this item.',
               selectableMetadata: [
                 {
-                  metadata: 'publisher'
-                }
+                  metadata: 'publisher',
+                },
               ],
-              languageCodes: []
-            }
-          ]
+              languageCodes: [],
+            },
+          ],
         } as FormRowModel,
         {
           fields: [
@@ -436,23 +440,23 @@ describe('FormBuilderService test suite', () => {
                 {
                   metadata: 'conference',
                   controlledVocabulary: 'EVENTAuthority',
-                  closed: false
-                }
+                  closed: false,
+                },
               ],
-              languageCodes: []
-            }
-          ]
-        } as FormRowModel
+              languageCodes: [],
+            },
+          ],
+        } as FormRowModel,
       ],
       self: {
-        href: 'testFormConfiguration.url'
+        href: 'testFormConfiguration.url',
       },
       type: 'submissionform',
       _links: {
         self: {
-          href: 'testFormConfiguration.url'
-        }
-      }
+          href: 'testFormConfiguration.url',
+        },
+      },
     } as any;
   });
 
@@ -519,14 +523,14 @@ describe('FormBuilderService test suite', () => {
     ((formModel[0] as DynamicRowGroupModel).get(1) as DsDynamicInputModel).value = 'test';
 
     value = {
-      issue: [new FormFieldMetadataValueObject('test')]
+      issue: [new FormFieldMetadataValueObject('test')],
     };
     expect(service.getValueFromModel(formModel)).toEqual(value);
 
     ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicOneboxModel).value = 'test one';
     value = {
       issue: [new FormFieldMetadataValueObject('test')],
-      conference: [new FormFieldMetadataValueObject('test one')]
+      conference: [new FormFieldMetadataValueObject('test one')],
     };
     expect(service.getValueFromModel(formModel)).toEqual(value);
   });
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index cf6f38bf7b..374f4029e8 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -1,6 +1,12 @@
-import {Injectable, Optional} from '@angular/core';
-import { AbstractControl, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-
+import {
+  Injectable,
+  Optional,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX_GROUP,
@@ -22,6 +28,14 @@ import isObject from 'lodash/isObject';
 import isString from 'lodash/isString';
 import mergeWith from 'lodash/mergeWith';
 
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  dateToString,
+  isNgbDateStruct,
+} from '../../date.util';
 import {
   hasNoValue,
   hasValue,
@@ -29,22 +43,20 @@ import {
   isNotEmpty,
   isNotNull,
   isNotUndefined,
-  isNull
+  isNull,
 } from '../../empty.util';
-import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
-import { RowParser } from './parsers/row-parser';
-import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
-import { dateToString, isNgbDateStruct } from '../../date.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
-import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  CONCAT_GROUP_SUFFIX,
+  DynamicConcatModel,
+} from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
+import { RowParser } from './parsers/row-parser';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
@@ -86,10 +98,10 @@ export class FormBuilderService extends DynamicFormService {
   createDynamicFormControlEvent(control: UntypedFormControl, group: UntypedFormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
     const $event = {
       value: (model as any).value,
-      autoSave: false
+      autoSave: false,
     };
     const context: DynamicFormArrayGroupModel = (model?.parent instanceof DynamicFormArrayGroupModel) ? model?.parent : null;
-    return {$event, context, control: control, group: group, model: model, type};
+    return { $event, context, control: control, group: group, model: model, type };
   }
 
   getTypeBindModel() {
@@ -196,6 +208,7 @@ export class FormBuilderService extends DynamicFormService {
           return new FormFieldMetadataValueObject((controlValue as any).value, controlLanguage, authority, (controlValue as any).display, place, (controlValue as any).confidence);
         }
       }
+      return controlValue;
     };
 
     const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): void => {
@@ -280,10 +293,10 @@ export class FormBuilderService extends DynamicFormService {
   }
 
   modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {},
-                         submissionScope?: string, readOnly = false, typeBindModel = null,
-                         isInnerForm = false): DynamicFormControlModel[] | never {
-     let rows: DynamicFormControlModel[] = [];
-     const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
+    submissionScope?: string, readOnly = false, typeBindModel = null,
+    isInnerForm = false): DynamicFormControlModel[] | never {
+    let rows: DynamicFormControlModel[] = [];
+    const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
         const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope,
diff --git a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
index 9b18084e40..b36e793f44 100644
--- a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
+++ b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
@@ -1,6 +1,14 @@
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../empty.util';
 import { ConfidenceType } from '../../../../core/shared/confidence-type';
-import { MetadataValueInterface, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
+import {
+  MetadataValueInterface,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../../core/shared/metadata.models';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export interface OtherInformation {
@@ -26,13 +34,13 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   otherInformation: OtherInformation;
 
   constructor(value: any = null,
-              language: any = null,
-              authority: string = null,
-              display: string = null,
-              place: number = 0,
-              confidence: number = null,
-              otherInformation: any = null,
-              metadata: string = null) {
+    language: any = null,
+    authority: string = null,
+    display: string = null,
+    place: number = 0,
+    confidence: number = null,
+    otherInformation: any = null,
+    metadata: string = null) {
     this.value = isNotNull(value) ? ((typeof value === 'string') ? value.trim() : value) : null;
     this.language = language;
     this.authority = authority;
diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts
index cbaf8193df..f81c955fab 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -1,9 +1,9 @@
-import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
 import { autoserialize } from 'cerialize';
 
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
 import { LanguageCode } from './form-field-language-value.model';
 import { RelationshipOptions } from './relationship-options.model';
-import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 
 /**
  * Representing SelectableMetadata properties
@@ -39,43 +39,43 @@ export class FormFieldModel {
    * The hints for this metadata field to display on form
    */
   @autoserialize
-  hints: string;
+    hints: string;
 
   /**
    * The label for this metadata field to display on form
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The languages available for this metadata field to display on form
    */
   @autoserialize
-  languageCodes: LanguageCode[];
+    languageCodes: LanguageCode[];
 
   /**
    * The error message for this metadata field to display on form in case of field is required
    */
   @autoserialize
-  mandatoryMessage: string;
+    mandatoryMessage: string;
 
   /**
    * Representing if this metadata field is mandatory or not
    */
   @autoserialize
-  mandatory: string;
+    mandatory: string;
 
   /**
    * Representing if this metadata field is repeatable or not
    */
   @autoserialize
-  repeatable: boolean;
+    repeatable: boolean;
 
   /**
    * Containing additional properties for this metadata field
    */
   @autoserialize
-  input: {
+    input: {
     /**
      * Representing the type for this metadata field
      */
@@ -91,41 +91,41 @@ export class FormFieldModel {
    * Representing additional vocabulary configuration for this metadata field
    */
   @autoserialize
-  selectableMetadata: SelectableMetadata[];
+    selectableMetadata: SelectableMetadata[];
 
   /**
    * Representing additional relationship configuration for this metadata field
    */
   @autoserialize
-  selectableRelationship: RelationshipOptions;
+    selectableRelationship: RelationshipOptions;
 
   @autoserialize
-  rows: FormRowModel[];
+    rows: FormRowModel[];
 
   /**
    * Representing the scope for this metadata field
    */
   @autoserialize
-  scope: string;
+    scope: string;
 
   /**
    * Containing additional css classes for this metadata field to use on form
    */
   @autoserialize
-  style: string;
+    style: string;
 
   /**
    * Containing types to bind for this field
    */
   @autoserialize
-  typeBind: string[];
+    typeBind: string[];
 
   /**
    * Containing the value for this metadata field
    */
   @autoserialize
-  value: any;
+    value: any;
 
   @autoserialize
-  visibility: SectionVisibility;
+    visibility: SectionVisibility;
 }
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index e86de70c81..3b29d0eb48 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -1,24 +1,31 @@
-import {Inject} from '@angular/core';
-import { FormFieldModel } from '../models/form-field.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DynamicFormControlLayout, } from '@ng-dynamic-forms/core';
+import { Inject } from '@angular/core';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import {
   CONCAT_FIRST_INPUT_SUFFIX,
   CONCAT_GROUP_SUFFIX,
   CONCAT_SECOND_INPUT_SUFFIX,
   DynamicConcatModel,
-  DynamicConcatModelConfig
+  DynamicConcatModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
-import { ParserOptions } from './parser-options';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { ParserOptions } from './parser-options';
 
 export class ConcatFieldParser extends FieldParser {
 
@@ -38,15 +45,12 @@ export class ConcatFieldParser extends FieldParser {
   }
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
-
-    let clsGroup: DynamicFormControlLayout;
-    let clsInput: DynamicFormControlLayout;
     const id: string = this.configData.selectableMetadata[0].metadata;
 
-    clsInput = {
+    const clsInput = {
       grid: {
-        host: 'col-sm-6'
-      }
+        host: 'col-sm-6',
+      },
     };
 
     const groupId = id.replace(/\./g, '_') + CONCAT_GROUP_SUFFIX;
@@ -60,14 +64,14 @@ export class ConcatFieldParser extends FieldParser {
       false,
       true,
       true,
-      false
+      false,
     );
     const input2ModelConfig: DsDynamicInputModelConfig = this.initModel(
       id + CONCAT_SECOND_INPUT_SUFFIX,
       false,
       true,
       true,
-      false
+      false,
     );
 
     input1ModelConfig.hideErrorMessages = true;
@@ -105,10 +109,10 @@ export class ConcatFieldParser extends FieldParser {
     concatGroup.group.push(model1);
     concatGroup.group.push(model2);
 
-    clsGroup = {
+    const clsGroup = {
       element: {
         control: 'form-row',
-      }
+      },
     };
     const concatModel = new DynamicConcatModel(concatGroup, clsGroup);
     concatModel.name = this.getFieldId();
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 9ab43709ad..d1912a7cad 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -1,7 +1,7 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { DateFieldParser } from './date-field-parser';
 import { DynamicDsDatePickerModel } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DateFieldParser } from './date-field-parser';
 import { ParserOptions } from './parser-options';
 
 describe('DateFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('DateFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'date'
+        type: 'date',
       },
       label: 'Date of Issue.',
       mandatory: 'true',
@@ -29,9 +29,9 @@ describe('DateFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'date',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
index c67c2c7695..ea9f193e33 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -1,11 +1,11 @@
-import { FieldParser } from './field-parser';
-import {
-  DynamicDsDatePickerModel,
-  DynamicDsDateControlModelConfig
-} from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { isNotEmpty } from '../../../empty.util';
 import { DS_DATE_PICKER_SEPARATOR } from '../ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import {
+  DynamicDsDateControlModelConfig,
+  DynamicDsDatePickerModel,
+} from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class DateFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
index d69f0e48e9..fd6908ed3b 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -1,7 +1,7 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { ParserOptions } from './parser-options';
-import { DisabledFieldParser } from './disabled-field-parser';
 import { DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { DisabledFieldParser } from './disabled-field-parser';
+import { ParserOptions } from './parser-options';
 
 describe('DisabledFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -12,13 +12,13 @@ describe('DisabledFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: ''
+        type: '',
       },
       label: 'Description',
       mandatory: 'false',
@@ -26,10 +26,10 @@ describe('DisabledFieldParser test suite', () => {
       hints: 'Enter a description.',
       selectableMetadata: [
         {
-          metadata: 'description'
-        }
+          metadata: 'description',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
index df53f26c3a..e9b97ba7d9 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
+import {
+  DsDynamicDisabledModelConfig,
+  DynamicDisabledModel,
+} from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DsDynamicDisabledModelConfig, DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+import { FieldParser } from './field-parser';
 
 /**
  * Field parser for disabled fields
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
index 3dca7558b3..0ab376d1aa 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
@@ -1,6 +1,6 @@
+import { DynamicScrollableDropdownModel } from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { DropdownFieldParser } from './dropdown-field-parser';
-import { DynamicScrollableDropdownModel } from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { ParserOptions } from './parser-options';
 
 describe('DropdownFieldParser test suite', () => {
@@ -12,13 +12,13 @@ describe('DropdownFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'dropdown'
+        type: 'dropdown',
       },
       label: 'Type',
       mandatory: 'false',
@@ -28,10 +28,10 @@ describe('DropdownFieldParser test suite', () => {
         {
           metadata: 'type',
           controlledVocabulary: 'common_types_dataset',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
index 3e5ec0b9da..1fc28d1274 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -1,19 +1,20 @@
-import {Inject} from '@angular/core';
+import { Inject } from '@angular/core';
+import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
+
+import { isNotEmpty } from '../../../empty.util';
+import {
+  DynamicScrollableDropdownModel,
+  DynamicScrollableDropdownModelConfig,
+} from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DynamicFormControlLayout, } from '@ng-dynamic-forms/core';
-import {
-  DynamicScrollableDropdownModel,
-  DynamicScrollableDropdownModelConfig
-} from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { isNotEmpty } from '../../../empty.util';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
 
 export class DropdownFieldParser extends FieldParser {
@@ -38,11 +39,11 @@ export class DropdownFieldParser extends FieldParser {
       }
       layout = {
         element: {
-          control: 'col'
+          control: 'col',
         },
         grid: {
-          host: 'col'
-        }
+          host: 'col',
+        },
       };
       const dropdownModel = new DynamicScrollableDropdownModel(dropdownModelConfig, layout);
       return dropdownModel;
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 7ea55d4454..c77b244d6a 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,30 +1,40 @@
-import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
-import { VisibilityType } from './../../../../submission/sections/visibility-type';
-import { Inject, InjectionToken } from '@angular/core';
-
-import uniqueId from 'lodash/uniqueId';
+import {
+  Inject,
+  InjectionToken,
+} from '@angular/core';
 import {
   DynamicFormControlLayout,
   DynamicFormControlRelation,
   MATCH_VISIBLE,
-  OR_OPERATOR
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
+import uniqueId from 'lodash/uniqueId';
 
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
-import { FormFieldModel } from '../models/form-field.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { isNgbDateStruct } from '../../../date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+} from '../../../empty.util';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DynamicRowArrayModel,
-  DynamicRowArrayModelConfig
+  DynamicRowArrayModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../models/relationship-options.model';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
+import { VisibilityType } from './../../../../submission/sections/visibility-type';
 import { setLayout } from './parser.utils';
 import { ParserOptions } from './parser-options';
-import { RelationshipOptions } from '../models/relationship-options.model';
-import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { ParserType } from './parser-type';
-import { isNgbDateStruct } from '../../../date.util';
-import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -50,14 +60,14 @@ export abstract class FieldParser {
     @Inject(SUBMISSION_ID) protected submissionId: string,
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
-    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
   ) {
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
 
   public parse() {
-     if (((this.getInitValueCount() > 1 && !this.configData.repeatable) || (this.configData.repeatable))
+    if (((this.getInitValueCount() > 1 && !this.configData.repeatable) || (this.configData.repeatable))
       && (this.configData.input.type !== ParserType.List)
       && (this.configData.input.type !== ParserType.Tag)
     ) {
@@ -110,13 +120,13 @@ export abstract class FieldParser {
             setLayout(model, 'grid', 'control', 'col');
           }
           return [model];
-        }
+        },
       } as DynamicRowArrayModelConfig;
 
       const layout: DynamicFormControlLayout = {
         grid: {
-          group: 'form-row'
-        }
+          group: 'form-row',
+        },
       };
 
       return new DynamicRowArrayModel(config, layout);
@@ -135,7 +145,7 @@ export abstract class FieldParser {
     if (isNotEmpty(this.configData.selectableMetadata) && isNotEmpty(this.configData.selectableMetadata[0].controlledVocabulary)) {
       controlModel.vocabularyOptions = new VocabularyOptions(
         this.configData.selectableMetadata[0].controlledVocabulary,
-        this.configData.selectableMetadata[0].closed
+        this.configData.selectableMetadata[0].closed,
       );
     }
   }
@@ -334,9 +344,9 @@ export abstract class FieldParser {
       && isNotEmpty(fieldScope)
       && isNotEmpty(visibility)
       && ((
-          submissionScope === SubmissionScopeType.WorkspaceItem
+        submissionScope === SubmissionScopeType.WorkspaceItem
           && visibility.main === VisibilityType.READONLY
-          )
+      )
         ||
           (visibility.other === VisibilityType.READONLY
           && submissionScope === SubmissionScopeType.WorkflowItem
@@ -360,7 +370,7 @@ export abstract class FieldParser {
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
         id: typeField,
-        value: value
+        value: value,
       });
     });
     // match: MATCH_VISIBLE means that if true, the field / component will be visible
@@ -372,7 +382,7 @@ export abstract class FieldParser {
     return [{
       match: MATCH_VISIBLE,
       operator: OR_OPERATOR,
-      when: bindValues
+      when: bindValues,
     }];
   }
 
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
index 30d1913a51..f0a446c0ce 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
@@ -1,8 +1,8 @@
+import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ListFieldParser } from './list-field-parser';
-import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
-import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 import { ParserOptions } from './parser-options';
 
 describe('ListFieldParser test suite', () => {
@@ -14,13 +14,13 @@ describe('ListFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'list'
+        type: 'list',
       },
       label: 'Type',
       mandatory: 'false',
@@ -30,10 +30,10 @@ describe('ListFieldParser test suite', () => {
         {
           metadata: 'type',
           controlledVocabulary: 'type_programme',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.ts b/src/app/shared/form/builder/parsers/list-field-parser.ts
index 48211b0aff..f786e888ce 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.ts
@@ -1,8 +1,8 @@
-import { FieldParser } from './field-parser';
 import { isNotEmpty } from '../../../empty.util';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class ListFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
index 24efcf3462..6d57e68643 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
@@ -1,7 +1,7 @@
+import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { LookupFieldParser } from './lookup-field-parser';
-import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { ParserOptions } from './parser-options';
 
 describe('LookupFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('LookupFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'lookup'
+        type: 'lookup',
       },
       label: 'Journal',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('LookupFieldParser test suite', () => {
         {
           metadata: 'journal',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
index 2c35d2ceb8..de7ba04e76 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
-import { DynamicLookupModel, DynamicLookupModelConfig } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class LookupFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
index d0281681ef..c6e8df8985 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
@@ -1,7 +1,7 @@
+import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { LookupNameFieldParser } from './lookup-name-field-parser';
-import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { ParserOptions } from './parser-options';
 
 describe('LookupNameFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('LookupNameFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'lookup-name'
+        type: 'lookup-name',
       },
       label: 'Author',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('LookupNameFieldParser test suite', () => {
         {
           metadata: 'author',
           controlledVocabulary: 'RPAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
index c791e07e74..0701d7cb7d 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
@@ -1,9 +1,9 @@
-import { FieldParser } from './field-parser';
 import {
   DynamicLookupNameModel,
-  DynamicLookupNameModelConfig
+  DynamicLookupNameModelConfig,
 } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class LookupNameFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
index 6b520142cc..7184e67e96 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
@@ -1,7 +1,7 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { NameFieldParser } from './name-field-parser';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { NameFieldParser } from './name-field-parser';
 import { ParserOptions } from './parser-options';
 
 describe('NameFieldParser test suite', () => {
@@ -15,13 +15,13 @@ describe('NameFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field1 = {
       input: {
-        type: 'name'
+        type: 'name',
       },
       label: 'Name',
       mandatory: 'false',
@@ -30,9 +30,9 @@ describe('NameFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'name',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
     field2 = {
@@ -51,8 +51,8 @@ describe('NameFieldParser test suite', () => {
         { metadata: 'dc.identifier.isbn', label: 'ISBN' },
         { metadata: 'dc.identifier.doi', label: 'DOI' },
         { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-        { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-      ]
+        { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+      ],
     } as FormFieldModel;
 
     field3 = {
@@ -64,9 +64,9 @@ describe('NameFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'title',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
   });
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.ts b/src/app/shared/form/builder/parsers/name-field-parser.ts
index e5ecb034ea..1c0fbd6d01 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.ts
@@ -1,7 +1,13 @@
 import { Inject } from '@angular/core';
+
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
-import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
+import {
+  CONFIG_DATA,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
 import { ParserOptions } from './parser-options';
 
 export class NameFieldParser extends ConcatFieldParser {
@@ -10,7 +16,7 @@ export class NameFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
   ) {
     super(submissionId, configData, initFormValues, parserOptions, ',', 'form.last-name', 'form.first-name');
   }
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
index a4c71d1f42..467431d963 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
@@ -1,10 +1,10 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { OneboxFieldParser } from './onebox-field-parser';
+import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DynamicQualdropModel } from '../ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { DynamicOneboxModel } from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
-import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { ParserOptions } from './parser-options';
+import { FormFieldModel } from '../models/form-field.model';
 import { FieldParser } from './field-parser';
+import { OneboxFieldParser } from './onebox-field-parser';
+import { ParserOptions } from './parser-options';
 
 describe('OneboxFieldParser test suite', () => {
   let field1: FormFieldModel;
@@ -17,7 +17,7 @@ describe('OneboxFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
@@ -31,10 +31,10 @@ describe('OneboxFieldParser test suite', () => {
         {
           metadata: 'title',
           controlledVocabulary: 'EVENTAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
     field2 = {
@@ -53,8 +53,8 @@ describe('OneboxFieldParser test suite', () => {
         { metadata: 'dc.identifier.isbn', label: 'ISBN' },
         { metadata: 'dc.identifier.doi', label: 'DOI' },
         { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-        { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-      ]
+        { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+      ],
     } as FormFieldModel;
 
     field3 = {
@@ -66,9 +66,9 @@ describe('OneboxFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'title',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
   });
 
@@ -118,10 +118,10 @@ describe('OneboxFieldParser test suite', () => {
           {
             metadata: 'title',
             controlledVocabulary: 'EVENTAuthority',
-            closed: false
-          }
+            closed: false,
+          },
         ],
-        languageCodes: []
+        languageCodes: [],
       } as FormFieldModel;
 
       parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions);
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
index 606c41ea74..2b994146c7 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -1,20 +1,26 @@
-import { DynamicSelectModel, DynamicSelectModelConfig } from '@ng-dynamic-forms/core';
+import {
+  DynamicSelectModel,
+  DynamicSelectModelConfig,
+} from '@ng-dynamic-forms/core';
 
-import { FieldParser } from './field-parser';
+import { isNotEmpty } from '../../../empty.util';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DsDynamicQualdropModelConfig,
   DynamicQualdropModel,
   QUALDROP_GROUP_SUFFIX,
   QUALDROP_METADATA_SUFFIX,
-  QUALDROP_VALUE_SUFFIX
+  QUALDROP_VALUE_SUFFIX,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { isNotEmpty } from '../../../empty.util';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DsDynamicOneboxModelConfig,
-  DynamicOneboxModel
+  DynamicOneboxModel,
 } from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class OneboxFieldParser extends FieldParser {
 
@@ -24,8 +30,8 @@ export class OneboxFieldParser extends FieldParser {
       const clsGroup = {
         element: {
           control: 'form-row',
-          hint: 'ds-form-qualdrop-hint'
-        }
+          hint: 'ds-form-qualdrop-hint',
+        },
       };
 
       const clsSelect = {
@@ -33,8 +39,8 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-addon custom-select',
         },
         grid: {
-          host: 'col-sm-4 pr-0'
-        }
+          host: 'col-sm-4 pr-0',
+        },
       };
 
       const clsInput = {
@@ -42,8 +48,8 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-value',
         },
         grid: {
-          host: 'col-sm-8 pl-0'
-        }
+          host: 'col-sm-8 pl-0',
+        },
       };
 
       const newId = this.configData.selectableMetadata[0].metadata
diff --git a/src/app/shared/form/builder/parsers/parser-factory.ts b/src/app/shared/form/builder/parsers/parser-factory.ts
index 26a9cb0f28..439baf4d4b 100644
--- a/src/app/shared/form/builder/parsers/parser-factory.ts
+++ b/src/app/shared/form/builder/parsers/parser-factory.ts
@@ -1,24 +1,25 @@
 import { StaticProvider } from '@angular/core';
-import { ParserType } from './parser-type';
+
+import { DateFieldParser } from './date-field-parser';
+import { DisabledFieldParser } from './disabled-field-parser';
+import { DropdownFieldParser } from './dropdown-field-parser';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DateFieldParser } from './date-field-parser';
-import { DropdownFieldParser } from './dropdown-field-parser';
-import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { ListFieldParser } from './list-field-parser';
 import { LookupFieldParser } from './lookup-field-parser';
 import { LookupNameFieldParser } from './lookup-name-field-parser';
-import { OneboxFieldParser } from './onebox-field-parser';
 import { NameFieldParser } from './name-field-parser';
+import { OneboxFieldParser } from './onebox-field-parser';
+import { ParserType } from './parser-type';
+import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { SeriesFieldParser } from './series-field-parser';
 import { TagFieldParser } from './tag-field-parser';
 import { TextareaFieldParser } from './textarea-field-parser';
-import { DisabledFieldParser } from './disabled-field-parser';
 
 const fieldParserDeps = [
   SUBMISSION_ID,
@@ -37,84 +38,84 @@ export class ParserFactory {
         return {
           provide: FieldParser,
           useClass: DateFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Dropdown: {
         return {
           provide: FieldParser,
           useClass: DropdownFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.RelationGroup: {
         return {
           provide: FieldParser,
           useClass: RelationGroupFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.List: {
         return {
           provide: FieldParser,
           useClass: ListFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Lookup: {
         return {
           provide: FieldParser,
           useClass: LookupFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.LookupName: {
         return {
           provide: FieldParser,
           useClass: LookupNameFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Onebox: {
         return {
           provide: FieldParser,
           useClass: OneboxFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Name: {
         return {
           provide: FieldParser,
           useClass: NameFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Series: {
         return {
           provide: FieldParser,
           useClass: SeriesFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Tag: {
         return {
           provide: FieldParser,
           useClass: TagFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Textarea: {
         return {
           provide: FieldParser,
           useClass: TextareaFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case undefined: {
         return {
           provide: FieldParser,
           useClass: DisabledFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       default: {
diff --git a/src/app/shared/form/builder/parsers/parser.utils.ts b/src/app/shared/form/builder/parsers/parser.utils.ts
index 734ec4b83a..e8b23b257d 100644
--- a/src/app/shared/form/builder/parsers/parser.utils.ts
+++ b/src/app/shared/form/builder/parsers/parser.utils.ts
@@ -1,5 +1,12 @@
-import { isNull, isUndefined } from '../../../empty.util';
-import { DynamicFormControlLayout, DynamicFormControlLayoutConfig } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlLayout,
+  DynamicFormControlLayoutConfig,
+} from '@ng-dynamic-forms/core';
+
+import {
+  isNull,
+  isUndefined,
+} from '../../../empty.util';
 
 export function setLayout(model: any, controlLayout: string, controlLayoutConfig: string, style: string) {
   if (isNull(model.layout)) {
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
index 7d48ad2d00..ef4f0f709a 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
@@ -1,8 +1,8 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { DynamicRelationGroupModel } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { RelationGroupFieldParser } from './relation-group-field-parser';
 
 describe('RelationGroupFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,20 +13,20 @@ describe('RelationGroupFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: 'WORKSPACE',
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'group'
+        type: 'group',
       },
       rows: [
         {
           fields: [
             {
               input: {
-                type: 'onebox'
+                type: 'onebox',
               },
               label: 'Author',
               mandatory: 'false',
@@ -34,14 +34,14 @@ describe('RelationGroupFieldParser test suite', () => {
               hints: 'Enter the name of the author.',
               selectableMetadata: [
                 {
-                  metadata: 'author'
-                }
+                  metadata: 'author',
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             },
             {
               input: {
-                type: 'onebox'
+                type: 'onebox',
               },
               label: 'Affiliation',
               mandatory: false,
@@ -49,13 +49,13 @@ describe('RelationGroupFieldParser test suite', () => {
               hints: 'Enter the affiliation of the author.',
               selectableMetadata: [
                 {
-                  metadata: 'affiliation'
-                }
+                  metadata: 'affiliation',
+                },
               ],
-              languageCodes: []
-            }
-          ]
-        }
+              languageCodes: [],
+            },
+          ],
+        },
       ],
       label: 'Authors',
       mandatory: 'true',
@@ -64,10 +64,10 @@ describe('RelationGroupFieldParser test suite', () => {
       hints: 'Enter the names of the authors of this item.',
       selectableMetadata: [
         {
-          metadata: 'author'
-        }
+          metadata: 'author',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
@@ -97,14 +97,14 @@ describe('RelationGroupFieldParser test suite', () => {
   it('should set group init value properly', () => {
     initFormValues = {
       author: [new FormFieldMetadataValueObject('test author')],
-      affiliation: [new FormFieldMetadataValueObject('test affiliation')]
+      affiliation: [new FormFieldMetadataValueObject('test affiliation')],
     };
     const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
     const expectedValue = [{
       author: new FormFieldMetadataValueObject('test author'),
-      affiliation: new FormFieldMetadataValueObject('test affiliation')
+      affiliation: new FormFieldMetadataValueObject('test affiliation'),
     }];
 
     expect(fieldModel.value).toEqual(expectedValue);
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
index 41c276fee8..112bfdaf24 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
@@ -1,14 +1,13 @@
-import { FieldParser } from './field-parser';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { FormFieldModel } from '../models/form-field.model';
-
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 import { isNotEmpty } from '../../../empty.util';
+import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 import {
   DynamicRelationGroupModel,
-  DynamicRelationGroupModelConfig
+  DynamicRelationGroupModelConfig,
 } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
-import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class RelationGroupFieldParser extends FieldParser {
 
@@ -52,8 +51,8 @@ export class RelationGroupFieldParser extends FieldParser {
     }
     const cls = {
       element: {
-        container: 'mb-3'
-      }
+        container: 'mb-3',
+      },
     };
 
     const model = new DynamicRelationGroupModel(modelConfiguration, cls);
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index 1f9bde8a7f..9fde7cc839 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -1,8 +1,8 @@
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { FormFieldModel } from '../models/form-field.model';
 import { RowParser } from './row-parser';
-import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 
 describe('RowParser test suite', () => {
 
@@ -37,10 +37,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'journal',
               controlledVocabulary: 'JOURNALAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'onebox' },
@@ -50,10 +50,10 @@ describe('RowParser test suite', () => {
           hints: ' Enter issue number.',
           selectableMetadata: [
             {
-              metadata: 'issue'
-            }
+              metadata: 'issue',
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'name' },
@@ -63,19 +63,19 @@ describe('RowParser test suite', () => {
           hints: 'Enter full name.',
           selectableMetadata: [
             {
-              metadata: 'name'
-            }
+              metadata: 'name',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
     row2 = {
       fields: [
         {
           input: {
             type: 'onebox',
-            regex: '^[a-zA-Z0-9]+$'
+            regex: '^[a-zA-Z0-9]+$',
           },
           label: 'Title',
           mandatory: 'false',
@@ -85,12 +85,12 @@ describe('RowParser test suite', () => {
             {
               metadata: 'title',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row3 = {
@@ -105,10 +105,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'title',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'onebox' },
@@ -121,19 +121,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'otherTitle',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row4 = {
       fields: [
         {
           input: {
-            type: 'dropdown'
+            type: 'dropdown',
           },
           label: 'Type',
           mandatory: 'false',
@@ -143,10 +143,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'type',
               controlledVocabulary: 'common_types_dataset',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'series' },
@@ -157,18 +157,18 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'series',
-            }
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row5 = {
       fields: [
         {
           input: {
-            type: 'lookup-name'
+            type: 'lookup-name',
           },
           label: 'Author',
           mandatory: 'false',
@@ -178,19 +178,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'author',
               controlledVocabulary: 'RPAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row6 = {
       fields: [
         {
           input: {
-            type: 'list'
+            type: 'list',
           },
           label: 'Type',
           mandatory: 'false',
@@ -200,19 +200,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'type',
               controlledVocabulary: 'type_programme',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row7 = {
       fields: [
         {
           input: {
-            type: 'date'
+            type: 'date',
           },
           label: 'Date of Issue.',
           mandatory: 'true',
@@ -222,18 +222,18 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'date',
-            }
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row8 = {
       fields: [
         {
           input: {
-            type: 'tag'
+            type: 'tag',
           },
           label: 'Keywords',
           mandatory: 'false',
@@ -243,19 +243,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'subject',
               controlledVocabulary: 'JOURNALAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row9 = {
       fields: [
         {
           input: {
-            type: 'textarea'
+            type: 'textarea',
           },
           label: 'Description',
           mandatory: 'false',
@@ -263,26 +263,26 @@ describe('RowParser test suite', () => {
           hints: 'Enter a description.',
           selectableMetadata: [
             {
-              metadata: 'description'
-            }
+              metadata: 'description',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row10 = {
       fields: [
         {
           input: {
-            type: 'group'
+            type: 'group',
           },
           rows: [
             {
               fields: [
                 {
                   input: {
-                    type: 'onebox'
+                    type: 'onebox',
                   },
                   label: 'Author',
                   mandatory: 'false',
@@ -290,14 +290,14 @@ describe('RowParser test suite', () => {
                   hints: 'Enter the name of the author.',
                   selectableMetadata: [
                     {
-                      metadata: 'author'
-                    }
+                      metadata: 'author',
+                    },
                   ],
-                  languageCodes: []
+                  languageCodes: [],
                 },
                 {
                   input: {
-                    type: 'onebox'
+                    type: 'onebox',
                   },
                   label: 'Affiliation',
                   mandatory: false,
@@ -305,13 +305,13 @@ describe('RowParser test suite', () => {
                   hints: 'Enter the affiliation of the author.',
                   selectableMetadata: [
                     {
-                      metadata: 'affiliation'
-                    }
+                      metadata: 'affiliation',
+                    },
                   ],
-                  languageCodes: []
-                }
-              ]
-            }
+                  languageCodes: [],
+                },
+              ],
+            },
           ],
           label: 'Authors',
           mandatory: 'true',
@@ -320,12 +320,12 @@ describe('RowParser test suite', () => {
           hints: 'Enter the names of the authors of this item.',
           selectableMetadata: [
             {
-              metadata: 'author'
-            }
+              metadata: 'author',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
   });
 
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index 3f5b4a04c6..97c9cb8257 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -1,25 +1,39 @@
-import { SubmissionFieldScopeType } from './../../../../core/submission/submission-field-scope-type';
-import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
-import { Injectable, Injector } from '@angular/core';
-
-import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
+  DynamicFormGroupModelConfig,
+} from '@ng-dynamic-forms/core';
 import uniqueId from 'lodash/uniqueId';
 
-import { isEmpty, isNotEmpty } from '../../../empty.util';
+import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../../empty.util';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { FormFieldModel } from '../models/form-field.model';
-import { CONFIG_DATA, FieldParser, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
+import { SubmissionFieldScopeType } from './../../../../core/submission/submission-field-scope-type';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
+import { setLayout } from './parser.utils';
 import { ParserFactory } from './parser-factory';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
-import { setLayout } from './parser.utils';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
-import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 
 export const ROW_ID_PREFIX = 'df-row-group-config-';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 
 /**
@@ -30,12 +44,12 @@ export class RowParser {
   }
 
   public parse(submissionId: string,
-               rowData,
-               scopeUUID,
-               initFormValues: any,
-               submissionScope,
-               readOnly: boolean,
-               typeField: string): DynamicRowGroupModel {
+    rowData,
+    scopeUUID,
+    initFormValues: any,
+    submissionScope,
+    readOnly: boolean,
+    typeField: string): DynamicRowGroupModel {
     let fieldModel: any = null;
     let parsedResult = null;
     const config: DynamicFormGroupModelConfig = {
@@ -52,7 +66,7 @@ export class RowParser {
       readOnly: readOnly,
       submissionScope: submissionScope,
       collectionUUID: scopeUUID,
-      typeField: typeField
+      typeField: typeField,
     };
 
     // Iterate over row's fields
@@ -67,14 +81,14 @@ export class RowParser {
             { provide: SUBMISSION_ID, useValue: submissionId },
             { provide: CONFIG_DATA, useValue: fieldData },
             { provide: INIT_FORM_VALUES, useValue: initFormValues },
-            { provide: PARSER_OPTIONS, useValue: parserOptions }
+            { provide: PARSER_OPTIONS, useValue: parserOptions },
           ],
-          parent: this.parentInjector
+          parent: this.parentInjector,
         });
 
         fieldModel = fieldInjector.get(FieldParser).parse();
       } else {
-        throw new Error(`unknown form control model type "${fieldData.input.type}" defined for Input field with label "${fieldData.label}".`,);
+        throw new Error(`unknown form control model type "${fieldData.input.type}" defined for Input field with label "${fieldData.label}".`);
       }
 
       if (fieldModel) {
@@ -109,7 +123,7 @@ export class RowParser {
       const clsGroup = {
         element: {
           control: 'form-row',
-        }
+        },
       };
       const groupModel = new DynamicRowGroupModel(config, clsGroup);
       if (Array.isArray(parsedResult)) {
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
index 0761cfe60e..d4b37e5d7f 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
@@ -1,8 +1,8 @@
-import { FormFieldModel } from '../models/form-field.model';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { SeriesFieldParser } from './series-field-parser';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { SeriesFieldParser } from './series-field-parser';
 
 describe('SeriesFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,7 +13,7 @@ describe('SeriesFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
@@ -26,9 +26,9 @@ describe('SeriesFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'series',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.ts b/src/app/shared/form/builder/parsers/series-field-parser.ts
index 36ee9c36c1..ce85d07d29 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.ts
@@ -1,7 +1,13 @@
 import { Inject } from '@angular/core';
+
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
-import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
+import {
+  CONFIG_DATA,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
 import { ParserOptions } from './parser-options';
 
 export class SeriesFieldParser extends ConcatFieldParser {
@@ -10,7 +16,7 @@ export class SeriesFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
   ) {
     super(submissionId, configData, initFormValues, parserOptions, ';');
   }
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
index 115829f8d3..571d06d983 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
@@ -1,8 +1,8 @@
+import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { TagFieldParser } from './tag-field-parser';
-import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { ParserOptions } from './parser-options';
+import { TagFieldParser } from './tag-field-parser';
 
 describe('TagFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,13 +13,13 @@ describe('TagFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'tag'
+        type: 'tag',
       },
       label: 'Keywords',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('TagFieldParser test suite', () => {
         {
           metadata: 'subject',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.ts b/src/app/shared/form/builder/parsers/tag-field-parser.ts
index dcc2c5575f..5c3f2e60bc 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
+import {
+  DynamicTagModel,
+  DynamicTagModelConfig,
+} from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DynamicTagModel, DynamicTagModelConfig } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FieldParser } from './field-parser';
 
 export class TagFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
index 855e464f21..95fef2103c 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
@@ -1,8 +1,8 @@
+import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { TextareaFieldParser } from './textarea-field-parser';
-import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { ParserOptions } from './parser-options';
+import { TextareaFieldParser } from './textarea-field-parser';
 
 describe('TextareaFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,13 +13,13 @@ describe('TextareaFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'textarea'
+        type: 'textarea',
       },
       label: 'Description',
       mandatory: 'false',
@@ -27,10 +27,10 @@ describe('TextareaFieldParser test suite', () => {
       hints: 'Enter a description.',
       selectableMetadata: [
         {
-          metadata: 'description'
-        }
+          metadata: 'description',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.ts
index 548ce567c3..c253899b3d 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.ts
@@ -1,23 +1,20 @@
-import { FieldParser } from './field-parser';
-import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { environment } from '../../../../../environments/environment';
 import {
   DsDynamicTextAreaModel,
-  DsDynamicTextAreaModelConfig
+  DsDynamicTextAreaModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { environment } from '../../../../../environments/environment';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class TextareaFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const textAreaModelConfig: DsDynamicTextAreaModelConfig = this.initModel(null, label);
 
-    let layout: DynamicFormControlLayout;
-
-    layout = {
+    const layout = {
       element: {
-        label: 'col-form-label'
-      }
+        label: 'col-form-label',
+      },
     };
 
     textAreaModelConfig.rows = 10;
diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index a6b90b23aa..24fdbbc8cf 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -17,7 +17,7 @@
           (mouseout)="t.close()">
         <a class="flex-sm-fill text-sm-center nav-link active bg-info"
            href="javascript:void(0);"
-           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged == i}"
+           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
            (click)="chipsSelected($event, i);">
           <span>
             <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true"></i>
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index 050950ed4d..ea6aa80882 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -1,18 +1,29 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
-
-import { Chips } from './models/chips.model';
-import { ChipsComponent } from './chips.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
-import { createTestComponent } from '../../testing/utils.test';
-import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { ConfidenceType } from '../../../core/shared/confidence-type';
 import { SortablejsModule } from 'ngx-sortablejs';
+
 import { environment } from '../../../../environments/environment';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { createTestComponent } from '../../testing/utils.test';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
+import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive';
+import { ChipsComponent } from './chips.component';
+import { Chips } from './models/chips.model';
 
 describe('ChipsComponent test suite', () => {
 
@@ -30,18 +41,18 @@ describe('ChipsComponent test suite', () => {
       imports: [
         NgbModule,
         SortablejsModule.forRoot({ animation: 150 }),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ChipsComponent,
         TestComponent,
-        AuthorityConfidenceStateDirective
+        AuthorityConfidenceStateDirective,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
         ChipsComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -145,7 +156,7 @@ describe('ChipsComponent test suite', () => {
       const item = {
         mainField: new FormFieldMetadataValueObject('main test', null, 'test001', 'main test', 0, ConfidenceType.CF_ACCEPTED),
         relatedField: new FormFieldMetadataValueObject('related test', null, 'test002', 'related test', 0, ConfidenceType.CF_ACCEPTED),
-        otherRelatedField: new FormFieldMetadataValueObject('other related test')
+        otherRelatedField: new FormFieldMetadataValueObject('other related test'),
       };
 
       chips = new Chips([item], 'display', 'mainField', environment.submission.icons.metadata);
@@ -179,7 +190,7 @@ describe('ChipsComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index 5166657582..00addb06c7 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -1,14 +1,21 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import isObject from 'lodash/isObject';
+import { BehaviorSubject } from 'rxjs';
+import { Options } from 'sortablejs';
 
+import { DragService } from '../../../core/drag.service';
 import { Chips } from './models/chips.model';
 import { ChipsItem } from './models/chips-item.model';
-import { DragService } from '../../../core/drag.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Options } from 'sortablejs';
-import { BehaviorSubject } from 'rxjs';
 
 @Component({
   selector: 'ds-chips',
@@ -41,7 +48,7 @@ export class ChipsComponent implements OnChanges {
       chosenClass: 'm-0',
       dragClass: 'm-0',
       filter: '.chips-sort-ignore',
-      ghostClass: 'm-0'
+      ghostClass: 'm-0',
     };
   }
 
@@ -102,7 +109,7 @@ export class ChipsComponent implements OnChanges {
                   .subscribe((label) => {
                     textToDisplay.push(label + ': ' + chipsItem.item[field].otherInformation[otherField]);
                   });
-            });
+              });
           }
         } else {
           textToDisplay.push(chipsItem.item[field]);
diff --git a/src/app/shared/form/chips/models/chips-item.model.spec.ts b/src/app/shared/form/chips/models/chips-item.model.spec.ts
index 27b4840d46..fd02032b25 100644
--- a/src/app/shared/form/chips/models/chips-item.model.spec.ts
+++ b/src/app/shared/form/chips/models/chips-item.model.spec.ts
@@ -1,5 +1,8 @@
-import { ChipsItem, ChipsItemIcon } from './chips-item.model';
 import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
+import {
+  ChipsItem,
+  ChipsItemIcon,
+} from './chips-item.model';
 
 describe('ChipsItem model test suite', () => {
   let item: ChipsItem;
@@ -58,7 +61,7 @@ describe('ChipsItem model test suite', () => {
     item = new ChipsItem(
       {
         label: 'A',
-        value: 'a'
+        value: 'a',
       },
       'label');
 
@@ -69,7 +72,7 @@ describe('ChipsItem model test suite', () => {
     item = new ChipsItem(
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'other'
+        otherProperty: 'other',
       },
       'value', 'toDisplay');
 
diff --git a/src/app/shared/form/chips/models/chips-item.model.ts b/src/app/shared/form/chips/models/chips-item.model.ts
index 277e6477ce..a2c6033ff8 100644
--- a/src/app/shared/form/chips/models/chips-item.model.ts
+++ b/src/app/shared/form/chips/models/chips-item.model.ts
@@ -1,9 +1,13 @@
 import isObject from 'lodash/isObject';
 import uniqueId from 'lodash/uniqueId';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
+
 import { ConfidenceType } from '../../../../core/shared/confidence-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../../builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 
 export interface ChipsItemIcon {
   metadata: string;
@@ -23,10 +27,10 @@ export class ChipsItem {
   private objToDisplay: string;
 
   constructor(item: any,
-              fieldToDisplay: string = 'display',
-              objToDisplay?: string,
-              icons?: ChipsItemIcon[],
-              editMode?: boolean) {
+    fieldToDisplay: string = 'display',
+    objToDisplay?: string,
+    icons?: ChipsItemIcon[],
+    editMode?: boolean) {
 
     this.id = uniqueId();
     this._item = item;
@@ -53,7 +57,7 @@ export class ChipsItem {
   }
 
   hasIcons(): boolean {
-     return isNotEmpty(this.icons);
+    return isNotEmpty(this.icons);
   }
 
   hasVisibleIcons(): boolean {
diff --git a/src/app/shared/form/chips/models/chips.model.spec.ts b/src/app/shared/form/chips/models/chips.model.spec.ts
index c86ff55c6f..eee87fef74 100644
--- a/src/app/shared/form/chips/models/chips.model.spec.ts
+++ b/src/app/shared/form/chips/models/chips.model.spec.ts
@@ -1,6 +1,6 @@
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 import { Chips } from './chips.model';
 import { ChipsItem } from './chips-item.model';
-import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 
 describe('Chips model test suite', () => {
   let items: any[];
@@ -53,15 +53,15 @@ describe('Chips model test suite', () => {
     items = [
       {
         label: 'A',
-        value: 'a'
+        value: 'a',
       },
       {
         label: 'B',
-        value: 'b'
+        value: 'b',
       },
       {
         label: 'C',
-        value: 'c'
+        value: 'c',
       },
     ];
     chips = new Chips(items, 'label');
@@ -73,15 +73,15 @@ describe('Chips model test suite', () => {
     items = [
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
     ];
     chips = new Chips(items, 'value', 'toDisplay');
@@ -94,21 +94,21 @@ describe('Chips model test suite', () => {
     items = [
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
     ];
     const iconsConfig = [{
       name: 'toDisplay',
       visibleWhenAuthorityEmpty: false,
-      style: 'fa-user'
+      style: 'fa-user',
     }];
     chips = new Chips(items, 'value', 'toDisplay', iconsConfig);
 
diff --git a/src/app/shared/form/chips/models/chips.model.ts b/src/app/shared/form/chips/models/chips.model.ts
index daeb363d82..5b2d3c5da8 100644
--- a/src/app/shared/form/chips/models/chips.model.ts
+++ b/src/app/shared/form/chips/models/chips.model.ts
@@ -2,12 +2,16 @@ import findIndex from 'lodash/findIndex';
 import isEqual from 'lodash/isEqual';
 import isObject from 'lodash/isObject';
 import { BehaviorSubject } from 'rxjs';
-import { ChipsItem, ChipsItemIcon } from './chips-item.model';
-import { hasValue, isNotEmpty } from '../../../empty.util';
+
 import { MetadataIconConfig } from '../../../../../config/submission-config.interface';
-import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 import { VocabularyEntry } from '../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../../builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
+import { ChipsItem } from './chips-item.model';
 
 export class Chips {
   chipsItems: BehaviorSubject<ChipsItem[]>;
@@ -18,9 +22,9 @@ export class Chips {
   private _items: ChipsItem[];
 
   constructor(items: any[] = [],
-              displayField: string = 'display',
-              displayObj?: string,
-              iconsConfig?: MetadataIconConfig[]) {
+    displayField: string = 'display',
+    displayObj?: string,
+    iconsConfig?: MetadataIconConfig[]) {
 
     this.displayField = displayField;
     this.displayObj = displayObj;
@@ -34,7 +38,7 @@ export class Chips {
     const icons = this.getChipsIcons(item);
     const chipsItem = new ChipsItem(item, this.displayField, this.displayObj, icons);
 
-    const duplicatedIndex = findIndex(this._items, {display: chipsItem.display.trim()});
+    const duplicatedIndex = findIndex(this._items, { display: chipsItem.display.trim() });
     if (duplicatedIndex === -1 || !isEqual(item, this.getChipByIndex(duplicatedIndex).item)) {
       this._items.push(chipsItem);
       this.chipsItems.next(this._items);
@@ -42,7 +46,7 @@ export class Chips {
   }
 
   public getChipById(id): ChipsItem {
-    const index = findIndex(this._items, {id: id});
+    const index = findIndex(this._items, { id: id });
     return this.getChipByIndex(index);
   }
 
@@ -83,7 +87,7 @@ export class Chips {
   }
 
   public remove(chipsItem: ChipsItem): void {
-    const index = findIndex(this._items, {id: chipsItem.id});
+    const index = findIndex(this._items, { id: chipsItem.id });
     this._items.splice(index, 1);
     this.chipsItems.next(this._items);
   }
@@ -108,7 +112,7 @@ export class Chips {
       return icons;
     }
 
-    const defaultConfigIndex: number = findIndex(this.iconsConfig, {name: 'default'});
+    const defaultConfigIndex: number = findIndex(this.iconsConfig, { name: 'default' });
     const defaultConfig: MetadataIconConfig = (defaultConfigIndex !== -1) ? this.iconsConfig[defaultConfigIndex] : undefined;
     let config: MetadataIconConfig;
     let configIndex: number;
@@ -118,20 +122,18 @@ export class Chips {
       .forEach((metadata) => {
 
         value = item[metadata];
-        configIndex = findIndex(this.iconsConfig, {name: metadata});
+        configIndex = findIndex(this.iconsConfig, { name: metadata });
 
         config = (configIndex !== -1) ? this.iconsConfig[configIndex] : defaultConfig;
 
         if (hasValue(value) && isNotEmpty(config) && !this.hasPlaceholder(value)) {
-
-          let icon: ChipsItemIcon;
           const visibleWhenAuthorityEmpty = this.displayObj !== metadata;
 
           // Set icon
-          icon = {
+          const icon = {
             metadata,
             visibleWhenAuthorityEmpty,
-            style: config.style
+            style: config.style,
           };
 
           icons.push(icon);
diff --git a/src/app/shared/form/directives/authority-confidence-state.directive.ts b/src/app/shared/form/directives/authority-confidence-state.directive.ts
index 49eee5ae8f..38eda18a61 100644
--- a/src/app/shared/form/directives/authority-confidence-state.directive.ts
+++ b/src/app/shared/form/directives/authority-confidence-state.directive.ts
@@ -16,37 +16,47 @@ import {
   OnChanges,
   Output,
   Renderer2,
-  SimpleChanges
+  SimpleChanges,
 } from '@angular/core';
-
+import { TranslateService } from '@ngx-translate/core';
 import findIndex from 'lodash/findIndex';
 
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../../core/shared/confidence-type';
-import { isNotEmpty, isNull } from '../../empty.util';
 import { ConfidenceIconConfig } from '../../../../config/submission-config.interface';
 import { environment } from '../../../../environments/environment';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import {
+  isNotEmpty,
+  isNull,
+} from '../../empty.util';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
 
 /**
  * Directive to add to the element a bootstrap utility class based on metadata confidence value
  */
 @Directive({
-  selector: '[dsAuthorityConfidenceState]'
+  selector: '[dsAuthorityConfidenceState]',
 })
 export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewInit {
 
   /**
    * The metadata value
    */
-  @Input() authorityValue: VocabularyEntry | FormFieldMetadataValueObject | string;
+  @Input() authorityValue: VocabularyEntry | FormFieldMetadataValueObject | MetadataValue | string;
 
   /**
    * A boolean representing if to show html icon if authority value is empty
    */
   @Input() visibleWhenAuthorityEmpty = true;
 
+  /**
+   * A boolean to configure the display of icons instead of default style configuration
+   * When true, the class configured in {@link ConfidenceIconConfig.icon} will be used, by default {@link ConfidenceIconConfig.style} is used
+   */
+  @Input() iconMode = false;
+
   /**
    * The css class applied before directive changes
    */
@@ -79,7 +89,8 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
    */
   constructor(
     private elem: ElementRef,
-    private renderer: Renderer2
+    private renderer: Renderer2,
+    private translate: TranslateService,
   ) {
   }
 
@@ -93,12 +104,19 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
       this.previousClass = this.getClassByConfidence(this.getConfidenceByValue(changes.authorityValue.previousValue));
     }
     this.newClass = this.getClassByConfidence(this.getConfidenceByValue(changes.authorityValue.currentValue));
+    const confidenceName = this.getNameByConfidence(this.getConfidenceByValue(changes.authorityValue.currentValue));
 
     if (isNull(this.previousClass)) {
       this.renderer.addClass(this.elem.nativeElement, this.newClass);
+      if (this.iconMode) {
+        this.renderer.setAttribute(this.elem.nativeElement, 'title', this.translate.instant(`confidence.indicator.help-text.${confidenceName}`));
+      }
     } else if (this.previousClass !== this.newClass) {
       this.renderer.removeClass(this.elem.nativeElement, this.previousClass);
       this.renderer.addClass(this.elem.nativeElement, this.newClass);
+      if (this.iconMode) {
+        this.renderer.setAttribute(this.elem.nativeElement, 'title', this.translate.instant(`confidence.indicator.help-text.${confidenceName}`));
+      }
     }
   }
 
@@ -131,6 +149,14 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
       confidence = value.confidence;
     }
 
+    if (isNotEmpty(value) && value instanceof MetadataValue) {
+      confidence = value.confidence;
+    }
+
+    if (isNotEmpty(value) && Object.values(ConfidenceType).includes(value)) {
+      confidence = value;
+    }
+
     return confidence;
   }
 
@@ -146,12 +172,32 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
 
     const confidenceIcons: ConfidenceIconConfig[] = environment.submission.icons.authority.confidence;
 
-    const confidenceIndex: number = findIndex(confidenceIcons, {value: confidence});
+    const confidenceIndex: number = findIndex(confidenceIcons, { value: confidence });
 
-    const defaultconfidenceIndex: number = findIndex(confidenceIcons, {value: 'default' as  any});
-    const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].style : '';
+    const defaultconfidenceIndex: number = findIndex(confidenceIcons, { value: 'default' as  any });
 
-    return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].style : defaultClass;
+    if (this.iconMode) {
+      const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].icon : '';
+      return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].icon : defaultClass;
+    } else {
+      const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].style : '';
+      return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].style : defaultClass;
+    }
+  }
+
+  /**
+   * Return the confidence value name
+   *
+   * @param confidence
+   * @returns
+   */
+  private getNameByConfidence(confidence: any): string {
+    const confidenceText = ConfidenceType[confidence];
+    if (isNotEmpty(confidenceText)) {
+      return confidenceText.replace('CF_', '').toLowerCase();
+    } else {
+      return 'unknown';
+    }
   }
 
 }
diff --git a/src/app/shared/form/form.actions.ts b/src/app/shared/form/form.actions.ts
index 30885de278..170fa25c11 100644
--- a/src/app/shared/form/form.actions.ts
+++ b/src/app/shared/form/form.actions.ts
@@ -41,7 +41,7 @@ export class FormInitAction implements Action {
    *    the Form validation status
    */
   constructor(formId: string, formData: any, valid: boolean) {
-    this.payload = {formId, formData, valid};
+    this.payload = { formId, formData, valid };
   }
 }
 
@@ -61,7 +61,7 @@ export class FormChangeAction implements Action {
    *    the FormGroup Object
    */
   constructor(formId: string, formData: any) {
-    this.payload = {formId, formData};
+    this.payload = { formId, formData };
   }
 }
 
@@ -81,7 +81,7 @@ export class FormAddTouchedAction implements Action {
    *    the array containing new touched fields
    */
   constructor(formId: string, touched: string[]) {
-    this.payload = {formId, touched};
+    this.payload = { formId, touched };
   }
 }
 
@@ -98,7 +98,7 @@ export class FormRemoveAction implements Action {
    *    the Form's ID
    */
   constructor(formId: string) {
-    this.payload = {formId};
+    this.payload = { formId };
   }
 }
 
@@ -118,7 +118,7 @@ export class FormStatusChangeAction implements Action {
    *    the Form validation status
    */
   constructor(formId: string, valid: boolean) {
-    this.payload = {formId, valid};
+    this.payload = { formId, valid };
   }
 }
 
@@ -132,7 +132,7 @@ export class FormAddError implements Action {
   };
 
   constructor(formId: string, fieldId: string, fieldIndex: number, errorMessage: string) {
-    this.payload = {formId, fieldId, fieldIndex, errorMessage};
+    this.payload = { formId, fieldId, fieldIndex, errorMessage };
   }
 }
 
@@ -144,8 +144,8 @@ export class FormRemoveErrorAction implements Action {
     fieldIndex: number,
   };
 
-  constructor(formId: string, fieldId: string, fieldIndex: number,) {
-    this.payload = {formId, fieldId, fieldIndex};
+  constructor(formId: string, fieldId: string, fieldIndex: number) {
+    this.payload = { formId, fieldId, fieldIndex };
   }
 }
 
@@ -156,7 +156,7 @@ export class FormClearErrorsAction implements Action {
   };
 
   constructor(formId: string) {
-    this.payload = {formId};
+    this.payload = { formId };
   }
 }
 
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 1b27c9d308..9f3f6d3365 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -58,11 +58,12 @@
         <div class="col text-right space-children-mr">
           <ng-content select="[before]"></ng-content>
             <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
-              <i class="fa fa-times"></i> {{cancelLabel | translate}}
+              <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="!(isValid() | async)"><i class="fas fa-save"></i> {{submitLabel | translate}}
+                    [disabled]="(isValid() | async) !== true">
+              <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
         </div>
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 2f3be3fded..edbe1ab610 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -1,29 +1,47 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
   DynamicFormValidationService,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { Store, StoreModule } from '@ngrx/store';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-
-import { FormComponent } from './form.component';
-import { FormService } from './form.service';
-import { FormBuilderService } from './builder/form-builder.service';
-import { FormState } from './form.reducer';
-import { FormChangeAction, FormStatusChangeAction } from './form.actions';
-import { StoreMock } from '../testing/store.mock';
-import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
-import { createTestComponent } from '../testing/utils.test';
 import { BehaviorSubject } from 'rxjs';
+
 import { storeModuleConfig } from '../../app.reducer';
+import { StoreMock } from '../testing/store.mock';
+import { createTestComponent } from '../testing/utils.test';
+import { FormBuilderService } from './builder/form-builder.service';
+import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
+import {
+  FormChangeAction,
+  FormStatusChangeAction,
+} from './form.actions';
+import { FormComponent } from './form.component';
+import { FormState } from './form.reducer';
+import { FormService } from './form.service';
 
 let TEST_FORM_MODEL;
 
@@ -42,12 +60,12 @@ function init() {
         label: 'Title',
         placeholder: 'Title',
         validators: {
-          required: null
+          required: null,
         },
         errorMessages: {
-          required: 'You must enter a main title for this item.'
-        }
-      }
+          required: 'You must enter a main title for this item.',
+        },
+      },
     ),
 
     new DynamicInputModel(
@@ -55,7 +73,7 @@ function init() {
         id: 'dc_title_alternative',
         label: 'Other Titles',
         placeholder: 'Other Titles',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -63,7 +81,7 @@ function init() {
         id: 'dc_publisher',
         label: 'Publisher',
         placeholder: 'Publisher',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -71,7 +89,7 @@ function init() {
         id: 'dc_identifier_citation',
         label: 'Citation',
         placeholder: 'Citation',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -79,7 +97,7 @@ function init() {
         id: 'dc_identifier_issn',
         label: 'Identifiers',
         placeholder: 'Identifiers',
-      }
+      },
     ),
   ];
 
@@ -94,19 +112,19 @@ function init() {
           new DynamicInputModel({
             id: 'bootstrapArrayGroupInput',
             placeholder: 'example array group input',
-            readOnly: false
-          })
+            readOnly: false,
+          }),
         ];
-      }
-    })
+      },
+    }),
   ];
   config = {
     form: {
       validatorMap: {
         required: 'required',
-        regex: 'pattern'
-      }
-    }
+        regex: 'pattern',
+      },
+    },
   } as any;
 
   formState = {
@@ -116,12 +134,12 @@ function init() {
         dc_title_alternative: null,
         dc_publisher: null,
         dc_identifier_citation: null,
-        dc_identifier_issn: null
+        dc_identifier_issn: null,
       },
       valid: false,
       errors: [],
-      touched: {}
-    }
+      touched: {},
+    },
   };
 
 }
@@ -144,7 +162,7 @@ describe('FormComponent test suite', () => {
         ReactiveFormsModule,
         NgbModule,
         StoreModule.forRoot({}, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
@@ -156,9 +174,9 @@ describe('FormComponent test suite', () => {
         FormBuilderService,
         FormComponent,
         FormService,
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -222,7 +240,7 @@ describe('FormComponent test suite', () => {
       const errors = [{
         fieldId: 'dc_title',
         fieldIndex: 0,
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       }];
       formState.testForm.errors = errors;
       form.next(formState.testForm);
@@ -235,7 +253,7 @@ describe('FormComponent test suite', () => {
     it('should remove form errors when errors are empty in the state', () => {
       (formComp as any).formErrors = [{
         fieldId: 'dc_title',
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       }];
       const errors = [];
 
@@ -254,7 +272,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.change, 'emit');
@@ -272,7 +290,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.change, 'emit');
@@ -289,7 +307,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       formComp.emitChange = false;
@@ -307,7 +325,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'blur'
+        type: 'blur',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.blur, 'emit');
@@ -324,7 +342,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'focus'
+        type: 'focus',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.focus, 'emit');
@@ -439,7 +457,7 @@ describe('FormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 79cf8ad2c7..c449cee89d 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -1,8 +1,19 @@
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-
-import { Observable, Subscription } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormArray,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
@@ -10,14 +21,30 @@ import {
   DynamicFormGroupModel,
   DynamicFormLayout,
 } from '@ng-dynamic-forms/core';
-import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import findIndex from 'lodash/findIndex';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
 
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNull,
+} from '../empty.util';
 import { FormBuilderService } from './builder/form-builder.service';
-import { hasValue, isNotEmpty, isNotNull, isNull } from '../empty.util';
-import { FormService } from './form.service';
-import { FormEntry, FormError } from './form.reducer';
 import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
+import {
+  FormEntry,
+  FormError,
+} from './form.reducer';
+import { FormService } from './form.service';
 
 /**
  * The default form component.
@@ -26,7 +53,7 @@ import { FormFieldMetadataValueObject } from './builder/models/form-field-metada
   exportAs: 'formComponent',
   selector: 'ds-form',
   styleUrls: ['form.component.scss'],
-  templateUrl: 'form.component.html'
+  templateUrl: 'form.component.html',
 })
 export class FormComponent implements OnDestroy, OnInit {
 
@@ -123,7 +150,7 @@ export class FormComponent implements OnDestroy, OnInit {
   }*/
 
   private getFormGroup(): UntypedFormGroup {
-    if (!!this.parentFormModel) {
+    if (this.parentFormModel) {
       return this.formGroup.parent as UntypedFormGroup;
     }
 
@@ -177,13 +204,13 @@ export class FormComponent implements OnDestroy, OnInit {
           errors
             .filter((error: FormError) => findIndex(this.formErrors, {
               fieldId: error.fieldId,
-              fieldIndex: error.fieldIndex
+              fieldIndex: error.fieldIndex,
             }) === -1)
             .forEach((error: FormError) => {
               const { fieldId } = error;
               const { fieldIndex } = error;
               let field: AbstractControl;
-              if (!!this.parentFormModel) {
+              if (this.parentFormModel) {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as UntypedFormGroup, formModel, fieldIndex);
               } else {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup, formModel, fieldIndex);
@@ -200,13 +227,13 @@ export class FormComponent implements OnDestroy, OnInit {
           this.formErrors
             .filter((error: FormError) => findIndex(errors, {
               fieldId: error.fieldId,
-              fieldIndex: error.fieldIndex
+              fieldIndex: error.fieldIndex,
             }) === -1)
             .forEach((error: FormError) => {
               const { fieldId } = error;
               const { fieldIndex } = error;
               let field: AbstractControl;
-              if (!!this.parentFormModel) {
+              if (this.parentFormModel) {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as UntypedFormGroup, formModel, fieldIndex);
               } else {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup, formModel, fieldIndex);
@@ -219,7 +246,7 @@ export class FormComponent implements OnDestroy, OnInit {
             });
           this.formErrors = errors;
           this.changeDetectorRef.detectChanges();
-        })
+        }),
     );
   }
 
diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts
index 792de6f251..5e3c26be92 100644
--- a/src/app/shared/form/form.module.ts
+++ b/src/app/shared/form/form.module.ts
@@ -1,47 +1,60 @@
-import { NgModule } from '@angular/core';
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { CommonModule } from '@angular/common';
-import { FormComponent } from './form.component';
-import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component';
-import { DsDynamicFormControlContainerComponent, dsDynamicFormControlMapFn } from './builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
-import { DsDynamicListComponent } from './builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
-import { DsDynamicLookupComponent } from './builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
-import { DsDynamicDisabledComponent } from './builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
-import { DsDynamicLookupRelationModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { DsDynamicScrollableDropdownComponent } from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicTagComponent } from './builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
-import { DsDynamicOneboxComponent } from './builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
-import { DsDynamicRelationGroupComponent } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerComponent } from './builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
-import { DsDynamicFormGroupComponent } from './builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
-import { DsDynamicFormArrayComponent } from './builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
-import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
-import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
-import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
-import { SharedModule } from '../shared.module';
+import { NgModule } from '@angular/core';
+import {
+  NgbDatepickerModule,
+  NgbTimepickerModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DYNAMIC_FORM_CONTROL_MAP_FN,
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { SortablejsModule } from 'ngx-sortablejs';
+
 import { SearchModule } from '../search/search.module';
-import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { SharedModule } from '../shared.module';
+import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component';
+import {
+  DsDynamicFormControlContainerComponent,
+  dsDynamicFormControlMapFn,
+} from './builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
+import { DsDynamicTypeBindRelationService } from './builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
 import { ExistingMetadataListElementComponent } from './builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { ExistingRelationListElementComponent } from './builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
-import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { DsDynamicFormArrayComponent } from './builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
 import { CustomSwitchComponent } from './builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { DsDatePickerComponent } from './builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicDisabledComponent } from './builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
+import { DsDynamicFormGroupComponent } from './builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
+import { DsDynamicLookupComponent } from './builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
+import { DsDynamicOneboxComponent } from './builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
+import { DsDynamicRelationGroupComponent } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
+import { DsDynamicScrollableDropdownComponent } from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DsDynamicTagComponent } from './builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
+import { DsDynamicLookupRelationModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
+import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component';
+import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { ThemedDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component';
+import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
+import { FormBuilderService } from './builder/form-builder.service';
 import { ChipsComponent } from './chips/chips.component';
-import { NumberPickerComponent } from './number-picker/number-picker.component';
 import { AuthorityConfidenceStateDirective } from './directives/authority-confidence-state.directive';
-import { SortablejsModule } from 'ngx-sortablejs';
+import { FormComponent } from './form.component';
+import { FormService } from './form.service';
+import { NumberPickerComponent } from './number-picker/number-picker.component';
 import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
 import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal/vocabulary-treeview-modal.component';
-import { FormBuilderService } from './builder/form-builder.service';
-import { DsDynamicTypeBindRelationService } from './builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
-import { FormService } from './form.service';
-import { NgxMaskModule } from 'ngx-mask';
-import { ThemedExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
-import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap';
-import { CdkTreeModule } from '@angular/cdk/tree';
-import { ThemedDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component';
-import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component';
 
 const COMPONENTS = [
   CustomSwitchComponent,
@@ -104,7 +117,7 @@ const DIRECTIVES = [
   providers: [
     {
       provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-      useValue: dsDynamicFormControlMapFn
+      useValue: dsDynamicFormControlMapFn,
     },
     DynamicFormLayoutService,
     DynamicFormService,
@@ -112,7 +125,7 @@ const DIRECTIVES = [
     FormBuilderService,
     DsDynamicTypeBindRelationService,
     FormService,
-  ]
+  ],
 })
 export class FormModule {
 }
diff --git a/src/app/shared/form/form.reducer.spec.ts b/src/app/shared/form/form.reducer.spec.ts
index dc85b3e0c3..d79d3404db 100644
--- a/src/app/shared/form/form.reducer.spec.ts
+++ b/src/app/shared/form/form.reducer.spec.ts
@@ -1,4 +1,3 @@
-import { formReducer } from './form.reducer';
 import {
   FormAddError,
   FormAddTouchedAction,
@@ -7,8 +6,9 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
+import { formReducer } from './form.reducer';
 
 describe('formReducer', () => {
 
@@ -19,19 +19,19 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: null,
       date: null,
-      description: null
+      description: null,
     };
     const valid = false;
     const action = new FormInitAction(formId, formData, valid);
@@ -47,19 +47,19 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: 'title',
       date: null,
-      description: null
+      description: null,
     };
     const state = {
       testForm: {
@@ -67,12 +67,12 @@ describe('formReducer', () => {
           author: null,
           title: 'title',
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const valid = false;
@@ -89,12 +89,12 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -102,19 +102,19 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: ['test'],
       date: null,
-      description: null
+      description: null,
     };
 
     const action = new FormChangeAction(formId, formData);
@@ -130,12 +130,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -143,12 +143,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
 
@@ -165,20 +165,20 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const expectedErrors = [
       {
         fieldId: 'title',
         fieldIndex: 0,
-        message: 'Not valid'
-      }
+        message: 'Not valid',
+      },
     ];
 
     const formId = 'testForm';
@@ -199,31 +199,31 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [
           {
             fieldId: 'author',
             fieldIndex: 0,
-            message: 'error.validation.required'
+            message: 'error.validation.required',
           },
           {
             fieldId: 'title',
             fieldIndex: 0,
-            message: 'error.validation.required'
-          }
+            message: 'error.validation.required',
+          },
         ],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const expectedErrors = [
       {
         fieldId: 'title',
         fieldIndex: 0,
-        message: 'error.validation.required'
-      }
+        message: 'error.validation.required',
+      },
     ];
 
     const formId = 'testForm';
@@ -243,12 +243,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const formId = 'testForm';
@@ -266,18 +266,18 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [
           {
             fieldId: 'author',
             fieldIndex: 0,
-            message: 'error.validation.required'
-          }
+            message: 'error.validation.required',
+          },
         ],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const formId = 'testForm';
@@ -295,12 +295,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -308,14 +308,14 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
-          title: true
-        }
-      }
+          title: true,
+        },
+      },
     };
     const formId = 'testForm';
     const touched = ['title'];
@@ -333,14 +333,14 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
-          title: true
-        }
-      }
+          title: true,
+        },
+      },
     };
     const state = {
       testForm: {
@@ -348,15 +348,15 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
           title: true,
-          author: true
-        }
-      }
+          author: true,
+        },
+      },
     };
     const formId = 'testForm';
     const touched = ['author'];
diff --git a/src/app/shared/form/form.reducer.ts b/src/app/shared/form/form.reducer.ts
index c1e9b12efa..cacb4fd9fe 100644
--- a/src/app/shared/form/form.reducer.ts
+++ b/src/app/shared/form/form.reducer.ts
@@ -1,3 +1,7 @@
+import isEqual from 'lodash/isEqual';
+import uniqWith from 'lodash/uniqWith';
+
+import { hasValue } from '../empty.util';
 import {
   FormAction,
   FormActionTypes,
@@ -8,11 +12,8 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
-import { hasValue } from '../empty.util';
-import isEqual from 'lodash/isEqual';
-import uniqWith from 'lodash/uniqWith';
 
 export interface FormError {
   message: string;
@@ -84,19 +85,19 @@ function addFormErrors(state: FormState, action: FormAddError) {
     const error: FormError = {
       fieldId: action.payload.fieldId,
       fieldIndex: action.payload.fieldIndex,
-      message: action.payload.errorMessage
+      message: action.payload.errorMessage,
     };
     const metadata = action.payload.fieldId.replace(/\_/g, '.');
     const touched = Object.assign({}, state[formId].touched, {
-      [metadata]: true
+      [metadata]: true,
     });
     return Object.assign({}, state, {
       [formId]: {
         data: state[formId].data,
         valid: state[formId].valid,
         errors: state[formId].errors ? uniqWith(state[formId].errors.concat(error), isEqual) : [].concat(error),
-        touched
-      }
+        touched,
+      },
     });
   } else {
     return state;
@@ -110,7 +111,7 @@ function removeFormError(state: FormState, action: FormRemoveErrorAction) {
   if (hasValue(state[formId])) {
     const errors = state[formId].errors.filter((error) => error.fieldId !== fieldId || error.fieldIndex !== fieldIndex);
     const newState = Object.assign({}, state);
-    newState[formId] = Object.assign({}, state[formId], {errors});
+    newState[formId] = Object.assign({}, state[formId], { errors });
     return newState;
   } else {
     return state;
@@ -122,7 +123,7 @@ function clearsFormErrors(state: FormState, action: FormClearErrorsAction) {
   if (hasValue(state[formId])) {
     const errors = [];
     const newState = Object.assign({}, state);
-    newState[formId] = Object.assign({}, state[formId], {errors});
+    newState[formId] = Object.assign({}, state[formId], { errors });
     return newState;
   } else {
     return state;
@@ -148,7 +149,7 @@ function initForm(state: FormState, action: FormInitAction): FormState {
   };
   if (!hasValue(state[action.payload.formId])) {
     return Object.assign({}, state, {
-      [action.payload.formId]: formState
+      [action.payload.formId]: formState,
     });
   } else {
     const newState = Object.assign({}, state);
@@ -171,9 +172,9 @@ function changeDataForm(state: FormState, action: FormChangeAction): FormState {
   if (hasValue(state[action.payload.formId])) {
     const newState = Object.assign({}, state);
     newState[action.payload.formId] = Object.assign({}, newState[action.payload.formId], {
-        data: action.payload.formData,
-        valid: state[action.payload.formId].valid
-      }
+      data: action.payload.formData,
+      valid: state[action.payload.formId].valid,
+    },
     );
     return newState;
   } else {
@@ -196,15 +197,15 @@ function changeStatusForm(state: FormState, action: FormStatusChangeAction): For
     return Object.assign({}, state, {
       [action.payload.formId]: {
         data: state[action.payload.formId].data,
-        valid: action.payload.valid
-      }
+        valid: action.payload.valid,
+      },
     });
   } else {
     const newState = Object.assign({}, state);
     newState[action.payload.formId] = Object.assign({}, newState[action.payload.formId], {
-        data: state[action.payload.formId].data,
-        valid: action.payload.valid
-      }
+      data: state[action.payload.formId].data,
+      valid: action.payload.valid,
+    },
     );
     return newState;
   }
@@ -242,7 +243,7 @@ function changeTouchedState(state: FormState, action: FormAddTouchedAction): For
     const newForm = Object.assign({}, newState[action.payload.formId]);
     newState[action.payload.formId] = newForm;
 
-    newForm.touched = { ... newForm.touched};
+    newForm.touched = { ... newForm.touched };
     action.payload.touched.forEach((field) => newForm.touched[field] = true);
 
     return newState;
diff --git a/src/app/shared/form/form.service.spec.ts b/src/app/shared/form/form.service.spec.ts
index 57880ffc14..a5c09c5854 100644
--- a/src/app/shared/form/form.service.spec.ts
+++ b/src/app/shared/form/form.service.spec.ts
@@ -1,23 +1,38 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { AbstractControl, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  AbstractControl,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core';
-
-import { FormService } from './form.service';
-import { FormBuilderService } from './builder/form-builder.service';
 import { AppState } from '../../app.reducer';
-import { formReducer } from './form.reducer';
 import { getMockFormBuilderService } from '../mocks/form-builder-service.mock';
+import { FormBuilderService } from './builder/form-builder.service';
+import { formReducer } from './form.reducer';
+import { FormService } from './form.service';
 
 describe('FormService test suite', () => {
   const config = {
     form: {
       validatorMap: {
         required: 'required',
-        regex: 'pattern'
-      }
-    }
+        regex: 'pattern',
+      },
+    },
   } as any;
   const formId = 'testForm';
   let service: FormService;
@@ -29,11 +44,11 @@ describe('FormService test suite', () => {
     new DynamicInputModel({
       id: 'title',
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Title is required'
-      }
+        required: 'Title is required',
+      },
     }),
     new DynamicInputModel({ id: 'date' }),
     new DynamicInputModel({ id: 'description' }),
@@ -45,21 +60,21 @@ describe('FormService test suite', () => {
 
           id: 'zipCode',
           label: 'Zip Code',
-          placeholder: 'ZIP'
+          placeholder: 'ZIP',
         }),
         new DynamicInputModel({
 
           id: 'state',
           label: 'State',
-          placeholder: 'State'
+          placeholder: 'State',
         }),
         new DynamicInputModel({
 
           id: 'city',
           label: 'City',
-          placeholder: 'City'
-        })
-      ]
+          placeholder: 'City',
+        }),
+      ],
     }),
   ];
 
@@ -73,16 +88,16 @@ describe('FormService test suite', () => {
     addressLocation: {
       zipCode: null,
       state: null,
-      city: null
-    }
+      city: null,
+    },
   };
   const formState = {
     testForm: {
       data: formData,
       valid: false,
       errors: [],
-      touched: {}
-    }
+      touched: {},
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -91,34 +106,34 @@ describe('FormService test suite', () => {
         StoreModule.forRoot({ formReducer }, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
-        })
-      ]
+            strictActionImmutability: false,
+          },
+        }),
+      ],
     }).compileComponents();
   }));
 
   beforeEach(inject([Store], (store: Store<AppState>) => {
-      builderService = getMockFormBuilderService();
-      store
-        .subscribe((state) => {
-          state.forms = formState;
-        });
-      const author: AbstractControl = new UntypedFormControl('test');
-      const title: AbstractControl = new UntypedFormControl(undefined, Validators.required);
-      const date: AbstractControl = new UntypedFormControl(undefined);
-      const description: AbstractControl = new UntypedFormControl(undefined);
-
-      const addressLocation: UntypedFormGroup = new UntypedFormGroup({
-        zipCode: new UntypedFormControl(undefined),
-        state: new UntypedFormControl(undefined),
-        city: new UntypedFormControl(undefined),
+    builderService = getMockFormBuilderService();
+    store
+      .subscribe((state) => {
+        state.forms = formState;
       });
+    const author: AbstractControl = new UntypedFormControl('test');
+    const title: AbstractControl = new UntypedFormControl(undefined, Validators.required);
+    const date: AbstractControl = new UntypedFormControl(undefined);
+    const description: AbstractControl = new UntypedFormControl(undefined);
 
-      formGroup = new UntypedFormGroup({ author, title, date, description, addressLocation });
-      controls = { author, title, date, description , addressLocation };
-      service = new FormService(builderService, store);
-    })
+    const addressLocation: UntypedFormGroup = new UntypedFormGroup({
+      zipCode: new UntypedFormControl(undefined),
+      state: new UntypedFormControl(undefined),
+      city: new UntypedFormControl(undefined),
+    });
+
+    formGroup = new UntypedFormGroup({ author, title, date, description, addressLocation });
+    controls = { author, title, date, description , addressLocation };
+    service = new FormService(builderService, store);
+  }),
   )
   ;
 
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index bf316daaed..35da58f5f6 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -1,15 +1,34 @@
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
-
-import { AppState } from '../../app.reducer';
-import { formObjectFromIdSelector } from './selectors';
-import { FormBuilderService } from './builder/form-builder.service';
-import { DynamicFormControlEvent, DynamicFormControlModel, DynamicFormGroupModel } from '@ng-dynamic-forms/core';
-import { isEmpty, isNotUndefined } from '../empty.util';
+import {
+  AbstractControl,
+  UntypedFormArray,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+} from '@ng-dynamic-forms/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import uniqueId from 'lodash/uniqueId';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { AppState } from '../../app.reducer';
+import {
+  isEmpty,
+  isNotUndefined,
+} from '../empty.util';
+import { FormBuilderService } from './builder/form-builder.service';
 import {
   FormAddError,
   FormAddTouchedAction,
@@ -17,10 +36,14 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
-import { FormEntry, FormError, FormTouchedState } from './form.reducer';
-import { environment } from '../../../environments/environment';
+import {
+  FormEntry,
+  FormError,
+  FormTouchedState,
+} from './form.reducer';
+import { formObjectFromIdSelector } from './selectors';
 
 @Injectable()
 export class FormService {
@@ -38,7 +61,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.valid),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -50,7 +73,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.data),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -62,7 +85,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.touched),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -74,7 +97,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.errors),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -85,7 +108,7 @@ export class FormService {
     return this.store.pipe(
       select(formObjectFromIdSelector(formId)),
       distinctUntilChanged(),
-      map((state) => isNotUndefined(state))
+      map((state) => isNotUndefined(state)),
     );
   }
 
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 9b2ef98925..12e29fa70e 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -6,7 +6,7 @@
       [disabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
-      <span class="sr-only">Increment</span>
+      <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
     </button>
     <input
       id="{{id}}"
@@ -24,6 +24,7 @@
       [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
+      [attr.aria-label]="placeholder"
     >
     <button
       class="btn btn-link-focus"
@@ -32,6 +33,6 @@
       [disabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
-      <span class="sr-only">Decrement</span>
+      <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
     </button>
 </div>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index d4484dbfa3..4257a0371f 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -1,12 +1,25 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
-
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { NumberPickerComponent } from './number-picker.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { createTestComponent } from '../../testing/utils.test';
+import { NumberPickerComponent } from './number-picker.component';
 
 describe('NumberPickerComponent test suite', () => {
 
@@ -23,7 +36,8 @@ describe('NumberPickerComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot(),
       ],
       declarations: [
         NumberPickerComponent,
@@ -33,7 +47,7 @@ describe('NumberPickerComponent test suite', () => {
         ChangeDetectorRef,
         NumberPickerComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -42,7 +56,6 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        tabindex="1"
         [disabled]="disabled"
         [min]="min"
         [max]="max"
@@ -147,7 +160,7 @@ describe('NumberPickerComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 82240c41d1..353e8c820a 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -1,5 +1,19 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, SimpleChanges, } from '@angular/core';
-import { ControlValueAccessor, UntypedFormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -7,7 +21,7 @@ import { isEmpty } from '../../empty.util';
   styleUrls: ['./number-picker.component.scss'],
   templateUrl: './number-picker.component.html',
   providers: [
-    {provide: NG_VALUE_ACCESSOR, useExisting: NumberPickerComponent, multi: true}
+    { provide: NG_VALUE_ACCESSOR, useExisting: NumberPickerComponent, multi: true },
   ],
 })
 
@@ -31,7 +45,9 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
   startValue: number;
 
-  constructor(private fb: UntypedFormBuilder, private cd: ChangeDetectorRef) {
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef,
+              private translate: TranslateService) {
   }
 
   ngOnInit() {
@@ -54,7 +70,7 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
     } else if (changes.value && changes.value.currentValue === null) {
       // When the user delete the inserted value
-        this.value = null;
+      this.value = null;
     } else if (changes.invalid) {
       this.invalid = changes.invalid.currentValue;
     }
@@ -103,13 +119,12 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
       if (i >= this.min && i <= this.max) {
         this.value = i;
-        this.emitChange();
       } else if (event.target.value === null || event.target.value === '') {
         this.value = null;
-        this.emitChange();
       } else {
         this.value = undefined;
       }
+      this.emitChange();
     } catch (e) {
       this.value = undefined;
     }
@@ -139,6 +154,6 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
   }
 
   emitChange() {
-    this.change.emit({field: this.name, value: this.value});
+    this.change.emit({ field: this.name, value: this.value });
   }
 }
diff --git a/src/app/shared/form/selectors.ts b/src/app/shared/form/selectors.ts
index aeefb5f984..95fdb19178 100644
--- a/src/app/shared/form/selectors.ts
+++ b/src/app/shared/form/selectors.ts
@@ -1,7 +1,13 @@
-import { createSelector, MemoizedSelector } from '@ngrx/store';
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
 
 import { AppState } from '../../app.reducer';
-import { FormEntry, FormState } from './form.reducer';
+import {
+  FormEntry,
+  FormState,
+} from './form.reducer';
 
 export const formStateSelector = (state: AppState) => state.forms;
 
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
index 590c69a159..53b265a2b6 100644
--- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal.component';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal.component';
+
 describe('VocabularyTreeviewModalComponent', () => {
   let component: VocabularyTreeviewModalComponent;
   let fixture: ComponentFixture<VocabularyTreeviewModalComponent>;
@@ -18,7 +21,7 @@ describe('VocabularyTreeviewModalComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
       ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts
index c6b0bf20fe..2bfc84542a 100644
--- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts
@@ -1,12 +1,18 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+
 import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 
 @Component({
   selector: 'ds-vocabulary-treeview-modal',
   templateUrl: './vocabulary-treeview-modal.component.html',
-  styleUrls: ['./vocabulary-treeview-modal.component.scss']
+  styleUrls: ['./vocabulary-treeview-modal.component.scss'],
 })
 /**
  * Component that contains a modal to display a VocabularyTreeviewComponent
@@ -33,6 +39,12 @@ export class VocabularyTreeviewModalComponent {
    */
   @Input() multiSelect = false;
 
+  /**
+   * An event fired when a vocabulary entry is selected.
+   * Event's payload equals to {@link VocabularyEntryDetail} selected.
+   */
+  @Output() select: EventEmitter<VocabularyEntryDetail> = new EventEmitter<VocabularyEntryDetail>(null);
+
   /**
    * Initialize instance variables
    *
@@ -46,6 +58,7 @@ export class VocabularyTreeviewModalComponent {
    * Method called on entry select
    */
   onSelect(item: VocabularyEntryDetail) {
+    this.select.emit(item);
     this.activeModal.close(item);
   }
 }
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
index 23ac6fcf8f..5c6279aa0d 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
@@ -1,8 +1,15 @@
-import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import {
+  CollectionViewer,
+  DataSource,
+} from '@angular/cdk/collections';
 import { FlatTreeControl } from '@angular/cdk/tree';
-
-import { BehaviorSubject, merge, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  merge,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 
 /**
@@ -36,7 +43,7 @@ export class VocabularyTreeFlatDataSource<T, F> extends DataSource<F> {
     const changes = [
       collectionViewer.viewChange,
       this._treeControl.expansionModel.changed,
-      this._flattenedData
+      this._flattenedData,
     ];
     return merge<any>(...changes).pipe(map((): F[] => {
       this._expandedData.next(
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
index 419f48d222..734e2cf460 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
@@ -1,5 +1,4 @@
 import { TreeControl } from '@angular/cdk/tree';
-
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
@@ -46,7 +45,7 @@ export class VocabularyTreeFlattener<T, F> {
                 Observable<T[]> | T[] | undefined | null) {}
 
   _flattenNode(node: T, level: number,
-               resultNodes: F[], parentMap: boolean[]): F[] {
+    resultNodes: F[], parentMap: boolean[]): F[] {
     const flatNode = this.transformFunction(node, level);
     resultNodes.push(flatNode);
 
@@ -66,7 +65,7 @@ export class VocabularyTreeFlattener<T, F> {
   }
 
   _flattenChildren(children: T[], level: number,
-                   resultNodes: F[], parentMap: boolean[]): void {
+    resultNodes: F[], parentMap: boolean[]): void {
     children.forEach((child, index) => {
       const childParentMap: boolean[] = parentMap.slice();
       childParentMap.push(index !== children.length - 1);
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
index 4ac1b08425..c4dc5fb1fd 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { BehaviorSubject } from 'rxjs';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 export const LOAD_MORE = 'LOAD_MORE';
 export const LOAD_MORE_ROOT = 'LOAD_MORE_ROOT';
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index fb7d162008..2baafc9d1d 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,8 +1,9 @@
-<ds-alert *ngIf="description | async" [content]="description | async" [type]="'alert-info'"></ds-alert>
-<div class="treeview-header row">
+<ds-alert [content]="'vocabulary-treeview.info' | translate" [type]="AlertType.Info"></ds-alert>
+<div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
+      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+             [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
         <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
@@ -10,21 +11,24 @@
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+          {{'vocabulary-treeview.search.form.add' | translate}}
+        </button>
       </div>
     </div>
   </div>
 </div>
 <div class="treeview-container">
   <ds-themed-loading *ngIf="loading | async" [showMessage]="false"></ds-themed-loading>
-  <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-center text-muted mt-4" >
+  <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
     <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h4>
+  </h2>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-          <span class="fas fa-angle-right invisible" aria-hidden="true"></span>
-        </button>
+      <span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
+        <i class="fas fa-fw fa-angle-right invisible"></i>
+      </span>
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
                  [class.text-success]="node.isSelected"
                  [ngbTooltip]="node.item?.otherInformation?.note"
@@ -52,11 +56,10 @@
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle
+        <button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
                 [attr.aria-label]="'toggle ' + node.name"
                 (click)="loadChildren(node)">
-          <span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
-                aria-hidden="true"></span>
+          <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
         </button>
 
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
index 3f0cea10d2..3d32acac5b 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -2,10 +2,6 @@
   text-align:left;
 }
 
-cdk-tree .btn:focus {
-  box-shadow: none !important;
-}
-
 label {
   cursor: pointer;
 }
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
index 9e6e8dedd3..52cfd9bd3f 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
@@ -1,27 +1,38 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { CdkTreeModule } from '@angular/cdk/tree';
-
-import { of as observableOf } from 'rxjs';
-import { StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { createTestComponent } from '../../testing/utils.test';
-import { VocabularyTreeviewComponent } from './vocabulary-treeview.component';
-import { VocabularyTreeviewService } from './vocabulary-treeview.service';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
-import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { storeModuleConfig } from '../../../app.reducer';
+import { authReducer } from '../../../core/auth/auth.reducer';
+import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
-import { authReducer } from '../../../core/auth/auth.reducer';
-import { storeModuleConfig } from '../../../app.reducer';
-import { By } from '@angular/platform-browser';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import { createTestComponent } from '../../testing/utils.test';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
+import { VocabularyTreeviewComponent } from './vocabulary-treeview.component';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import {
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 describe('VocabularyTreeviewComponent test suite', () => {
 
@@ -56,7 +67,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
     findEntryDetailById: jasmine.createSpy('findEntryDetailById'),
     searchTopEntries: jasmine.createSpy('searchTopEntries'),
     getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
-    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests')
+    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests'),
   });
 
   initialState = {
@@ -68,9 +79,9 @@ describe('VocabularyTreeviewComponent test suite', () => {
         loading: false,
         authToken: new AuthTokenInfo('test_token'),
         userId: 'testid',
-        authMethods: []
-      }
-    }
+        authMethods: [],
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -78,11 +89,11 @@ describe('VocabularyTreeviewComponent test suite', () => {
       imports: [
         CdkTreeModule,
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         VocabularyTreeviewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: VocabularyTreeviewService, useValue: vocabularyTreeviewServiceStub },
@@ -90,9 +101,9 @@ describe('VocabularyTreeviewComponent test suite', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         provideMockStore({ initialState }),
         ChangeDetectorRef,
-        VocabularyTreeviewComponent
+        VocabularyTreeviewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then(() => {
       vocabularyTreeviewServiceStub.getData.and.returnValue(observableOf([]));
       vocabularyTreeviewServiceStub.isLoading.and.returnValue(observableOf(false));
@@ -142,7 +153,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       const currentValue = new FormFieldMetadataValueObject();
       currentValue.value = 'testValue';
       currentValue.otherInformation = {
-        id: 'entryID'
+        id: 'entryID',
       };
       comp.selectedItems = [currentValue.value];
       fixture.detectChanges();
@@ -154,7 +165,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       const currentValue = new VocabularyEntry();
       currentValue.value = 'testValue';
       currentValue.otherInformation = {
-        id: 'entryID'
+        id: 'entryID',
       };
       comp.selectedItems = [currentValue.value];
       fixture.detectChanges();
@@ -242,20 +253,20 @@ describe('VocabularyTreeviewComponent test suite', () => {
         {
           'item': {
             'id': 'srsc:SCB11',
-            'display': 'HUMANITIES and RELIGION'
-          }
+            'display': 'HUMANITIES and RELIGION',
+          },
         } as TreeviewNode,
         {
           'item': {
             'id': 'srsc:SCB12',
-            'display': 'LAW/JURISPRUDENCE'
-          }
+            'display': 'LAW/JURISPRUDENCE',
+          },
         } as TreeviewNode,
         {
           'item': {
             'id': 'srsc:SCB13',
-            'display': 'SOCIAL SCIENCES'
-          }
+            'display': 'SOCIAL SCIENCES',
+          },
         } as TreeviewNode,
       ]));
       fixture = TestBed.createComponent(VocabularyTreeviewComponent);
@@ -284,7 +295,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index 017416e8c2..c2364ac87a 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -1,24 +1,43 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { map } from 'rxjs/operators';
-import { Observable, Subscription } from 'rxjs';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
 
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../empty.util';
-import { VocabularyTreeviewService } from './vocabulary-treeview.service';
-import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { CoreState } from '../../../core/core-state.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
-import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
-import { CoreState } from '../../../core/core-state.model';
-import { lowerCase } from 'lodash/string';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { AlertType } from '../../alert/alert-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
+import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
+import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import {
+  LOAD_MORE,
+  LOAD_MORE_ROOT,
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 /**
  * Component that shows a hierarchical vocabulary in a tree view
@@ -26,9 +45,9 @@ import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operato
 @Component({
   selector: 'ds-vocabulary-treeview',
   templateUrl: './vocabulary-treeview.component.html',
-  styleUrls: ['./vocabulary-treeview.component.scss']
+  styleUrls: ['./vocabulary-treeview.component.scss'],
 })
-export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
+export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
   /**
    * The {@link VocabularyOptions} object
@@ -50,11 +69,6 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   @Input() multiSelect = false;
 
-  /**
-   * Contain a descriptive message for this vocabulary retrieved from i18n files
-   */
-  description: Observable<string>;
-
   /**
    * A map containing the current node showed by the tree
    */
@@ -112,6 +126,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   private subs: Subscription[] = [];
 
+  readonly AlertType = AlertType;
+
   /**
    * Initialize instance variables
    *
@@ -124,7 +140,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
     private vocabularyTreeviewService: VocabularyTreeviewService,
     private vocabularyService: VocabularyService,
     private store: Store<CoreState>,
-    private translate: TranslateService
+    private translate: TranslateService,
   ) {
     this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel,
       this.isExpandable, this.getChildren);
@@ -161,7 +177,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
       node.loadMoreParentItem,
       node.isSearchNode,
       node.isInInitValueHierarchy,
-      node.isSelected
+      node.isSelected,
     );
     this.nodeMap.set(node.item.id, newNode);
 
@@ -213,13 +229,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
     this.subs.push(
       this.vocabularyTreeviewService.getData().subscribe((data) => {
         this.dataSource.data = data;
-      })
-    );
-
-    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
-      map((type) => lowerCase(type)),
-    ).subscribe(
-      (type) => this.description = this.translate.get('vocabulary-treeview.info', { type })
+      }),
     );
 
     this.loading = this.vocabularyTreeviewService.isLoading();
@@ -306,6 +316,15 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
     }
   }
 
+  add() {
+    const userVocabularyEntry = {
+      value: this.searchText,
+      display: this.searchText,
+    } as VocabularyEntryDetail;
+    this.select.emit(userVocabularyEntry);
+  }
+
+
   /**
    * Unsubscribe from all subscriptions
    */
@@ -322,4 +341,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   private getEntryId(entry: VocabularyEntry): string {
     return entry.authority || entry.otherInformation.id || undefined;
   }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    this.reset();
+    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), this.selectedItems, null);
+  }
 }
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
index 97be15a041..fea65250a0 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
@@ -1,21 +1,40 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { from as observableFrom } from 'rxjs';
+import {
+  expand,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 
-import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { LOAD_MORE_NODE, LOAD_MORE_ROOT_NODE, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { expand, map, switchMap } from 'rxjs/operators';
-import { from as observableFrom } from 'rxjs';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import {
+  LOAD_MORE_NODE,
+  LOAD_MORE_ROOT_NODE,
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 describe('VocabularyTreeviewService test suite', () => {
 
@@ -62,7 +81,7 @@ describe('VocabularyTreeviewService test suite', () => {
     findEntryDetailById: jasmine.createSpy('findEntryDetailById'),
     searchTopEntries: jasmine.createSpy('searchTopEntries'),
     getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
-    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests')
+    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests'),
   });
 
   function init() {
@@ -71,7 +90,7 @@ describe('VocabularyTreeviewService test suite', () => {
       elementsPerPage: 1,
       totalElements: 3,
       totalPages: 1,
-      currentPage: 1
+      currentPage: 1,
     });
     loadMoreNode = new TreeviewNode(LOAD_MORE_NODE, false, new PageInfo(), item);
     loadMoreRootNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, new PageInfo(), null);
@@ -129,13 +148,13 @@ describe('VocabularyTreeviewService test suite', () => {
     treeNodeList = [
       itemNode,
       itemNode2,
-      itemNode3
+      itemNode3,
     ];
     treeNodeListWithChildren = [
       itemNode,
       itemNode2,
       itemNode3,
-      childNode
+      childNode,
     ];
     treeNodeListWithLoadMoreRoot = treeNodeList;
     treeNodeListWithLoadMore = treeNodeListWithChildren;
@@ -145,7 +164,7 @@ describe('VocabularyTreeviewService test suite', () => {
     nodeMap = new Map<string, TreeviewNode>([
       [item.id, itemNode],
       [item2.id, itemNode2],
-      [item3.id, itemNode3]
+      [item3.id, itemNode3],
     ]);
 
     nodeMapWithChildren = new Map<string, TreeviewNode>([
@@ -167,15 +186,15 @@ describe('VocabularyTreeviewService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         VocabularyTreeviewService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     }).compileComponents();
   }));
 
@@ -189,7 +208,7 @@ describe('VocabularyTreeviewService test suite', () => {
   describe('initialize', () => {
     it('should set vocabularyName and call retrieveTopNodes method', () => {
       serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3])),
       }));
 
       scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, []));
@@ -202,17 +221,17 @@ describe('VocabularyTreeviewService test suite', () => {
 
     it('should set initValueHierarchy', () => {
       serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-c', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3])),
       }));
       serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child2)
-        })
+          a: createSuccessfulRemoteDataObject(child2),
+        }),
       );
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValue(
         hot('-b', {
-          b: createSuccessfulRemoteDataObject(item)
-        })
+          b: createSuccessfulRemoteDataObject(item),
+        }),
       );
       scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, [], 'root2'));
       scheduler.flush();
@@ -253,10 +272,10 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 2,
         totalPages: 2,
-        currentPage: 2
+        currentPage: 2,
       });
       spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
-        a: buildPaginatedList(pageInfo, [child2])
+        a: buildPaginatedList(pageInfo, [child2]),
       }));
 
       serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
@@ -274,10 +293,10 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 2,
         totalPages: 2,
-        currentPage: 1
+        currentPage: 1,
       });
       spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
-        a: buildPaginatedList(pageInfo, [child2])
+        a: buildPaginatedList(pageInfo, [child2]),
       }));
 
       serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
@@ -299,23 +318,23 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       });
       serviceAsAny.vocabularyService.getVocabularyEntriesByValue.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [childEntry3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [childEntry3])),
       }));
 
       serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(child3)
+        a: createSuccessfulRemoteDataObject(child3),
       }));
 
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValues(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child)
+          a: createSuccessfulRemoteDataObject(child),
         }),
         hot('-b', {
-          b: createSuccessfulRemoteDataObject(item)
-        })
+          b: createSuccessfulRemoteDataObject(item),
+        }),
       );
       vocabularyOptions.query = 'root1-child1-child1';
 
@@ -328,7 +347,7 @@ describe('VocabularyTreeviewService test suite', () => {
       const levels$ = serviceAsAny.dataChange.pipe(
         expand((nodes: TreeviewNode[]) => {         // recursively apply:
           return observableFrom(nodes).pipe(        //   for each node in the array...
-            switchMap(node => node.childrenChange)  //   ...map it to the array its child nodes.
+            switchMap(node => node.childrenChange),  //   ...map it to the array its child nodes.
           );                                        // because we only have one child per node in this case,
         }),                                         // this results in an array of nodes for each level of the tree.
         map((nodes: TreeviewNode[]) => nodes.map(node => node.item)), // finally, replace nodes with their vocab entries
@@ -339,7 +358,7 @@ describe('VocabularyTreeviewService test suite', () => {
         a: [item],
         b: [child],
         c: [child3],
-        d: []           // ensure that grandchild has no children & the recursion stopped there
+        d: [],           // ensure that grandchild has no children & the recursion stopped there
       }));
     });
   });
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
index f524af4c0e..0cf951bfaf 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
@@ -1,32 +1,43 @@
 import { Injectable } from '@angular/core';
-
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { map, merge, mergeMap, scan } from 'rxjs/operators';
 import findIndex from 'lodash/findIndex';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  merge,
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload,
+} from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import {
   LOAD_MORE_NODE,
   LOAD_MORE_ROOT_NODE,
   TreeviewFlatNode,
-  TreeviewNode
+  TreeviewNode,
 } from './vocabulary-treeview-node.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { isEmpty, isNotEmpty } from '../../empty.util';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
-} from '../../../core/shared/operators';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 /**
  * A service that provides methods to deal with vocabulary tree
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class VocabularyTreeviewService {
 
@@ -116,7 +127,7 @@ export class VocabularyTreeviewService {
         .subscribe((hierarchy: string[]) => {
           this.initValueHierarchy = hierarchy;
           this.retrieveTopNodes(pageInfo, [], selectedItems);
-      });
+        });
     } else {
       this.retrieveTopNodes(pageInfo, [], selectedItems);
     }
@@ -165,7 +176,7 @@ export class VocabularyTreeviewService {
       if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
         // Update page info
         const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
-          currentPage: list.pageInfo.currentPage + 1
+          currentPage: list.pageInfo.currentPage + 1,
         });
         parent.updatePageInfo(newPageInfo);
 
@@ -202,8 +213,8 @@ export class VocabularyTreeviewService {
       mergeMap((result: VocabularyEntry[]) => (result.length > 0) ? result : observableOf(null)),
       mergeMap((entry: VocabularyEntry) =>
         this.vocabularyService.findEntryDetailById(entry.otherInformation.id, this.vocabularyName).pipe(
-          getFirstSucceededRemoteDataPayload()
-        )
+          getFirstSucceededRemoteDataPayload(),
+        ),
       ),
       mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, selectedItems)),
       scan((acc: TreeviewNode[], value: TreeviewNode) => {
@@ -213,7 +224,7 @@ export class VocabularyTreeviewService {
           return [...acc, value];
         }
       }, []),
-      merge(this.hideSearchingWhenUnsubscribed$)
+      merge(this.hideSearchingWhenUnsubscribed$),
     ).subscribe((nodes: TreeviewNode[]) => {
       this.dataChange.next(nodes);
       this.loading.next(false);
@@ -274,7 +285,7 @@ export class VocabularyTreeviewService {
   private getNodeHierarchyById(id: string, selectedItems: string[]): Observable<string[]> {
     return this.getById(id).pipe(
       mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, selectedItems,[], false)),
-      map((node: TreeviewNode) => this.getNodeHierarchyIds(node, selectedItems))
+      map((node: TreeviewNode) => this.getNodeHierarchyIds(node, selectedItems)),
     );
   }
 
@@ -286,7 +297,7 @@ export class VocabularyTreeviewService {
    */
   private getChildrenNodesByParent(parentId: string, pageInfo: PageInfo): Observable<PaginatedList<VocabularyEntryDetail>> {
     return this.vocabularyService.getEntryDetailChildren(parentId, this.vocabularyName, pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -296,7 +307,7 @@ export class VocabularyTreeviewService {
    */
   private getParentNode(entryId: string): Observable<VocabularyEntryDetail> {
     return this.vocabularyService.getEntryDetailParent(entryId, this.vocabularyName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -307,7 +318,7 @@ export class VocabularyTreeviewService {
    */
   private getById(entryId: string): Observable<VocabularyEntryDetail> {
     return this.vocabularyService.findEntryDetailById(entryId, this.vocabularyName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -319,7 +330,7 @@ export class VocabularyTreeviewService {
    */
   private retrieveTopNodes(pageInfo: PageInfo, nodes: TreeviewNode[], selectedItems: string[]): void {
     this.vocabularyService.searchTopEntries(this.vocabularyName, pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
       this.vocabularyService.clearSearchTopRequests();
       const newNodes: TreeviewNode[] = list.page.map((entry: VocabularyEntryDetail) => this._generateNode(entry, selectedItems));
@@ -328,7 +339,7 @@ export class VocabularyTreeviewService {
       if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
         // Need a new load more node
         const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
-          currentPage: list.pageInfo.currentPage + 1
+          currentPage: list.pageInfo.currentPage + 1,
         });
         const loadMoreNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, newPageInfo);
         loadMoreNode.updatePageInfo(newPageInfo);
@@ -368,7 +379,7 @@ export class VocabularyTreeviewService {
 
     if (node.item.hasOtherInformation() && isNotEmpty(node.item.otherInformation.parent)) {
       return this.getParentNode(node.item.otherInformation.id).pipe(
-        mergeMap((parentItem: VocabularyEntryDetail) => this.getNodeHierarchy(parentItem, selectedItems, [node], toStore))
+        mergeMap((parentItem: VocabularyEntryDetail) => this.getNodeHierarchy(parentItem, selectedItems, [node], toStore)),
       );
     } else {
       return observableOf(node);
diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
index 67f66c9757..870e636023 100644
--- a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
+++ b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
@@ -1,8 +1,11 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NativeWindowService } from '../../core/services/window.service';
 
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { NativeWindowService } from '../../core/services/window.service';
 import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { GoogleRecaptchaComponent } from './google-recaptcha.component';
@@ -15,7 +18,7 @@ describe('GoogleRecaptchaComponent', () => {
 
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: jasmine.createSpy('findByPropertyName')
+    findByPropertyName: jasmine.createSpy('findByPropertyName'),
   });
 
   const confResponse$ = createSuccessfulRemoteDataObject$({ values: ['valid-google-recaptcha-key'] });
@@ -24,11 +27,11 @@ describe('GoogleRecaptchaComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [ GoogleRecaptchaComponent ],
       providers: [
-      { provide: ConfigurationDataService, useValue: configurationDataService },
-      { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-    ]
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
 
diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.ts
index 16c49ba45b..4ea408d596 100644
--- a/src/app/shared/google-recaptcha/google-recaptcha.component.ts
+++ b/src/app/shared/google-recaptcha/google-recaptcha.component.ts
@@ -1,9 +1,19 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from 'src/app/core/services/window.service';
 
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { NativeWindowRef, NativeWindowService } from 'src/app/core/services/window.service';
 import { isNotEmpty } from '../empty.util';
 
 @Component({
diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts
index b326eb0416..4550bf9753 100644
--- a/src/app/shared/handle.service.spec.ts
+++ b/src/app/shared/handle.service.spec.ts
@@ -1,47 +1,92 @@
-import { HandleService } from './handle.service';
+import { TestBed } from '@angular/core/testing';
+
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import {
+  CANONICAL_PREFIX_KEY,
+  HandleService,
+} from './handle.service';
+import { createSuccessfulRemoteDataObject$ } from './remote-data.utils';
+import { ConfigurationDataServiceStub } from './testing/configuration-data.service.stub';
 
 describe('HandleService', () => {
   let service: HandleService;
 
+  let configurationService: ConfigurationDataServiceStub;
+
   beforeEach(() => {
-    service = new HandleService();
+    configurationService = new ConfigurationDataServiceStub();
+
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: ConfigurationDataService, useValue: configurationService },
+      ],
+    });
+    service = TestBed.inject(HandleService);
   });
 
   describe(`normalizeHandle`, () => {
-    it(`should simply return an already normalized handle`, () => {
-      let input, output;
+    it('should normalize a handle url with custom conical prefix with trailing slash', (done: DoneFn) => {
+      spyOn(configurationService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$({
+        ... new ConfigurationProperty(),
+        name: CANONICAL_PREFIX_KEY,
+        values: ['https://hdl.handle.net/'],
+      }));
 
-      input = '123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual(input);
-
-      input = '12.3456.789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual(input);
+      service.normalizeHandle('https://hdl.handle.net/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
     });
 
-    it(`should normalize a handle url`, () => {
-      let input, output;
+    it('should normalize a handle url with custom conical prefix without trailing slash', (done: DoneFn) => {
+      spyOn(configurationService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$({
+        ... new ConfigurationProperty(),
+        name: CANONICAL_PREFIX_KEY,
+        values: ['https://hdl.handle.net/'],
+      }));
 
-      input = 'https://hdl.handle.net/handle/123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual('123456789/123456');
-
-      input = 'https://rest.api/server/handle/123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual('123456789/123456');
+      service.normalizeHandle('https://hdl.handle.net/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
     });
 
-    it(`should return null if the input doesn't contain a handle`, () => {
-      let input, output;
+    describe('should simply return an already normalized handle', () => {
+      it('123456789/123456', (done: DoneFn) => {
+        service.normalizeHandle('123456789/123456').subscribe((handle: string | null) => {
+          expect(handle).toBe('123456789/123456');
+          done();
+        });
+      });
 
-      input = 'https://hdl.handle.net/handle/123456789';
-      output = service.normalizeHandle(input);
-      expect(output).toBeNull();
+      it('12.3456.789/123456', (done: DoneFn) => {
+        service.normalizeHandle('12.3456.789/123456').subscribe((handle: string | null) => {
+          expect(handle).toBe('12.3456.789/123456');
+          done();
+        });
+      });
+    });
 
-      input = 'something completely different';
-      output = service.normalizeHandle(input);
-      expect(output).toBeNull();
+    it('should normalize handle urls starting with handle', (done: DoneFn) => {
+      service.normalizeHandle('https://rest.api/server/handle/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
+    });
+
+    it('should return null if the input doesn\'t contain a valid handle', (done: DoneFn) => {
+      service.normalizeHandle('https://hdl.handle.net/123456789').subscribe((handle: string | null) => {
+        expect(handle).toBeNull();
+        done();
+      });
+    });
+
+    it('should return null if the input doesn\'t contain a handle', (done: DoneFn) => {
+      service.normalizeHandle('something completely different').subscribe((handle: string | null) => {
+        expect(handle).toBeNull();
+        done();
+      });
     });
   });
 });
diff --git a/src/app/shared/handle.service.ts b/src/app/shared/handle.service.ts
index da0f17f7de..0c4912c031 100644
--- a/src/app/shared/handle.service.ts
+++ b/src/app/shared/handle.service.ts
@@ -1,41 +1,86 @@
 import { Injectable } from '@angular/core';
-import { isNotEmpty, isEmpty } from './empty.util';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-const PREFIX_REGEX = /handle\/([^\/]+\/[^\/]+)$/;
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  hasNoValue,
+  isEmpty,
+} from './empty.util';
+
+export const CANONICAL_PREFIX_KEY = 'handle.canonical.prefix';
+
+const PREFIX_REGEX = (prefix: string | undefined) => {
+  const formattedPrefix: string = prefix?.replace(/\/$/, '');
+  return new RegExp(`(${formattedPrefix ? formattedPrefix  + '|' : '' }handle)\/([^\/]+\/[^\/]+)$`);
+};
 const NO_PREFIX_REGEX = /^([^\/]+\/[^\/]+)$/;
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class HandleService {
 
+  constructor(
+    protected configurationService: ConfigurationDataService,
+  ) {
+  }
 
   /**
    * Turns a handle string into the default 123456789/12345 format
    *
-   * @param handle the input handle
+   * When the <b>handle.canonical.prefix</b> doesn't end with handle, be sure to expose the variable so that the
+   * frontend can find the handle
    *
-   * normalizeHandle('123456789/123456')                                 // '123456789/123456'
-   * normalizeHandle('12.3456.789/123456')                               // '12.3456.789/123456'
-   * normalizeHandle('https://hdl.handle.net/handle/123456789/123456')   // '123456789/123456'
-   * normalizeHandle('https://rest.api/server/handle/123456789/123456')  // '123456789/123456'
-   * normalizeHandle('https://rest.api/server/handle/123456789')         // null
+   * @param handle the input handle
+   * @return
+   * <ul>
+   *   <li>normalizeHandle('123456789/123456')                                 // '123456789/123456'</li>
+   *   <li>normalizeHandle('12.3456.789/123456')                               // '12.3456.789/123456'</li>
+   *   <li>normalizeHandle('https://hdl.handle.net/123456789/123456')          // '123456789/123456'</li>
+   *   <li>normalizeHandle('https://rest.api/server/handle/123456789/123456')  // '123456789/123456'</li>
+   *   <li>normalizeHandle('https://rest.api/server/handle/123456789')         // null</li>
+   * </ul>
    */
-  normalizeHandle(handle: string): string {
-    let matches: string[];
-    if (isNotEmpty(handle)) {
-      matches = handle.match(PREFIX_REGEX);
+  normalizeHandle(handle: string): Observable<string | null> {
+    if (hasNoValue(handle)) {
+      return observableOf(null);
     }
+    return this.configurationService.findByPropertyName(CANONICAL_PREFIX_KEY).pipe(
+      getFirstCompletedRemoteData(),
+      map((configurationPropertyRD: RemoteData<ConfigurationProperty>) => {
+        if (configurationPropertyRD.hasSucceeded) {
+          return configurationPropertyRD.payload.values.length >= 1 ? configurationPropertyRD.payload.values[0] : undefined;
+        } else {
+          return undefined;
+        }
+      }),
+      map((prefix: string | undefined) => {
+        let matches: string[];
 
-    if (isEmpty(matches) || matches.length < 2) {
-      matches = handle.match(NO_PREFIX_REGEX);
-    }
+        matches = handle.match(PREFIX_REGEX(prefix));
 
-    if (isEmpty(matches) || matches.length < 2) {
-      return null;
-    } else {
-      return matches[1];
-    }
+        if (isEmpty(matches) || matches.length < 3) {
+          matches = handle.match(NO_PREFIX_REGEX);
+        }
+
+        if (isEmpty(matches) || matches.length < 2) {
+          return null;
+        } else {
+          return matches[matches.length - 1];
+        }
+      }),
+      take(1),
+    );
   }
 
 }
diff --git a/src/app/shared/host-window.actions.ts b/src/app/shared/host-window.actions.ts
index 3616b05004..0e909dfd36 100644
--- a/src/app/shared/host-window.actions.ts
+++ b/src/app/shared/host-window.actions.ts
@@ -3,7 +3,7 @@ import { Action } from '@ngrx/store';
 import { type } from './ngrx/type';
 
 export const HostWindowActionTypes = {
-  RESIZE: type('dspace/host-window/RESIZE')
+  RESIZE: type('dspace/host-window/RESIZE'),
 };
 
 export class HostWindowResizeAction implements Action {
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index f580c0e1da..7e1fe3761b 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,7 +1,8 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
-import { hostWindowReducer } from './search/host-window.reducer';
+
 import { HostWindowResizeAction } from './host-window.actions';
+import { hostWindowReducer } from './search/host-window.reducer';
 
 class NullAction extends HostWindowResizeAction {
   type = null;
@@ -44,6 +45,10 @@ describe('hostWindowReducer', () => {
 
     const action = new HostWindowResizeAction(1024, 768);
     hostWindowReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
 });
diff --git a/src/app/shared/host-window.service.spec.ts b/src/app/shared/host-window.service.spec.ts
index bbb9b3eece..345eb8f36d 100644
--- a/src/app/shared/host-window.service.spec.ts
+++ b/src/app/shared/host-window.service.spec.ts
@@ -1,9 +1,15 @@
 import { Store } from '@ngrx/store';
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { AppState } from '../app.reducer';
 
-import { HostWindowService, WidthCategory } from './host-window.service';
+import { AppState } from '../app.reducer';
+import {
+  HostWindowService,
+  WidthCategory,
+} from './host-window.service';
 import { CSSVariableServiceStub } from './testing/css-variable-service.stub';
 
 describe('HostWindowService', () => {
@@ -224,7 +230,7 @@ describe('HostWindowService', () => {
     it('should return SM if SM_MIN <= width < MD_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.SM_MIN + Math.floor((GridBreakpoint.MD_MIN - GridBreakpoint.SM_MIN) / 2)
+          a: GridBreakpoint.SM_MIN + Math.floor((GridBreakpoint.MD_MIN - GridBreakpoint.SM_MIN) / 2),
         }));
 
       const result = service.widthCategory;
@@ -236,7 +242,7 @@ describe('HostWindowService', () => {
     it('should return MD if MD_MIN <= width < LG_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.MD_MIN + Math.floor((GridBreakpoint.LG_MIN - GridBreakpoint.MD_MIN) / 2)
+          a: GridBreakpoint.MD_MIN + Math.floor((GridBreakpoint.LG_MIN - GridBreakpoint.MD_MIN) / 2),
         }));
 
       const result = service.widthCategory;
@@ -248,7 +254,7 @@ describe('HostWindowService', () => {
     it('should return LG if LG_MIN <= width < XL_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.LG_MIN + Math.floor((GridBreakpoint.XL_MIN - GridBreakpoint.LG_MIN) / 2)
+          a: GridBreakpoint.LG_MIN + Math.floor((GridBreakpoint.XL_MIN - GridBreakpoint.LG_MIN) / 2),
         }));
 
       const result = service.widthCategory;
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 6d13d921e0..f029ca1d6a 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -1,22 +1,34 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-
-import { filter, distinctUntilChanged, map } from 'rxjs/operators';
-import { HostWindowState } from './search/host-window.reducer';
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { hasValue } from './empty.util';
 import { AppState } from '../app.reducer';
+import { hasValue } from './empty.util';
 import { CSSVariableService } from './sass-helper/css-variable.service';
+import { HostWindowState } from './search/host-window.reducer';
 
 export enum WidthCategory {
-  XS,
-  SM,
-  MD,
-  LG,
-  XL
+  XS = 0,
+  SM = 1,
+  MD = 2,
+  LG = 3,
+  XL = 4,
 }
 
+export const maxMobileWidth = WidthCategory.SM;
+
 const hostWindowStateSelector = (state: AppState) => state.hostWindow;
 const widthSelector = createSelector(hostWindowStateSelector, (hostWindow: HostWindowState) => hostWindow.width);
 
@@ -26,22 +38,22 @@ export class HostWindowService {
 
   constructor(
     private store: Store<AppState>,
-    private variableService: CSSVariableService
+    private variableService: CSSVariableService,
   ) {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-      this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
-      this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
-      this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
-      this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
-    });
+        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
+        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
+        this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
+        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
+      });
   }
 
   private getWidthObs(): Observable<number> {
     return this.store.pipe(
       select(widthSelector),
-      filter((width) => hasValue(width))
+      filter((width) => hasValue(width)),
     );
   }
 
@@ -60,52 +72,87 @@ export class HostWindowService {
           return WidthCategory.XL;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isXs(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.XS),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isSm(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.SM),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isMd(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.MD),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isLg(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.LG),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isXl(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.XL),
-      distinctUntilChanged()
+      distinctUntilChanged(),
+    );
+  }
+
+  is(exactWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat === exactWidthCat),
+      distinctUntilChanged(),
+    );
+  }
+
+  isIn(widthCatArray: [WidthCategory]): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCatArray.includes(widthCat)),
+      distinctUntilChanged(),
+    );
+  }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxWidthCat),
+      distinctUntilChanged(),
+    );
+  }
+
+  isMobile(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxMobileWidth),
+      distinctUntilChanged(),
+    );
+  }
+
+  isDesktop(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat > maxMobileWidth),
+      distinctUntilChanged(),
     );
   }
 
   isXsOrSm(): Observable<boolean> {
     return observableCombineLatest(
       this.isXs(),
-      this.isSm()
+      this.isSm(),
     ).pipe(
       map(([isXs, isSm]) => isXs || isSm),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 }
diff --git a/src/app/shared/hover-class.directive.spec.ts b/src/app/shared/hover-class.directive.spec.ts
index 9c222dfe3a..80c2b9d1b1 100644
--- a/src/app/shared/hover-class.directive.spec.ts
+++ b/src/app/shared/hover-class.directive.spec.ts
@@ -1,10 +1,17 @@
-import { Component, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { HoverClassDirective } from './hover-class.directive';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
+import { HoverClassDirective } from './hover-class.directive';
+
 @Component({
-  template: `<div dsHoverClass="ds-hover"></div>`
+  template: `<div dsHoverClass="ds-hover"></div>`,
 })
 class TestComponent {
 }
@@ -16,7 +23,7 @@ describe('HoverClassDirective', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      declarations: [TestComponent, HoverClassDirective]
+      declarations: [TestComponent, HoverClassDirective],
     }).createComponent(TestComponent);
 
     fixture.detectChanges();
diff --git a/src/app/shared/hover-class.directive.ts b/src/app/shared/hover-class.directive.ts
index 4c41486858..d0caa5a530 100644
--- a/src/app/shared/hover-class.directive.ts
+++ b/src/app/shared/hover-class.directive.ts
@@ -1,7 +1,12 @@
-import { Directive, ElementRef, HostListener, Input } from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  HostListener,
+  Input,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsHoverClass]'
+  selector: '[dsHoverClass]',
 })
 /**
  * A directive adding a class to an element when hovered over
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 7ea0b96d5b..18cfafe5f4 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -1,12 +1,22 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-import { IdleModalComponent } from './idle-modal.component';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { IdleModalComponent } from './idle-modal.component';
 
 describe('IdleModalComponent', () => {
   let component: IdleModalComponent;
@@ -27,9 +37,9 @@ describe('IdleModalComponent', () => {
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
         { provide: AuthService, useValue: authServiceStub },
-        { provide: Store, useValue: storeStub }
+        { provide: Store, useValue: storeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -93,7 +103,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'extendSessionPressed');
       debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -108,7 +118,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'logOutPressed');
       debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -123,7 +133,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'closePressed');
       debugElement.query(By.css('.close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts
index 4873137ff1..23456b1468 100644
--- a/src/app/shared/idle-modal/idle-modal.component.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.ts
@@ -1,11 +1,17 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { environment } from '../../../environments/environment';
-import { AuthService } from '../../core/auth/auth.service';
-import { hasValue } from '../empty.util';
 import { Store } from '@ngrx/store';
+
+import { environment } from '../../../environments/environment';
 import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-idle-modal',
@@ -28,7 +34,7 @@ export class IdleModalComponent implements OnInit {
    * An event fired when the modal is closed
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
   constructor(private activeModal: NgbActiveModal,
               private authService: AuthService,
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
index 9f2b66694b..9581ba8ea8 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
@@ -1,4 +1,4 @@
-<ul class="navbar-nav" *ngIf="(isAuthenticated$ | async) && isImpersonating">
+<ul class="navbar-nav" *ngIf="isImpersonating$ | async">
   <li class="nav-item">
     <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
       <i class="fa fa-user-secret"></i>
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
index af03afc05f..b78479327a 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
@@ -1,19 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { ImpersonateNavbarComponent } from './impersonate-navbar.component';
-import { VarDirective } from '../utils/var.directive';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
 import { authReducer } from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { EPersonMock } from '../testing/eperson.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
+import { VarDirective } from '../utils/var.directive';
+import { ImpersonateNavbarComponent } from './impersonate-navbar.component';
 
 describe('ImpersonateNavbarComponent', () => {
   let component: ImpersonateNavbarComponent;
@@ -25,7 +35,7 @@ describe('ImpersonateNavbarComponent', () => {
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isImpersonating: false,
-      stopImpersonatingAndRefresh: {}
+      stopImpersonatingAndRefresh: {},
     });
     initialState = {
       core: {
@@ -36,9 +46,9 @@ describe('ImpersonateNavbarComponent', () => {
           loading: false,
           authToken: new AuthTokenInfo('test_token'),
           userId: EPersonMock.id,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
 
     TestBed.configureTestingModule({
@@ -52,7 +62,7 @@ describe('ImpersonateNavbarComponent', () => {
         { provide: AuthService, useValue: authService },
         provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -65,7 +75,7 @@ describe('ImpersonateNavbarComponent', () => {
 
   describe('when the user is impersonating another user', () => {
     beforeEach(() => {
-      component.isImpersonating = true;
+      component.isImpersonating$ = observableOf(true);
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
index 6166ee950d..e8560d5efa 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
@@ -1,36 +1,56 @@
-import { Component, OnInit } from '@angular/core';
-import { select, Store } from '@ngrx/store';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { AuthService } from '../../core/auth/auth.service';
-import { Observable } from 'rxjs';
 import { isAuthenticated } from '../../core/auth/selectors';
 
 @Component({
   selector: 'ds-impersonate-navbar',
-  templateUrl: 'impersonate-navbar.component.html'
+  templateUrl: 'impersonate-navbar.component.html',
 })
 /**
  * Navbar component for actions to take concerning impersonating users
  */
 export class ImpersonateNavbarComponent implements OnInit {
-  /**
-   * Whether or not the user is authenticated.
-   * @type {Observable<string>}
-   */
-  isAuthenticated$: Observable<boolean>;
 
   /**
    * Is the user currently impersonating another user?
    */
-  isImpersonating: boolean;
+  isImpersonating$: Observable<boolean>;
 
-  constructor(private store: Store<AppState>,
-              private authService: AuthService) {
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected elRef: ElementRef,
+    protected store: Store<AppState>,
+    protected authService: AuthService,
+  ) {
   }
 
   ngOnInit(): void {
-    this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
-    this.isImpersonating = this.authService.isImpersonating();
+    this.isImpersonating$ = this.store.pipe(select(isAuthenticated)).pipe(
+      map((isUserAuthenticated: boolean) => isUserAuthenticated && this.authService.isImpersonating()),
+    );
+    this.subscriptions.push(this.isImpersonating$.subscribe((isImpersonating: boolean) => {
+      if (isImpersonating) {
+        this.elRef.nativeElement.classList.remove('d-none');
+      } else {
+        this.elRef.nativeElement.classList.add('d-none');
+      }
+    }));
   }
 
   /**
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index 7515b830b9..17e7197261 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
index 4c979a1d4c..93ee64e036 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
@@ -1,13 +1,21 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DsoInputSuggestionsComponent } from './dso-input-suggestions.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DsoInputSuggestionsComponent } from './dso-input-suggestions.component';
 
 describe('DsoInputSuggestionsComponent', () => {
 
@@ -18,17 +26,17 @@ describe('DsoInputSuggestionsComponent', () => {
 
   const dso1 = {
     uuid: 'test-uuid-1',
-    name: 'test-name-1'
+    name: 'test-name-1',
   } as DSpaceObject;
 
   const dso2 = {
     uuid: 'test-uuid-2',
-    name: 'test-name-2'
+    name: 'test-name-2',
   } as DSpaceObject;
 
   const dso3 = {
     uuid: 'test-uuid-3',
-    name: 'test-name-3'
+    name: 'test-name-3',
   } as DSpaceObject;
 
   const suggestions = [dso1, dso2, dso3];
@@ -38,9 +46,9 @@ describe('DsoInputSuggestionsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [DsoInputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(DsoInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index 26c7d91b41..788db8930c 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -1,11 +1,16 @@
-import { Component, forwardRef, Input } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { InputSuggestionsComponent } from '../input-suggestions.component';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { hasValue } from '../../empty.util';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { InputSuggestionsComponent } from '../input-suggestions.component';
 
 @Component({
   selector: 'ds-dso-input-suggestions',
@@ -17,9 +22,9 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => DsoInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 726dc9ca0e..d29163e09a 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -20,10 +20,9 @@
            [ngModelOptions]="{standalone: true}" autocomplete="off"
     />
   </ng-template>
-  <label class="d-none">
-    <input type="submit"/>
-    <span>{{'search.filters.search.submit' | translate}}</span>
-  </label>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
index 6a0324d2ac..ebc508c90c 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
@@ -1,11 +1,19 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { FilterInputSuggestionsComponent } from './filter-input-suggestions.component';
 
 describe('FilterInputSuggestionsComponent', () => {
@@ -16,7 +24,7 @@ describe('FilterInputSuggestionsComponent', () => {
   let el: HTMLElement;
   const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
     displayValue: 'suggestion dos',
-    value: 'suggestion dos'
+    value: 'suggestion dos',
   }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
   beforeEach(waitForAsync(() => {
@@ -24,9 +32,9 @@ describe('FilterInputSuggestionsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [FilterInputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(FilterInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -54,4 +62,31 @@ describe('FilterInputSuggestionsComponent', () => {
       expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex]);
     });
   });
+
+  describe('component methods', () => {
+    const testData = {
+      value: 'test-field',
+    } as unknown as any;
+
+    beforeEach(() => {
+      spyOn(comp.submitSuggestion, 'emit');
+      spyOn(comp.clickSuggestion, 'emit');
+      spyOn(comp, 'close');
+    });
+
+    it('should properly submit', () => {
+      comp.onSubmit(testData);
+      expect(comp.submitSuggestion.emit).toHaveBeenCalledWith(testData);
+      expect(comp.value).toBe(testData);
+    });
+
+    it('should update value on suggestion clicked', () => {
+      comp.onClickSuggestion(testData);
+      expect(comp.clickSuggestion.emit).toHaveBeenCalledWith(testData);
+      expect(comp.value).toBe(testData.value);
+      expect(comp.blockReopen).toBeTruthy();
+      expect(comp.close).toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index ee47dc80c9..09ed9de602 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -1,5 +1,10 @@
-import { Component, forwardRef, Input } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../input-suggestions.component';
 import { InputSuggestion } from '../input-suggestions.model';
 
@@ -13,9 +18,9 @@ import { InputSuggestion } from '../input-suggestions.model';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => FilterInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
index f137982fee..188dcbcb6a 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
index 9793844e89..d21ee75037 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
@@ -1,12 +1,20 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { InputSuggestionsComponent } from './input-suggestions.component';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { InputSuggestionsComponent } from './input-suggestions.component';
 
 describe('InputSuggestionsComponent', () => {
 
@@ -19,16 +27,16 @@ describe('InputSuggestionsComponent', () => {
   beforeEach(waitForAsync(() => {
     suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
       displayValue: 'suggestion dos',
-      value: 'suggestion dos'
+      value: 'suggestion dos',
     }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [InputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(InputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 7e05dbcc8c..686670d464 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -8,11 +8,15 @@ import {
   QueryList,
   SimpleChanges,
   ViewChild,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { hasValue, isNotEmpty } from '../empty.util';
 import { ControlValueAccessor } from '@angular/forms';
+import { BehaviorSubject } from 'rxjs';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
 
 @Component({
   selector: 'ds-input-suggestions',
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index d6e2ead6ea..c5d71e33fd 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -10,7 +10,9 @@
          [placeholder]="placeholder"
          ng-model-options="{standalone: true}"
          autocomplete="off">
-  <input type="submit" class="d-none"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
index dad2edc30e..a610368016 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
@@ -1,11 +1,22 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ValidationSuggestionsComponent } from './validation-suggestions.component';
@@ -18,7 +29,7 @@ describe('ValidationSuggestionsComponent', () => {
   let el: HTMLElement;
   const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
     displayValue: 'suggestion dos',
-    value: 'suggestion dos'
+    value: 'suggestion dos',
   }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
   beforeEach(waitForAsync(() => {
@@ -30,9 +41,9 @@ describe('ValidationSuggestionsComponent', () => {
         { provide: MetadataFieldDataService, useValue: {} },
         { provide: ObjectUpdatesService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ValidationSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index 050b3296c5..a867b59179 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -1,5 +1,16 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { UntypedFormControl, UntypedFormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  NG_VALUE_ACCESSOR,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { MetadatumViewModel } from '../../../core/shared/metadata.models';
 import { MetadataFieldValidator } from '../../utils/metadatafield-validator.directive';
@@ -16,9 +27,9 @@ import { InputSuggestion } from '../input-suggestions.model';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => ValidationSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
@@ -55,8 +66,8 @@ export class ValidationSuggestionsComponent extends InputSuggestionsComponent im
     this.form = new UntypedFormGroup({
       metadataNameField: new UntypedFormControl(this._value, {
         asyncValidators: [this.metadataFieldValidator.validate.bind(this.metadataFieldValidator)],
-        validators: [Validators.required]
-      })
+        validators: [Validators.required],
+      }),
     });
   }
 
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index d9a5efaa81..9be622099b 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,13 +1,16 @@
 <div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="javascript:void(0);" role="button"
+  <a href="javascript:void(0);" role="menuitem"
      [attr.aria-label]="'nav.language' |translate"
-     [title]="'nav.language' | translate" class="px-1"
+     aria-controls="language-menu-list"
+     aria-haspopup="menu"
+     [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>
-  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
+  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
     <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
+        role="menuitem"
             (keyup.enter)="useLang(lang)"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss
index 7b593a9bb5..ea099435a8 100644
--- a/src/app/shared/lang-switch/lang-switch.component.scss
+++ b/src/app/shared/lang-switch/lang-switch.component.scss
@@ -9,3 +9,7 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdown-item {
+  cursor: pointer;
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 6d3c847086..d0147146da 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,14 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
-import { Observable, of } from 'rxjs';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-
-import { LangSwitchComponent } from './lang-switch.component';
 import { LangConfig } from '../../../config/lang-config.interface';
 import { LocaleService } from '../../core/locale/locale.service';
+import { LangSwitchComponent } from './lang-switch.component';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -23,8 +39,8 @@ class CustomLoader implements TranslateLoader {
       'footer': {
         'copyright': 'copyright © 2002-{{ year }}',
         'link.dspace': 'DSpace software',
-        'link.lyrasis': 'LYRASIS'
-      }
+        'link.lyrasis': 'LYRASIS',
+      },
     });
   }
 }
@@ -39,7 +55,7 @@ describe('LangSwitchComponent', () => {
   function getMockLocaleService(): LocaleService {
     return jasmine.createSpyObj('LocaleService', {
       setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
-      refreshAfterChangeLanguage: jasmine.createSpy('refreshAfterChangeLanguage')
+      refreshAfterChangeLanguage: jasmine.createSpy('refreshAfterChangeLanguage'),
     });
   }
 
@@ -63,21 +79,21 @@ describe('LangSwitchComponent', () => {
           code: 'de',
           label: 'Deutsch',
           active: true,
-        }]
+        }],
       };
 
       TestBed.configureTestingModule({
         imports: [HttpClientTestingModule, TranslateModule.forRoot(
           {
-            loader: { provide: TranslateLoader, useClass: CustomLoader }
-          }
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
+          },
         )],
         declarations: [LangSwitchComponent],
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
-        ]
+        ],
       }).compileComponents()
         .then(() => {
           translate = TestBed.inject(TranslateService);
@@ -148,22 +164,22 @@ describe('LangSwitchComponent', () => {
         }, {
           code: 'de',
           label: 'Deutsch',
-          active: false
-        }]
+          active: false,
+        }],
       };
 
       TestBed.configureTestingModule({
         imports: [HttpClientTestingModule, TranslateModule.forRoot(
           {
-            loader: { provide: TranslateLoader, useClass: CustomLoader }
-          }
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
+          },
         )],
         declarations: [LangSwitchComponent],
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
-          { provide: LocaleService, useValue: getMockLocaleService() }
-        ]
+          { provide: LocaleService, useValue: getMockLocaleService() },
+        ],
       }).compileComponents();
       translate = TestBed.inject(TranslateService);
       translate.addLangs(mockConfig.languages.filter((MyLangConfig) => MyLangConfig.active === true).map((a) => a.code));
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 41d707a056..e070af99bf 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,5 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { LangConfig } from '../../../config/lang-config.interface';
@@ -25,14 +28,18 @@ export class LangSwitchComponent implements OnInit {
   moreThanOneLanguage: boolean;
 
   constructor(
+    public el: ElementRef,
     public translate: TranslateService,
-    private localeService: LocaleService
+    private localeService: LocaleService,
   ) {
   }
 
   ngOnInit(): void {
     this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
     this.moreThanOneLanguage = (this.activeLangs.length > 1);
+    if (!this.moreThanOneLanguage) {
+      this.el.nativeElement.parentElement.classList.add('d-none');
+    }
   }
 
   /**
diff --git a/src/app/shared/lang-switch/themed-lang-switch.component.ts b/src/app/shared/lang-switch/themed-lang-switch.component.ts
new file mode 100644
index 0000000000..e2ecf4c24d
--- /dev/null
+++ b/src/app/shared/lang-switch/themed-lang-switch.component.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../theme-support/themed.component';
+import { LangSwitchComponent } from './lang-switch.component';
+
+/**
+ * Themed wrapper for {@link LangSwitchComponent}
+ */
+@Component({
+  selector: 'ds-themed-lang-switch',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedLangSwitchComponent extends ThemedComponent<LangSwitchComponent> {
+
+  protected getComponentName(): string {
+    return 'LangSwitchComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/lang-switch/lang-switch.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./lang-switch.component`);
+  }
+
+}
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index d564d43dc0..6afa60d93a 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-
 import { LoadingComponent } from './loading.component';
 
 describe('LoadingComponent (inline template)', () => {
@@ -21,12 +27,12 @@ describe('LoadingComponent (inline template)', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [LoadingComponent], // declare the test component
-      providers: [TranslateService]
+      providers: [TranslateService],
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index e64d89620b..4ad335983b 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -1,14 +1,18 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-
 import { Subscription } from 'rxjs';
+
 import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-loading',
   styleUrls: ['./loading.component.scss'],
-  templateUrl: './loading.component.html'
+  templateUrl: './loading.component.html',
 })
 export class LoadingComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/shared/loading/themed-loading.component.ts b/src/app/shared/loading/themed-loading.component.ts
index 48773d75c8..75ea39660d 100644
--- a/src/app/shared/loading/themed-loading.component.ts
+++ b/src/app/shared/loading/themed-loading.component.ts
@@ -1,7 +1,12 @@
-import { Component, Input, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ThemeService } from '../theme-support/theme.service';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { LoadingComponent } from './loading.component';
-import { ThemeService } from '../theme-support/theme.service';
 
 /**
  * Themed wrapper for LoadingComponent
@@ -20,11 +25,10 @@ export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
   protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage', 'spinner'];
 
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
-    protected themeService: ThemeService
+    protected themeService: ThemeService,
   ) {
-    super(resolver, cdr, themeService);
+    super(cdr, themeService);
   }
 
   protected getComponentName(): string {
diff --git a/src/app/shared/log-in/container/log-in-container.component.spec.ts b/src/app/shared/log-in/container/log-in-container.component.spec.ts
index 29598e422e..63da7d926a 100644
--- a/src/app/shared/log-in/container/log-in-container.component.spec.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.spec.ts
@@ -1,32 +1,46 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { LogInContainerComponent } from './log-in-container.component';
 import { authReducer } from '../../../core/auth/auth.reducer';
-import { SharedModule } from '../../shared.module';
 import { AuthService } from '../../../core/auth/auth.service';
 import { AuthMethod } from '../../../core/auth/models/auth.method';
-import { AuthServiceStub } from '../../testing/auth-service.stub';
-import { createTestComponent } from '../../testing/utils.test';
+import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { HardRedirectService } from '../../../core/services/hard-redirect.service';
+import { SharedModule } from '../../shared.module';
+import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
+import { createTestComponent } from '../../testing/utils.test';
+import { LogInContainerComponent } from './log-in-container.component';
 
 describe('LogInContainerComponent', () => {
 
   let component: LogInContainerComponent;
   let fixture: ComponentFixture<LogInContainerComponent>;
 
-  const authMethod = new AuthMethod('password');
+  const authMethod = new AuthMethod(AuthMethodType.Password, 0);
 
   let hardRedirectService: HardRedirectService;
 
   beforeEach(waitForAsync(() => {
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       redirect: {},
-      getCurrentRoute: {}
+      getCurrentRoute: {},
     });
     // refine the test module by declaring the test component
     TestBed.configureTestingModule({
@@ -35,19 +49,21 @@ describe('LogInContainerComponent', () => {
         ReactiveFormsModule,
         StoreModule.forRoot(authReducer),
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
+        RouterTestingModule,
       ],
       declarations: [
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: HardRedirectService, useValue: hardRedirectService },
-        LogInContainerComponent
+        LogInContainerComponent,
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -108,11 +124,11 @@ describe('LogInContainerComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
   isStandalonePage = true;
-  authMethod = new AuthMethod('password');
+  authMethod = new AuthMethod(AuthMethodType.Password, 0);
 
 }
diff --git a/src/app/shared/log-in/container/log-in-container.component.ts b/src/app/shared/log-in/container/log-in-container.component.ts
index f6a08a1e1e..5b1b2a001d 100644
--- a/src/app/shared/log-in/container/log-in-container.component.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.ts
@@ -1,7 +1,13 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+  Type,
+} from '@angular/core';
 
-import { rendersAuthMethodType } from '../methods/log-in.methods-decorator';
 import { AuthMethod } from '../../../core/auth/models/auth.method';
+import { rendersAuthMethodType } from '../methods/log-in.methods-decorator';
 
 /**
  * This component represents a component container for log-in methods available.
@@ -9,7 +15,7 @@ import { AuthMethod } from '../../../core/auth/models/auth.method';
 @Component({
   selector: 'ds-log-in-container',
   templateUrl: './log-in-container.component.html',
-  styleUrls: ['./log-in-container.component.scss']
+  styleUrls: ['./log-in-container.component.scss'],
 })
 export class LogInContainerComponent implements OnInit {
 
@@ -27,12 +33,9 @@ export class LogInContainerComponent implements OnInit {
    */
   public objectInjector: Injector;
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {Injector} injector
-   */
-  constructor(private injector: Injector) {
+  constructor(
+    protected injector: Injector,
+  ) {
   }
 
   /**
@@ -44,15 +47,15 @@ export class LogInContainerComponent implements OnInit {
         { provide: 'authMethodProvider', useFactory: () => (this.authMethod), deps: [] },
         { provide: 'isStandalonePage', useFactory: () => (this.isStandalonePage), deps: [] },
       ],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
   /**
    * Find the correct component based on the AuthMethod's type
    */
-  getAuthMethodContent(): string {
-      return rendersAuthMethodType(this.authMethod.authMethodType);
+  getAuthMethodContent(): Type<Component> {
+    return rendersAuthMethodType(this.authMethod.authMethodType);
   }
 
 }
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 6b1fdb9ff6..d80513d5d0 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,13 +1,7 @@
 <ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
-<div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 mx-auto login-container">
-  <ng-container *ngFor="let authMethod of (authMethods); let i = index">
-    <div *ngIf="i === 1" class="text-center mt-2">
-      <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
-    </div>
+<div *ngIf="(loading | async) !== true && (isAuthenticated | async) !== true" class="px-4 py-3 mx-auto login-container">
+  <ng-container *ngFor="let authMethod of (authMethods | async); let last = last">
     <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
+    <div *ngIf="!last" class="dropdown-divider my-2"></div>
   </ng-container>
-
-  <div class="dropdown-divider"></div>
-  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly">{{"login.form.new-user" | translate}}</a>
-  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly">{{"login.form.forgot-password" | translate}}</a>
 </div>
diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts
index 0a13e8b701..1d0bd3460d 100644
--- a/src/app/shared/log-in/log-in.component.spec.ts
+++ b/src/app/shared/log-in/log-in.component.spec.ts
@@ -1,27 +1,42 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { StoreModule } from '@ngrx/store';
-
-import { LogInComponent } from './log-in.component';
-import { authReducer } from '../../core/auth/auth.reducer';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { AuthService } from '../../core/auth/auth.service';
-import { authMethodsMock, AuthServiceStub } from '../testing/auth-service.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { SharedModule } from '../shared.module';
-import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
-import { ActivatedRouteStub } from '../testing/active-router.stub';
 import { ActivatedRoute } from '@angular/router';
-import { NativeWindowService } from '../../core/services/window.service';
-import { provideMockStore } from '@ngrx/store/testing';
-import { createTestComponent } from '../testing/utils.test';
 import { RouterTestingModule } from '@angular/router/testing';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import { authReducer } from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { NativeWindowService } from '../../core/services/window.service';
+import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { SharedModule } from '../shared.module';
+import { ActivatedRouteStub } from '../testing/active-router.stub';
+import {
+  authMethodsMock,
+  AuthServiceStub,
+} from '../testing/auth-service.stub';
+import { createTestComponent } from '../testing/utils.test';
+import { ThemeService } from '../theme-support/theme.service';
+import { LogInComponent } from './log-in.component';
+
 describe('LogInComponent', () => {
 
   let component: LogInComponent;
@@ -32,9 +47,9 @@ describe('LogInComponent', () => {
         authenticated: false,
         loaded: false,
         loading: false,
-        authMethods: authMethodsMock
-      }
-    }
+        authMethods: authMethodsMock,
+      },
+    },
   };
   let hardRedirectService: HardRedirectService;
 
@@ -43,29 +58,29 @@ describe('LogInComponent', () => {
   beforeEach(waitForAsync(() => {
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       redirect: {},
-      getCurrentRoute: {}
+      getCurrentRoute: {},
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: of(true)
+      isAuthorized: of(true),
     });
 
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
         RouterTestingModule,
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -75,11 +90,12 @@ describe('LogInComponent', () => {
         { provide: HardRedirectService, useValue: hardRedirectService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
-        LogInComponent
+        { provide: ThemeService, useValue: getMockThemeService() },
+        LogInComponent,
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -91,7 +107,7 @@ describe('LogInComponent', () => {
 
     // synchronous beforeEach
     beforeEach(() => {
-      const html = `<ds-log-in [isStandalonePage]="isStandalonePage"> </ds-log-in>`;
+      const html = `<ds-themed-log-in [isStandalonePage]="isStandalonePage"> </ds-themed-log-in>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
@@ -133,7 +149,7 @@ describe('LogInComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index e6b2ba9dcf..d5cacd0b37 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,29 +1,35 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { AuthMethod } from '../../core/auth/models/auth.method';
 import {
   getAuthenticationError,
   getAuthenticationMethods,
   isAuthenticated,
-  isAuthenticationLoading
+  isAuthenticationLoading,
 } from '../../core/auth/selectors';
-import { getForgotPasswordRoute, getRegisterRoute } from '../../app-routing-paths';
-import { hasValue } from '../empty.util';
-import { AuthService } from '../../core/auth/auth.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { CoreState } from '../../core/core-state.model';
-import { AuthMethodType } from '../../core/auth/models/auth.method-type';
+import { hasValue } from '../empty.util';
+import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
 
-/**
- * /users/sign-in
- * @class LogInComponent
- */
 @Component({
   selector: 'ds-log-in',
   templateUrl: './log-in.component.html',
-  styleUrls: ['./log-in.component.scss']
+  styleUrls: ['./log-in.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LogInComponent implements OnInit {
 
@@ -37,7 +43,7 @@ export class LogInComponent implements OnInit {
    * The list of authentication methods available
    * @type {AuthMethod[]}
    */
-  public authMethods: AuthMethod[];
+  public authMethods: Observable<AuthMethod[]>;
 
   /**
    * Whether user is authenticated.
@@ -51,24 +57,19 @@ export class LogInComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  /**
-   * Whether or not the current user (or anonymous) is authorized to register an account
-   */
-  canRegister$: Observable<boolean>;
-
   constructor(private store: Store<CoreState>,
               private authService: AuthService,
-              private authorizationService: AuthorizationDataService) {
+  ) {
   }
 
   ngOnInit(): void {
-
-    this.store.pipe(
+    this.authMethods = this.store.pipe(
       select(getAuthenticationMethods),
-    ).subscribe(methods => {
-      // ignore the ip authentication method when it's returned by the backend
-      this.authMethods = methods.filter(a => a.authMethodType !== AuthMethodType.Ip);
-    });
+      map((methods: AuthMethod[]) => methods
+        .filter((authMethod: AuthMethod) => rendersAuthMethodType(authMethod.authMethodType) !== undefined)
+        .sort((method1: AuthMethod, method2: AuthMethod) => method1.position - method2.position),
+      ),
+    );
 
     // set loading
     this.loading = this.store.pipe(select(isAuthenticationLoading));
@@ -82,15 +83,6 @@ export class LogInComponent implements OnInit {
         this.authService.clearRedirectUrl();
       }
     });
-
-    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
   }
 
-  getRegisterRoute() {
-    return getRegisterRoute();
-  }
-
-  getForgotRoute() {
-    return getForgotPasswordRoute();
-  }
 }
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
index 6046aec725..378bb6ed67 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -1,3 +1,3 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToExternalProvider()">
+<button class="btn btn-lg btn-primary btn-block text-white" (click)="redirectToExternalProvider()">
   <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
 </button>
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
index de4f62eb9e..7daf88bef5 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
@@ -1,47 +1,48 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
+import { storeModuleConfig } from '../../../../app.reducer';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from './log-in-external-provider.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { NativeWindowService } from '../../../../core/services/window.service';
+import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { LogInExternalProviderComponent } from './log-in-external-provider.component';
 
 describe('LogInExternalProviderComponent', () => {
 
   let component: LogInExternalProviderComponent;
   let fixture: ComponentFixture<LogInExternalProviderComponent>;
-  let page: Page;
-  let user: EPerson;
   let componentAsAny: any;
   let setHrefSpy;
-  let orcidBaseUrl;
-  let location;
+  let orcidBaseUrl: string;
+  let location: string;
   let initialState: any;
   let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
-    user = EPersonMock;
     orcidBaseUrl = 'dspace-rest.test/orcid?redirectUrl=';
     location = orcidBaseUrl + 'http://dspace-angular.test/home';
 
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       getCurrentRoute: {},
-      redirect: {}
+      redirect: {},
     });
 
     initialState = {
@@ -51,25 +52,25 @@ describe('LogInExternalProviderComponent', () => {
           loaded: false,
           blocking: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   });
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
-        LogInExternalProviderComponent
+        LogInExternalProviderComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Orcid, location) },
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Orcid, 0, location) },
         { provide: 'isStandalonePage', useValue: true },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: new RouterStub() },
@@ -78,8 +79,8 @@ describe('LogInExternalProviderComponent', () => {
         provideMockStore({ initialState }),
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -94,7 +95,6 @@ describe('LogInExternalProviderComponent', () => {
     componentAsAny = component;
 
     // create page
-    page = new Page(component, fixture);
     setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
 
   });
@@ -130,25 +130,3 @@ describe('LogInExternalProviderComponent', () => {
   });
 
 });
-
-/**
- * I represent the DOM elements and attach spies.
- *
- * @class Page
- */
-class Page {
-
-  public emailInput: HTMLInputElement;
-  public navigateSpy: jasmine.Spy;
-  public passwordInput: HTMLInputElement;
-
-  constructor(private component: LogInExternalProviderComponent, private fixture: ComponentFixture<LogInExternalProviderComponent>) {
-    // use injector to get services
-    const injector = fixture.debugElement.injector;
-    const store = injector.get(Store);
-
-    // add spies
-    this.navigateSpy = spyOn(store, 'dispatch');
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
index f182968457..bab69875f9 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
@@ -1,25 +1,39 @@
-import { Component, Inject, OnInit, } from '@angular/core';
-
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { select, Store } from '@ngrx/store';
 
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
-
-import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
-import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
-import { isEmpty, isNotNull } from '../../../empty.util';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
-import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
-import { CoreState } from '../../../../core/core-state.model';
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from '../../../../core/auth/selectors';
+import { CoreState } from '../../../../core/core-state.model';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../../core/services/window.service';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import {
+  isEmpty,
+  isNotNull,
+} from '../../../empty.util';
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
 
 @Component({
   selector: 'ds-log-in-external-provider',
   templateUrl: './log-in-external-provider.component.html',
-  styleUrls: ['./log-in-external-provider.component.scss']
+  styleUrls: ['./log-in-external-provider.component.scss'],
 })
 @renderAuthMethodFor(AuthMethodType.Oidc)
 @renderAuthMethodFor(AuthMethodType.Shibboleth)
@@ -65,7 +79,7 @@ export class LogInExternalProviderComponent implements OnInit {
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private authService: AuthService,
     private hardRedirectService: HardRedirectService,
-    private store: Store<CoreState>
+    private store: Store<CoreState>,
   ) {
     this.authMethod = injectedAuthMethodModel;
   }
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 0614bdeb51..f0b25da98a 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -1,6 +1,11 @@
+import {
+  Component,
+  Type,
+} from '@angular/core';
+
 import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
 
-const authMethodsMap = new Map();
+const authMethodsMap: Map<AuthMethodType, Type<Component>> = new Map();
 
 export function renderAuthMethodFor(authMethodType: AuthMethodType) {
   return function decorator(objectElement: any) {
@@ -11,6 +16,6 @@ export function renderAuthMethodFor(authMethodType: AuthMethodType) {
   };
 }
 
-export function rendersAuthMethodType(authMethodType: AuthMethodType) {
+export function rendersAuthMethodType(authMethodType: AuthMethodType): Type<Component> | undefined {
   return authMethodsMap.get(authMethodType);
 }
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index c1f1016cb8..567a05f544 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,9 +1,8 @@
 <form class="form-login"
       (ngSubmit)="submit()"
       [formGroup]="form" novalidate>
-  <label class="sr-only">{{"login.form.email" | translate}}</label>
   <input [attr.aria-label]="'login.form.email' |translate"
-         autocomplete="off"
+         autocomplete="username"
          autofocus
          class="form-control form-control-lg position-relative"
          formControlName="email"
@@ -11,9 +10,8 @@
          required
          type="email"
          [attr.data-test]="'email' | dsBrowserOnly">
-  <label class="sr-only">{{"login.form.password" | translate}}</label>
   <input [attr.aria-label]="'login.form.password' |translate"
-         autocomplete="off"
+         autocomplete="current-password"
          class="form-control form-control-lg position-relative mb-3"
          placeholder="{{'login.form.password' | translate}}"
          formControlName="password"
@@ -28,3 +26,12 @@
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
           [disabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
+
+<ng-container *ngIf="canShowDivider$ | async">
+  <div class="mt-2">
+    <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
+       [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
+    <a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
+       [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
+  </div>
+</ng-container>
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.scss b/src/app/shared/log-in/methods/password/log-in-password.component.scss
index 0eda382c0a..955252b51e 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.scss
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.scss
@@ -11,3 +11,7 @@
   border-top-right-radius: 0;
 }
 
+.dropdown-item {
+  white-space: normal;
+  padding: .25rem .75rem;
+}
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
index 5d9370f204..dbd3067909 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
@@ -1,38 +1,45 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { LogInPasswordComponent } from './log-in-password.component';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
+import { storeModuleConfig } from '../../../../app.reducer';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { LogInPasswordComponent } from './log-in-password.component';
 
 describe('LogInPasswordComponent', () => {
 
   let component: LogInPasswordComponent;
   let fixture: ComponentFixture<LogInPasswordComponent>;
   let page: Page;
-  let user: EPerson;
   let initialState: any;
   let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
-    user = EPersonMock;
-
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
-      getCurrentRoute: {}
+      getCurrentRoute: {},
     });
 
     initialState = {
@@ -42,20 +49,20 @@ describe('LogInPasswordComponent', () => {
           loaded: false,
           blocking: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   });
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         LogInPasswordComponent,
@@ -63,20 +70,21 @@ describe('LogInPasswordComponent', () => {
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password, 0) },
         { provide: 'isStandalonePage', useValue: true },
         { provide: HardRedirectService, useValue: hardRedirectService },
         provideMockStore({ initialState }),
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
   }));
 
-  beforeEach(() => {
+  beforeEach(async () => {
     // create component and test fixture
     fixture = TestBed.createComponent(LogInPasswordComponent);
 
@@ -87,10 +95,8 @@ describe('LogInPasswordComponent', () => {
     page = new Page(component, fixture);
 
     // verify the fixture is stable (no pending tasks)
-    fixture.whenStable().then(() => {
-      page.addPageElements();
-    });
-
+    await fixture.whenStable();
+    page.addPageElements();
   });
 
   it('should create a FormGroup comprised of FormControls', () => {
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 22b3b13130..9c53ac7b4f 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -1,20 +1,49 @@
-import { map } from 'rxjs/operators';
-import { Component, Inject, OnInit } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest,
+  Observable,
+  shareReplay,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../../../core/auth/auth.actions';
-
-import { getAuthenticationError, getAuthenticationInfo, } from '../../../../core/auth/selectors';
-import { isNotEmpty } from '../../../empty.util';
-import { fadeOut } from '../../../animations/fade';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import {
+  getForgotPasswordRoute,
+  getRegisterRoute,
+} from '../../../../app-routing-paths';
+import {
+  AuthenticateAction,
+  ResetAuthenticationMessagesAction,
+} from '../../../../core/auth/auth.actions';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import {
+  getAuthenticationError,
+  getAuthenticationInfo,
+} from '../../../../core/auth/selectors';
 import { CoreState } from '../../../../core/core-state.model';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { fadeOut } from '../../../animations/fade';
+import { isNotEmpty } from '../../../empty.util';
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
 
 /**
  * /users/sign-in
@@ -24,7 +53,7 @@ import { CoreState } from '../../../../core/core-state.model';
   selector: 'ds-log-in-password',
   templateUrl: './log-in-password.component.html',
   styleUrls: ['./log-in-password.component.scss'],
-  animations: [fadeOut]
+  animations: [fadeOut],
 })
 @renderAuthMethodFor(AuthMethodType.Password)
 export class LogInPasswordComponent implements OnInit {
@@ -61,26 +90,34 @@ export class LogInPasswordComponent implements OnInit {
 
   /**
    * The authentication form.
-   * @type {FormGroup}
+   * @type {UntypedFormGroup}
    */
   public form: UntypedFormGroup;
 
   /**
-   * @constructor
-   * @param {AuthMethod} injectedAuthMethodModel
-   * @param {boolean} isStandalonePage
-   * @param {AuthService} authService
-   * @param {HardRedirectService} hardRedirectService
-   * @param {FormBuilder} formBuilder
-   * @param {Store<State>} store
+   * Whether the current user (or anonymous) is authorized to register an account
    */
+  public canRegister$: Observable<boolean>;
+
+  /**
+   * Whether or not the current user (or anonymous) is authorized to register an account
+   */
+  canForgot$: Observable<boolean>;
+
+  /**
+   * Shows the divider only if contains at least one link to show
+   */
+  canShowDivider$: Observable<boolean>;
+
+
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
     @Inject('isStandalonePage') public isStandalonePage: boolean,
     private authService: AuthService,
     private hardRedirectService: HardRedirectService,
     private formBuilder: UntypedFormBuilder,
-    private store: Store<CoreState>
+    protected store: Store<CoreState>,
+    protected authorizationService: AuthorizationDataService,
   ) {
     this.authMethod = injectedAuthMethodModel;
   }
@@ -94,16 +131,16 @@ export class LogInPasswordComponent implements OnInit {
     // set formGroup
     this.form = this.formBuilder.group({
       email: ['', Validators.required],
-      password: ['', Validators.required]
+      password: ['', Validators.required],
     });
 
     // set error
     this.error = this.store.pipe(select(
       getAuthenticationError),
-      map((error) => {
-        this.hasError = (isNotEmpty(error));
-        return error;
-      })
+    map((error) => {
+      this.hasError = (isNotEmpty(error));
+      return error;
+    }),
     );
 
     // set error
@@ -112,9 +149,29 @@ export class LogInPasswordComponent implements OnInit {
       map((message) => {
         this.hasMessage = (isNotEmpty(message));
         return message;
-      })
+      }),
     );
 
+    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(
+      shareReplay({ refCount: false, bufferSize: 1 }),
+    );
+    this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(
+      shareReplay({ refCount: false, bufferSize: 1 }),
+    );
+    this.canShowDivider$ =
+        combineLatest([this.canRegister$, this.canForgot$])
+          .pipe(
+            map(([canRegister, canForgot]) => canRegister || canForgot),
+            filter(Boolean),
+          );
+  }
+
+  getRegisterRoute() {
+    return getRegisterRoute();
+  }
+
+  getForgotRoute() {
+    return getForgotPasswordRoute();
   }
 
   /**
diff --git a/src/app/shared/log-in/themed-log-in.component.ts b/src/app/shared/log-in/themed-log-in.component.ts
new file mode 100644
index 0000000000..39f81d16cb
--- /dev/null
+++ b/src/app/shared/log-in/themed-log-in.component.ts
@@ -0,0 +1,37 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ThemedComponent } from '../theme-support/themed.component';
+import { LogInComponent } from './log-in.component';
+
+/**
+ * Themed wrapper for {@link LogInComponent}
+ */
+@Component({
+  selector: 'ds-themed-log-in',
+  styleUrls: [],
+  templateUrl: './../theme-support/themed.component.html',
+})
+export class ThemedLogInComponent extends ThemedComponent<LogInComponent> {
+
+  @Input() isStandalonePage: boolean;
+
+  protected inAndOutputNames: (keyof LogInComponent & keyof this)[] = [
+    'isStandalonePage',
+  ];
+
+  protected getComponentName(): string {
+    return 'LogInComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/log-in/log-in.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./log-in.component');
+  }
+
+}
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 83e58b3841..26f03b95a4 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -2,5 +2,5 @@
 
   <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
 
-  <button class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button role="menuitem" class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts
index 028738a019..260a920558 100644
--- a/src/app/shared/log-out/log-out.component.spec.ts
+++ b/src/app/shared/log-out/log-out.component.spec.ts
@@ -1,18 +1,28 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { Store, StoreModule } from '@ngrx/store';
-
-import { authReducer } from '../../core/auth/auth.reducer';
-import { EPersonMock } from '../testing/eperson.mock';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { Router } from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { AppState } from '../../app.reducer';
-import { LogOutComponent } from './log-out.component';
-import { RouterStub } from '../testing/router.stub';
+import { authReducer } from '../../core/auth/auth.reducer';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { EPersonMock } from '../testing/eperson.mock';
+import { RouterStub } from '../testing/router.stub';
+import { LogOutComponent } from './log-out.component';
 
 describe('LogOutComponent', () => {
 
@@ -41,10 +51,10 @@ describe('LogOutComponent', () => {
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         LogOutComponent,
@@ -54,8 +64,8 @@ describe('LogOutComponent', () => {
         { provide: Router, useValue: routerStub },
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts
index 6fa71caa32..24cc38f3ce 100644
--- a/src/app/shared/log-out/log-out.component.ts
+++ b/src/app/shared/log-out/log-out.component.ts
@@ -1,19 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
 
-import { LogOutAction } from '../../core/auth/auth.actions';
-import { getLogOutError, } from '../../core/auth/selectors';
 import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { getLogOutError } from '../../core/auth/selectors';
 import { fadeOut } from '../animations/fade';
 
 @Component({
   selector: 'ds-log-out',
   templateUrl: './log-out.component.html',
   styleUrls: ['./log-out.component.scss'],
-  animations: [fadeOut]
+  animations: [fadeOut],
 })
 export class LogOutComponent implements OnInit {
   /**
diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts
index 4759a5712e..3794458dd4 100644
--- a/src/app/shared/menu/initial-menus-state.ts
+++ b/src/app/shared/menu/initial-menus-state.ts
@@ -1,5 +1,5 @@
-import { MenusState } from './menus-state.model';
 import { MenuID } from './menu-id.model';
+import { MenusState } from './menus-state.model';
 
 /**
  * The initial state of the menus
@@ -12,7 +12,7 @@ export const initialMenusState: MenusState = {
       previewCollapsed: true,
       visible: false,
       sections: {},
-      sectionToSubsectionIndex: {}
+      sectionToSubsectionIndex: {},
     },
   [MenuID.PUBLIC]:
     {
@@ -21,7 +21,7 @@ export const initialMenusState: MenusState = {
       previewCollapsed: true,
       visible: true,
       sections: {},
-      sectionToSubsectionIndex: {}
+      sectionToSubsectionIndex: {},
     },
   [MenuID.DSO_EDIT]:
     {
@@ -30,6 +30,6 @@ export const initialMenusState: MenusState = {
       previewCollapsed: true,
       visible: false,
       sections: {},
-      sectionToSubsectionIndex: {}
+      sectionToSubsectionIndex: {},
     },
 };
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.html b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
index dc602cc572..c95c63fdf5 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
@@ -1,4 +1,5 @@
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    [ngClass]="{'disabled': !hasLink }"
    [attr.aria-disabled]="!hasLink"
    [href]="href"
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
index 4c55758b3d..22039ed0d6 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
@@ -1,7 +1,15 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ExternalLinkMenuItemComponent } from './external-link-menu-item.component';
 
 describe('ExternalLinkMenuItemComponent', () => {
@@ -24,7 +32,7 @@ describe('ExternalLinkMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: { text: text, href: link } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
index 5fbbe608db..124bf4595e 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
@@ -1,15 +1,21 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { rendersMenuItemForType } from '../menu-item.decorator';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+
 import { isNotEmpty } from '../../empty.util';
-import { ExternalLinkMenuItemModel } from './models/external-link.model';
+import { rendersMenuItemForType } from '../menu-item.decorator';
 import { MenuItemType } from '../menu-item-type.model';
+import { ExternalLinkMenuItemModel } from './models/external-link.model';
 
 /**
  * Component that renders a menu section of type EXTERNAL
  */
 @Component({
   selector: 'ds-external-link-menu-item',
-  templateUrl: './external-link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './external-link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.EXTERNAL)
 export class ExternalLinkMenuItemComponent implements OnInit {
@@ -18,7 +24,7 @@ export class ExternalLinkMenuItemComponent implements OnInit {
   hasLink: boolean;
 
   constructor(
-    @Inject('itemModelProvider') item: ExternalLinkMenuItemModel
+    @Inject('itemModelProvider') item: ExternalLinkMenuItemModel,
   ) {
     this.item = item;
   }
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 91e23ad886..58a3cec10c 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -1,8 +1,7 @@
-
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
    [ngClass]="{ 'disabled': !hasLink || item.disabled }"
    [attr.aria-disabled]="!hasLink || item.disabled"
-   [title]="item.text | translate"
+   [attr.data-test]="'link-menu-item.'+item.text"
    [routerLink]="getRouterLink()"
    [queryParams]="item.queryParams"
    (click)="$event.stopPropagation()"
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
index 96444a5447..e92b725101 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { LinkMenuItemComponent } from './link-menu-item.component';
-import { RouterLinkDirectiveStub } from '../../testing/router-link-directive.stub';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Router } from '@angular/router';
+import { RouterLinkDirectiveStub } from '../../testing/router-link-directive.stub';
+import { LinkMenuItemComponent } from './link-menu-item.component';
 
 describe('LinkMenuItemComponent', () => {
   let component: LinkMenuItemComponent;
@@ -19,7 +27,7 @@ describe('LinkMenuItemComponent', () => {
   function init() {
     text = 'HELLO';
     link = '/world/hello';
-    queryParams = {params: true};
+    queryParams = { params: true };
   }
 
   beforeEach(waitForAsync(() => {
@@ -31,7 +39,7 @@ describe('LinkMenuItemComponent', () => {
         { provide: 'itemModelProvider', useValue: { text: text, link: link, queryParams: queryParams } },
         { provide: Router, useValue: RouterStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts
index 39f9006987..6d3424cb77 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts
@@ -1,16 +1,22 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { LinkMenuItemModel } from './models/link.model';
-import { rendersMenuItemForType } from '../menu-item.decorator';
-import { isNotEmpty } from '../../empty.util';
-import { MenuItemType } from '../menu-item-type.model';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
+import { isNotEmpty } from '../../empty.util';
+import { rendersMenuItemForType } from '../menu-item.decorator';
+import { MenuItemType } from '../menu-item-type.model';
+import { LinkMenuItemModel } from './models/link.model';
+
 /**
  * Component that renders a menu section of type LINK
  */
 @Component({
   selector: 'ds-link-menu-item',
-  templateUrl: './link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.LINK)
 export class LinkMenuItemComponent implements OnInit {
diff --git a/src/app/shared/menu/menu-item/menu-item.component.scss b/src/app/shared/menu/menu-item/menu-item.component.scss
new file mode 100644
index 0000000000..ca7546d79a
--- /dev/null
+++ b/src/app/shared/menu/menu-item/menu-item.component.scss
@@ -0,0 +1,5 @@
+:host {
+  .ds-menu-item {
+    display: inline-block;
+  }
+}
diff --git a/src/app/shared/menu/menu-item/models/altmetric.model.ts b/src/app/shared/menu/menu-item/models/altmetric.model.ts
index e27004c268..cf007f92b6 100644
--- a/src/app/shared/menu/menu-item/models/altmetric.model.ts
+++ b/src/app/shared/menu/menu-item/models/altmetric.model.ts
@@ -1,5 +1,5 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Altmetric Menu Section
diff --git a/src/app/shared/menu/menu-item/models/external-link.model.ts b/src/app/shared/menu/menu-item/models/external-link.model.ts
index d835691107..8cd9854113 100644
--- a/src/app/shared/menu/menu-item/models/external-link.model.ts
+++ b/src/app/shared/menu/menu-item/models/external-link.model.ts
@@ -1,5 +1,5 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing a Link Menu Section for an external link
diff --git a/src/app/shared/menu/menu-item/models/link.model.ts b/src/app/shared/menu/menu-item/models/link.model.ts
index f26340749c..b80a259717 100644
--- a/src/app/shared/menu/menu-item/models/link.model.ts
+++ b/src/app/shared/menu/menu-item/models/link.model.ts
@@ -1,7 +1,8 @@
-import { MenuItemModel } from './menu-item.model';
-import { MenuItemType } from '../../menu-item-type.model';
 import { Params } from '@angular/router';
 
+import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
+
 /**
  * Model representing an Link Menu Section
  */
diff --git a/src/app/shared/menu/menu-item/models/onclick.model.ts b/src/app/shared/menu/menu-item/models/onclick.model.ts
index 32139001d0..3ec19dfe19 100644
--- a/src/app/shared/menu/menu-item/models/onclick.model.ts
+++ b/src/app/shared/menu/menu-item/models/onclick.model.ts
@@ -1,5 +1,5 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an OnClick Menu Section
@@ -8,5 +8,5 @@ export class OnClickMenuItemModel implements MenuItemModel {
   type = MenuItemType.ONCLICK;
   disabled: boolean;
   text: string;
-  function: () => {};
+  function: () => void;
 }
diff --git a/src/app/shared/menu/menu-item/models/search.model.ts b/src/app/shared/menu/menu-item/models/search.model.ts
index 1c2b5a6456..c9d3c9fe4e 100644
--- a/src/app/shared/menu/menu-item/models/search.model.ts
+++ b/src/app/shared/menu/menu-item/models/search.model.ts
@@ -1,5 +1,5 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Search Bar Menu Section
diff --git a/src/app/shared/menu/menu-item/models/text.model.ts b/src/app/shared/menu/menu-item/models/text.model.ts
index 4fe8a41cc9..04eea7e53b 100644
--- a/src/app/shared/menu/menu-item/models/text.model.ts
+++ b/src/app/shared/menu/menu-item/models/text.model.ts
@@ -1,5 +1,5 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Text Menu Section
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 5e8aecbd44..4e68b6c5bc 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,10 +1,10 @@
 <a *ngIf="!item.disabled"
+   class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    href="javascript:void(0);"
-   class="nav-item nav-link"
-   role="button"
    [title]="item.text | translate"
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled"   class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" class="nav-item nav-link disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
index 18ae66b23d..3f9514adc8 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
@@ -1,9 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { OnClickMenuItemComponent } from './onclick-menu-item.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { OnClickMenuItemModel } from './models/onclick.model';
+import { OnClickMenuItemComponent } from './onclick-menu-item.component';
 
 describe('OnClickMenuItemComponent', () => {
   let component: OnClickMenuItemComponent;
@@ -22,7 +30,7 @@ describe('OnClickMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: item },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -45,7 +53,7 @@ describe('OnClickMenuItemComponent', () => {
   });
 
   it('should call the function on the item when clicked', () => {
-    debugElement.query(By.css('a.nav-link')).triggerEventHandler('click', new Event(('click')));
+    debugElement.query(By.css('a.ds-menu-item')).triggerEventHandler('click', new Event(('click')));
     expect(item.function).toHaveBeenCalled();
   });
 });
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 68e477b1fb..a067f2e5cb 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -1,15 +1,19 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
 import { rendersMenuItemForType } from '../menu-item.decorator';
-import { OnClickMenuItemModel } from './models/onclick.model';
 import { MenuItemType } from '../menu-item-type.model';
+import { OnClickMenuItemModel } from './models/onclick.model';
 
 /**
  * Component that renders a menu section of type ONCLICK
  */
 @Component({
   selector: 'ds-onclick-menu-item',
-  styleUrls: ['./onclick-menu-item.component.scss'],
-  templateUrl: './onclick-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
+  templateUrl: './onclick-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.ONCLICK)
 export class OnClickMenuItemComponent {
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.html b/src/app/shared/menu/menu-item/text-menu-item.component.html
index 11c4420402..ba3cf99a49 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.html
@@ -1 +1 @@
-<span [class.disabled]="item.disabled">{{item.text | translate}}</span>
+<span class="ds-menu-item" [class.disabled]="item.disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
index a0c159af23..81c565c539 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
@@ -1,8 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TextMenuItemComponent } from './text-menu-item.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { TextMenuItemComponent } from './text-menu-item.component';
 
 describe('TextMenuItemComponent', () => {
   let component: TextMenuItemComponent;
@@ -16,7 +24,7 @@ describe('TextMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: { text: text } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.ts b/src/app/shared/menu/menu-item/text-menu-item.component.ts
index 25549f53a8..9bbb1ec8c3 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.ts
@@ -1,13 +1,18 @@
-import { Component, Inject } from '@angular/core';
-import { TextMenuItemModel } from './models/text.model';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
 import { rendersMenuItemForType } from '../menu-item.decorator';
 import { MenuItemType } from '../menu-item-type.model';
+import { TextMenuItemModel } from './models/text.model';
 
 /**
  * Component that renders a menu section of type TEXT
  */
 @Component({
   selector: 'ds-text-menu-item',
+  styleUrls: ['./menu-item.component.scss'],
   templateUrl: './text-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.TEXT)
diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index 515ee2ff5c..f052a7e981 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,6 +1,6 @@
+import { hasValue } from '../empty.util';
 import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './menu-id.model';
-import { hasValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
@@ -19,7 +19,7 @@ export function rendersSectionForMenu(menuID: MenuID, expandable: boolean, theme
       menuComponentMap.set(menuID, new Map());
     }
     if (!menuComponentMap.get(menuID).get(expandable)) {
-        menuComponentMap.get(menuID).set(expandable, new Map());
+      menuComponentMap.get(menuID).set(expandable, new Map());
     }
     menuComponentMap.get(menuID).get(expandable).set(theme, menuSectionWrapperComponent);
   };
diff --git a/src/app/shared/menu/menu-section/menu-section.component.spec.ts b/src/app/shared/menu/menu-section/menu-section.component.spec.ts
index f40f45f9b4..4e1ee897bf 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.spec.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.spec.ts
@@ -1,13 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuSectionComponent } from './menu-section.component';
-import { MenuService } from '../menu.service';
-import { MenuServiceStub } from '../../testing/menu-service.stub';
 import { of as observableOf } from 'rxjs';
+
+import { MenuServiceStub } from '../../testing/menu-service.stub';
+import { MenuService } from '../menu.service';
 import { LinkMenuItemComponent } from '../menu-item/link-menu-item.component';
 import { MenuSection } from '../menu-section.model';
+import { MenuSectionComponent } from './menu-section.component';
 
 describe('MenuSectionComponent', () => {
   let comp: MenuSectionComponent;
@@ -19,7 +28,7 @@ describe('MenuSectionComponent', () => {
     dummySection = {
       id: 'section',
       visible: true,
-      active: false
+      active: false,
     } as any;
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule],
@@ -29,9 +38,9 @@ describe('MenuSectionComponent', () => {
         { provide: MenuService, useClass: MenuServiceStub },
         { provide: MenuSection, useValue: dummySection },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MenuSectionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 9b5bd499e1..1624e83aa8 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -1,21 +1,37 @@
-import { Component, Injector, OnDestroy, OnInit } from '@angular/core';
-import { MenuService } from '../menu.service';
-import { getComponentForMenuItemType } from '../menu-item.decorator';
-import { hasNoValue, hasValue } from '../../empty.util';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { MenuItemModel } from '../menu-item/models/menu-item.model';
-import { distinctUntilChanged, switchMap } from 'rxjs/operators';
+import {
+  Component,
+  Injector,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  switchMap,
+} from 'rxjs/operators';
+
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { MenuSection } from '../menu-section.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+import { MenuService } from '../menu.service';
 import { MenuID } from '../menu-id.model';
+import { getComponentForMenuItemType } from '../menu-item.decorator';
+import { MenuItemModel } from '../menu-item/models/menu-item.model';
 import { MenuItemType } from '../menu-item-type.model';
+import { MenuSection } from '../menu-section.model';
 
 /**
  * A basic implementation of a menu section's component
  */
 @Component({
   selector: 'ds-menu-section',
-  template: ''
+  template: '',
 })
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
@@ -97,21 +113,21 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
     this.updateSectionMap(
       this.section.id,
       this.getItemModelInjector(this.section.model),
-      this.getMenuItemComponent(this.section.model)
+      this.getMenuItemComponent(this.section.model),
     );
     this.subSections$ = this.menuService.getSubSectionsByParentID(this.menuID, this.section.id);
     this.subs.push(
       this.subSections$.pipe(
         // if you return an array from a switchMap it will emit each element as a separate event.
         // So this switchMap is equivalent to a subscribe with a forEach inside
-        switchMap((sections: MenuSection[]) => sections)
+        switchMap((sections: MenuSection[]) => sections),
       ).subscribe((section: MenuSection) => {
         this.updateSectionMap(
           section.id,
           this.getItemModelInjector(section.model),
-          this.getMenuItemComponent(section.model)
+          this.getMenuItemComponent(section.model),
         );
-      })
+      }),
     );
   }
 
@@ -148,7 +164,7 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
     }
     return Injector.create({
       providers: [{ provide: 'itemModelProvider', useFactory: () => (itemModel), deps: [] }],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/shared/menu/menu-state.model.ts b/src/app/shared/menu/menu-state.model.ts
index 0bedac2129..398f2732fe 100644
--- a/src/app/shared/menu/menu-state.model.ts
+++ b/src/app/shared/menu/menu-state.model.ts
@@ -1,6 +1,6 @@
+import { MenuID } from './menu-id.model';
 import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuSections } from './menu-sections.model';
-import { MenuID } from './menu-id.model';
 
 /**
  * Represents the state of a single menu in the store
diff --git a/src/app/shared/menu/menu.actions.ts b/src/app/shared/menu/menu.actions.ts
index f02fd73292..f3c9aa73dc 100644
--- a/src/app/shared/menu/menu.actions.ts
+++ b/src/app/shared/menu/menu.actions.ts
@@ -1,8 +1,9 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
-import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
+import { MenuSection } from './menu-section.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -18,6 +19,7 @@ export const MenuActionTypes = {
   EXPAND_MENU: type('dspace/menu/EXPAND_MENU'),
   SHOW_MENU: type('dspace/menu/SHOW_MENU'),
   HIDE_MENU: type('dspace/menu/HIDE_MENU'),
+  REINIT_MENUS: type('dspace/menu/REINIT_MENUS'),
   COLLAPSE_MENU_PREVIEW: type('dspace/menu/COLLAPSE_MENU_PREVIEW'),
   EXPAND_MENU_PREVIEW: type('dspace/menu/EXPAND_MENU_PREVIEW'),
   ADD_SECTION: type('dspace/menu-section/ADD_SECTION'),
@@ -115,6 +117,13 @@ export class ExpandMenuPreviewAction implements Action {
   }
 }
 
+/**
+ * Action used to re-initialise the menus
+ */
+export class ReinitMenuAction implements Action {
+  type = MenuActionTypes.REINIT_MENUS;
+}
+
 // MENU SECTION ACTIONS
 /**
  * Action used to perform state changes for a section of a certain menu
@@ -224,4 +233,5 @@ export type MenuAction =
   | DeactivateMenuSectionAction
   | ToggleActiveMenuSectionAction
   | CollapseMenuPreviewAction
-  | ExpandMenuPreviewAction;
+  | ExpandMenuPreviewAction
+  | ReinitMenuAction;
diff --git a/src/app/shared/menu/menu.component.spec.ts b/src/app/shared/menu/menu.component.spec.ts
index f0660fab4a..d7613e8c38 100644
--- a/src/app/shared/menu/menu.component.spec.ts
+++ b/src/app/shared/menu/menu.component.spec.ts
@@ -1,28 +1,77 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+// eslint-disable-next-line max-classes-per-file
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuService } from './menu.service';
-import { MenuComponent } from './menu.component';
-import { MenuServiceStub } from '../testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
-import { Router, ActivatedRoute } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
-import { Item } from '../../core/shared/item.model';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { authReducer } from '../../core/auth/auth.reducer';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../core/shared/item.model';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { ThemeService } from '../theme-support/theme.service';
-import { getMockThemeService } from '../mocks/theme-service.mock';
+import { MenuComponent } from './menu.component';
+import { MenuService } from './menu.service';
+import { MenuID } from './menu-id.model';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { MenuItemType } from './menu-item-type.model';
+import { rendersSectionForMenu } from './menu-section.decorator';
+import { MenuSection } from './menu-section.model';
+
+const mockMenuID = 'mock-menuID' as MenuID;
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '',
+})
+@rendersSectionForMenu(mockMenuID, true)
+class TestExpandableMenuComponent {
+}
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '',
+})
+@rendersSectionForMenu(mockMenuID, false)
+class TestMenuComponent {
+}
 
 describe('MenuComponent', () => {
   let comp: MenuComponent;
   let fixture: ComponentFixture<MenuComponent>;
   let menuService: MenuService;
-  let router: any;
-
-  const mockMenuID = 'mock-menuID' as MenuID;
+  let store: MockStore;
 
   const mockStatisticSection = { 'id': 'statistics_site', 'active': true, 'visible': true, 'index': 2, 'type': 'statistics', 'model': { 'type': 1, 'text': 'menu.section.statistics', 'link': 'statistics' } };
 
@@ -35,38 +84,72 @@ describe('MenuComponent', () => {
     lastModified: '2018',
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(mockItem)
+      dso: createSuccessfulRemoteDataObject(mockItem),
     }),
-    children: []
+    children: [],
+  };
+
+  const initialState = {
+    menus: {
+      [mockMenuID]: {
+        collapsed: true,
+        id: mockMenuID,
+        previewCollapsed: true,
+        sectionToSubsectionIndex: {
+          section1: [],
+        },
+        sections: {
+          section1: {
+            id: 'section1',
+            active: false,
+            visible: true,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'test',
+              link: '/test',
+            } as LinkMenuItemModel,
+          },
+        },
+        visible: true,
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(false)
+      isAuthorized: observableOf(false),
     });
 
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        NoopAnimationsModule,
+        RouterTestingModule,
+        StoreModule.forRoot(authReducer, storeModuleConfig),
+      ],
       declarations: [MenuComponent],
       providers: [
         Injector,
         { provide: ThemeService, useValue: getMockThemeService() },
-        { provide: MenuService, useClass: MenuServiceStub },
+        MenuService,
+        provideMockStore({ initialState }),
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ActivatedRoute, useValue: routeStub },
+        TestExpandableMenuComponent,
+        TestMenuComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MenuComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -74,13 +157,62 @@ describe('MenuComponent', () => {
     fixture = TestBed.createComponent(MenuComponent);
     comp = fixture.componentInstance; // SearchPageComponent test instance
     comp.menuID = mockMenuID;
-    menuService = (comp as any).menuService;
-    router = TestBed.inject(Router);
+    menuService = TestBed.inject(MenuService);
+    store = TestBed.inject(Store) as MockStore<AppState>;
     spyOn(comp as any, 'getSectionDataInjector').and.returnValue(MenuSection);
-    spyOn(comp as any, 'getSectionComponent').and.returnValue(observableOf({}));
     fixture.detectChanges();
   });
 
+  describe('ngOnInit', () => {
+    it('should trigger the section observable again when a new sub section has been added', () => {
+      spyOn(comp.sectionMap$, 'next').and.callThrough();
+      const hasSubSections = new BehaviorSubject(false);
+      spyOn(menuService, 'hasSubSections').and.returnValue(hasSubSections.asObservable());
+      spyOn(store, 'dispatch').and.callThrough();
+
+      store.setState({
+        menus: {
+          [mockMenuID]: {
+            collapsed: true,
+            id: mockMenuID,
+            previewCollapsed: true,
+            sectionToSubsectionIndex: {
+              section1: ['test'],
+            },
+            sections: {
+              section1: {
+                id: 'section1',
+                active: false,
+                visible: true,
+                model: {
+                  type: MenuItemType.LINK,
+                  text: 'test',
+                  link: '/test',
+                } as LinkMenuItemModel,
+              },
+              test: {
+                id: 'test',
+                parentID: 'section1',
+                active: false,
+                visible: true,
+                model: {
+                  type: MenuItemType.LINK,
+                  text: 'test',
+                  link: '/test',
+                } as LinkMenuItemModel,
+              },
+            },
+            visible: true,
+          },
+        },
+      });
+      expect(menuService.hasSubSections).toHaveBeenCalled();
+      hasSubSections.next(true);
+
+      expect(comp.sectionMap$.next).toHaveBeenCalled();
+    });
+  });
+
   describe('toggle', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
index 35e180b476..d1b844acc5 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -1,25 +1,44 @@
-import { ChangeDetectionStrategy, Component, Injector, OnDestroy, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { MenuService } from './menu.service';
-import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { hasValue, isNotEmptyOperator } from '../empty.util';
-import { MenuSectionComponent } from './menu-section/menu-section.component';
-import { getComponentForMenu } from './menu-section.decorator';
-import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../empty.util';
 import { ThemeService } from '../theme-support/theme.service';
+import { MenuService } from './menu.service';
+import { MenuID } from './menu-id.model';
+import { getComponentForMenu } from './menu-section.decorator';
+import { MenuSection } from './menu-section.model';
+import { MenuSectionComponent } from './menu-section/menu-section.component';
 
 /**
  * A basic implementation of a MenuComponent
  */
 @Component({
   selector: 'ds-menu',
-  template: ''
+  template: '',
 })
 export class MenuComponent implements OnInit, OnDestroy {
   /**
@@ -74,7 +93,7 @@ export class MenuComponent implements OnInit, OnDestroy {
   private activatedRouteLastChild: ActivatedRoute;
 
   constructor(protected menuService: MenuService, protected injector: Injector, public authorizationService: AuthorizationDataService,
-              public route: ActivatedRoute, protected themeService: ThemeService
+              public route: ActivatedRoute, protected themeService: ThemeService,
   ) {
   }
 
@@ -86,7 +105,7 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID);
     this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
     this.menuVisible = this.menuService.isMenuVisible(this.menuID);
-    this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(distinctUntilChanged(compareArraysUsingIds()));
+    this.sections = this.menuService.getMenuTopSections(this.menuID);
 
     this.subs.push(
       this.sections.pipe(
@@ -101,17 +120,17 @@ export class MenuComponent implements OnInit, OnDestroy {
         }),
         isNotEmptyOperator(),
         switchMap((section: MenuSection) => this.getSectionComponent(section).pipe(
-          map((component: GenericConstructor<MenuSectionComponent>) => ({ section, component }))
+          map((component: GenericConstructor<MenuSectionComponent>) => ({ section, component })),
         )),
-        distinctUntilChanged((x, y) => x.section.id === y.section.id)
+        distinctUntilChanged((x, y) => x.section.id === y.section.id && x.component.prototype === y.component.prototype),
       ).subscribe(({ section, component }) => {
         const nextMap = this.sectionMap$.getValue();
         nextMap.set(section.id, {
           injector: this.getSectionDataInjector(section),
-          component
+          component,
         });
         this.sectionMap$.next(nextMap);
-      })
+      }),
     );
   }
 
@@ -140,7 +159,7 @@ export class MenuComponent implements OnInit, OnDestroy {
               return section;
             }
           }));
-      })
+      }),
     );
   }
 
@@ -219,7 +238,7 @@ export class MenuComponent implements OnInit, OnDestroy {
     return this.menuService.hasSubSections(this.menuID, section.id).pipe(
       map((expandable: boolean) => {
         return getComponentForMenu(this.menuID, expandable, this.themeService.getThemeName());
-      }
+      },
       ),
     );
   }
@@ -232,7 +251,7 @@ export class MenuComponent implements OnInit, OnDestroy {
   private getSectionDataInjector(section: MenuSection) {
     return Injector.create({
       providers: [{ provide: 'sectionDataProvider', useFactory: () => (section), deps: [] }],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/shared/menu/menu.effects.spec.ts b/src/app/shared/menu/menu.effects.spec.ts
new file mode 100644
index 0000000000..f3b6d9ddde
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.spec.ts
@@ -0,0 +1,51 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import {
+  StoreAction,
+  StoreActionTypes,
+} from '../../store.actions';
+import { ReinitMenuAction } from './menu.actions';
+import { MenuEffects } from './menu.effects';
+
+describe('MenuEffects', () => {
+  let menuEffects: MenuEffects;
+  let actions: Observable<any>;
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        MenuEffects,
+        provideMockActions(() => actions),
+      ],
+    });
+  }));
+
+  beforeEach(() => {
+    menuEffects = TestBed.inject(MenuEffects);
+  });
+
+  describe('reinitDSOMenus', () => {
+    describe('When a REHYDRATE action is triggered', () => {
+      let action;
+      beforeEach(() => {
+        action = new StoreAction(StoreActionTypes.REHYDRATE, null);
+      });
+      it('should return a ReinitMenuAction', () => {
+        actions = hot('--a-', { a: action });
+        const expected = cold('--b-', { b: new ReinitMenuAction });
+
+        expect(menuEffects.reinitDSOMenus).toBeObservable(expected);
+      });
+    });
+  });
+
+
+});
diff --git a/src/app/shared/menu/menu.effects.ts b/src/app/shared/menu/menu.effects.ts
new file mode 100644
index 0000000000..e3216ef0e8
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { map } from 'rxjs/operators';
+
+import { StoreActionTypes } from '../../store.actions';
+import { ReinitMenuAction } from './menu.actions';
+
+@Injectable()
+export class MenuEffects {
+
+  /**
+   * When the store is rehydrated in the browser, re-initialise the menus to ensure
+   * the menus with functions are loaded correctly.
+   */
+  reinitDSOMenus = createEffect(() => this.actions$
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
+      map(() => new ReinitMenuAction()),
+    ));
+
+  constructor(private actions$: Actions) {
+  }
+
+}
diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts
index 28bdab9987..e650788f88 100644
--- a/src/app/shared/menu/menu.module.ts
+++ b/src/app/shared/menu/menu.module.ts
@@ -1,13 +1,14 @@
-import { MenuSectionComponent } from './menu-section/menu-section.component';
-import { MenuComponent } from './menu.component';
-import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterModule } from '@angular/router';
-import { LinkMenuItemComponent } from './menu-item/link-menu-item.component';
-import { TextMenuItemComponent } from './menu-item/text-menu-item.component';
-import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { MenuComponent } from './menu.component';
 import { ExternalLinkMenuItemComponent } from './menu-item/external-link-menu-item.component';
+import { LinkMenuItemComponent } from './menu-item/link-menu-item.component';
+import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component';
+import { TextMenuItemComponent } from './menu-item/text-menu-item.component';
+import { MenuSectionComponent } from './menu-section/menu-section.component';
 
 const COMPONENTS = [
   MenuSectionComponent,
@@ -32,7 +33,7 @@ const PROVIDERS = [
 
 @NgModule({
   imports: [
-    ...MODULES
+    ...MODULES,
   ],
   declarations: [
     ...COMPONENTS,
@@ -43,8 +44,8 @@ const PROVIDERS = [
     ...ENTRY_COMPONENTS,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 
 /**
diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts
index 2865e887fc..da837f2062 100644
--- a/src/app/shared/menu/menu.reducer.spec.ts
+++ b/src/app/shared/menu/menu.reducer.spec.ts
@@ -1,5 +1,7 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
+import { initialMenusState } from './initial-menus-state';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -10,16 +12,16 @@ import {
   ExpandMenuPreviewAction,
   HideMenuAction,
   HideMenuSectionAction,
+  ReinitMenuAction,
   RemoveMenuSectionAction,
   ShowMenuAction,
   ShowMenuSectionAction,
   ToggleActiveMenuSectionAction,
-  ToggleMenuAction
+  ToggleMenuAction,
 } from './menu.actions';
 import { menusReducer } from './menu.reducer';
-import { initialMenusState} from './initial-menus-state';
-import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuID } from './menu-id.model';
+import { MenuSectionIndex } from './menu-section-Index.model';
 
 let visibleSection1;
 let dummyState;
@@ -57,10 +59,10 @@ describe('menusReducer', () => {
             visible: true,
             model: {
               type: 0,
-              text: 'menu.section.new'
+              text: 'menu.section.new',
             },
             icon: 'plus-circle',
-            index: 0
+            index: 0,
           },
           new_item: {
             id: 'new_item',
@@ -70,8 +72,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_item',
-              link: '/items/submission'
-            }
+              link: '/items/submission',
+            },
           },
           new_community: {
             id: 'new_community',
@@ -81,8 +83,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_community',
-              link: '/communities/submission'
-            }
+              link: '/communities/submission',
+            },
           },
           access_control: {
             id: 'access_control',
@@ -90,10 +92,10 @@ describe('menusReducer', () => {
             visible: true,
             model: {
               type: 0,
-              text: 'menu.section.access_control'
+              text: 'menu.section.access_control',
             },
             icon: 'key',
-            index: 4
+            index: 4,
           },
           access_control_people: {
             id: 'access_control_people',
@@ -103,8 +105,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.access_control_people',
-              link: '#'
-            }
+              link: '#',
+            },
           },
           access_control_groups: {
             id: 'access_control_groups',
@@ -114,8 +116,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.access_control_groups',
-              link: '#'
-            }
+              link: '#',
+            },
           },
           new_collection: {
             id: 'new_collection',
@@ -125,9 +127,9 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_collection',
-              link: '/collections/submission'
-            }
-          }
+              link: '/collections/submission',
+            },
+          },
         },
         sectionToSubsectionIndex: {
           access_control: [
@@ -137,10 +139,10 @@ describe('menusReducer', () => {
           new: [
             'new_collection',
             'new_item',
-            'new_community'
-          ]
-        }
-      }
+            'new_community',
+          ],
+        },
+      },
     };
   });
 
@@ -180,6 +182,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set collapsed to false for the correct menu in response to the EXPAND_MENU action', () => {
@@ -201,6 +204,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set collapsed to false for the correct menu in response to the TOGGLE_MENU action when collapsed is true', () => {
@@ -231,6 +235,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to true for the correct menu in response to the COLLAPSE_MENU_PREVIEW action', () => {
@@ -252,6 +257,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to false for the correct menu in response to the EXPAND_MENU_PREVIEW action', () => {
@@ -273,6 +279,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to true for the correct menu in response to the SHOW_MENU action', () => {
@@ -294,6 +301,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to false for the correct menu in response to the HIDE_MENU action', () => {
@@ -315,6 +323,18 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
+  });
+
+  it('should reset the menu state to the initial state when performing the REINIT_MENUS action without affecting the previous state', () => {
+    dummyState[MenuID.ADMIN].visible = true;
+    const state = dummyState;
+    deepFreeze([state]);
+
+    const action = new ReinitMenuAction();
+    const menusState = menusReducer(state, action);
+    expect(menusState).toEqual(initialMenusState);
+
   });
 
   it('should set add a new section for the correct menu in response to the ADD_SECTION action', () => {
@@ -347,6 +367,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should remove a section for the correct menu in response to the REMOVE_SECTION action', () => {
@@ -383,6 +404,10 @@ describe('menusReducer', () => {
 
     const action = new ActivateMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set active to false for the correct menu section in response to the DEACTIVATE_SECTION action', () => {
@@ -401,6 +426,10 @@ describe('menusReducer', () => {
 
     const action = new DeactivateMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set active to false for the correct menu in response to the TOGGLE_ACTIVE_SECTION action when active is true', () => {
@@ -430,6 +459,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to true for the correct menu section in response to the SHOW_SECTION action', () => {
@@ -448,6 +478,10 @@ describe('menusReducer', () => {
 
     const action = new ShowMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to false for the correct menu section in response to the HIDE_SECTION action', () => {
@@ -466,5 +500,9 @@ describe('menusReducer', () => {
 
     const action = new HideMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 });
diff --git a/src/app/shared/menu/menu.reducer.ts b/src/app/shared/menu/menu.reducer.ts
index c7ea017cc2..e0a6dc7d8b 100644
--- a/src/app/shared/menu/menu.reducer.ts
+++ b/src/app/shared/menu/menu.reducer.ts
@@ -1,3 +1,5 @@
+import { hasValue } from '../empty.util';
+import { initialMenusState } from './initial-menus-state';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -8,16 +10,14 @@ import {
   MenuSectionAction,
   RemoveMenuSectionAction,
   ShowMenuSectionAction,
-  ToggleActiveMenuSectionAction
+  ToggleActiveMenuSectionAction,
 } from './menu.actions';
-import { initialMenusState} from './initial-menus-state';
-import { hasValue } from '../empty.util';
-import { MenusState } from './menus-state.model';
-import { MenuState } from './menu-state.model';
+import { MenuID } from './menu-id.model';
+import { MenuSection } from './menu-section.model';
 import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuSections } from './menu-sections.model';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
+import { MenuState } from './menu-state.model';
+import { MenusState } from './menus-state.model';
 
 /**
  * Reducer that handles MenuActions to update the MenusState
@@ -26,36 +26,39 @@ import { MenuID } from './menu-id.model';
  * @returns {MenusState} The new, reducer MenusState
  */
 export function menusReducer(state: MenusState = initialMenusState, action: MenuAction): MenusState {
-  const menuState: MenuState = state[action.menuID];
   switch (action.type) {
     case MenuActionTypes.COLLAPSE_MENU: {
-      const newMenuState = Object.assign({}, menuState, { collapsed: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { collapsed: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.EXPAND_MENU: {
-      const newMenuState = Object.assign({}, menuState, { collapsed: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { collapsed: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.COLLAPSE_MENU_PREVIEW: {
-      const newMenuState = Object.assign({}, menuState, { previewCollapsed: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { previewCollapsed: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.EXPAND_MENU_PREVIEW: {
-      const newMenuState = Object.assign({}, menuState, { previewCollapsed: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { previewCollapsed: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.TOGGLE_MENU: {
+      const menuState = state[action.menuID];
       const newMenuState = Object.assign({}, menuState, { collapsed: !menuState.collapsed });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.SHOW_MENU: {
-      const newMenuState = Object.assign({}, menuState, { visible: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { visible: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.HIDE_MENU: {
-      const newMenuState = Object.assign({}, menuState, { visible: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { visible: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
+    case MenuActionTypes.REINIT_MENUS: {
+      return Object.assign({}, initialMenusState);
+    }
     case MenuActionTypes.ADD_SECTION: {
       return addSection(state, action as AddMenuSectionAction);
     }
@@ -120,7 +123,7 @@ function reorderSections(state: MenusState, action: MenuSectionAction) {
   });
   const newMenuState = Object.assign({}, menuState, {
     sections: newSectionState,
-    sectionToSubsectionIndex: newSectionIndexState
+    sectionToSubsectionIndex: newSectionIndexState,
   });
   return Object.assign({}, state, { [action.menuID]: newMenuState });
 }
@@ -136,7 +139,7 @@ function removeSection(state: MenusState, action: RemoveMenuSectionAction) {
   const id = action.id;
   const newState = removeFromIndex(state, menuState.sections[action.id], action.menuID);
   const newMenuState = Object.assign({}, newState[action.menuID], {
-    sections: Object.assign({}, newState[action.menuID].sections)
+    sections: Object.assign({}, newState[action.menuID].sections),
   });
   delete newMenuState.sections[id];
   return Object.assign({}, newState, { [action.menuID]: newMenuState });
@@ -230,13 +233,13 @@ function toggleActiveSection(state: MenusState, action: ToggleActiveMenuSectionA
  * @param {MenuSection} section The section that will be added or replaced in the state
  * @returns {MenusState} The new reduced state
  */
-function putSectionState(state: MenusState, action: MenuAction, section: MenuSection): MenusState {
+function putSectionState(state: MenusState, action: MenuSectionAction, section: MenuSection): MenusState {
   const menuState: MenuState = state[action.menuID];
   const newSections = Object.assign({}, menuState.sections, {
-    [section.id]: section
+    [section.id]: section,
   });
   const newMenuState = Object.assign({}, menuState, {
-    sections: newSections
+    sections: newSections,
   });
   return Object.assign({}, state, { [action.menuID]: newMenuState });
 }
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 0d8d669a0a..c5c8ee2a4f 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -1,11 +1,17 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NavigationEnd } from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { MenuService } from './menu.service';
+import { storeModuleConfig } from '../../app.reducer';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -18,15 +24,14 @@ import {
   RemoveMenuSectionAction,
   ShowMenuAction,
   ToggleActiveMenuSectionAction,
-  ToggleMenuAction
+  ToggleMenuAction,
 } from './menu.actions';
 import { menusReducer } from './menu.reducer';
-import { storeModuleConfig } from '../../app.reducer';
-import { MenuSection } from './menu-section.model';
+import { MenuService } from './menu.service';
 import { MenuID } from './menu-id.model';
-import { MenuItemType } from './menu-item-type.model';
 import { LinkMenuItemModel } from './menu-item/models/link.model';
-import { NavigationEnd } from '@angular/router';
+import { MenuItemType } from './menu-item-type.model';
+import { MenuSection } from './menu-section.model';
 
 describe('MenuService', () => {
   let service: MenuService;
@@ -41,6 +46,7 @@ describe('MenuService', () => {
   let routeDataMenuSection: MenuSection;
   let routeDataMenuSectionResolved: MenuSection;
   let routeDataMenuChildSection: MenuSection;
+  let routeDataMenuOverwrittenChildSection: MenuSection;
   let toBeRemovedMenuSection: MenuSection;
   let alreadyPresentMenuSection: MenuSection;
   let route;
@@ -52,31 +58,31 @@ describe('MenuService', () => {
     visibleSection1 = {
       id: 'section',
       visible: true,
-      active: false
+      active: false,
     };
     visibleSection2 = {
       id: 'section_2',
-      visible: true
+      visible: true,
     };
     hiddenSection3 = {
       id: 'section_3',
-      visible: false
+      visible: false,
     };
     subSection4 = {
       id: 'section_4',
       visible: true,
-      parentID: 'section'
+      parentID: 'section',
     };
     subSection4 = {
       id: 'section_4',
       visible: true,
-      parentID: 'section'
+      parentID: 'section',
     };
     topSections = {
       section: visibleSection1,
       section_2: visibleSection2,
       section_3: hiddenSection3,
-      section_4: subSection4
+      section_4: subSection4,
     };
 
     fakeMenu = {
@@ -86,14 +92,14 @@ describe('MenuService', () => {
       sections: topSections,
       previewCollapsed: true,
       sectionToSubsectionIndex: {
-        'section': ['section_4']
-      }
+        'section': ['section_4'],
+      },
     } as any;
 
     initialState = {
       menus: {
-        'admin-sidebar': fakeMenu
-      }
+        'admin-sidebar': fakeMenu,
+      },
     };
 
     routeDataMenuSection = {
@@ -103,8 +109,8 @@ describe('MenuService', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'menu.section.mockSection',
-        link: 'path/:linkparam'
-      } as LinkMenuItemModel
+        link: 'path/:linkparam',
+      } as LinkMenuItemModel,
     };
     routeDataMenuSectionResolved = {
       id: 'mockSection_id_param_resolved',
@@ -113,8 +119,8 @@ describe('MenuService', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'menu.section.mockSection',
-        link: 'path/link_param_resolved'
-      } as LinkMenuItemModel
+        link: 'path/link_param_resolved',
+      } as LinkMenuItemModel,
     };
     routeDataMenuChildSection = {
       id: 'mockChildSection',
@@ -124,8 +130,19 @@ describe('MenuService', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'menu.section.mockChildSection',
-        link: ''
-      } as LinkMenuItemModel
+        link: '',
+      } as LinkMenuItemModel,
+    };
+    routeDataMenuOverwrittenChildSection = {
+      id: 'mockChildSection',
+      parentID: 'mockSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockChildOverwrittenSection',
+        link: '',
+      } as LinkMenuItemModel,
     };
     toBeRemovedMenuSection = {
       id: 'toBeRemovedSection',
@@ -134,8 +151,8 @@ describe('MenuService', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'menu.section.toBeRemovedSection',
-        link: ''
-      } as LinkMenuItemModel
+        link: '',
+      } as LinkMenuItemModel,
     };
     alreadyPresentMenuSection = {
       id: 'alreadyPresentSection',
@@ -144,36 +161,46 @@ describe('MenuService', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'menu.section.alreadyPresentSection',
-        link: ''
-      } as LinkMenuItemModel
+        link: '',
+      } as LinkMenuItemModel,
     };
     route = {
       root: {
         snapshot: {
           data: {
             menu: {
-              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection]
-            }
+              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection],
+            },
           },
           params: {
             idparam: 'id_param_resolved',
             linkparam: 'link_param_resolved',
-          }
+          },
         },
         firstChild: {
           snapshot: {
             data: {
               menu: {
-                [MenuID.PUBLIC]: routeDataMenuChildSection
-              }
-            }
-          }
-        }
-      }
+                [MenuID.PUBLIC]: routeDataMenuChildSection,
+              },
+            },
+          },
+          firstChild: {
+            snapshot: {
+              data: {
+                menu: {
+                  [MenuID.PUBLIC]: routeDataMenuOverwrittenChildSection,
+                },
+              },
+            },
+          },
+
+        },
+      },
     };
 
     router = {
-      events: observableOf(new NavigationEnd(1, 'test-url', 'test-url'))
+      events: observableOf(new NavigationEnd(1, 'test-url', 'test-url')),
     };
   }
 
@@ -181,12 +208,12 @@ describe('MenuService', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({menus: menusReducer}, storeModuleConfig)
+        StoreModule.forRoot({ menus: menusReducer }, storeModuleConfig),
       ],
       providers: [
-        provideMockStore({initialState}),
-        {provide: MenuService, useValue: service}
-      ]
+        provideMockStore({ initialState }),
+        { provide: MenuService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
@@ -201,7 +228,7 @@ describe('MenuService', () => {
 
       const result = service.getMenu(MenuID.ADMIN);
       const expected = cold('b', {
-        b: fakeMenu
+        b: fakeMenu,
       });
 
       expect(result).toBeObservable(expected);
@@ -214,7 +241,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuTopSections(MenuID.ADMIN);
       const expected = cold('b', {
-        b: [visibleSection1, visibleSection2]
+        b: [visibleSection1, visibleSection2],
       });
 
       expect(result).toBeObservable(expected);
@@ -224,7 +251,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuTopSections(MenuID.ADMIN, false);
       const expected = cold('b', {
-        b: [visibleSection1, visibleSection2, hiddenSection3]
+        b: [visibleSection1, visibleSection2, hiddenSection3],
       });
 
       expect(result).toBeObservable(expected);
@@ -237,7 +264,7 @@ describe('MenuService', () => {
 
         const result = service.getSubSectionsByParentID(MenuID.ADMIN, 'section');
         const expected = cold('b', {
-          b: [subSection4]
+          b: [subSection4],
         });
 
         expect(result).toBeObservable(expected);
@@ -261,7 +288,7 @@ describe('MenuService', () => {
 
         const result = service.hasSubSections(MenuID.ADMIN, 'section');
         const expected = cold('b', {
-          b: true
+          b: true,
         });
 
         expect(result).toBeObservable(expected);
@@ -273,7 +300,7 @@ describe('MenuService', () => {
 
         const result = service.hasSubSections(MenuID.ADMIN, 'fakeId');
         const expected = cold('b', {
-          b: false
+          b: false,
         });
 
         expect(result).toBeObservable(expected);
@@ -286,7 +313,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuSection(MenuID.ADMIN, 'section_3');
       const expected = cold('b', {
-        b: hiddenSection3
+        b: hiddenSection3,
       });
 
       expect(result).toBeObservable(expected);
@@ -296,7 +323,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuSection(MenuID.ADMIN, 'fake');
       const expected = cold('b', {
-        b: undefined
+        b: undefined,
       });
 
       expect(result).toBeObservable(expected);
@@ -311,7 +338,7 @@ describe('MenuService', () => {
 
       const result = service.isMenuCollapsed(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.collapsed
+        b: fakeMenu.collapsed,
       });
 
       expect(result).toBeObservable(expected);
@@ -326,7 +353,7 @@ describe('MenuService', () => {
 
       const result = service.isMenuPreviewCollapsed(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.previewCollapsed
+        b: fakeMenu.previewCollapsed,
       });
 
       expect(result).toBeObservable(expected);
@@ -341,24 +368,24 @@ describe('MenuService', () => {
         visible: true,
         sections: {},
         previewCollapsed: false,
-        sectionToSubsectionIndex: {}
+        sectionToSubsectionIndex: {},
       } as any;
       spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
     });
     it('should return false when no top-level sections are visible', () => {
       const noTopLevelVisibleSections = {
-        section: {id: 's1', visible: false},
-        section_2: {id: 's2', visible: false},
-        section_3: {id: 's3', visible: false},
-        section_4: {id: 's1_1', visible: true, parentID: 's1'},
-        section_5: {id: 's2_1', visible: true, parentID: 's2'},
+        section: { id: 's1', visible: false },
+        section_2: { id: 's2', visible: false },
+        section_3: { id: 's3', visible: false },
+        section_4: { id: 's1_1', visible: true, parentID: 's1' },
+        section_5: { id: 's2_1', visible: true, parentID: 's2' },
       };
       const testMenu = {
         id: MenuID.ADMIN,
@@ -369,13 +396,13 @@ describe('MenuService', () => {
         sectionToSubsectionIndex: {
           'section': ['section_4'],
           'section_2': ['section_5'],
-        }
+        },
       } as any;
       spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
@@ -383,11 +410,11 @@ describe('MenuService', () => {
 
     it('should return true when any top-level section is visible', () => {
       const noTopLevelVisibleSections = {
-        section: {id: 's1', visible: false},
-        section_2: {id: 's2', visible: true},
-        section_3: {id: 's3', visible: false},
-        section_4: {id: 's1_1', visible: true, parentID: 's1'},
-        section_5: {id: 's2_1', visible: true, parentID: 's2'},
+        section: { id: 's1', visible: false },
+        section_2: { id: 's2', visible: true },
+        section_3: { id: 's3', visible: false },
+        section_4: { id: 's1_1', visible: true, parentID: 's1' },
+        section_5: { id: 's2_1', visible: true, parentID: 's2' },
       };
       const testMenu = {
         id: MenuID.ADMIN,
@@ -398,13 +425,13 @@ describe('MenuService', () => {
         sectionToSubsectionIndex: {
           'section': ['section_4'],
           'section_2': ['section_5'],
-        }
+        },
       } as any;
       spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(result).toBeObservable(expected);
@@ -420,7 +447,7 @@ describe('MenuService', () => {
 
       const result = service.isMenuVisible(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.visible
+        b: fakeMenu.visible,
       });
 
       expect(result).toBeObservable(expected);
@@ -435,7 +462,7 @@ describe('MenuService', () => {
     it('should return false when the section is not active', () => {
       const result = service.isSectionActive(MenuID.ADMIN, 'fakeID');
       const expected = cold('(b|)', {
-        b: visibleSection1.active
+        b: visibleSection1.active,
       });
 
       expect(result).toBeObservable(expected);
@@ -450,7 +477,7 @@ describe('MenuService', () => {
     it('should return false when the section is hidden', () => {
       const result = service.isSectionVisible(MenuID.ADMIN, 'fakeID');
       const expected = cold('(b|)', {
-        b: hiddenSection3.visible
+        b: hiddenSection3.visible,
       });
       expect(result).toBeObservable(expected);
     });
@@ -541,7 +568,7 @@ describe('MenuService', () => {
   });
 
   describe('buildRouteMenuSections', () => {
-    it('should add and remove menu sections depending on the current route', () => {
+    it('should add and remove menu sections depending on the current route and overwrite menu sections when they have the same ID with the child route version', () => {
       spyOn(service, 'addSection');
       spyOn(service, 'removeSection');
 
@@ -550,7 +577,8 @@ describe('MenuService', () => {
       service.buildRouteMenuSections(MenuID.PUBLIC);
 
       expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
-      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(service.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuOverwrittenChildSection);
       expect(service.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
       expect(service.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
     });
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index fac3b3fba7..0e087439bd 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -1,8 +1,39 @@
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { AppState, keySelector } from '../../app.reducer';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -11,18 +42,18 @@ import {
   DeactivateMenuSectionAction,
   ExpandMenuAction,
   ExpandMenuPreviewAction,
-  HideMenuAction, HideMenuSectionAction,
+  HideMenuAction,
+  HideMenuSectionAction,
   RemoveMenuSectionAction,
-  ShowMenuAction, ShowMenuSectionAction,
+  ShowMenuAction,
+  ShowMenuSectionAction,
   ToggleActiveMenuSectionAction,
   ToggleMenuAction,
 } from './menu.actions';
-import { hasNoValue, hasValue, hasValueOperator, isNotEmpty, isEmpty } from '../empty.util';
-import { MenuState } from './menu-state.model';
-import { MenuSections } from './menu-sections.model';
-import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { MenuSection } from './menu-section.model';
+import { MenuSections } from './menu-sections.model';
+import { MenuState } from './menu-state.model';
 
 export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
   return createSelector(selector, (state) => {
@@ -81,12 +112,14 @@ export class MenuService {
     return this.store.pipe(
       select(menuByIDSelector(menuID)),
       select(menuSectionStateSelector),
-      map((sections: MenuSections) => {
-          return Object.values(sections)
-            .filter((section: MenuSection) => hasNoValue(section.parentID))
-            .filter((section: MenuSection) => !mustBeVisible || section.visible);
-        }
-      )
+      map((sections: MenuSections) => Object.values(sections)),
+      distinctUntilChanged(compareArraysUsingIds()),
+      map((sections: MenuSection[]) => {
+        return sections
+          .filter((section: MenuSection) => hasNoValue(section.parentID))
+          .filter((section: MenuSection) => !mustBeVisible || section.visible);
+      },
+      ),
     );
   }
 
@@ -103,9 +136,9 @@ export class MenuService {
       select(getSubSectionsFromSectionSelector(parentID)),
       map((ids: string[]) => isNotEmpty(ids) ? ids : []),
       switchMap((ids: string[]) =>
-        observableCombineLatest(ids.map((id: string) => this.getMenuSection(menuID, id)))
+        observableCombineLatest(ids.map((id: string) => this.getMenuSection(menuID, id))),
       ),
-      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => hasValue(section) && (!mustBeVisible || section.visible)))
+      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => hasValue(section) && (!mustBeVisible || section.visible))),
     );
   }
 
@@ -119,7 +152,7 @@ export class MenuService {
     return this.store.pipe(
       select(menuByIDSelector(menuID)),
       select(getSubSectionsFromSectionSelector(parentID)),
-      map((ids: string[]) => isNotEmpty(ids))
+      map((ids: string[]) => isNotEmpty(ids)),
     );
   }
 
@@ -142,7 +175,7 @@ export class MenuService {
    */
   getNonPersistentMenuSections(menuID: MenuID): Observable<MenuSection[]> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => Object.values(state.sections).filter((section: MenuSection) => !section.shouldPersistOnRouteChange))
+      map((state: MenuState) => Object.values(state.sections).filter((section: MenuSection) => !section.shouldPersistOnRouteChange)),
     );
   }
 
@@ -171,7 +204,7 @@ export class MenuService {
    */
   isMenuCollapsed(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.collapsed : undefined)
+      map((state: MenuState) => hasValue(state) ? state.collapsed : undefined),
     );
   }
 
@@ -182,7 +215,7 @@ export class MenuService {
    */
   isMenuPreviewCollapsed(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.previewCollapsed : undefined)
+      map((state: MenuState) => hasValue(state) ? state.previewCollapsed : undefined),
     );
   }
 
@@ -194,7 +227,7 @@ export class MenuService {
    */
   isMenuVisibleWithVisibleSections(menuID: MenuID): Observable<boolean> {
     return observableCombineLatest([this.isMenuVisible(menuID), this.menuHasVisibleSections(menuID)]).pipe(
-      map(([menuVisible, visibleSections]) => menuVisible && visibleSections)
+      map(([menuVisible, visibleSections]) => menuVisible && visibleSections),
     );
   }
 
@@ -205,7 +238,7 @@ export class MenuService {
    */
   isMenuVisible(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.visible : undefined)
+      map((state: MenuState) => hasValue(state) ? state.visible : undefined),
     );
   }
 
@@ -219,7 +252,7 @@ export class MenuService {
       map((state: MenuState) => hasValue(state)
         ? Object.values(state.sections)
           .some(section => section.visible && section.parentID === undefined)
-        : undefined)
+        : undefined),
     );
   }
 
@@ -363,7 +396,7 @@ export class MenuService {
   buildRouteMenuSections(menuID: MenuID) {
     this.getNonPersistentMenuSections(menuID).pipe(
       map((sections) => sections.map((section) => section.id)),
-      take(1)
+      take(1),
     ).subscribe((shouldNotPersistIDs: string[]) => {
       const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
       resolvedSections.forEach((section) => {
@@ -399,7 +432,8 @@ export class MenuService {
       }
 
       if (!last) {
-        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)];
+        const childMenuSections = this.resolveRouteMenuSections(route.firstChild, menuID);
+        return [...menuSections.filter(menu => !(childMenuSections).map(childMenu => childMenu.id).includes(menu.id)), ...childMenuSections];
       } else {
         return [...menuSections];
       }
@@ -415,7 +449,7 @@ export class MenuService {
     } else if (typeof object === 'string') {
       resolved = object;
       Object.entries(params).forEach(([key, value]: [string, string]) =>
-        resolved = resolved.replaceAll(`:${key}`, value)
+        resolved = resolved.replaceAll(`:${key}`, value),
       );
     } else if (Array.isArray(object)) {
       resolved = [];
diff --git a/src/app/shared/menu/menus-state.model.ts b/src/app/shared/menu/menus-state.model.ts
index 9590fa1760..096da4d3eb 100644
--- a/src/app/shared/menu/menus-state.model.ts
+++ b/src/app/shared/menu/menus-state.model.ts
@@ -1,5 +1,5 @@
-import { MenuState } from './menu-state.model';
 import { MenuID } from './menu-id.model';
+import { MenuState } from './menu-state.model';
 
 /**
  * Represents the state of all menus in the store
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index d69f87883b..7748e385ca 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,5 +1,5 @@
 <div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
-  <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
+  <h2 class="simple-view-element-header" *ngIf="label">{{ label }}</h2>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
index 75dfd09d0d..bf17d63d6c 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
@@ -2,4 +2,7 @@
   .simple-view-element {
     margin-bottom: 15px;
   }
+  .simple-view-element-header {
+    font-size: 1.25rem;
+  }
 }
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
index 5ef272db3b..0047e72640 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
@@ -1,34 +1,41 @@
 /* eslint-disable max-classes-per-file */
-import { Component, Input } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
 
 @Component({
-    selector: 'ds-component-without-content',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
-      '</ds-metadata-field-wrapper>'
+  selector: 'ds-component-without-content',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+      '</ds-metadata-field-wrapper>',
 })
 class NoContentComponent {
   public hideIfNoTextContent = true;
 }
 
 @Component({
-    selector: 'ds-component-with-empty-spans',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+  selector: 'ds-component-with-empty-spans',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span></span>\n' +
       '    <span></span>\n' +
-      '</ds-metadata-field-wrapper>'
+      '</ds-metadata-field-wrapper>',
 })
 class SpanContentComponent {
   @Input() hideIfNoTextContent = true;
 }
 
 @Component({
-    selector: 'ds-component-with-text',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+  selector: 'ds-component-with-text',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span>The quick brown fox jumps over the lazy dog</span>\n' +
-      '</ds-metadata-field-wrapper>'
+      '</ds-metadata-field-wrapper>',
 })
 class TextContentComponent {
   @Input() hideIfNoTextContent = true;
@@ -41,7 +48,7 @@ describe('MetadataFieldWrapperComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent]
+      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 5c6b99248f..0a159e76ec 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 /**
  * This component renders any content inside this wrapper.
@@ -7,7 +10,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'ds-metadata-field-wrapper',
   styleUrls: ['./metadata-field-wrapper.component.scss'],
-  templateUrl: './metadata-field-wrapper.component.html'
+  templateUrl: './metadata-field-wrapper.component.html',
 })
 export class MetadataFieldWrapperComponent {
 
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.html b/src/app/shared/metadata-representation/metadata-representation-loader.component.html
deleted file mode 100644
index 3979c238ad..0000000000
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-container dsMetadataRepresentation></ng-container>
\ No newline at end of file
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
index 7edf1a700e..8c9bf77f52 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { Context } from '../../core/shared/context.model';
 import {
   MetadataRepresentation,
-  MetadataRepresentationType
+  MetadataRepresentationType,
 } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { MetadataRepresentationLoaderComponent } from './metadata-representation-loader.component';
-import { MetadataRepresentationDirective } from './metadata-representation.directive';
-import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
-import { ThemeService } from '../theme-support/theme.service';
+import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 import { PlainTextMetadataListElementComponent } from '../object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import { ThemeService } from '../theme-support/theme.service';
+import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
+import { MetadataRepresentationLoaderComponent } from './metadata-representation-loader.component';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -36,34 +45,37 @@ describe('MetadataRepresentationLoaderComponent', () => {
   const themeName = 'test-theme';
 
   beforeEach(waitForAsync(() => {
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: themeName,
-    });
+    themeService = getMockThemeService(themeName);
     TestBed.configureTestingModule({
       imports: [],
-      declarations: [MetadataRepresentationLoaderComponent, PlainTextMetadataListElementComponent, MetadataRepresentationDirective],
+      declarations: [
+        MetadataRepresentationLoaderComponent,
+        PlainTextMetadataListElementComponent,
+        DynamicComponentLoaderDirective,
+      ],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         {
           provide: METADATA_REPRESENTATION_COMPONENT_FACTORY,
-          useValue: jasmine.createSpy('getMetadataRepresentationComponent').and.returnValue(PlainTextMetadataListElementComponent)
+          useValue: jasmine.createSpy('getMetadataRepresentationComponent').and.returnValue(PlainTextMetadataListElementComponent),
         },
         {
           provide: ThemeService,
           useValue: themeService,
-        }
-      ]
+        },
+      ],
     }).overrideComponent(MetadataRepresentationLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [PlainTextMetadataListElementComponent]
-      }
+        entryComponents: [PlainTextMetadataListElementComponent],
+      },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(MetadataRepresentationLoaderComponent);
     comp = fixture.componentInstance;
+    spyOn(comp, 'getComponent').and.callThrough();
 
     comp.mdRepresentation = new TestType();
     comp.context = testContext;
@@ -71,8 +83,8 @@ describe('MetadataRepresentationLoaderComponent', () => {
   }));
 
   describe('When the component is rendered', () => {
-    it('should call the getMetadataRepresentationComponent function with the right entity type, representation type and context', () => {
-      expect((comp as any).getMetadataRepresentationComponent).toHaveBeenCalledWith(testType, testRepresentationType, testContext, themeName);
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
index 42ee093278..084ca8c32c 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
@@ -1,124 +1,55 @@
-import { Component, ComponentFactoryResolver, Inject, Input, OnInit, ViewChild, OnChanges, SimpleChanges, ComponentRef, ViewContainerRef, ComponentFactory } from '@angular/core';
 import {
-  MetadataRepresentation,
-  MetadataRepresentationType
-} from '../../core/shared/metadata-representation/metadata-representation.model';
-import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../../core/shared/metadata-representation/metadata-representation.model';
+import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component';
 import { MetadataRepresentationListElementComponent } from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import { MetadataRepresentationDirective } from './metadata-representation.directive';
-import { hasValue, isNotEmpty, hasNoValue } from '../empty.util';
 import { ThemeService } from '../theme-support/theme.service';
+import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
 
 @Component({
   selector: 'ds-metadata-representation-loader',
-  templateUrl: './metadata-representation-loader.component.html'
+  templateUrl: '../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type), its metadata representation and, optionally, its context
  */
-export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges {
+export class MetadataRepresentationLoaderComponent extends AbstractComponentLoaderComponent<MetadataRepresentationListElementComponent> {
+
+  @Input() context: Context;
 
   /**
    * The item or metadata to determine the component for
    */
-  private _mdRepresentation: MetadataRepresentation;
-  get mdRepresentation(): MetadataRepresentation {
-    return this._mdRepresentation;
-  }
-  @Input() set mdRepresentation(nextValue: MetadataRepresentation) {
-    this._mdRepresentation = nextValue;
-    if (hasValue(this.compRef?.instance)) {
-      this.compRef.instance.mdRepresentation = nextValue;
-    }
-  }
+  @Input() mdRepresentation: MetadataRepresentation;
 
-  /**
-   * The optional context
-   */
-  @Input() context: Context;
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'context',
+    'mdRepresentation',
+  ];
 
-  /**
-   * Directive to determine where the dynamic child component is located
-   */
-  @ViewChild(MetadataRepresentationDirective, {static: true}) mdRepDirective: MetadataRepresentationDirective;
-
-  /**
-   * The reference to the dynamic component
-   */
-  protected compRef: ComponentRef<MetadataRepresentationListElementComponent>;
-
-  protected inAndOutputNames: (keyof this)[] = [
+  protected inputNames: (keyof this & string)[] = [
     'context',
     'mdRepresentation',
   ];
 
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private themeService: ThemeService,
+    protected themeService: ThemeService,
     @Inject(METADATA_REPRESENTATION_COMPONENT_FACTORY) private getMetadataRepresentationComponent: (entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>,
   ) {
+    super(themeService);
   }
 
-  /**
-   * Set up the dynamic child component
-   */
-  ngOnInit(): void {
-    this.instantiateComponent();
-  }
-
-  /**
-   * Whenever the inputs change, update the inputs of the dynamic component
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.compRef)) {
-      // sometimes the component has not been initialized yet, so it first needs to be initialized
-      // before being called again
-      this.instantiateComponent(changes);
-    } else {
-      // if an input or output has changed
-      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
-        this.connectInputsAndOutputs();
-        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
-          (this.compRef.instance as any).ngOnChanges(changes);
-        }
-      }
-    }
-  }
-
-  private instantiateComponent(changes?: SimpleChanges): void {
-    const componentFactory: ComponentFactory<MetadataRepresentationListElementComponent> = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
-
-    const viewContainerRef: ViewContainerRef = this.mdRepDirective.viewContainerRef;
-    viewContainerRef.clear();
-
-    this.compRef = viewContainerRef.createComponent(componentFactory);
-
-    if (hasValue(changes)) {
-      this.ngOnChanges(changes);
-    } else {
-      this.connectInputsAndOutputs();
-    }
-  }
-
-  /**
-   * Fetch the component depending on the item's entity type, metadata representation type and context
-   * @returns {string}
-   */
-  private getComponent(): GenericConstructor<MetadataRepresentationListElementComponent> {
+  public getComponent(): GenericConstructor<MetadataRepresentationListElementComponent> {
     return this.getMetadataRepresentationComponent(this.mdRepresentation.itemType, this.mdRepresentation.representationType, this.context, this.themeService.getThemeName());
   }
 
-  /**
-   * Connect the in and outputs of this component to the dynamic component,
-   * to ensure they're in sync
-   */
-  protected connectInputsAndOutputs(): void {
-    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
-      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
-        this.compRef.instance[name] = this[name];
-      });
-    }
-  }
 }
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
index 09d4d60532..8a6ac7eb22 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
@@ -1,14 +1,15 @@
-  /* eslint-disable max-classes-per-file */
+/* eslint-disable max-classes-per-file */
+import { v4 as uuidv4 } from 'uuid';
+
+import { environment } from '../../../environments/environment';
+import { Context } from '../../core/shared/context.model';
+import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
 import {
   DEFAULT_ENTITY_TYPE,
   DEFAULT_REPRESENTATION_TYPE,
   getMetadataRepresentationComponent,
-  metadataRepresentationComponent
+  metadataRepresentationComponent,
 } from './metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { Context } from '../../core/shared/context.model';
-import { v4 as uuidv4 } from 'uuid';
-import { environment } from '../../../environments/environment';
 
 let ogEnvironmentThemes;
 
@@ -114,7 +115,7 @@ describe('MetadataRepresentation decorator function', () => {
           },
           {
             name: 'ancestor',         // Matches typeAncestor, but not typeUnthemed
-          }
+          },
         ];
       });
 
@@ -143,7 +144,7 @@ describe('MetadataRepresentation decorator function', () => {
         expect(() => {
           getMetadataRepresentationComponent(prefix + typeAncestor, MetadataRepresentationType.Item, Context.Any, 'extension-cycle');
         }).toThrowError(
-          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1'
+          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1',
         );
       });
     });
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
index ae601e480c..1267aa60c0 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
@@ -1,16 +1,21 @@
-import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { hasNoValue, hasValue } from '../empty.util';
-import { Context } from '../../core/shared/context.model';
 import { InjectionToken } from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
 import {
+  hasNoValue,
+  hasValue,
+} from '../empty.util';
+import {
+  DEFAULT_CONTEXT,
+  DEFAULT_THEME,
   resolveTheme,
-  DEFAULT_THEME, DEFAULT_CONTEXT
 } from '../object-collection/shared/listable-object/listable-object.decorator';
 
 export const METADATA_REPRESENTATION_COMPONENT_FACTORY = new InjectionToken<(entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>>('getMetadataRepresentationComponent', {
   providedIn: 'root',
-  factory: () => getMetadataRepresentationComponent
+  factory: () => getMetadataRepresentationComponent,
 });
 
 export const map = new Map();
diff --git a/src/app/shared/metadata-representation/metadata-representation.directive.ts b/src/app/shared/metadata-representation/metadata-representation.directive.ts
deleted file mode 100644
index 9ff0573baf..0000000000
--- a/src/app/shared/metadata-representation/metadata-representation.directive.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dsMetadataRepresentation]',
-})
-/**
- * Directive used as a hook to know where to inject the dynamic metadata representation component
- */
-export class MetadataRepresentationDirective {
-  constructor(public viewContainerRef: ViewContainerRef) { }
-}
diff --git a/src/app/shared/mocks/action.mock.ts b/src/app/shared/mocks/action.mock.ts
index e227946f64..f5c7c683b0 100644
--- a/src/app/shared/mocks/action.mock.ts
+++ b/src/app/shared/mocks/action.mock.ts
@@ -2,5 +2,5 @@ import { Action } from '@ngrx/store';
 
 export class ActionMock implements Action {
   type = null;
-  payload: {};
+  payload: any;
 }
diff --git a/src/app/shared/mocks/active-router.mock.ts b/src/app/shared/mocks/active-router.mock.ts
index 672cdcd8f6..448ee0a1b4 100644
--- a/src/app/shared/mocks/active-router.mock.ts
+++ b/src/app/shared/mocks/active-router.mock.ts
@@ -1,28 +1,37 @@
 import { Params } from '@angular/router';
-
 import { BehaviorSubject } from 'rxjs';
 
 export class MockActivatedRoute {
 
   private _testParams?: any;
+  private _testUrl?: any;
 
   // ActivatedRoute.params is Observable
   private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
+  // ActivatedRoute.url is Observable
+  private urlSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testUrl);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
+  url = this.urlSubject.asObservable();
 
-  constructor(params?: Params) {
+  constructor(params?: Params, url?: any) {
     if (params) {
       this.testParams = params;
     } else {
       this.testParams = {};
     }
+
+    if (url) {
+      this.testUrl = url;
+    } else {
+      this.testUrl = {};
+    }
   }
 
   // Test parameters
   get testParams() { return this._testParams; }
-  set testParams(params: {}) {
+  set testParams(params: any) {
     this._testParams = params;
     this.subject.next(params);
   }
@@ -31,4 +40,11 @@ export class MockActivatedRoute {
   get snapshot() {
     return { params: this.testParams, queryParams: this.testParams };
   }
+
+  //ActivatedRoute.url
+  get testUrl() { return this._testUrl; }
+  set testUrl(url: any) {
+    this._testUrl = url;
+    this.urlSubject.next(url);
+  }
 }
diff --git a/src/app/shared/mocks/admin-guard.service.mock.ts b/src/app/shared/mocks/admin-guard.service.mock.ts
index 5d77f4610c..ee7b599324 100644
--- a/src/app/shared/mocks/admin-guard.service.mock.ts
+++ b/src/app/shared/mocks/admin-guard.service.mock.ts
@@ -1,5 +1,10 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  CanActivateChild,
+  RouterStateSnapshot,
+} from '@angular/router';
 
 import { hasValue } from '../empty.util';
 
diff --git a/src/app/shared/mocks/angulartics2.service.mock.ts b/src/app/shared/mocks/angulartics2.service.mock.ts
index ccafaf3f48..3d48b86a68 100644
--- a/src/app/shared/mocks/angulartics2.service.mock.ts
+++ b/src/app/shared/mocks/angulartics2.service.mock.ts
@@ -4,6 +4,6 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class Angulartics2Mock {
   public eventTrack = {
-    next: (param: any): void => {}
+    next: (param: any): void => {},
   };
 }
diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts
index c32615a4f6..c5737ca170 100644
--- a/src/app/shared/mocks/auth.service.mock.ts
+++ b/src/app/shared/mocks/auth.service.mock.ts
@@ -1,5 +1,8 @@
 /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class AuthServiceMock {
   public checksAuthenticationToken() {
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
index 0b6b218164..84664b7b20 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
@@ -1,5 +1,9 @@
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import {
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import { of as observableOf } from 'rxjs';
+
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
 import { EndpointMockingRestService } from './endpoint-mocking-rest.service';
 import { ResponseMapMock } from './mocks/response-map.mock';
@@ -15,16 +19,16 @@ describe('EndpointMockingRestService', () => {
     serverHttpResponse = {
       body: { bar: false },
       headers: new HttpHeaders(),
-      statusText: '200'
+      statusText: '200',
     } as HttpResponse<any>;
 
     mockResponseMap = new Map([
-      ['/foo', { bar: true }]
+      ['/foo', { bar: true }],
     ]);
 
     const httpStub = jasmine.createSpyObj('http', {
       get: observableOf(serverHttpResponse),
-      request: observableOf(serverHttpResponse)
+      request: observableOf(serverHttpResponse),
     });
 
     service = new EndpointMockingRestService(mockResponseMap, httpStub);
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index 0358451557..ad867e0cf0 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -1,13 +1,28 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { isEmpty } from '../../empty.util';
-import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
-import { DspaceRestService, HttpOptions } from '../../../core/dspace-rest/dspace-rest.service';
-import { MOCK_RESPONSE_MAP, ResponseMapMock } from './mocks/response-map.mock';
 import { environment } from '../../../../environments/environment';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import {
+  DspaceRestService,
+  HttpOptions,
+} from '../../../core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
+import { isEmpty } from '../../empty.util';
+import {
+  MOCK_RESPONSE_MAP,
+  ResponseMapMock,
+} from './mocks/response-map.mock';
 
 /**
  * Service to access DSpace's REST API.
@@ -21,7 +36,7 @@ export class EndpointMockingRestService extends DspaceRestService {
 
   constructor(
     @Inject(MOCK_RESPONSE_MAP) protected mockResponseMap: ResponseMapMock,
-    protected http: HttpClient
+    protected http: HttpClient,
   ) {
     super(http);
   }
@@ -83,7 +98,7 @@ export class EndpointMockingRestService extends DspaceRestService {
       payload: mockData,
       headers: new HttpHeaders(),
       statusCode: 200,
-      statusText: 'OK'
+      statusText: 'OK',
     });
   }
 
diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts
index 018f57d5f3..7769095f2c 100644
--- a/src/app/shared/mocks/external-source.service.mock.ts
+++ b/src/app/shared/mocks/external-source.service.mock.ts
@@ -9,15 +9,15 @@ export const externalSourceOrcid: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid',
+    },
+  },
 };
 
 export const externalSourceCiencia: ExternalSource = {
@@ -27,15 +27,15 @@ export const externalSourceCiencia: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia',
+    },
+  },
 };
 
 export const externalSourceMyStaffDb: ExternalSource = {
@@ -45,15 +45,15 @@ export const externalSourceMyStaffDb: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db',
+    },
+  },
 };
 
 /**
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
index c94fa6c0d6..1be0fc5720 100644
--- a/src/app/shared/mocks/find-id-config-data.service.mock.ts
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -1,5 +1,5 @@
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
   return jasmine.createSpyObj('findByIdDataService', {
@@ -7,7 +7,7 @@ export function getMockFindByIdDataService(propertyKey: string, ...values: strin
       ... new ConfigurationProperty(),
       name: propertyKey,
       values: values,
-    })
+    }),
   });
 }
 
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index eaaeb60829..46845dcb10 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -1,6 +1,10 @@
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+
+import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { FormBuilderService } from '../form/builder/form-builder.service';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import {DsDynamicInputModel} from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 
 export function getMockFormBuilderService(): FormBuilderService {
 
@@ -22,24 +26,24 @@ export function getMockFormBuilderService(): FormBuilderService {
     isConcatGroup: false,
     hasArrayGroupValue: true,
     getTypeBindModel: new DsDynamicInputModel({
-        name: 'dc.type',
-        id: 'dc_type',
-        readOnly: false,
-        disabled: false,
-        repeatable: false,
-        value: {
-          value: 'boundType',
-          display: 'Bound Type',
-          authority: 'bound-auth-key'
-        },
-        submissionId: '1234',
-        metadataFields: ['dc.type'],
-        hasSelectableMetadata: false,
-        typeBindRelations: [
-          {match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'boundType'}]}
-        ]
-      }
-    )
+      name: 'dc.type',
+      id: 'dc_type',
+      readOnly: false,
+      disabled: false,
+      repeatable: false,
+      value: {
+        value: 'boundType',
+        display: 'Bound Type',
+        authority: 'bound-auth-key',
+      },
+      submissionId: '1234',
+      metadataFields: ['dc.type'],
+      hasSelectableMetadata: false,
+      typeBindRelations: [
+        { match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'boundType' }] },
+      ],
+    },
+    ),
   });
 
 }
diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts
index 3529f9e81b..39fc3823b0 100644
--- a/src/app/shared/mocks/form-models.mock.ts
+++ b/src/app/shared/mocks/form-models.mock.ts
@@ -1,19 +1,19 @@
 import { DynamicSelectModel } from '@ng-dynamic-forms/core';
 
+import { FormRowModel } from '../../core/config/models/config-submission-form.model';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
 import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DynamicQualdropModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import {
   DynamicRowArrayModel,
-  DynamicRowArrayModelConfig
+  DynamicRowArrayModelConfig,
 } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { DynamicRowGroupModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DynamicRelationGroupModel } from '../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldModel } from '../form/builder/models/form-field.model';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { DynamicRowGroupModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { FormRowModel } from '../../core/config/models/config-submission-form.model';
 
 export const qualdropSelectConfig = {
   name: 'dc.identifier_QUALDROP_METADATA',
@@ -25,30 +25,30 @@ export const qualdropSelectConfig = {
   options: [
     {
       label: 'ISSN',
-      value: 'dc.identifier.issn'
+      value: 'dc.identifier.issn',
     },
     {
       label: 'Other',
-      value: 'dc.identifier.other'
+      value: 'dc.identifier.other',
     },
     {
       label: 'ISMN',
-      value: 'dc.identifier.ismn'
+      value: 'dc.identifier.ismn',
     },
     {
       label: 'Gov\'t Doc #',
-      value: 'dc.identifier.govdoc'
+      value: 'dc.identifier.govdoc',
     },
     {
       label: 'URI',
-      value: 'dc.identifier.uri'
+      value: 'dc.identifier.uri',
     },
     {
       label: 'ISBN',
-      value: 'dc.identifier.isbn'
-    }
+      value: 'dc.identifier.isbn',
+    },
   ],
-  value: 'dc.identifier.issn'
+  value: 'dc.identifier.issn',
 };
 
 export const qualdropInputConfig = {
@@ -60,7 +60,7 @@ export const qualdropInputConfig = {
   value: 'test',
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockQualdropSelectModel = new DynamicSelectModel(qualdropSelectConfig);
@@ -71,7 +71,7 @@ export const qualdropConfig = {
   legend: 'Identifiers',
   readOnly: false,
   group: [mockQualdropSelectModel, mockQualdropInputModel],
-  required: false
+  required: false,
 };
 
 export const MockQualdropModel = new DynamicQualdropModel(qualdropConfig);
@@ -90,7 +90,7 @@ const rowArrayQualdropConfig = {
   metadataKey: 'dc.some.key',
   metadataFields: ['dc.some.key'],
   hasSelectableMetadata: false,
-  showButtons: true
+  showButtons: true,
 } as DynamicRowArrayModelConfig;
 
 export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArrayModel(rowArrayQualdropConfig);
@@ -107,10 +107,10 @@ const mockFormRowModel = {
         {
           metadata: 'journal',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel,
     {
       input: { type: 'onebox' },
@@ -120,12 +120,12 @@ const mockFormRowModel = {
       hints: ' Enter issue number.',
       selectableMetadata: [
         {
-          metadata: 'issue'
-        }
+          metadata: 'issue',
+        },
       ],
-      languageCodes: []
-    } as FormFieldModel
-  ]
+      languageCodes: [],
+    } as FormFieldModel,
+  ],
 } as FormRowModel;
 
 const relationGroupConfig = {
@@ -140,15 +140,15 @@ const relationGroupConfig = {
   value: {
     journal: [
       'journal test 1',
-      'journal test 2'
+      'journal test 2',
     ],
     issue: [
       'issue test 1',
-      'issue test 2'
+      'issue test 2',
     ],
   },
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const MockRelationModel: DynamicRelationGroupModel = new DynamicRelationGroupModel(relationGroupConfig);
@@ -158,12 +158,12 @@ export const inputWithLanguageAndAuthorityConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithAuthority',
@@ -178,7 +178,7 @@ export const inputWithLanguageAndAuthorityConfig = {
   },
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageAndAuthorityModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityConfig);
@@ -187,12 +187,12 @@ export const inputWithLanguageConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithLanguage',
@@ -203,7 +203,7 @@ export const inputWithLanguageConfig = {
   value: 'testWithLanguage',
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageModel = new DsDynamicInputModel(inputWithLanguageConfig);
@@ -213,12 +213,12 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithLanguageAndAuthorityArray',
@@ -233,7 +233,7 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   }],
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageAndAuthorityArrayModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityArrayConfig);
@@ -247,7 +247,7 @@ export const inputWithFormFieldValueConfig = {
   value: new FormFieldMetadataValueObject('testWithFormFieldValue'),
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithFormFieldValueModel = new DsDynamicInputModel(inputWithFormFieldValueConfig);
@@ -261,11 +261,11 @@ export const inputWithAuthorityValueConfig = {
   value: Object.assign({}, new VocabularyEntry(), {
     value: 'testWithAuthorityValue',
     authority: 'testWithAuthorityValue',
-    display: 'testWithAuthorityValue'
+    display: 'testWithAuthorityValue',
   }),
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithAuthorityValueModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -279,7 +279,7 @@ export const inputWithObjectValueConfig = {
   value: { value: 'testWithObjectValue', authority: 'testWithObjectValue', display: 'testWithObjectValue' },
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithObjectValueModel = new DsDynamicInputModel(inputWithObjectValueConfig);
@@ -297,14 +297,14 @@ export const fileFormEditInputConfig = {
   repeatable: false,
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockFileFormEditInputModel = new DsDynamicInputModel(fileFormEditInputConfig);
 
 export const mockFileFormEditRowGroupModel = new DynamicRowGroupModel({
   id: 'mockRowGroupModel',
-  group: [mockFileFormEditInputModel]
+  group: [mockFileFormEditInputModel],
 });
 
 // Mock configuration and model for an input with type binding
@@ -317,30 +317,30 @@ export const inputWithTypeBindConfig = {
   value: {
     value: 'testWithTypeBind',
     display: 'testWithTypeBind',
-    authority: 'bound-auth-key'
+    authority: 'bound-auth-key',
   },
   submissionId: '1234',
   metadataFields: [],
   hasSelectableMetadata: false,
   getTypeBindModel: new DsDynamicInputModel({
-      name: 'testWithTypeBind',
-      id: 'testWithTypeBind',
-      readOnly: false,
-      disabled: false,
-      repeatable: false,
-      value: {
-        value: 'testWithTypeBind',
-        display: 'testWithTypeBind',
-        authority: 'bound-auth-key'
-      },
-      submissionId: '1234',
-      metadataFields: [],
-      hasSelectableMetadata: false,
-      typeBindRelations: [
-        {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
-      ]
-    }
-  )
+    name: 'testWithTypeBind',
+    id: 'testWithTypeBind',
+    readOnly: false,
+    disabled: false,
+    repeatable: false,
+    value: {
+      value: 'testWithTypeBind',
+      display: 'testWithTypeBind',
+      authority: 'bound-auth-key',
+    },
+    submissionId: '1234',
+    metadataFields: [],
+    hasSelectableMetadata: false,
+    typeBindRelations: [
+      { match: 'VISIBLE', operator: 'OR', when: [{ 'id': 'dc.type', 'value': 'boundType' }] },
+    ],
+  },
+  ),
 };
 
 export const mockInputWithTypeBindModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -355,8 +355,8 @@ export const dcTypeInputConfig = {
   metadataFields: [],
   hasSelectableMetadata: false,
   value: {
-    value: 'boundType'
-  }
+    value: 'boundType',
+  },
 };
 
 export const mockDcTypeInputModel = new DsDynamicInputModel(dcTypeInputConfig);
diff --git a/src/app/shared/mocks/form-service.mock.ts b/src/app/shared/mocks/form-service.mock.ts
index 0475250627..5b6ef32814 100644
--- a/src/app/shared/mocks/form-service.mock.ts
+++ b/src/app/shared/mocks/form-service.mock.ts
@@ -6,7 +6,7 @@ import { FormService } from '../form/form.service';
  * Mock for [[FormService]]
  */
 export function getMockFormService(
-  id$: string = 'random_id'
+  id$: string = 'random_id',
 ): FormService {
   return jasmine.createSpyObj('FormService', {
     getFormData: jasmine.createSpy('getFormData'),
diff --git a/src/app/shared/mocks/health-endpoint.mocks.ts b/src/app/shared/mocks/health-endpoint.mocks.ts
index a9246d91a1..b3378f67eb 100644
--- a/src/app/shared/mocks/health-endpoint.mocks.ts
+++ b/src/app/shared/mocks/health-endpoint.mocks.ts
@@ -3,7 +3,7 @@ import {
   HealthInfoComponent,
   HealthInfoResponse,
   HealthResponse,
-  HealthStatus
+  HealthStatus,
 } from '../../health-page/models/health-component.model';
 
 export const HealthResponseObj: HealthResponse = {
@@ -17,47 +17,47 @@ export const HealthResponseObj: HealthResponse = {
           'details': {
             'database': 'PostgreSQL',
             'result': 1,
-            'validationQuery': 'SELECT 1'
-          }
+            'validationQuery': 'SELECT 1',
+          },
         },
         'dspaceDataSource': {
           'status': HealthStatus.UP,
           'details': {
             'database': 'PostgreSQL',
             'result': 1,
-            'validationQuery': 'SELECT 1'
-          }
-        }
-      }
+            'validationQuery': 'SELECT 1',
+          },
+        },
+      },
     },
     'geoIp': {
       'status': HealthStatus.UP_WITH_ISSUES,
       'details': {
-        'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.'
-      }
+        'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.',
+      },
     },
     'solrOaiCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
+        'detectedPathType': 'particular core',
+      },
     },
     'solrSearchCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
+        'detectedPathType': 'particular core',
+      },
     },
     'solrStatisticsCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
-    }
-  }
+        'detectedPathType': 'particular core',
+      },
+    },
+  },
 };
 
 export const HealthComponentOne: HealthComponent = {
@@ -68,25 +68,25 @@ export const HealthComponentOne: HealthComponent = {
       'details': {
         'database': 'PostgreSQL',
         'result': 1,
-        'validationQuery': 'SELECT 1'
-      }
+        'validationQuery': 'SELECT 1',
+      },
     },
     'dspaceDataSource': {
       'status': HealthStatus.UP,
       'details': {
         'database': 'PostgreSQL',
         'result': 1,
-        'validationQuery': 'SELECT 1'
-      }
-    }
-  }
+        'validationQuery': 'SELECT 1',
+      },
+    },
+  },
 };
 
 export const HealthComponentTwo: HealthComponent = {
   'status': HealthStatus.UP_WITH_ISSUES,
   'details': {
-    'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.'
-  }
+    'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.',
+  },
 };
 
 export const HealthInfoResponseObj: HealthInfoResponse = {
@@ -97,7 +97,7 @@ export const HealthInfoResponseObj: HealthInfoResponse = {
     'db': 'jdbc:postgresql://localhost:5432/dspace7',
     'solr': {
       'server': 'http://localhost:8983/solr',
-      'prefix': ''
+      'prefix': '',
     },
     'mail': {
       'server': 'smtp.example.com',
@@ -105,29 +105,29 @@ export const HealthInfoResponseObj: HealthInfoResponse = {
       'feedback-recipient': 'dspace-help@myu.edu',
       'mail-admin': 'dspace-help@myu.edu',
       'mail-helpdesk': 'dspace-help@myu.edu',
-      'alert-recipient': 'dspace-help@myu.edu'
+      'alert-recipient': 'dspace-help@myu.edu',
     },
     'cors': {
-      'allowed-origins': 'http://localhost:4000'
+      'allowed-origins': 'http://localhost:4000',
     },
     'ui': {
-      'url': 'http://localhost:4000'
-    }
+      'url': 'http://localhost:4000',
+    },
   },
   'java': {
     'vendor': 'Private Build',
     'version': '11.0.15',
     'runtime': {
       'name': 'OpenJDK Runtime Environment',
-      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1'
+      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1',
     },
     'jvm': {
       'name': 'OpenJDK 64-Bit Server VM',
       'vendor': 'Private Build',
-      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1'
-    }
+      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1',
+    },
   },
-  'version': '7.3-SNAPSHOT'
+  'version': '7.3-SNAPSHOT',
 };
 
 export const HealthInfoComponentOne: HealthInfoComponent = {
@@ -137,7 +137,7 @@ export const HealthInfoComponentOne: HealthInfoComponent = {
   'db': 'jdbc:postgresql://localhost:5432/dspace7',
   'solr': {
     'server': 'http://localhost:8983/solr',
-    'prefix': ''
+    'prefix': '',
   },
   'mail': {
     'server': 'smtp.example.com',
@@ -145,16 +145,16 @@ export const HealthInfoComponentOne: HealthInfoComponent = {
     'feedback-recipient': 'dspace-help@myu.edu',
     'mail-admin': 'dspace-help@myu.edu',
     'mail-helpdesk': 'dspace-help@myu.edu',
-    'alert-recipient': 'dspace-help@myu.edu'
+    'alert-recipient': 'dspace-help@myu.edu',
   },
   'cors': {
-    'allowed-origins': 'http://localhost:4000'
+    'allowed-origins': 'http://localhost:4000',
   },
   'ui': {
-    'url': 'http://localhost:4000'
-  }
+    'url': 'http://localhost:4000',
+  },
 };
 
 export const HealthInfoComponentTwo = {
-  'version': '7.3-SNAPSHOT'
+  'version': '7.3-SNAPSHOT',
 };
diff --git a/src/app/shared/mocks/host-window-service.mock.ts b/src/app/shared/mocks/host-window-service.mock.ts
index 4c8cd2b633..1e5bf222d7 100644
--- a/src/app/shared/mocks/host-window-service.mock.ts
+++ b/src/app/shared/mocks/host-window-service.mock.ts
@@ -1,4 +1,7 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 // declare a stub service
 export class HostWindowServiceMock {
diff --git a/src/app/shared/mocks/href-only-data.service.mock.ts b/src/app/shared/mocks/href-only-data.service.mock.ts
index ba7d02ec25..a54b94c601 100644
--- a/src/app/shared/mocks/href-only-data.service.mock.ts
+++ b/src/app/shared/mocks/href-only-data.service.mock.ts
@@ -1,7 +1,11 @@
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
 
 export function getMockHrefOnlyDataService(
diff --git a/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts b/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
index 78766a0b31..17dd25685e 100644
--- a/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
+++ b/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
@@ -6,7 +6,7 @@ import { HttpXsrfTokenExtractor } from '@angular/common/http';
  * the same fake XSRF token.
  */
 export class HttpXsrfTokenExtractorMock extends HttpXsrfTokenExtractor {
-    constructor(private token: string | null) { super(); }
+  constructor(private token: string | null) { super(); }
 
-    getToken(): string | null { return this.token; }
+  getToken(): string | null { return this.token; }
 }
diff --git a/src/app/shared/mocks/item.mock.ts b/src/app/shared/mocks/item.mock.ts
index 77685cca9a..7f723bfd61 100644
--- a/src/app/shared/mocks/item.mock.ts
+++ b/src/app/shared/mocks/item.mock.ts
@@ -1,38 +1,38 @@
 import { of as observableOf } from 'rxjs';
-import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
-import { Bitstream } from '../../core/shared/bitstream.model';
 
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
-import { Bundle } from '../../core/shared/bundle.model';
 
 export const MockBitstreamFormat1: BitstreamFormat = Object.assign(new BitstreamFormat(), {
   shortDescription: 'Microsoft Word XML',
-    description: 'Microsoft Word XML',
-    mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    supportLevel: 0,
-    internal: false,
-    extensions: null,
-    _links:{
+  description: 'Microsoft Word XML',
+  mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  supportLevel: 0,
+  internal: false,
+  extensions: null,
+  _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10'
-    }
-    }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10',
+    },
+  },
 });
 
 export const MockBitstreamFormat2: BitstreamFormat = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'Adobe PDF',
-    description: 'Adobe Portable Document Format',
-    mimetype: 'application/pdf',
-    supportLevel: 0,
-    internal: false,
-    extensions: null,
-    _links:{
-      self: {
-        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4'
-      }
-    }
+  shortDescription: 'Adobe PDF',
+  description: 'Adobe Portable Document Format',
+  mimetype: 'application/pdf',
+  supportLevel: 0,
+  internal: false,
+  extensions: null,
+  _links:{
+    self: {
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4',
+    },
+  },
 });
 
 export const MockBitstreamFormat3: BitstreamFormat = Object.assign(new BitstreamFormat(), {
@@ -44,9 +44,9 @@ export const MockBitstreamFormat3: BitstreamFormat = Object.assign(new Bitstream
   extensions: null,
   _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17'
-    }
-  }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17',
+    },
+  },
 });
 
 export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
@@ -57,8 +57,8 @@ export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
     bundleName: 'ORIGINAL',
     _links:{
       self: {
-        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
-      }
+        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
+      },
     },
     id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
     uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -67,10 +67,10 @@ export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
       'dc.title': [
         {
           language: null,
-          value: 'test_word.docx'
-        }
-      ]
-    }
+          value: 'test_word.docx',
+        },
+      ],
+    },
   });
 
 export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
@@ -85,16 +85,16 @@ export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
     self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28' },
     content: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content' },
     format: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4' },
-    bundle: { href: '' }
+    bundle: { href: '' },
   },
   metadata: {
     'dc.title': [
       {
         language: null,
-        value: 'test_pdf.pdf'
-      }
-    ]
-  }
+        value: 'test_pdf.pdf',
+      },
+    ],
+  },
 });
 
 export const MockBitstream3: Bitstream = Object.assign(new Bitstream(), {
@@ -109,16 +109,16 @@ export const MockBitstream3: Bitstream = Object.assign(new Bitstream(), {
     self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29' },
     content: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/content' },
     format: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17' },
-    bundle: { href: '' }
+    bundle: { href: '' },
   },
   metadata: {
     'dc.title': [
       {
         language: null,
-        value: 'scary'
-      }
-    ]
-  }
+        value: 'scary',
+      },
+    ],
+  },
 });
 
 export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
@@ -128,7 +128,7 @@ export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
     _links: {
       self: {
         href: 'dspace-angular://aggregated/object/1507836003548',
-      }
+      },
     },
     requestPending: false,
     responsePending: false,
@@ -148,14 +148,14 @@ export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
         elementsPerPage: 20,
         totalElements: 3,
         totalPages: 1,
-        currentPage: 2
+        currentPage: 2,
       },
       page: [
         MockBitstream1,
-        MockBitstream2
-      ]
-    }
-  }))
+        MockBitstream2,
+      ],
+    },
+  })),
 });
 
 
@@ -171,8 +171,8 @@ export const ItemMock: Item = Object.assign(new Item(), {
   ])),
   _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
-    }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+    },
   },
   id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   uuid: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
@@ -181,116 +181,116 @@ export const ItemMock: Item = Object.assign(new Item(), {
     'dc.creator': [
       {
         language: 'en_US',
-        value: 'Doe, Jane'
-      }
+        value: 'Doe, Jane',
+      },
     ],
     'dc.date.accessioned': [
       {
         language: null,
-        value: '1650-06-26T19:58:25Z'
-      }
+        value: '1650-06-26T19:58:25Z',
+      },
     ],
     'dc.date.available': [
       {
         language: null,
-        value: '1650-06-26T19:58:25Z'
-      }
+        value: '1650-06-26T19:58:25Z',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '1650-06-26'
-      }
+        value: '1650-06-26',
+      },
     ],
     'dc.identifier.issn': [
       {
         language: 'en_US',
-        value: '123456789'
-      }
+        value: '123456789',
+      },
     ],
     'dc.identifier.uri': [
       {
         language: null,
-        value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
-      }
+        value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
-      }
+        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+      },
     ],
     'dc.description.provenance': [
       {
         language: 'en',
-        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
+        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
+        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
+        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
-      }
+        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+      },
     ],
     'dc.language': [
       {
         language: 'en_US',
-        value: 'en'
-      }
+        value: 'en',
+      },
     ],
     'dc.rights': [
       {
         language: 'en_US',
-        value: '© Jane Doe'
-      }
+        value: '© Jane Doe',
+      },
     ],
     'dc.subject': [
       {
         language: 'en_US',
-        value: 'keyword1'
+        value: 'keyword1',
       },
       {
         language: 'en_US',
-        value: 'keyword2'
+        value: 'keyword2',
       },
       {
         language: 'en_US',
-        value: 'keyword3'
-      }
+        value: 'keyword3',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test PowerPoint Document'
-      }
+        value: 'Test PowerPoint Document',
+      },
     ],
     'dc.type': [
       {
         language: 'en_US',
-        value: 'text'
-      }
-    ]
+        value: 'text',
+      },
+    ],
   },
   owningCollection: observableOf({
-      _links: {
-        self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb'
-        }
+    _links: {
+      self: {
+        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
       },
-      requestPending: false,
-      responsePending: false,
-      isSuccessful: true,
-      errorMessage: '',
-      statusCode: '202',
-      pageInfo: {},
-      payload: []
-    }
-  )
+    },
+    requestPending: false,
+    responsePending: false,
+    isSuccessful: true,
+    errorMessage: '',
+    statusCode: '202',
+    pageInfo: {},
+    payload: [],
+  },
+  ),
 });
 /* eslint-enable @typescript-eslint/no-shadow */
diff --git a/src/app/shared/mocks/link-service.mock.ts b/src/app/shared/mocks/link-service.mock.ts
index d50640a629..d691976198 100644
--- a/src/app/shared/mocks/link-service.mock.ts
+++ b/src/app/shared/mocks/link-service.mock.ts
@@ -4,6 +4,6 @@ export function getMockLinkService(): LinkService {
   return jasmine.createSpyObj('linkService', {
     resolveLinks: jasmine.createSpy('resolveLinks'),
     resolveLink: jasmine.createSpy('resolveLink'),
-    removeResolvedLinks: jasmine.createSpy('removeResolvedLinks')
+    removeResolvedLinks: jasmine.createSpy('removeResolvedLinks'),
   });
 }
diff --git a/src/app/shared/mocks/mock-native-window-ref.ts b/src/app/shared/mocks/mock-native-window-ref.ts
index 5a6d6c5f30..47f804fa4b 100644
--- a/src/app/shared/mocks/mock-native-window-ref.ts
+++ b/src/app/shared/mocks/mock-native-window-ref.ts
@@ -6,9 +6,9 @@ export const MockWindow = {
     },
     get href() {
       return this._href;
-    }
+    },
   },
-  origin: 'http://localhost'
+  origin: 'http://localhost',
 };
 
 export class NativeWindowRefMock {
diff --git a/src/app/shared/mocks/mock-resource-policy-service.ts b/src/app/shared/mocks/mock-resource-policy-service.ts
index 2cf73561e5..b6f2908508 100644
--- a/src/app/shared/mocks/mock-resource-policy-service.ts
+++ b/src/app/shared/mocks/mock-resource-policy-service.ts
@@ -5,6 +5,6 @@ export function getMockResourcePolicyService(): ResourcePolicyDataService {
     searchByResource: jasmine.createSpy('searchByResource'),
     create: jasmine.createSpy('create'),
     delete: jasmine.createSpy('delete'),
-    update: jasmine.createSpy('update')
+    update: jasmine.createSpy('update'),
   });
 }
diff --git a/src/app/shared/mocks/mock-trucatable.service.ts b/src/app/shared/mocks/mock-trucatable.service.ts
index 2641bcd89c..a0711015ed 100644
--- a/src/app/shared/mocks/mock-trucatable.service.ts
+++ b/src/app/shared/mocks/mock-trucatable.service.ts
@@ -14,6 +14,6 @@ export const mockTruncatableService: any = {
   collapse: (id: string) => {
   },
   toggle: (id: string) => {
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts
new file mode 100644
index 0000000000..30237b6b79
--- /dev/null
+++ b/src/app/shared/mocks/notifications.mock.ts
@@ -0,0 +1,1874 @@
+import { of as observableOf } from 'rxjs';
+
+import { QualityAssuranceEventDataService } from '../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../core/notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ResourceType } from '../../core/shared/resource-type';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { SearchResult } from '../search/models/search-result.model';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+// Items
+// -------------------------------------------------------------------------------
+
+const ItemMockPid1: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174001',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174001',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Index nominum et rerum',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid2: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174004',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174004',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid3: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174005',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174005',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Sustainable development',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid4: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174006',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174006',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Reply to Critics',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid5: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174007',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174007',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid6: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174008',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174008',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Donald Davidson',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid7: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174009',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174009',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Missing abstract article',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid8: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174002',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid9: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174003',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174003',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid10: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const NotificationsMockDspaceObject: SearchResult<DSpaceObject> = Object.assign(
+  new SearchResult<DSpaceObject>(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+// Sources
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceSourceObjectMorePid: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MORE!PID',
+  lastEvent: '2020/10/09 10:11 UTC',
+  totalEvents: 33,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MORE!PID',
+    },
+  },
+};
+
+export const qualityAssuranceSourceObjectMoreAbstract: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MORE!ABSTRACT',
+  lastEvent: '2020/09/08 21:14 UTC',
+  totalEvents: 5,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MORE!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceSourceObjectMissingPid: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MISSING!PID',
+  lastEvent: '2020/10/01 07:36 UTC',
+  totalEvents: 4,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MISSING!PID',
+    },
+  },
+};
+
+// Topics
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceTopicObjectMorePid: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MORE!PID',
+  name: 'ENRICH/MORE/PID',
+  lastEvent: '2020/10/09 10:11 UTC',
+  totalEvents: 33,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MORE!PID',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMoreAbstract: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MORE!ABSTRACT',
+  name: 'ENRICH/MORE/ABSTRACT',
+  lastEvent: '2020/09/08 21:14 UTC',
+  totalEvents: 5,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MORE!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingPid: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!PID',
+  name: 'ENRICH/MISSING/PID',
+  lastEvent: '2020/10/01 07:36 UTC',
+  totalEvents: 4,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!PID',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingAbstract: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!ABSTRACT',
+  name: 'ENRICH/MISSING/ABSTRACT',
+  lastEvent: '2020/10/08 16:14 UTC',
+  totalEvents: 71,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingAcm: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!SUBJECT!ACM',
+  name: 'ENRICH/MISSING/SUBJECT/ACM',
+  lastEvent: '2020/09/21 17:51 UTC',
+  totalEvents: 18,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!SUBJECT!ACM',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingProject: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!PROJECT',
+  name: 'ENRICH/MISSING/PROJECT',
+  lastEvent: '2020/09/17 10:28 UTC',
+  totalEvents: 6,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!PROJECT',
+    },
+  },
+};
+
+// Events
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceEventObjectMissingPid: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174001',
+  uuid: '123e4567-e89b-12d3-a456-426614174001',
+  type: new ResourceType('qaevent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21486',
+  title: 'Index nominum et rerum',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.18848/1447-9494/cgp/v15i09/45934',
+    pidHref: 'https://doi.org/10.18848/1447-9494/cgp/v15i09/45934',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid1)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid2: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174004',
+  uuid: '123e4567-e89b-12d3-a456-426614174004',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21486',
+  title: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'urn',
+    value: 'http://thesis2.sba.units.it/store/handle/item/12238',
+    pidHref:'http://thesis2.sba.units.it/store/handle/item/12238',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid2)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid3: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174005',
+  uuid: '123e4567-e89b-12d3-a456-426614174005',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/554',
+  title: 'Sustainable development',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.4324/9780203408889',
+    pidHref: 'https://doi.org/10.4324/9780203408889',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid3)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid4: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174006',
+  uuid: '123e4567-e89b-12d3-a456-426614174006',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/10787',
+  title: 'Reply to Critics',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.1080/13698230.2018.1430104',
+    pidHref: 'https://doi.org/10.1080/13698230.2018.1430104',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing DOI',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid4)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid5: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174007',
+  uuid: '123e4567-e89b-12d3-a456-426614174007',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/11339',
+  title: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'urn',
+    value: 'http://thesis2.sba.units.it/store/handle/item/12477',
+    pidHref:'http://thesis2.sba.units.it/store/handle/item/12477',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid5)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid6: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174008',
+  uuid: '123e4567-e89b-12d3-a456-426614174008',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/29860',
+  title: 'Donald Davidson',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.1111/j.1475-4975.2004.00098.x',
+    pidHref: 'https://doi.org/10.1111/j.1475-4975.2004.00098.x',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid6)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingAbstract: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174009',
+  uuid: '123e4567-e89b-12d3-a456-426614174009',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21110',
+  title: 'Missing abstract article',
+  trust: 0.751,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla scelerisque vestibulum tellus sed lacinia. Aenean vitae sapien a quam congue ultrices. Sed vehicula sollicitudin ligula, vitae lacinia velit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla scelerisque vestibulum tellus sed lacinia. Aenean vitae sapien a quam congue ultrices. Sed vehicula sollicitudin ligula, vitae lacinia velit.',
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing abstract',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid7)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingProjectFound: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174002',
+  uuid: '123e4567-e89b-12d3-a456-426614174002',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21838',
+  title: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: null,
+    sourceId: null,
+    acronym: 'PAThs',
+    code: '687567',
+    funder: 'EC',
+    fundingProgram: 'H2020',
+    jurisdiction: 'EU',
+    reason: 'Project found',
+    title: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002/related',
+    },
+  },
+  target: createSuccessfulRemoteDataObject$(ItemMockPid8),
+  related: createSuccessfulRemoteDataObject$(ItemMockPid10),
+};
+
+export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174003',
+  uuid: '123e4567-e89b-12d3-a456-426614174003',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21838',
+  title: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: null,
+    sourceId: null,
+    acronym: 'PAThs',
+    code: '687567B',
+    funder: 'EC',
+    fundingProgram: 'H2021',
+    jurisdiction: 'EU',
+    title: 'Tracking Unknown Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+    reason: 'Project not found',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003/related',
+    },
+  },
+  target: createSuccessfulRemoteDataObject$(ItemMockPid9),
+  related: createNoContentRemoteDataObject$(),
+};
+
+// Classes
+// -------------------------------------------------------------------------------
+
+/**
+ * Mock for [[NotificationsStateService]]
+ */
+export function getMockNotificationsStateService(): any {
+  return jasmine.createSpyObj('NotificationsStateService', {
+    getQualityAssuranceTopics: jasmine.createSpy('getQualityAssuranceTopics'),
+    isQualityAssuranceTopicsLoading: jasmine.createSpy('isQualityAssuranceTopicsLoading'),
+    isQualityAssuranceTopicsLoaded: jasmine.createSpy('isQualityAssuranceTopicsLoaded'),
+    isQualityAssuranceTopicsProcessing: jasmine.createSpy('isQualityAssuranceTopicsProcessing'),
+    getQualityAssuranceTopicsTotalPages: jasmine.createSpy('getQualityAssuranceTopicsTotalPages'),
+    getQualityAssuranceTopicsCurrentPage: jasmine.createSpy('getQualityAssuranceTopicsCurrentPage'),
+    getQualityAssuranceTopicsTotals: jasmine.createSpy('getQualityAssuranceTopicsTotals'),
+    dispatchRetrieveQualityAssuranceTopics: jasmine.createSpy('dispatchRetrieveQualityAssuranceTopics'),
+    getQualityAssuranceSource: jasmine.createSpy('getQualityAssuranceSource'),
+    isQualityAssuranceSourceLoading: jasmine.createSpy('isQualityAssuranceSourceLoading'),
+    isQualityAssuranceSourceLoaded: jasmine.createSpy('isQualityAssuranceSourceLoaded'),
+    isQualityAssuranceSourceProcessing: jasmine.createSpy('isQualityAssuranceSourceProcessing'),
+    getQualityAssuranceSourceTotalPages: jasmine.createSpy('getQualityAssuranceSourceTotalPages'),
+    getQualityAssuranceSourceCurrentPage: jasmine.createSpy('getQualityAssuranceSourceCurrentPage'),
+    getQualityAssuranceSourceTotals: jasmine.createSpy('getQualityAssuranceSourceTotals'),
+    dispatchRetrieveQualityAssuranceSource: jasmine.createSpy('dispatchRetrieveQualityAssuranceSource'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceSourceDataService]]
+ */
+export function getMockQualityAssuranceSourceRestService(): QualityAssuranceTopicDataService {
+  return jasmine.createSpyObj('QualityAssuranceSourceDataService', {
+    getSources: jasmine.createSpy('getSources'),
+    getSource: jasmine.createSpy('getSource'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceTopicDataService]]
+ */
+export function getMockQualityAssuranceTopicRestService(): QualityAssuranceTopicDataService {
+  return jasmine.createSpyObj('QualityAssuranceTopicDataService', {
+    getTopic: jasmine.createSpy('getTopic'),
+    searchTopicsByTarget: jasmine.createSpy('searchTopicsByTarget'),
+    searchTopicsBySource: jasmine.createSpy('searchTopicsBySource'),
+    clearFindAllTopicsRequests: jasmine.createSpy('clearFindAllTopicsRequests'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceEventDataService]]
+ */
+export function getMockQualityAssuranceEventRestService(): QualityAssuranceEventDataService {
+  return jasmine.createSpyObj('QualityAssuranceEventDataService', {
+    getEventsByTopic: jasmine.createSpy('getEventsByTopic'),
+    getEvent: jasmine.createSpy('getEvent'),
+    patchEvent: jasmine.createSpy('patchEvent'),
+    boundProject: jasmine.createSpy('boundProject'),
+    removeProject: jasmine.createSpy('removeProject'),
+    clearFindByTopicRequests: jasmine.createSpy('.clearFindByTopicRequests'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceEventDataService]]
+ */
+export function getMockSuggestionsService(): any {
+  return jasmine.createSpyObj('SuggestionsService', {
+    getTargets: jasmine.createSpy('getTargets'),
+    getSuggestions: jasmine.createSpy('getSuggestions'),
+    clearSuggestionRequests: jasmine.createSpy('clearSuggestionRequests'),
+    deleteReviewedSuggestion: jasmine.createSpy('deleteReviewedSuggestion'),
+    retrieveCurrentUserSuggestions: jasmine.createSpy('retrieveCurrentUserSuggestions'),
+    getTargetUuid: jasmine.createSpy('getTargetUuid'),
+  });
+}
diff --git a/src/app/shared/mocks/publication-claim-targets.mock.ts b/src/app/shared/mocks/publication-claim-targets.mock.ts
new file mode 100644
index 0000000000..0b3c3bc9b0
--- /dev/null
+++ b/src/app/shared/mocks/publication-claim-targets.mock.ts
@@ -0,0 +1,42 @@
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { ResourceType } from '../../core/shared/resource-type';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+export const mockSuggestionTargetsObjectOne: SuggestionTarget = {
+  type: new ResourceType('suggestiontarget'),
+  id: 'reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26',
+  display: 'Bollini, Andrea',
+  source: 'reciter',
+  total: 31,
+  _links: {
+    target: {
+      href: 'https://rest.api/rest/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    suggestions: {
+      href: 'https://rest.api/rest/api/integration/suggestions/search/findByTargetAndSource?target=gf3d657-9d6d-4a87-b905-fef0f8cae26c&source=reciter',
+    },
+    self: {
+      href: 'https://rest.api/rest/api/integration/suggestiontargets/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+  },
+};
+
+export const mockSuggestionTargetsObjectTwo: SuggestionTarget = {
+  type: new ResourceType('suggestiontarget'),
+  id: 'reciter:nhy567-9d6d-ty67-b905-fef0f8cae26',
+  display: 'Digilio, Andrea',
+  source: 'reciter',
+  total: 12,
+  _links: {
+    target: {
+      href: 'https://rest.api/rest/api/core/items/nhy567-9d6d-ty67-b905-fef0f8cae26',
+    },
+    suggestions: {
+      href: 'https://rest.api/rest/api/integration/suggestions/search/findByTargetAndSource?target=nhy567-9d6d-ty67-b905-fef0f8cae26&source=reciter',
+    },
+    self: {
+      href: 'https://rest.api/rest/api/integration/suggestiontargets/reciter:nhy567-9d6d-ty67-b905-fef0f8cae26',
+    },
+  },
+};
diff --git a/src/app/shared/mocks/publication-claim.mock.ts b/src/app/shared/mocks/publication-claim.mock.ts
new file mode 100644
index 0000000000..41866a47f9
--- /dev/null
+++ b/src/app/shared/mocks/publication-claim.mock.ts
@@ -0,0 +1,210 @@
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+import { Suggestion } from '../../core/notifications/models/suggestion.model';
+import { SUGGESTION } from '../../core/notifications/models/suggestion-objects.resource-type';
+
+export const mockSuggestionPublicationOne: Suggestion =  {
+  id: '24694773',
+  display: 'publication one',
+  source: 'reciter',
+  externalSourceUri: 'https://dspace7.4science.cloud/server/api/integration/reciterSourcesEntry/pubmed/entryValues/24694772',
+  score: '48',
+  evidences: {
+    acceptedRejectedEvidence: {
+      score: '2.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    authorNameEvidence: {
+      score: '0',
+      notes: 'some notes, eventually empty or null',
+    },
+    journalCategoryEvidence: {
+      score: '6',
+      notes: 'some notes, eventually empty or null',
+    },
+    affiliationEvidence: {
+      score: 'xxx',
+      notes: 'some notes, eventually empty or null',
+    },
+    relationshipEvidence: {
+      score: '9',
+      notes: 'some notes, eventually empty or null',
+    },
+    educationYearEvidence: {
+      score: '3.6',
+      notes: 'some notes, eventually empty or null',
+    },
+    personTypeEvidence: {
+      score: '4',
+      notes: 'some notes, eventually empty or null',
+    },
+    articleCountEvidence: {
+      score: '6.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    averageClusteringEvidence: {
+      score: '7',
+      notes: 'some notes, eventually empty or null',
+    },
+  },
+  metadata: {
+    'dc.identifier.uri': [
+      {
+        value: 'https://publication/0000-0003-3681-2038',
+        language: null,
+        authority: null,
+        confidence: -1,
+        place: -1,
+      } as any,
+    ],
+    'dc.title': [
+      {
+        value: 'publication one',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.date.issued': [
+      {
+        value: '2010-11-03',
+        language: null,
+        authority: null,
+        confidence: -1,
+      }  as any,
+    ],
+    'dspace.entity.type': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: 'OrgUnit',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.description': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).",
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+  },
+  type: SUGGESTION,
+  _links: {
+    target: {
+      href: 'https://dspace7.4science.cloud/server/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/suggestions/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26c:24694772',
+    },
+  },
+};
+
+export const mockSuggestionPublicationTwo: Suggestion =  {
+  id: '24694772',
+  display: 'publication two',
+  source: 'reciter',
+  externalSourceUri: 'https://dspace7.4science.cloud/server/api/integration/reciterSourcesEntry/pubmed/entryValues/24694772',
+  score: '48',
+  evidences: {
+    acceptedRejectedEvidence: {
+      score: '2.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    authorNameEvidence: {
+      score: '0',
+      notes: 'some notes, eventually empty or null',
+    },
+    journalCategoryEvidence: {
+      score: '6',
+      notes: 'some notes, eventually empty or null',
+    },
+    affiliationEvidence: {
+      score: 'xxx',
+      notes: 'some notes, eventually empty or null',
+    },
+    relationshipEvidence: {
+      score: '9',
+      notes: 'some notes, eventually empty or null',
+    },
+    educationYearEvidence: {
+      score: '3.6',
+      notes: 'some notes, eventually empty or null',
+    },
+    personTypeEvidence: {
+      score: '4',
+      notes: 'some notes, eventually empty or null',
+    },
+    articleCountEvidence: {
+      score: '6.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    averageClusteringEvidence: {
+      score: '7',
+      notes: 'some notes, eventually empty or null',
+    },
+  },
+  metadata: {
+    'dc.identifier.uri': [
+      {
+        value: 'https://publication/0000-0003-3681-2038',
+        language: null,
+        authority: null,
+        confidence: -1,
+        place: -1,
+      } as any,
+    ],
+    'dc.title': [
+      {
+        value: 'publication one',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.date.issued': [
+      {
+        value: '2010-11-03',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dspace.entity.type': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: 'OrgUnit',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.description': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).",
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+  },
+  type: SUGGESTION,
+  _links: {
+    target: {
+      href: 'https://dspace7.4science.cloud/server/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/suggestions/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26c:24694772',
+    },
+  },
+};
diff --git a/src/app/shared/mocks/remote-data-build.service.mock.ts b/src/app/shared/mocks/remote-data-build.service.mock.ts
index a0fc74a753..a44e54c92c 100644
--- a/src/app/shared/mocks/remote-data-build.service.mock.ts
+++ b/src/app/shared/mocks/remote-data-build.service.mock.ts
@@ -1,12 +1,19 @@
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
-import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestEntry } from '../../core/data/request-entry.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue } from '../empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { RequestEntry } from '../../core/data/request-entry.model';
 
 export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observable<RemoteData<any>>, buildList$?: Observable<RemoteData<PaginatedList<any>>>): RemoteDataBuildService {
   return {
@@ -16,7 +23,7 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
         return toRemoteDataObservable$;
       } else {
         return payload$.pipe(map((payload) => ({
-          payload
+          payload,
         } as RemoteData<any>)));
       }
     },
@@ -30,7 +37,7 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
     buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
-    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
+    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({}),
   } as RemoteDataBuildService;
 
 }
@@ -43,7 +50,7 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
         return toRemoteDataObservable$;
       } else {
         return payload$.pipe(map((payload) => ({
-          payload
+          payload,
         } as RemoteData<any>)));
       }
     },
@@ -63,12 +70,12 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
           } else {
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
           }
-        })
+        }),
       );
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
     buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
-    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
+    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({}),
   } as RemoteDataBuildService;
 
 }
diff --git a/src/app/shared/mocks/request.service.mock.ts b/src/app/shared/mocks/request.service.mock.ts
index 90db66dcd7..fd6dd7fdfb 100644
--- a/src/app/shared/mocks/request.service.mock.ts
+++ b/src/app/shared/mocks/request.service.mock.ts
@@ -1,4 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RequestService } from '../../core/data/request.service';
 import SpyObj = jasmine.SpyObj;
 import { RequestEntry } from '../../core/data/request-entry.model';
@@ -15,6 +19,6 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
     setStaleByHrefSubstring: observableOf(true),
     setStaleByUUID: observableOf(true),
     hasByHref$: observableOf(false),
-    shouldDispatchRequest: true
+    shouldDispatchRequest: true,
   });
 }
diff --git a/src/app/shared/mocks/role-service.mock.ts b/src/app/shared/mocks/role-service.mock.ts
index f13ae501ef..2ab9978e62 100644
--- a/src/app/shared/mocks/role-service.mock.ts
+++ b/src/app/shared/mocks/role-service.mock.ts
@@ -1,4 +1,8 @@
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
 import { RoleType } from '../../core/roles/role-types';
 
 export class RoleServiceMock {
diff --git a/src/app/shared/mocks/router.mock.ts b/src/app/shared/mocks/router.mock.ts
index 98a63363b6..3e2b8f9ce1 100644
--- a/src/app/shared/mocks/router.mock.ts
+++ b/src/app/shared/mocks/router.mock.ts
@@ -9,9 +9,9 @@ export class RouterMock {
     snapshot: {
       url: '',
       root: {
-        queryParamMap: null
-      }
-    }
+        queryParamMap: null,
+      },
+    },
   };
 
   // noinspection TypeScriptUnresolvedFunction
diff --git a/src/app/shared/mocks/scroll-to-service.mock.ts b/src/app/shared/mocks/scroll-to-service.mock.ts
index 03b68e55d2..2ff92930e5 100644
--- a/src/app/shared/mocks/scroll-to-service.mock.ts
+++ b/src/app/shared/mocks/scroll-to-service.mock.ts
@@ -5,6 +5,6 @@ import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
  */
 export function getMockScrollToService(): ScrollToService {
   return jasmine.createSpyObj('scrollToService', {
-    scrollTo: jasmine.createSpy('scrollTo')
+    scrollTo: jasmine.createSpy('scrollTo'),
   });
 }
diff --git a/src/app/shared/mocks/search-service.mock.ts b/src/app/shared/mocks/search-service.mock.ts
index 74dec2ff40..41db3cd8e2 100644
--- a/src/app/shared/mocks/search-service.mock.ts
+++ b/src/app/shared/mocks/search-service.mock.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { SearchService } from '../../core/shared/search/search.service';
 
 export function getMockSearchService(): SearchService {
@@ -7,6 +8,6 @@ export function getMockSearchService(): SearchService {
     getEndpoint: observableOf('discover/search/objects'),
     getSearchLink: '/mydspace',
     getScopes: observableOf(['test-scope']),
-    setServiceOptions: {}
+    setServiceOptions: {},
   });
 }
diff --git a/src/app/shared/mocks/section-accesses-config.service.mock.ts b/src/app/shared/mocks/section-accesses-config.service.mock.ts
index cc852b86a5..8e03913528 100644
--- a/src/app/shared/mocks/section-accesses-config.service.mock.ts
+++ b/src/app/shared/mocks/section-accesses-config.service.mock.ts
@@ -1,5 +1,5 @@
-import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 const configRes = Object.assign(new SubmissionFormsModel(), {
@@ -9,32 +9,32 @@ const configRes = Object.assign(new SubmissionFormsModel(), {
     {
       'name': 'openaccess',
       'hasStartDate': false,
-      'hasEndDate': false
+      'hasEndDate': false,
     },
     {
       'name': 'lease',
       'hasStartDate': false,
       'hasEndDate': true,
-      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00',
     },
     {
       'name': 'embargo',
       'hasStartDate': true,
       'hasEndDate': false,
-      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00',
     },
     {
       'name': 'administrator',
       'hasStartDate': false,
-      'hasEndDate': false
-    }
+      'hasEndDate': false,
+    },
   ],
   'type': 'submissionaccessoption',
   '_links': {
     'self': {
-      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
-    }
-  }
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration',
+    },
+  },
 });
 
 
@@ -45,32 +45,32 @@ const configResNotChangeDiscoverable = Object.assign(new SubmissionFormsModel(),
     {
       'name': 'openaccess',
       'hasStartDate': false,
-      'hasEndDate': false
+      'hasEndDate': false,
     },
     {
       'name': 'lease',
       'hasStartDate': false,
       'hasEndDate': true,
-      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00',
     },
     {
       'name': 'embargo',
       'hasStartDate': true,
       'hasEndDate': false,
-      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00',
     },
     {
       'name': 'administrator',
       'hasStartDate': false,
-      'hasEndDate': false
-    }
+      'hasEndDate': false,
+    },
   ],
   'type': 'submissionaccessoption',
   '_links': {
     'self': {
-      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
-    }
-  }
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration',
+    },
+  },
 });
 
 export function getSubmissionAccessesConfigService(): SubmissionFormsConfigDataService {
diff --git a/src/app/shared/mocks/section-accesses.service.mock.ts b/src/app/shared/mocks/section-accesses.service.mock.ts
index 5302b37a63..e212bfccbb 100644
--- a/src/app/shared/mocks/section-accesses.service.mock.ts
+++ b/src/app/shared/mocks/section-accesses.service.mock.ts
@@ -1,6 +1,7 @@
-import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
 import { of as observableOf } from 'rxjs';
 
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+
 const dataRes = Object.assign(new SubmissionFormsModel(), {
   'id': 'AccessConditionDefaultConfiguration',
   'accessConditions': [],
diff --git a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
index 9308325682..f379af2568 100644
--- a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
+++ b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
@@ -1,6 +1,4 @@
-import {
-  WorkspaceitemSectionSherpaPoliciesObject
-} from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionSherpaPoliciesObject } from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
 
 export const SherpaDataResponse = {
   'id': 'sherpaPolicies',
@@ -15,7 +13,7 @@ export const SherpaDataResponse = {
       'dateCreated': '2012-11-20 14:51:52',
       'dateModified': '2020-03-06 11:25:54',
       'inDOAJ': false,
-      'publiclyVisible': true
+      'publiclyVisible': true,
     },
     'journals': [{
       'titles': ['The Lancet', 'Lancet'],
@@ -31,7 +29,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       },
       'publishers': [{
         'name': 'Elsevier',
@@ -41,7 +39,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       }],
       'policies': [{
         'id': 0,
@@ -55,7 +53,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Preprint Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 1,
@@ -63,7 +61,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Institutional Website'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 2,
@@ -71,7 +69,7 @@ export const SherpaDataResponse = {
           'prerequisites': ['If Required by Funder'],
           'locations': ['Non-Commercial Repository'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': { amount: 6, units: 'Months' }
+          'embargo': { amount: 6, units: 'Months' },
         }, {
           'articleVersion': 'accepted',
           'option': 3,
@@ -79,7 +77,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Non-Commercial Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }],
         'urls': {
           'http://download.thelancet.com/flatcontentassets/authors/lancet-information-for-authors.pdf': 'Guidelines for Authors',
@@ -87,15 +85,15 @@ export const SherpaDataResponse = {
           'http://www.thelancet.com/lancet-information-for-authors/after-publication': 'What happens after publication?',
           'http://www.thelancet.com/lancet/information-for-authors/disclosure-of-results': 'Disclosure of results before publication',
           'https://www.elsevier.com/__data/assets/pdf_file/0005/78476/external-embargo-list.pdf': 'Journal Embargo Period List',
-          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors'
+          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors',
         },
         'openAccessProhibited': false,
         'publicationCount': 0,
         'preArchiving': 'can',
         'postArchiving': 'can',
-        'pubArchiving': 'cannot'
+        'pubArchiving': 'cannot',
       }],
-      'inDOAJ': false
-    }]
-  }
+      'inDOAJ': false,
+    }],
+  },
 } as WorkspaceitemSectionSherpaPoliciesObject;
diff --git a/src/app/shared/mocks/section-upload.service.mock.ts b/src/app/shared/mocks/section-upload.service.mock.ts
index ae3515105d..3789bbac63 100644
--- a/src/app/shared/mocks/section-upload.service.mock.ts
+++ b/src/app/shared/mocks/section-upload.service.mock.ts
@@ -5,11 +5,14 @@ import { SubmissionFormsConfigDataService } from '../../core/config/submission-f
  */
 export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
+    updatePrimaryBitstreamOperation: jasmine.createSpy('updatePrimaryBitstreamOperation'),
+    updateFilePrimaryBitstream: jasmine.createSpy('updateFilePrimaryBitstream'),
+    getUploadedFilesData: jasmine.createSpy('getUploadedFilesData'),
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),
     getDefaultPolicies: jasmine.createSpy('getDefaultPolicies'),
     addUploadedFile: jasmine.createSpy('addUploadedFile'),
     updateFileData: jasmine.createSpy('updateFileData'),
-    removeUploadedFile: jasmine.createSpy('removeUploadedFile')
+    removeUploadedFile: jasmine.createSpy('removeUploadedFile'),
   });
 }
diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index 268ae33ab3..df31dc96f3 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -9,38 +9,38 @@ import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 export const mockSectionsData = {
   traditionalpageone: {
     'dc.title': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   license: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   upload: {
-    files: []
-  }
+    files: [],
+  },
 };
 
 export const mockSectionsDataTwo = {
   traditionalpageone: {
     'dc.title': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   traditionalpagetwo: {
     'dc.relation': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   license: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   upload: {
-    files: []
-  }
+    files: [],
+  },
 };
 
 export const mockSectionsErrors = [
@@ -49,15 +49,15 @@ export const mockSectionsErrors = [
     paths: [
       '/sections/traditionalpageone/dc.contributor.author',
       '/sections/traditionalpageone/dc.title',
-      '/sections/traditionalpageone/dc.date.issued'
-    ]
+      '/sections/traditionalpageone/dc.date.issued',
+    ],
   },
   {
     message: 'error.validation.license.notgranted',
     paths: [
-      '/sections/license'
-    ]
-  }
+      '/sections/license',
+    ],
+  },
 ];
 
 export const mockSectionsErrorsTouchedField = [
@@ -65,14 +65,14 @@ export const mockSectionsErrorsTouchedField = [
     message: 'error.validation.required',
     paths: [
       '/sections/traditionalpageone/dc.title',
-    ]
+    ],
   },
   {
     message: 'error.validation.license.notgranted',
     paths: [
-      '/sections/license'
-    ]
-  }
+      '/sections/license',
+    ],
+  },
 ];
 
 export const mockUploadResponse1Errors = {
@@ -81,23 +81,23 @@ export const mockUploadResponse1Errors = {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
-    }
-  ]
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
+    },
+  ],
 };
 
 export const mockUploadResponse1ParsedErrors: any = {
   traditionalpageone: [
     { path: '/sections/traditionalpageone/dc.title', message: 'error.validation.required' },
-    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' }
-  ]
+    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' },
+  ],
 };
 
 export const mockLicenseParsedErrors: any = {
   license: [
-    { path: '/sections/license', message: 'error.validation.license.notgranted' }
-  ]
+    { path: '/sections/license', message: 'error.validation.license.notgranted' },
+  ],
 };
 
 export const mockUploadResponse2Errors = {
@@ -106,26 +106,26 @@ export const mockUploadResponse2Errors = {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
     },
     {
       message: 'error.upload',
       paths: [
-        '/sections/upload'
-      ]
-    }
-  ]
+        '/sections/upload',
+      ],
+    },
+  ],
 };
 
 export const mockUploadResponse2ParsedErrors = {
   traditionalpageone: [
     { path: '/sections/traditionalpageone/dc.title', message: 'error.validation.required' },
-    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' }
+    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' },
   ],
   upload: [
-    { path: '/sections/upload', message: 'error.upload' }
-  ]
+    { path: '/sections/upload', message: 'error.upload' },
+  ],
 };
 
 export const mockSubmissionRestResponse = [
@@ -151,9 +151,9 @@ export const mockSubmissionRestResponse = [
             _links: {
               content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
               format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-              self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-            }
-          }
+              self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+            },
+          },
         ],
         id: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
         uuid: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -163,46 +163,46 @@ export const mockSubmissionRestResponse = [
           {
             key: 'dc.provenance',
             language: null,
-            value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+            value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
           },
           {
             key: 'dc.rights.license',
             language: null,
-            value: ''
+            value: '',
           },
           {
             key: 'dc.description',
             language: null,
-            value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+            value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
           },
           {
             key: 'dc.description.abstract',
             language: null,
-            value: 'This collection contains sample items.'
+            value: 'This collection contains sample items.',
           },
           {
             key: 'dc.description.tableofcontents',
             language: null,
-            value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+            value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
           },
           {
             key: 'dc.rights',
             language: null,
-            value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+            value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
           },
           {
             key: 'dc.title',
             language: null,
-            value: 'Collection of Sample Items'
-          }
+            value: 'Collection of Sample Items',
+          },
         ],
         _links: {
           license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
           defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
           logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-        }
-      }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+        },
+      },
     ],
     item: [
       {
@@ -221,9 +221,9 @@ export const mockSubmissionRestResponse = [
           bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/bitstreams' },
           owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/owningCollection' },
           templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/templateItemOf' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5' }
-        }
-      }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5' },
+        },
+      },
     ],
     sections: {},
     submissionDefinition: [
@@ -235,12 +235,12 @@ export const mockSubmissionRestResponse = [
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-              config: ''
+              config: '',
             },
           },
           {
@@ -248,12 +248,12 @@ export const mockSubmissionRestResponse = [
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-              config: ''
+              config: '',
             },
           },
           {
@@ -263,7 +263,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
             },
           },
           {
@@ -273,7 +273,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
             },
           },
           {
@@ -283,7 +283,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
             },
           },
           {
@@ -292,23 +292,23 @@ export const mockSubmissionRestResponse = [
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-              config: ''
+              config: '',
             },
-          }
+          },
         ],
         name: 'traditional',
         type: 'submissiondefinition',
         _links: {
           collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
           sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
         },
-      }
+      },
     ],
     submitter: [],
     errors: [],
@@ -318,9 +318,9 @@ export const mockSubmissionRestResponse = [
       item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
       submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
       submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-    }
-  }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+    },
+  },
 ];
 
 export const mockSubmissionObject = {
@@ -332,7 +332,7 @@ export const mockSubmissionObject = {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -342,10 +342,10 @@ export const mockSubmissionObject = {
           uuid: 'resource-policy-20',
           type: 'resourcePolicy',
           _links: {
-            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' }
-          }
-        }
-      ]
+            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' },
+          },
+        },
+      ],
     },
     logo: {
       sizeBytes: 7451,
@@ -360,8 +360,8 @@ export const mockSubmissionObject = {
       _links: {
         content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
         format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-      }
+        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+      },
     },
     id: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
     uuid: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -371,45 +371,45 @@ export const mockSubmissionObject = {
       {
         key: 'dc.provenance',
         language: null,
-        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
       },
       {
         key: 'dc.rights.license',
         language: null,
-        value: ''
+        value: '',
       },
       {
         key: 'dc.description',
         language: null,
-        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
       },
       {
         key: 'dc.description.abstract',
         language: null,
-        value: 'This collection contains sample items.'
+        value: 'This collection contains sample items.',
       },
       {
         key: 'dc.description.tableofcontents',
         language: null,
-        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
       },
       {
         key: 'dc.rights',
         language: null,
-        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
       },
       {
         key: 'dc.title',
         language: null,
-        value: 'Collection of Sample Items'
-      }
+        value: 'Collection of Sample Items',
+      },
     ],
     _links: {
       license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
       defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
       logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+    },
   },
   item: {
     handle: null,
@@ -423,9 +423,9 @@ export const mockSubmissionObject = {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
+      page: [],
     },
     id: 'cae8af78-c874-4468-af79-e6c996aa8270',
     uuid: 'cae8af78-c874-4468-af79-e6c996aa8270',
@@ -436,8 +436,8 @@ export const mockSubmissionObject = {
       bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/bitstreams' },
       owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/owningCollection' },
       templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/templateItemOf' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' },
+    },
   },
   submissionDefinition: {
     isDefault: true,
@@ -446,7 +446,7 @@ export const mockSubmissionObject = {
         elementsPerPage: 5,
         totalElements: 5,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -454,12 +454,12 @@ export const mockSubmissionObject = {
           sectionType: 'collection',
           visibility: {
             main: 'HIDDEN',
-            other: 'HIDDEN'
+            other: 'HIDDEN',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-            config: ''
+            config: '',
           },
         },
         {
@@ -469,7 +469,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
           },
         },
         {
@@ -479,7 +479,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
           },
         },
         {
@@ -489,7 +489,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
           },
         },
         {
@@ -498,32 +498,32 @@ export const mockSubmissionObject = {
           sectionType: 'license',
           visibility: {
             main: null,
-            other: 'READONLY'
+            other: 'READONLY',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-            config: ''
+            config: '',
           },
-        }
-      ]
+        },
+      ],
     },
     name: 'traditional',
     type: 'submissiondefinition',
     _links: {
       collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
       sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
     },
     collections: {
       pageInfo: {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
-    }
+      page: [],
+    },
   },
   submitter: {
     handle: null,
@@ -542,17 +542,17 @@ export const mockSubmissionObject = {
       {
         key: 'eperson.firstname',
         language: null,
-        value: 'Demo'
+        value: 'Demo',
       },
       {
         key: 'eperson.lastname',
         language: null,
-        value: 'Submitter'
-      }
+        value: 'Submitter',
+      },
     ],
     _links: {
-      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-5tg6-a9cd-6d910e68dca5' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-5tg6-a9cd-6d910e68dca5' },
+    },
   },
   id: 826,
   lastModified: '2019-01-09T10:17:33.738+0000',
@@ -560,20 +560,20 @@ export const mockSubmissionObject = {
     license: {
       url: null,
       acceptanceDate: null,
-      granted: false
+      granted: false,
     },
     upload: {
-      files: []
-    }
+      files: [],
+    },
   },
   errors: [
     {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
-    }
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
+    },
   ],
   type: 'workspaceitem',
   _links: {
@@ -581,8 +581,8 @@ export const mockSubmissionObject = {
     item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
     submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
     submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-  }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+  },
 };
 
 export const mockSubmissionObjectNew = {
@@ -594,7 +594,7 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -604,10 +604,10 @@ export const mockSubmissionObjectNew = {
           uuid: 'resource-policy-20',
           type: 'resourcePolicy',
           _links: {
-            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' }
-          }
-        }
-      ]
+            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' },
+          },
+        },
+      ],
     },
     logo: {
       sizeBytes: 7451,
@@ -622,8 +622,8 @@ export const mockSubmissionObjectNew = {
       _links: {
         content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
         format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-      }
+        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+      },
     },
     id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
     uuid: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -633,45 +633,45 @@ export const mockSubmissionObjectNew = {
       {
         key: 'dc.provenance',
         language: null,
-        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
       },
       {
         key: 'dc.rights.license',
         language: null,
-        value: ''
+        value: '',
       },
       {
         key: 'dc.description',
         language: null,
-        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
       },
       {
         key: 'dc.description.abstract',
         language: null,
-        value: 'This collection contains sample items.'
+        value: 'This collection contains sample items.',
       },
       {
         key: 'dc.description.tableofcontents',
         language: null,
-        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
       },
       {
         key: 'dc.rights',
         language: null,
-        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
       },
       {
         key: 'dc.title',
         language: null,
-        value: 'Collection of Sample Items'
-      }
+        value: 'Collection of Sample Items',
+      },
     ],
     _links: {
       license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
       defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
       logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+    },
   },
   item: {
     handle: null,
@@ -685,9 +685,9 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
+      page: [],
     },
     id: 'cae8af78-c874-4468-af79-e6c996aa8270',
     uuid: 'cae8af78-c874-4468-af79-e6c996aa8270',
@@ -698,8 +698,8 @@ export const mockSubmissionObjectNew = {
       bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/bitstreams' },
       owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/owningCollection' },
       templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/templateItemOf' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' },
+    },
   },
   submissionDefinition: {
     isDefault: true,
@@ -708,7 +708,7 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 5,
         totalElements: 5,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -716,12 +716,12 @@ export const mockSubmissionObjectNew = {
           sectionType: 'collection',
           visibility: {
             main: 'HIDDEN',
-            other: 'HIDDEN'
+            other: 'HIDDEN',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-            config: ''
+            config: '',
           },
         },
         {
@@ -731,7 +731,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
           },
         },
         {
@@ -741,7 +741,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
           },
         },
         {
@@ -751,7 +751,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
           },
         },
         {
@@ -760,32 +760,32 @@ export const mockSubmissionObjectNew = {
           sectionType: 'license',
           visibility: {
             main: null,
-            other: 'READONLY'
+            other: 'READONLY',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-            config: ''
+            config: '',
           },
-        }
-      ]
+        },
+      ],
     },
     name: 'traditionaltwo',
     type: 'submissiondefinition',
     _links: {
       collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
       sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
     },
     collections: {
       pageInfo: {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
-    }
+      page: [],
+    },
   },
   submitter: {
     handle: null,
@@ -804,17 +804,17 @@ export const mockSubmissionObjectNew = {
       {
         key: 'eperson.firstname',
         language: null,
-        value: 'Demo'
+        value: 'Demo',
       },
       {
         key: 'eperson.lastname',
         language: null,
-        value: 'Submitter'
-      }
+        value: 'Submitter',
+      },
     ],
     _links: {
-      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-4bb9-a9cd-45gh23e68dca5' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-4bb9-a9cd-45gh23e68dca5' },
+    },
   },
   id: 826,
   lastModified: '2019-01-09T10:17:33.738+0000',
@@ -826,8 +826,8 @@ export const mockSubmissionObjectNew = {
     item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
     submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
     submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-  }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+  },
 };
 
 export const mockSubmissionCollectionId = '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb';
@@ -844,12 +844,12 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'utils',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -857,12 +857,12 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'collection',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -872,7 +872,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
       },
     },
     {
@@ -882,7 +882,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
       },
     },
     {
@@ -892,7 +892,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
       },
     },
     {
@@ -901,21 +901,21 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'license',
       visibility: {
         main: null,
-        other: 'READONLY'
+        other: 'READONLY',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-        config: ''
+        config: '',
       },
-    }
+    },
   ],
   name: 'traditional',
   type: 'submissiondefinition',
   _links: {
     collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
     sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
   },
 } as any;
 
@@ -927,12 +927,12 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'utils',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -940,12 +940,12 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'collection',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -955,7 +955,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
       },
     },
     {
@@ -965,7 +965,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
       },
     },
     {
@@ -975,7 +975,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
       },
     },
     {
@@ -984,21 +984,21 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'license',
       visibility: {
         main: null,
-        other: 'READONLY'
+        other: 'READONLY',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-        config: ''
+        config: '',
       },
-    }
+    },
   ]),
   name: 'traditional',
   type: 'submissiondefinition',
   _links: {
     collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
     sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
   },
 } as any;
 
@@ -1015,7 +1015,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -1023,7 +1023,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'collection': {
         config: '',
@@ -1031,7 +1031,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -1039,7 +1039,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'traditionalpageone': {
         header: 'submit.progressbar.describe.stepone',
@@ -1053,7 +1053,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         formId: '2_traditionalpageone',
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'traditionalpagetwo': {
         header: 'submit.progressbar.describe.steptwo',
@@ -1066,7 +1066,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'detect-duplicate': {
         header: 'submit.progressbar.detect-duplicate',
@@ -1076,12 +1076,12 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {
-          matches: {}
+          matches: {},
         },
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'upload': {
         header: 'submit.progressbar.upload',
@@ -1091,12 +1091,12 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {
-          files: []
+          files: [],
         },
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'license': {
         header: 'submit.progressbar.license',
@@ -1105,7 +1105,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
@@ -1113,13 +1113,16 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
-      } as any
+        removePending: false,
+      } as any,
+      'duplicates': {
+        potentialDuplicates: [],
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.assign({}, {
@@ -1135,14 +1138,14 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       collection: {
         config: '',
@@ -1150,14 +1153,14 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpageone: {
         header: 'submit.progressbar.describe.stepone',
@@ -1170,7 +1173,7 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpagetwo: {
         header: 'submit.progressbar.describe.steptwo',
@@ -1182,7 +1185,7 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       upload: {
         header: 'submit.progressbar.upload',
@@ -1192,11 +1195,11 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {
-          files: []
+          files: [],
         },
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       license: {
         header: 'submit.progressbar.license',
@@ -1205,20 +1208,20 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
-      } as any
+        isValid: false,
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.assign({}, {
@@ -1234,14 +1237,14 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       collection: {
         config: '',
@@ -1249,14 +1252,14 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpageone: {
         header: 'submit.progressbar.describe.stepone',
@@ -1269,7 +1272,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpagetwo: {
         header: 'submit.progressbar.describe.steptwo',
@@ -1281,7 +1284,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       license: {
         header: 'submit.progressbar.license',
@@ -1290,20 +1293,20 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
-      } as any
+        isValid: false,
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSectionsState = Object.assign({}, {
@@ -1313,14 +1316,14 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'utils',
     visibility: {
       main: 'HIDDEN',
-      other: 'HIDDEN'
+      other: 'HIDDEN',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   collection: {
     config: '',
@@ -1328,14 +1331,14 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'collection',
     visibility: {
       main: 'HIDDEN',
-      other: 'HIDDEN'
+      other: 'HIDDEN',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   traditionalpageone: {
     header: 'submit.progressbar.describe.stepone',
@@ -1347,7 +1350,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   traditionalpagetwo: {
     header: 'submit.progressbar.describe.steptwo',
@@ -1359,7 +1362,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   upload: {
     header: 'submit.progressbar.upload',
@@ -1371,7 +1374,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   license: {
     header: 'submit.progressbar.license',
@@ -1380,15 +1383,15 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'license',
     visibility: {
       main: null,
-      other: 'READONLY'
+      other: 'READONLY',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
-  } as any
+    isValid: false,
+  } as any,
 });
 
 export const mockSectionsList = [
@@ -1399,7 +1402,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.describe.stepone',
     id: 'traditionalpageone',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo',
@@ -1408,7 +1411,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.describe.steptwo',
     id: 'traditionalpagetwo',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload',
@@ -1417,7 +1420,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.upload',
     id: 'upload',
-    sectionType: 'upload'
+    sectionType: 'upload',
   },
   {
     config: '',
@@ -1426,8 +1429,8 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.license',
     id: 'license',
-    sectionType: 'license'
-  }
+    sectionType: 'license',
+  },
 ];
 
 export const mockUploadConfigResponseMetadata = {
@@ -1436,7 +1439,7 @@ export const mockUploadConfigResponseMetadata = {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Title',
           mandatory: true,
@@ -1448,18 +1451,18 @@ export const mockUploadConfigResponseMetadata = {
               metadata: 'dc.title',
               label: null,
               controlledVocabulary: null,
-              closed: null
-            }
+              closed: null,
+            },
           ],
-          languageCodes: []
-        }
-      ]
+          languageCodes: [],
+        },
+      ],
     },
     {
       fields: [
         {
           input: {
-            type: 'textarea'
+            type: 'textarea',
           },
           label: 'Description',
           mandatory: false,
@@ -1470,18 +1473,18 @@ export const mockUploadConfigResponseMetadata = {
               metadata: 'dc.description',
               label: null,
               controlledVocabulary: null,
-              closed: null
-            }
+              closed: null,
+            },
           ],
-          languageCodes: []
-        }
-      ]
-    }
+          languageCodes: [],
+        },
+      ],
+    },
   ],
   name: 'bitstream-metadata',
   type: 'submissionform',
   _links: {
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' },
   },
 };
 
@@ -1490,25 +1493,25 @@ export const mockUploadConfigResponse = {
     {
       name: 'openaccess',
       hasStartDate: false,
-      hasEndDate: false
+      hasEndDate: false,
     },
     {
       name: 'lease',
       hasStartDate: false,
       hasEndDate: true,
-      maxEndDate: '2019-07-12T14:40:06.308+0000'
+      maxEndDate: '2019-07-12T14:40:06.308+0000',
     },
     {
       name: 'embargo',
       hasStartDate: true,
       hasEndDate: false,
-      maxStartDate: '2022-01-12T14:40:06.308+0000'
+      maxStartDate: '2022-01-12T14:40:06.308+0000',
     },
     {
       name: 'administrator',
       hasStartDate: false,
-      hasEndDate: false
-    }
+      hasEndDate: false,
+    },
   ],
   metadata: createSuccessfulRemoteDataObject$(mockUploadConfigResponseMetadata),
   required: true,
@@ -1517,7 +1520,7 @@ export const mockUploadConfigResponse = {
   type: 'submissionupload',
   _links: {
     metadata: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload/metadata' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
   },
 };
 
@@ -1534,17 +1537,17 @@ export const mockGroup = Object.assign(new Group(), {
   metadata: [],
   _links: {
     groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1/groups' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1' },
   },
   groups: {
     pageInfo: {
       elementsPerPage: 0,
       totalElements: 0,
       totalPages: 1,
-      currentPage: 1
+      currentPage: 1,
     },
-    page: []
-  }
+    page: [],
+  },
 });
 
 export const mockUploadFiles = [
@@ -1559,8 +1562,8 @@ export const mockUploadFiles = [
           display: '123456-test-upload.jpg',
           confidence: -1,
           place: 0,
-          otherInformation: null
-        }
+          otherInformation: null,
+        },
       ],
       'dc.title': [
         {
@@ -1570,9 +1573,9 @@ export const mockUploadFiles = [
           display: '123456-test-upload.jpg',
           confidence: -1,
           place: 0,
-          otherInformation: null
-        }
-      ]
+          otherInformation: null,
+        },
+      ],
     },
     accessConditions: [
       {
@@ -1582,7 +1585,7 @@ export const mockUploadFiles = [
         groupUUID: '123456-g',
         action: 'READ',
         endDate: '2019-01-16',
-        type: 'resourcePolicy'
+        type: 'resourcePolicy',
       },
       {
         id: 3676,
@@ -1590,8 +1593,8 @@ export const mockUploadFiles = [
         rpType: 'TYPE_CUSTOM',
         groupUUID: '123456-g',
         action: 'READ',
-        type: 'resourcePolicy'
-      }
+        type: 'resourcePolicy',
+      },
     ],
     format: {
       id: 16,
@@ -1601,18 +1604,24 @@ export const mockUploadFiles = [
       supportLevel: 0,
       internal: false,
       extensions: null,
-      type: 'bitstreamformat'
+      type: 'bitstreamformat',
     },
     sizeBytes: 202999,
     checkSum: {
       checkSumAlgorithm: 'MD5',
-      value: '5e0996996863d2623439cbb53052bc72'
+      value: '5e0996996863d2623439cbb53052bc72',
     },
-    url: 'https://test-ui.com/api/core/bitstreams/123456-test-upload/content'
-  }
+    url: 'https://test-ui.com/api/core/bitstreams/123456-test-upload/content',
+  },
 ];
 
+export const mockUploadFilesData = {
+  primary: null,
+  files: JSON.parse(JSON.stringify(mockUploadFiles)),
+};
+
 export const mockFileFormData = {
+  primary: [true],
   metadata: {
     'dc.title': [
       {
@@ -1622,8 +1631,8 @@ export const mockFileFormData = {
         display: 'title',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
     'dc.description': [
       {
@@ -1633,9 +1642,9 @@ export const mockFileFormData = {
         display: 'description',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
-    ]
+        otherInformation: null,
+      },
+    ],
   },
   accessConditions: [
     {
@@ -1648,8 +1657,8 @@ export const mockFileFormData = {
             display: 'openaccess',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
       },
     },
@@ -1663,8 +1672,8 @@ export const mockFileFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         endDate: [
           {
@@ -1674,14 +1683,14 @@ export const mockFileFormData = {
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
+      },
     },
     {
       accessConditionGroup: {
@@ -1693,8 +1702,8 @@ export const mockFileFormData = {
             display: 'embargo',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         startDate: [
           {
@@ -1704,16 +1713,16 @@ export const mockFileFormData = {
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
-    }
-  ]
+      },
+    },
+  ],
 };
 
 
@@ -1730,8 +1739,8 @@ export const mockAccessesFormData = {
             display: 'openaccess',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
       },
     },
@@ -1745,29 +1754,29 @@ export const mockAccessesFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         endDate: [
           {
             value: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
+      },
     },
     {
       accessConditionGroup: {
@@ -1779,30 +1788,30 @@ export const mockAccessesFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         startDate: [
           {
             value: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
-    }
-  ]
+      },
+    },
+  ],
 };
 
diff --git a/src/app/shared/mocks/suggestion.mock.ts b/src/app/shared/mocks/suggestion.mock.ts
new file mode 100644
index 0000000000..90226841ef
--- /dev/null
+++ b/src/app/shared/mocks/suggestion.mock.ts
@@ -0,0 +1,1361 @@
+import { of as observableOf } from 'rxjs';
+
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { SearchResult } from '../search/models/search-result.model';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+// Items
+// -------------------------------------------------------------------------------
+
+const ItemMockPid1: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174001',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174001',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Index nominum et rerum',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid2: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174004',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174004',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid3: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174005',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174005',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Sustainable development',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid4: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174006',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174006',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Reply to Critics',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid5: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174007',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174007',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid6: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174008',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174008',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Donald Davidson',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid7: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174009',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174009',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Missing abstract article',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid8: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174002',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid9: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174003',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174003',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid10: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const OpenaireMockDspaceObject: SearchResult<DSpaceObject> = Object.assign(
+  new SearchResult<DSpaceObject>(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+// Classes
+// -------------------------------------------------------------------------------
+
+/**
+ * Mock for [[SuggestionNotificationsStateService]]
+ */
+export function getMockSuggestionNotificationsStateService(): any {
+  return jasmine.createSpyObj('SuggestionNotificationsStateService', {
+    getOpenaireBrokerTopics: jasmine.createSpy('getOpenaireBrokerTopics'),
+    isOpenaireBrokerTopicsLoading: jasmine.createSpy('isOpenaireBrokerTopicsLoading'),
+    isOpenaireBrokerTopicsLoaded: jasmine.createSpy('isOpenaireBrokerTopicsLoaded'),
+    isOpenaireBrokerTopicsProcessing: jasmine.createSpy('isOpenaireBrokerTopicsProcessing'),
+    getOpenaireBrokerTopicsTotalPages: jasmine.createSpy('getOpenaireBrokerTopicsTotalPages'),
+    getOpenaireBrokerTopicsCurrentPage: jasmine.createSpy('getOpenaireBrokerTopicsCurrentPage'),
+    getOpenaireBrokerTopicsTotals: jasmine.createSpy('getOpenaireBrokerTopicsTotals'),
+    dispatchRetrieveOpenaireBrokerTopics: jasmine.createSpy('dispatchRetrieveOpenaireBrokerTopics'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+    dispatchRefreshUserSuggestionsAction: undefined,
+  });
+}
+/**
+ * Mock for [[OpenaireBrokerEventRestService]]
+ */
+export function getMockSuggestionsService(): any {
+  return jasmine.createSpyObj('SuggestionsService', {
+    getTargets: jasmine.createSpy('getTargets'),
+    getSuggestions: observableOf([]),
+    clearSuggestionRequests: jasmine.createSpy('clearSuggestionRequests'),
+    deleteReviewedSuggestion: jasmine.createSpy('deleteReviewedSuggestion'),
+    retrieveCurrentUserSuggestions: jasmine.createSpy('retrieveCurrentUserSuggestions'),
+    getTargetUuid: jasmine.createSpy('getTargetUuid'),
+    ignoreSuggestion: observableOf(null),
+    ignoreSuggestionMultiple: observableOf({ success: 1, fails: 0 }),
+    approveAndImportMultiple: observableOf({ success: 1, fails: 0 }),
+    approveAndImport: observableOf({ id: '1234' }),
+    isCollectionFixed: false,
+    translateSuggestionSource: 'testSource',
+    translateSuggestionType: 'testType',
+  });
+}
diff --git a/src/app/shared/mocks/theme-service.mock.ts b/src/app/shared/mocks/theme-service.mock.ts
index e3c2960e51..44d889c025 100644
--- a/src/app/shared/mocks/theme-service.mock.ts
+++ b/src/app/shared/mocks/theme-service.mock.ts
@@ -1,7 +1,8 @@
-import { ThemeService } from '../theme-support/theme.service';
 import { of as observableOf } from 'rxjs';
-import { ThemeConfig } from '../../../config/theme.model';
+
+import { ThemeConfig } from '../../../config/theme.config';
 import { isNotEmpty } from '../empty.util';
+import { ThemeService } from '../theme-support/theme.service';
 
 export function getMockThemeService(themeName = 'base', themes?: ThemeConfig[]): ThemeService {
   const spy = jasmine.createSpyObj('themeService', {
diff --git a/src/app/shared/mocks/translate-loader.mock.ts b/src/app/shared/mocks/translate-loader.mock.ts
index 3251de9ea1..ea1ee7528e 100644
--- a/src/app/shared/mocks/translate-loader.mock.ts
+++ b/src/app/shared/mocks/translate-loader.mock.ts
@@ -1,5 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
 import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class TranslateLoaderMock implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
diff --git a/src/app/shared/mocks/translate.service.mock.ts b/src/app/shared/mocks/translate.service.mock.ts
index 38b088e50f..ecb87007e2 100644
--- a/src/app/shared/mocks/translate.service.mock.ts
+++ b/src/app/shared/mocks/translate.service.mock.ts
@@ -5,6 +5,6 @@ export function getMockTranslateService(): TranslateService {
     get: jasmine.createSpy('get'),
     use: jasmine.createSpy('use'),
     instant: jasmine.createSpy('instant'),
-    setDefaultLang: jasmine.createSpy('setDefaultLang')
+    setDefaultLang: jasmine.createSpy('setDefaultLang'),
   });
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts
index cf627fc1ce..086cd9d81a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts
@@ -1,13 +1,23 @@
-import { Component, OnInit, Injector } from '@angular/core';
-import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component';
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Params,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { Params, Router, ActivatedRoute, NavigationExtras } from '@angular/router';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
+import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component';
 
 /**
  * Abstract component for rendering an advanced claimed task's action
@@ -17,7 +27,7 @@ import { RequestService } from '../../../../core/data/request.service';
  */
 @Component({
   selector: 'ds-advanced-claimed-task-action-abstract',
-  template: ''
+  template: '',
 })
 export abstract class AdvancedClaimedTaskActionsAbstractComponent extends ClaimedTaskActionsAbstractComponent implements OnInit {
 
@@ -53,7 +63,7 @@ export abstract class AdvancedClaimedTaskActionsAbstractComponent extends Claime
    */
   initPageRoute() {
     this.subs.push(this.object.workflowitem.pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((workflowItem: WorkflowItem) => {
       this.workflowTaskPageRoute = getAdvancedWorkflowRoute(workflowItem.id);
     }));
diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
index 1ff55cefd6..2af6713885 100644
--- a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
@@ -1,20 +1,25 @@
-import { Component, Injector, OnDestroy } from '@angular/core';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  Injector,
+  OnDestroy,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { take } from 'rxjs/operators';
-import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { Item } from '../../../../core/shared/item.model';
-import { MyDSpaceReloadableActionsComponent } from '../../mydspace-reloadable-actions';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type';
 import { isEmpty } from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { MyDSpaceReloadableActionsComponent } from '../../mydspace-reloadable-actions';
 
 /**
  * Abstract component for rendering a claimed task's action
@@ -25,7 +30,7 @@ import { isEmpty } from '../../../empty.util';
  */
 @Component({
   selector: 'ds-claimed-task-action-abstract',
-  template: ''
+  template: '',
 })
 export abstract class ClaimedTaskActionsAbstractComponent extends MyDSpaceReloadableActionsComponent<ClaimedTask, ClaimedTaskDataService> implements OnDestroy {
 
@@ -75,7 +80,7 @@ export abstract class ClaimedTaskActionsAbstractComponent extends MyDSpaceReload
    */
   createbody(): any {
     return {
-      [this.option]: 'true'
+      [this.option]: 'true',
     };
   }
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index 7944d24d96..9e364ac808 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -4,5 +4,5 @@
         [disabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="!(processing$ | async)"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
index b79040fb12..0d1463d44b 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
@@ -1,23 +1,37 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { of, of as observableOf } from 'rxjs';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
-import { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
+import { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
 
 let component: ClaimedTaskActionsApproveComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsApproveComponent>;
@@ -31,7 +45,7 @@ let mockPoolTaskDataService: PoolTaskDataService;
 describe('ClaimedTaskActionsApproveComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
   const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-    submitTask: observableOf(new ProcessTaskResponse(true))
+    submitTask: observableOf(new ProcessTaskResponse(true)),
   });
 
   beforeEach(waitForAsync(() => {
@@ -55,9 +69,9 @@ describe('ClaimedTaskActionsApproveComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsApproveComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsApproveComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -92,7 +106,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
       spyOn(component, 'startActionExecution').and.returnValue(of(null));
 
       expectedBody = {
-        [component.option]: 'true'
+        [component.option]: 'true',
       };
 
       component.submitTask();
@@ -109,7 +123,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
     it('should call claimedTaskService\'s submitTask', (done) => {
 
       const expectedBody = {
-        [component.option]: 'true'
+        [component.option]: 'true',
       };
 
       component.actionExecution().subscribe(() => {
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 467d1514c9..809754ed7e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -1,15 +1,22 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Observable, of } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 
 export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
 
@@ -43,7 +50,7 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
 
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const reloadedObject = Object.assign(new ClaimedApprovedTaskSearchResult(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index a2e0b14134..2d1453da71 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -1,28 +1,41 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
-import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { VarDirective } from '../../utils/var.directive';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { By } from '@angular/platform-browser';
+import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -57,28 +70,28 @@ function init() {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   rdItem = createSuccessfulRemoteDataObject(item);
   workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem), id: '333' });
@@ -87,7 +100,7 @@ function init() {
   workflowAction = Object.assign(new WorkflowAction(), { id: 'action-1', options: ['option-1', 'option-2'] });
 
   workflowActionService = jasmine.createSpyObj('workflowActionService', {
-    findById: createSuccessfulRemoteDataObject$(workflowAction)
+    findById: createSuccessfulRemoteDataObject$(workflowAction),
   });
 }
 
@@ -99,9 +112,9 @@ describe('ClaimedTaskActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ClaimedTaskActionsComponent, VarDirective],
       providers: [
@@ -111,11 +124,11 @@ describe('ClaimedTaskActionsComponent', () => {
         { provide: ClaimedTaskDataService, useValue: mockDataService },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
-        { provide: WorkflowActionDataService, useValue: workflowActionService }
+        { provide: WorkflowActionDataService, useValue: workflowActionService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index 195a2193e5..c1705b44fc 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -1,21 +1,25 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
 import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to ClaimedTask object.
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 38ed36c0f1..2b95b02df4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -6,7 +6,7 @@
   <span *ngIf="processing$ | async">
     <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
   </span>
-  <span *ngIf="!(processing$ | async)">
+  <span *ngIf="(processing$ | async) !== true">
     <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
   </span>
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts
index 092e53f3f4..05500da7f4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts
@@ -1,21 +1,33 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { ClaimedTaskActionsDeclineTaskComponent } from './claimed-task-actions-decline-task.component';
 import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { ClaimedTaskActionsDeclineTaskComponent } from './claimed-task-actions-decline-task.component';
 
 let component: ClaimedTaskActionsDeclineTaskComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsDeclineTaskComponent>;
@@ -40,9 +52,9 @@ describe('ClaimedTaskActionsDeclineTaskComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ClaimedTaskDataService, useValue: claimedTaskService },
@@ -54,9 +66,9 @@ describe('ClaimedTaskActionsDeclineTaskComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsDeclineTaskComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsDeclineTaskComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 5afbde7d7d..c134647f15 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -1,17 +1,22 @@
-import { Component, Injector } from '@angular/core';
-import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
-import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import {
-  ClaimedDeclinedTaskTaskSearchResult
-} from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteData } from 'src/app/core/data/remote-data';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
+import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
+import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
 
 export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
 
@@ -19,7 +24,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
 @Component({
   selector: 'ds-claimed-task-actions-decline-task',
   templateUrl: './claimed-task-actions-decline-task.component.html',
-  styleUrls: ['./claimed-task-actions-decline-task.component.scss']
+  styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
@@ -43,7 +48,7 @@ export class ClaimedTaskActionsDeclineTaskComponent extends ClaimedTaskActionsAb
 
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     return Object.assign(new ClaimedDeclinedTaskTaskSearchResult(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
   }
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
index 7bdf57561f..680dc27502 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
@@ -1,21 +1,32 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task-actions-edit-metadata.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { TranslateLoaderMock } from '../../../testing/translate-loader.mock';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
+import { TranslateLoaderMock } from '../../../testing/translate-loader.mock';
+import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task-actions-edit-metadata.component';
 
 let component: ClaimedTaskActionsEditMetadataComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsEditMetadataComponent>;
@@ -49,9 +60,9 @@ describe('ClaimedTaskActionsEditMetadataComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsEditMetadataComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsEditMetadataComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
index 7da189dddd..aab15afc58 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
@@ -1,11 +1,15 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 
 export const WORKFLOW_TASK_OPTION_EDIT_METADATA = 'submit_edit_metadata';
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts
index bb41fedfb5..a768832b7e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts
@@ -1,25 +1,30 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdvancedClaimedTaskActionRatingComponent } from './advanced-claimed-task-action-rating.component';
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { ADVANCED_WORKFLOW_ACTION_RATING } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { RouterStub } from '../../../testing/router.stub';
 import { SearchServiceStub } from '../../../testing/search-service.stub';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { Router, ActivatedRoute } from '@angular/router';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { Location } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import {
-  ADVANCED_WORKFLOW_ACTION_RATING
-} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
-import { of as observableOf } from 'rxjs';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { AdvancedClaimedTaskActionRatingComponent } from './advanced-claimed-task-action-rating.component';
 
 const taskId = 'claimed-task-1';
 const workflowId = 'workflow-1';
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts
index a1cc81e050..0da68e7347 100644
--- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts
@@ -1,16 +1,21 @@
-import { Component, Injector } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 import {
-  AdvancedClaimedTaskActionsAbstractComponent
-} from '../abstract/advanced-claimed-task-actions-abstract.component';
+  Component,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import {
   ADVANCED_WORKFLOW_ACTION_RATING,
   ADVANCED_WORKFLOW_TASK_OPTION_RATING,
 } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
 
 /**
@@ -20,7 +25,7 @@ import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-deco
 @Component({
   selector: 'ds-advanced-claimed-task-action-rating-reviewer',
   templateUrl: './advanced-claimed-task-action-rating.component.html',
-  styleUrls: ['./advanced-claimed-task-action-rating.component.scss']
+  styleUrls: ['./advanced-claimed-task-action-rating.component.scss'],
 })
 export class AdvancedClaimedTaskActionRatingComponent extends AdvancedClaimedTaskActionsAbstractComponent {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 0cb2871bf5..2f96c16f08 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -4,7 +4,7 @@
         [disabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="!(processing$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
 </button>
 
 <ng-template #rejectModal let-c="close" let-d="dismiss">
@@ -31,7 +31,7 @@
               [disabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-        <span *ngIf="!(processing$ | async)">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
+        <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
       </button>
     </form>
   </div>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
index 2d369ae014..2350b526d3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
@@ -1,27 +1,44 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormBuilder, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { ClaimedTaskActionsRejectComponent } from './claimed-task-actions-reject.component';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { of } from 'rxjs';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { ClaimedTaskActionsRejectComponent } from './claimed-task-actions-reject.component';
 
 let component: ClaimedTaskActionsRejectComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsRejectComponent>;
@@ -35,7 +52,7 @@ const requestService = getMockRequestService();
 const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
 
 const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-  submitTask: of(new ProcessTaskResponse(true))
+  submitTask: of(new ProcessTaskResponse(true)),
 });
 
 let mockPoolTaskDataService: PoolTaskDataService;
@@ -66,9 +83,9 @@ describe('ClaimedTaskActionsRejectComponent', () => {
         UntypedFormBuilder,
         NgbModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsRejectComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
     fixture = TestBed.createComponent(ClaimedTaskActionsRejectComponent);
     component = fixture.componentInstance;
@@ -122,7 +139,7 @@ describe('ClaimedTaskActionsRejectComponent', () => {
 
       expectedBody = {
         [component.option]: 'true',
-        reason: null
+        reason: null,
       };
 
       const btn = fixture.debugElement.query(By.css('.btn-danger'));
@@ -147,10 +164,10 @@ describe('ClaimedTaskActionsRejectComponent', () => {
     let expectedBody;
 
     beforeEach(() => {
-      spyOn((component.rejectForm as any), 'get').and.returnValue({value: 'required'});
+      spyOn((component.rejectForm as any), 'get').and.returnValue({ value: 'required' });
       expectedBody = {
         [component.option]: 'true',
-        reason: 'required'
+        reason: 'required',
       };
     });
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 7d68af1b8f..b55d43c745 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -1,18 +1,32 @@
-import { Component, Injector, OnInit } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { Observable, of } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 
 export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
 
@@ -57,7 +71,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
    */
   ngOnInit() {
     this.rejectForm = this.formBuilder.group({
-      reason: ['', Validators.required]
+      reason: ['', Validators.required],
     });
   }
 
@@ -94,7 +108,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
 
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const reloadedObject = Object.assign(new ClaimedDeclinedTaskSearchResult(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 66f8e2a058..e10dec2e6e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -4,5 +4,5 @@
         [disabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="!(processing$ | async)"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
index 765849f0ae..9ac6aba5d4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
@@ -1,23 +1,35 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task-actions-return-to-pool.component';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
-import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { of } from 'rxjs';
+import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task-actions-return-to-pool.component';
 
 let component: ClaimedTaskActionsReturnToPoolComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsReturnToPoolComponent>;
@@ -31,7 +43,7 @@ let mockPoolTaskDataService: PoolTaskDataService;
 describe('ClaimedTaskActionsReturnToPoolComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
   const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-    returnToPoolTask: of(new ProcessTaskResponse(true))
+    returnToPoolTask: of(new ProcessTaskResponse(true)),
   });
 
   beforeEach(waitForAsync(() => {
@@ -55,9 +67,9 @@ describe('ClaimedTaskActionsReturnToPoolComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsReturnToPoolComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsReturnToPoolComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index 7949176968..7970772f2f 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -1,16 +1,20 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Observable } from 'rxjs';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { take } from 'rxjs/operators';
 
 export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts
index 81fe423481..d6b2a10b53 100644
--- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts
@@ -1,28 +1,31 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import {
-  AdvancedClaimedTaskActionSelectReviewerComponent
-} from './advanced-claimed-task-action-select-reviewer.component';
-import { Router, ActivatedRoute } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchServiceStub } from '../../../testing/search-service.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { By } from '@angular/platform-browser';
-import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER
-} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { AdvancedClaimedTaskActionSelectReviewerComponent } from './advanced-claimed-task-action-select-reviewer.component';
 
 const taskId = 'claimed-task-1';
 const workflowId = 'workflow-1';
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts
index d6217320ba..5081fc6ab4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts
@@ -1,17 +1,22 @@
-import { Component, Injector } from '@angular/core';
-import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
 import {
-  AdvancedClaimedTaskActionsAbstractComponent
-} from '../abstract/advanced-claimed-task-actions-abstract.component';
-import { Router, ActivatedRoute } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
+  Component,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
+
 import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import {
   ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER,
-  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER
+  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
 } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component';
+import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
 
 /**
  * Advanced Workflow button that redirect to the {@link AdvancedWorkflowActionSelectReviewerComponent}
@@ -20,7 +25,7 @@ import {
 @Component({
   selector: 'ds-advanced-claimed-task-action-select-reviewer',
   templateUrl: './advanced-claimed-task-action-select-reviewer.component.html',
-  styleUrls: ['./advanced-claimed-task-action-select-reviewer.component.scss']
+  styleUrls: ['./advanced-claimed-task-action-select-reviewer.component.scss'],
 })
 export class AdvancedClaimedTaskActionSelectReviewerComponent extends AdvancedClaimedTaskActionsAbstractComponent {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
index 3630c7ea0c..99edf00824 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
@@ -1,5 +1,8 @@
-  /* eslint-disable max-classes-per-file */
-import { getComponentByWorkflowTaskOption, rendersWorkflowTaskOption } from './claimed-task-actions-decorator';
+/* eslint-disable max-classes-per-file */
+import {
+  getComponentByWorkflowTaskOption,
+  rendersWorkflowTaskOption,
+} from './claimed-task-actions-decorator';
 
 describe('ClaimedTaskActions decorator function', () => {
   const option1 = 'test_option_1';
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html
deleted file mode 100644
index 364443c47f..0000000000
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-template dsClaimedTaskActions></ng-template>
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
index 95e31f5523..d9f31aef75 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
@@ -1,22 +1,33 @@
-import { ClaimedTaskActionsLoaderComponent } from './claimed-task-actions-loader.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ThemeService } from 'src/app/shared/theme-support/theme.service';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { Item } from '../../../../core/shared/item.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ClaimedTaskActionsLoaderComponent } from './claimed-task-actions-loader.component';
 
 const searchService = getMockSearchService();
 
@@ -25,6 +36,7 @@ const requestService = getMockRequestService();
 describe('ClaimedTaskActionsLoaderComponent', () => {
   let comp: ClaimedTaskActionsLoaderComponent;
   let fixture: ComponentFixture<ClaimedTaskActionsLoaderComponent>;
+  let themeService: ThemeService;
 
   const option = 'test_option';
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
@@ -34,36 +46,42 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
 
   const workflowitem = Object.assign(new WorkflowItem(), { id: '333' });
 
   beforeEach(waitForAsync(() => {
+    themeService = getMockThemeService('dspace');
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ClaimedTaskActionsLoaderComponent, ClaimedTaskActionsEditMetadataComponent, ClaimedTaskActionsDirective],
+      declarations: [
+        ClaimedTaskActionsLoaderComponent,
+        ClaimedTaskActionsEditMetadataComponent,
+        DynamicComponentLoaderDirective,
+      ],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         { provide: ClaimedTaskDataService, useValue: {} },
@@ -72,13 +90,14 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
         { provide: Router, useValue: new RouterStub() },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestService },
-        { provide: PoolTaskDataService, useValue: {} }
-      ]
+        { provide: PoolTaskDataService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+      ],
     }).overrideComponent(ClaimedTaskActionsLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ClaimedTaskActionsEditMetadataComponent]
-      }
+        entryComponents: [ClaimedTaskActionsEditMetadataComponent],
+      },
     }).compileComponents();
   }));
 
@@ -89,14 +108,14 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
     comp.object = object;
     comp.option = option;
     comp.workflowitem = workflowitem;
-    spyOn(comp, 'getComponentByWorkflowTaskOption').and.returnValue(ClaimedTaskActionsEditMetadataComponent);
+    spyOn(comp, 'getComponent').and.returnValue(ClaimedTaskActionsEditMetadataComponent);
 
     fixture.detectChanges();
   }));
 
   describe('When the component is rendered', () => {
-    it('should call the getComponentByWorkflowTaskOption function with the right option', () => {
-      expect(comp.getComponentByWorkflowTaskOption).toHaveBeenCalledWith(option);
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
index c0dc1cad02..f05dc75cf3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
@@ -1,33 +1,28 @@
 import {
   Component,
-  ComponentFactoryResolver,
   EventEmitter,
   Input,
-  OnInit,
   Output,
-  ViewChild,
-  OnChanges,
-  SimpleChanges,
-  ComponentRef,
 } from '@angular/core';
-import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
-import { hasValue, isNotEmpty, hasNoValue } from '../../../empty.util';
-import { MyDSpaceActionsResult } from '../../mydspace-actions';
+
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component';
+import { MyDSpaceActionsResult } from '../../mydspace-actions';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
+import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator';
 
 @Component({
   selector: 'ds-claimed-task-actions-loader',
-  templateUrl: './claimed-task-actions-loader.component.html'
+  templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * Component for loading a ClaimedTaskAction component depending on the "option" input
  * Passes on the ClaimedTask to the component and subscribes to the processCompleted output
  */
-export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
+export class ClaimedTaskActionsLoaderComponent extends AbstractComponentLoaderComponent<ClaimedTaskActionsAbstractComponent> {
   /**
    * The item object that belonging to the ClaimedTask object
    */
@@ -54,85 +49,22 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
    */
   @Output() processCompleted = new EventEmitter<MyDSpaceActionsResult>();
 
-  /**
-   * Directive to determine where the dynamic child component is located
-   */
-  @ViewChild(ClaimedTaskActionsDirective, {static: true}) claimedTaskActionsDirective: ClaimedTaskActionsDirective;
-
-  /**
-   * The reference to the dynamic component
-   */
-  protected compRef: ComponentRef<Component>;
-
   /**
    * The list of input and output names for the dynamic component
    */
-  protected inAndOutputNames: (keyof ClaimedTaskActionsAbstractComponent & keyof this)[] = [
+  protected inputNames: (keyof this & string)[] = [
+    'item',
     'object',
     'option',
+    'workflowitem',
+  ];
+
+  protected outputNames: (keyof this & string)[] = [
     'processCompleted',
   ];
 
-  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+  public getComponent(): GenericConstructor<ClaimedTaskActionsAbstractComponent> {
+    return getComponentByWorkflowTaskOption(this.option);
   }
 
-  /**
-   * Fetch, create and initialize the relevant component
-   */
-  ngOnInit(): void {
-    this.instantiateComponent();
-  }
-
-  /**
-   * Whenever the inputs change, update the inputs of the dynamic component
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.compRef)) {
-      // sometimes the component has not been initialized yet, so it first needs to be initialized
-      // before being called again
-      this.instantiateComponent(changes);
-    } else {
-      // if an input or output has changed
-      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
-        this.connectInputsAndOutputs();
-        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
-          (this.compRef.instance as any).ngOnChanges(changes);
-        }
-      }
-    }
-  }
-
-  private instantiateComponent(changes?: SimpleChanges): void {
-    const comp = this.getComponentByWorkflowTaskOption(this.option);
-    if (hasValue(comp)) {
-      const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
-
-      const viewContainerRef = this.claimedTaskActionsDirective.viewContainerRef;
-      viewContainerRef.clear();
-
-      this.compRef = viewContainerRef.createComponent(componentFactory);
-
-      if (hasValue(changes)) {
-        this.ngOnChanges(changes);
-      } else {
-        this.connectInputsAndOutputs();
-      }
-    }
-  }
-
-  getComponentByWorkflowTaskOption(option: string) {
-    return getComponentByWorkflowTaskOption(option);
-  }
-
-  /**
-   * Connect the in and outputs of this component to the dynamic component,
-   * to ensure they're in sync
-   */
-  protected connectInputsAndOutputs(): void {
-    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
-      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
-        this.compRef.instance[name] = this[name];
-      });
-    }
-  }
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts
deleted file mode 100644
index a4a55b541b..0000000000
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dsClaimedTaskActions]',
-})
-/**
- * Directive used as a hook to know where to inject the dynamic Claimed Task Actions component
- */
-export class ClaimedTaskActionsDirective {
-  constructor(public viewContainerRef: ViewContainerRef) { }
-}
diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
index e6abfa76a1..fce043191a 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
@@ -1,21 +1,31 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ItemActionsComponent } from './item-actions.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { RouterStub } from '../../testing/router.stub';
+import { ItemActionsComponent } from './item-actions.component';
 
 let component: ItemActionsComponent;
 let fixture: ComponentFixture<ItemActionsComponent>;
@@ -30,28 +40,28 @@ mockObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const searchService = getMockSearchService();
@@ -65,9 +75,9 @@ describe('ItemActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ItemActionsComponent],
       providers: [
@@ -76,11 +86,11 @@ describe('ItemActionsComponent', () => {
         { provide: ItemDataService, useValue: mockDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce }
+        { provide: RequestService, useValue: requestServce },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.ts b/src/app/shared/mydspace-actions/item/item-actions.component.ts
index 4df11d65d9..a3288cae2c 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts
@@ -1,13 +1,19 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents mydspace actions related to Item object.
diff --git a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
index 6408dddac6..d61e99a08a 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
@@ -1,19 +1,19 @@
-import { ResourceType } from '../../core/shared/resource-type';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
-import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { Item } from '../../core/shared/item.model';
-import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
-import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
 import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { Item } from '../../core/shared/item.model';
+import { ResourceType } from '../../core/shared/resource-type';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
+import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
+import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
 
 /**
- * Class to return DataService for given ResourceType
+ * Class to return UpdateDataServiceImpl for given ResourceType
  */
 export class MyDSpaceActionsServiceFactory<T extends CacheableObject, TService extends IdentifiableDataService<T>> {
   public getConstructor(type: ResourceType): TService {
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.module.ts b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
index 68e3a8fb58..14a4de5592 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions.module.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
@@ -5,14 +5,15 @@
  *
  * http://www.dspace.org/license/
  */
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared.module';
 import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
+import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
+import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
 import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
 import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
-import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
-import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
 import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component';
 import { ItemActionsComponent } from './item/item-actions.component';
 import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.ts b/src/app/shared/mydspace-actions/mydspace-actions.ts
index 931929ccce..5100d8122e 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions.ts
@@ -1,20 +1,31 @@
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { Component, EventEmitter, Injector, Input, Output } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { take, tap } from 'rxjs/operators';
-
-import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
+import { SearchService } from '../../core/shared/search/search.service';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
 import { NotificationsService } from '../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { SearchService } from '../../core/shared/search/search.service';
-import { getFirstSucceededRemoteData } from '../../core/shared/operators';
-import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory';
 
 export interface MyDSpaceActionsResult {
   result: boolean;
@@ -47,7 +58,7 @@ export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService
   public processing$ = new BehaviorSubject<boolean>(false);
 
   /**
-   * Instance of DataService related to mydspace object
+   * Instance of UpdateDataServiceImpl related to mydspace object
    */
   protected objectDataService: TService;
 
@@ -99,7 +110,7 @@ export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService
     // See https://github.com/DSpace/dspace-angular/pull/468
     this.searchService.getEndpoint().pipe(
       take(1),
-      tap((cachedHref: string) => this.requestService.removeByHrefSubstring(cachedHref))
+      tap((cachedHref: string) => this.requestService.removeByHrefSubstring(cachedHref)),
     ).subscribe(() => this.router.navigateByUrl(url));
   }
 
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
index fe9d955287..c408137f70 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
@@ -1,24 +1,39 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
-import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
-import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
-import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { RouterStub } from '../testing/router.stub';
-import { getMockSearchService } from '../mocks/search-service.mock';
-import { getMockRequestService } from '../mocks/request.service.mock';
+
+import { RequestService } from '../../core/data/request.service';
 import { Item } from '../../core/shared/item.model';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { SearchService } from '../../core/shared/search/search.service';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { getMockSearchService } from '../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { NotificationsService } from '../notifications/notifications.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { RequestService } from '../../core/data/request.service';
-import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../remote-data.utils';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
 
 let mockDataService: PoolTaskDataService;
 let mockClaimedTaskDataService: ClaimedTaskDataService;
@@ -40,28 +55,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -89,11 +104,11 @@ describe('MyDSpaceReloadableActionsComponent', () => {
         { provide: PoolTaskDataService, useValue: mockDataService },
         { provide: ClaimedTaskDataService, useValue: mockClaimedTaskDataService },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -222,7 +237,7 @@ describe('MyDSpaceReloadableActionsComponent', () => {
     it('should emit the reloaded object in case of success', (done) => {
 
       component.startActionExecution().subscribe( (result) => {
-        expect(component.processCompleted.emit).toHaveBeenCalledWith({result: true, reloadedObject: result as any});
+        expect(component.processCompleted.emit).toHaveBeenCalledWith({ result: true, reloadedObject: result as any });
         done();
       });
     });
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
index c126c8c53b..28e3ac4040 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
@@ -1,22 +1,33 @@
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { Component, Injector, OnInit } from '@angular/core';
-
-import { map, switchMap, take, tap } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
+import { SearchService } from '../../core/shared/search/search.service';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
 import { NotificationsService } from '../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { Observable, of } from 'rxjs';
-import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { getSearchResultFor } from '../search/search-result-element-decorator';
 import { MyDSpaceActionsComponent } from './mydspace-actions';
-import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 
 /**
  * Abstract class for all different representations of mydspace actions
@@ -72,7 +83,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
               (reloadedObject) => {
                 this.processing$.next(false);
                 this.handleReloadableActionResponse(res.hasSucceeded, reloadedObject);
-              })
+              }),
           );
         } else {
           this.processing$.next(false);
@@ -93,7 +104,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
   handleReloadableActionResponse(result: boolean, reloadedObject: DSpaceObject): void {
     if (result) {
       if (reloadedObject) {
-        this.processCompleted.emit({result, reloadedObject});
+        this.processCompleted.emit({ result, reloadedObject });
       } else {
         this.reload();
       }
@@ -120,7 +131,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const constructor = getSearchResultFor((dso as any).constructor);
     const reloadedObject = Object.assign(new constructor(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
@@ -138,7 +149,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
           return of(res);
         }
       })).pipe(map((dso) => {
-          return dso ? this.convertReloadedObject(dso) : dso;
+      return dso ? this.convertReloadedObject(dso) : dso;
     }));
   }
 
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 9d63a42d03..1d98934011 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -3,7 +3,7 @@
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="!(processing$ | async)"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
+  <span *ngIf="(processing$ | async) !== true"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
     translate}}</span>
 </button>
 <button class="btn btn-primary workflow-view ml-1 mt-1 mb-3" data-test="view-btn"
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
index cb0799caa6..2a558c0ba6 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
@@ -1,28 +1,38 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
+import { PoolTaskSearchResult } from '../../object-collection/shared/pool-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { PoolTaskActionsComponent } from './pool-task-actions.component';
-import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { PoolTaskSearchResult } from '../../object-collection/shared/pool-task-search-result.model';
-import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 
 let mockDataService: PoolTaskDataService;
 let mockClaimedTaskDataService: ClaimedTaskDataService;
@@ -44,28 +54,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -93,11 +103,11 @@ describe('PoolTaskActionsComponent', () => {
         { provide: PoolTaskDataService, useValue: mockDataService },
         { provide: ClaimedTaskDataService, useValue: mockClaimedTaskDataService },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index c8dcd87a33..7cb5ab154c 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -1,23 +1,30 @@
-import { Component, Injector, Input, OnDestroy } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnDestroy,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable } from 'rxjs';
-import { switchMap, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { Item } from '../../../core/shared/item.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
 /**
  * This component represents mydspace actions related to PoolTask object.
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
index 9f266d054e..9c7a103836 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
@@ -1,24 +1,34 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
 
 let component: WorkflowitemActionsComponent;
 let fixture: ComponentFixture<WorkflowitemActionsComponent>;
@@ -37,28 +47,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockObject = Object.assign(new WorkflowItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
@@ -70,9 +80,9 @@ describe('WorkflowitemActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [WorkflowitemActionsComponent],
       providers: [
@@ -81,11 +91,11 @@ describe('WorkflowitemActionsComponent', () => {
         { provide: WorkflowItemDataService, useValue: mockDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce }
+        { provide: RequestService, useValue: requestServce },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowitemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
index 3587356642..c0f6d33a9d 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
@@ -1,15 +1,18 @@
-import { Component, Injector, Input } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import { TranslateService } from '@ngx-translate/core';
 
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to WorkflowItem object.
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 6e958c7a8b..c3515b4d72 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -22,7 +22,7 @@
     (click)="$event.preventDefault();confirmDiscard(content)">
     <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
       {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-    <span *ngIf="!(processingDelete$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
+    <span *ngIf="(processingDelete$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
       translate}}</span>
   </button>
 </div>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
index c76cce3982..f8e50c1ba0 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -1,32 +1,45 @@
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../remote-data.utils';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
 
 let component: WorkspaceitemActionsComponent;
 let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
@@ -37,7 +50,7 @@ let authorizationService;
 let authService;
 
 const mockDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
-  delete: jasmine.createSpy('delete')
+  delete: jasmine.createSpy('delete'),
 });
 
 const searchService = getMockSearchService();
@@ -50,28 +63,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
@@ -152,23 +165,23 @@ const ePersonMock: EPerson = Object.assign(new EPerson(), {
 });
 
 authService = jasmine.createSpyObj('authService', {
-  getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore')
+  getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore'),
 });
 
 describe('WorkspaceitemActionsComponent', () => {
   beforeEach(waitForAsync(async () => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
-   await TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         NgbModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [WorkspaceitemActionsComponent],
       providers: [
@@ -179,12 +192,12 @@ describe('WorkspaceitemActionsComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
         { provide: AuthService, useValue:  authService },
-        { provide: AuthorizationDataService, useValue: authorizationService},
-        NgbModal
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        NgbModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceitemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index 05afacf0da..7d340edfb9 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -1,24 +1,35 @@
-import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { Item } from '../../../core/shared/item.model';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject, Observable, switchMap } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  switchMap,
+} from 'rxjs';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
+import { AuthService } from '../../../core/auth/auth.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to WorkspaceItem object.
@@ -69,7 +80,7 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
     protected requestService: RequestService,
     private authService: AuthService,
     public authorizationService: AuthorizationDataService,
-    ) {
+  ) {
     super(WorkspaceItem.type, injector, router, notificationsService, translate, searchService, requestService);
 
   }
@@ -89,7 +100,7 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
               this.handleActionResponse(response.hasSucceeded);
             });
         }
-      }
+      },
     );
   }
 
@@ -104,7 +115,7 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
           getRemoteDataPayload(),
           switchMap((item: Item) => {
             return this.authorizationService.isAuthorized(FeatureID.CanEditItem, item?._links?.self.href, eperson.uuid);
-          })
+          }),
         ) as Observable<boolean>;
       }));
   }
diff --git a/src/app/shared/ng-for-track-by-id.directive.ts b/src/app/shared/ng-for-track-by-id.directive.ts
index 00979bc2bf..5850c0582e 100644
--- a/src/app/shared/ng-for-track-by-id.directive.ts
+++ b/src/app/shared/ng-for-track-by-id.directive.ts
@@ -1,5 +1,8 @@
-import { Directive, Host } from '@angular/core';
 import { NgForOf } from '@angular/common';
+import {
+  Directive,
+  Host,
+} from '@angular/core';
 
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 
diff --git a/src/app/shared/ngrx/dspace-router-state-serializer.ts b/src/app/shared/ngrx/dspace-router-state-serializer.ts
index 46370e3ccd..f8c25540ad 100644
--- a/src/app/shared/ngrx/dspace-router-state-serializer.ts
+++ b/src/app/shared/ngrx/dspace-router-state-serializer.ts
@@ -1,6 +1,9 @@
-import { RouterStateSerializer } from '@ngrx/router-store';
-import { Params, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
+import {
+  Params,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { RouterStateSerializer } from '@ngrx/router-store';
 
 export interface RouterStateUrl {
   url: string;
diff --git a/src/app/shared/ngrx/no-op.action.ts b/src/app/shared/ngrx/no-op.action.ts
index cd05c9c05f..96d03b8f9a 100644
--- a/src/app/shared/ngrx/no-op.action.ts
+++ b/src/app/shared/ngrx/no-op.action.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from './type';
 
 export const NO_OP_ACTION_TYPE = type('dspace/ngrx/NO_OP_ACTION');
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
new file mode 100644
index 0000000000..8e4b5bc2f6
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -0,0 +1,12 @@
+<div role="button"
+     class="w-100 h-100 pt-4 pb-3 px-2 box-container"
+     [ngStyle]="{'background-color': boxConfig.color}"
+     [dsHoverClass]="'shadow-lg'"
+     (click)="onClick(boxConfig)"
+     [title]="boxConfig.description | translate"
+>
+  <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
+    <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+    <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+  </div>
+</div>
diff --git a/src/app/shared/notification-box/notification-box.component.scss b/src/app/shared/notification-box/notification-box.component.scss
new file mode 100644
index 0000000000..3bc1d23248
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.scss
@@ -0,0 +1,8 @@
+.box-container {
+  min-width: max-content;
+}
+
+.box-counter {
+  font-size: calc(var(--bs-font-size-lg) * 1.5);
+}
+
diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts
new file mode 100644
index 0000000000..f78cf5c332
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { NotificationBoxComponent } from './notification-box.component';
+
+describe('NotificationBoxComponent', () => {
+  let component: NotificationBoxComponent;
+  let fixture: ComponentFixture<NotificationBoxComponent>;
+  let mockBoxConfig: AdminNotifyMetricsBox;
+
+  beforeEach(async () => {
+    mockBoxConfig = {
+      'color': '#D4EDDA',
+      'title': 'admin-notify-dashboard.delivered',
+      'config': 'NOTIFY.outgoing.delivered',
+      'count': 79,
+      'description': 'box description',
+    };
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ NotificationBoxComponent ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(NotificationBoxComponent);
+    component = fixture.componentInstance;
+    component.boxConfig = mockBoxConfig;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
new file mode 100644
index 0000000000..f444c1e932
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -0,0 +1,30 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../object-collection/shared/listable-object/listable-object.decorator';
+
+@listableObjectComponent(AdminNotifySearchResult, ViewMode.ListElement)
+@Component({
+  selector: 'ds-notification-box',
+  templateUrl: './notification-box.component.html',
+  styleUrls: ['./notification-box.component.scss'],
+})
+/**
+ * Component to display the count of notifications for each type of LDN message and to access the related filtered search
+ * (each box works as a filter button setting a specific search configuration)
+ */
+export class NotificationBoxComponent {
+  @Input() boxConfig: AdminNotifyMetricsBox;
+  @Output() selectedBoxConfig: EventEmitter<string> = new EventEmitter();
+
+  public onClick(boxConfig: AdminNotifyMetricsBox) {
+    this.selectedBoxConfig.emit(boxConfig.config);
+  }
+}
diff --git a/src/app/shared/notifications/models/notification-options.model.ts b/src/app/shared/notifications/models/notification-options.model.ts
index 65011496b3..12bd25a201 100644
--- a/src/app/shared/notifications/models/notification-options.model.ts
+++ b/src/app/shared/notifications/models/notification-options.model.ts
@@ -12,8 +12,8 @@ export class NotificationOptions implements INotificationOptions {
   public animate: any;
 
   constructor(timeOut = 5000,
-              clickToClose = true,
-              animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
+    clickToClose = true,
+    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
 
     this.timeOut = timeOut;
     this.clickToClose = clickToClose;
diff --git a/src/app/shared/notifications/models/notification.model.ts b/src/app/shared/notifications/models/notification.model.ts
index 98562a19b4..b79ecbc12e 100644
--- a/src/app/shared/notifications/models/notification.model.ts
+++ b/src/app/shared/notifications/models/notification.model.ts
@@ -1,8 +1,12 @@
-import { INotificationOptions, NotificationOptions } from './notification-options.model';
-import { NotificationType } from './notification-type';
-import { isEmpty } from '../../empty.util';
 import { Observable } from 'rxjs';
 
+import { isEmpty } from '../../empty.util';
+import {
+  INotificationOptions,
+  NotificationOptions,
+} from './notification-options.model';
+import { NotificationType } from './notification-type';
+
 export interface INotification {
   id: string;
   type: NotificationType;
@@ -21,11 +25,11 @@ export class Notification implements INotification {
   public html: boolean;
 
   constructor(id: string,
-              type: NotificationType,
-              title?: Observable<string> | string,
-              content?: Observable<string> | string,
-              options?: NotificationOptions,
-              html?: boolean) {
+    type: NotificationType,
+    title?: Observable<string> | string,
+    content?: Observable<string> | string,
+    options?: NotificationOptions,
+    html?: boolean) {
 
     this.id = id;
     this.type = type;
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index befa84cfc0..dae0207493 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -16,10 +16,10 @@
     <div class="d-flex flex-column justify-content-center align-items-center">
       <div class="notification-icon d-flex justify-content-center"><i
         [ngClass]="{'fas fa-2x': true,
-      'fa-check-circle': notification.type == 'alert-success',
-      'fa-times-circle': notification.type == 'alert-danger',
-      'fa-exclamation-triangle': notification.type == 'alert-warning',
-      'fa-info-circle': notification.type == 'alert-info'
+      'fa-check-circle': notification.type === 'alert-success',
+      'fa-times-circle': notification.type === 'alert-danger',
+      'fa-exclamation-triangle': notification.type === 'alert-warning',
+      'fa-info-circle': notification.type === 'alert-info'
       }"></i></div>
     </div>
     <div class="d-flex flex-column justify-content-center align-content-stretch">
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index 06c46b0f5d..ecfc25fee0 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -5,7 +5,8 @@
 }
 
 .close {
-  outline: none !important
+  outline: none !important;
+  opacity: 0.8;
 }
 
 .notification-icon {
diff --git a/src/app/shared/notifications/notification/notification.component.spec.ts b/src/app/shared/notifications/notification/notification.component.spec.ts
index f6de303726..0871d1bae6 100644
--- a/src/app/shared/notifications/notification/notification.component.spec.ts
+++ b/src/app/shared/notifications/notification/notification.component.spec.ts
@@ -1,20 +1,38 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { ChangeDetectorRef, DebugElement } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Store, StoreModule } from '@ngrx/store';
-
-import { NotificationComponent } from './notification.component';
-import { NotificationsService } from '../notifications.service';
+import { storeModuleConfig } from '../../../app.reducer';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { Notification } from '../models/notification.model';
+import { NotificationOptions } from '../models/notification-options.model';
 import { NotificationType } from '../models/notification-type';
 import { notificationsReducer } from '../notifications.reducers';
-import { NotificationOptions } from '../models/notification-options.model';
-import { Notification } from '../models/notification.model';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { storeModuleConfig } from '../../../app.reducer';
-import { BehaviorSubject } from 'rxjs';
+import { NotificationsService } from '../notifications.service';
+import { NotificationComponent } from './notification.component';
 
 describe('NotificationComponent', () => {
 
@@ -29,7 +47,7 @@ describe('NotificationComponent', () => {
   beforeEach(waitForAsync(() => {
     const store: Store<Notification> = jasmine.createSpyObj('store', {
       /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-      notifications: []
+      notifications: [],
     });
 
     TestBed.configureTestingModule({
@@ -40,8 +58,8 @@ describe('NotificationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [NotificationComponent], // declare the test component
       providers: [
@@ -49,7 +67,7 @@ describe('NotificationComponent', () => {
         ChangeDetectorRef,
         NotificationsService,
         TranslateService,
-      ]
+      ],
     }).compileComponents();  // compile template and css
 
   }));
@@ -62,7 +80,7 @@ describe('NotificationComponent', () => {
       type: NotificationType.Info,
       title: 'Notif. title',
       content: 'Notif. content',
-      options: new NotificationOptions()
+      options: new NotificationOptions(),
     };
 
     fixture.detectChanges();
@@ -105,7 +123,7 @@ describe('NotificationComponent', () => {
       title: 'Notif. title',
       content: htmlContent,
       options: new NotificationOptions(),
-      html: true
+      html: true,
     };
 
     fixture.detectChanges();
@@ -129,9 +147,9 @@ describe('NotificationComponent', () => {
         content: 'test',
         options: Object.assign(
           new NotificationOptions(),
-          { timeout: TIMEOUT }
+          { timeout: TIMEOUT },
         ),
-        html: true
+        html: true,
       };
     });
 
diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts
index 6dbda23e61..35081f57d3 100644
--- a/src/app/shared/notifications/notification/notification.component.ts
+++ b/src/app/shared/notifications/notification/notification.component.ts
@@ -1,4 +1,4 @@
-import { Observable, of as observableOf } from 'rxjs';
+import { trigger } from '@angular/animations';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -8,22 +8,64 @@ import {
   OnDestroy,
   OnInit,
   TemplateRef,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-import { trigger } from '@angular/animations';
 import { DomSanitizer } from '@angular/platform-browser';
-import { NotificationsService } from '../notifications.service';
-import { scaleEnter, scaleInState, scaleLeave, scaleOutState } from '../../animations/scale';
-import { rotateEnter, rotateInState, rotateLeave, rotateOutState } from '../../animations/rotate';
-import { fromBottomEnter, fromBottomInState, fromBottomLeave, fromBottomOutState } from '../../animations/fromBottom';
-import { fromRightEnter, fromRightInState, fromRightLeave, fromRightOutState } from '../../animations/fromRight';
-import { fromLeftEnter, fromLeftInState, fromLeftLeave, fromLeftOutState } from '../../animations/fromLeft';
-import { fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState } from '../../animations/fromTop';
-import { fadeInEnter, fadeInState, fadeOutLeave, fadeOutState } from '../../animations/fade';
-import { NotificationAnimationsStatus } from '../models/notification-animations-type';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  first,
+} from 'rxjs/operators';
+
+import {
+  fadeInEnter,
+  fadeInState,
+  fadeOutLeave,
+  fadeOutState,
+} from '../../animations/fade';
+import {
+  fromBottomEnter,
+  fromBottomInState,
+  fromBottomLeave,
+  fromBottomOutState,
+} from '../../animations/fromBottom';
+import {
+  fromLeftEnter,
+  fromLeftInState,
+  fromLeftLeave,
+  fromLeftOutState,
+} from '../../animations/fromLeft';
+import {
+  fromRightEnter,
+  fromRightInState,
+  fromRightLeave,
+  fromRightOutState,
+} from '../../animations/fromRight';
+import {
+  fromTopEnter,
+  fromTopInState,
+  fromTopLeave,
+  fromTopOutState,
+} from '../../animations/fromTop';
+import {
+  rotateEnter,
+  rotateInState,
+  rotateLeave,
+  rotateOutState,
+} from '../../animations/rotate';
+import {
+  scaleEnter,
+  scaleInState,
+  scaleLeave,
+  scaleOutState,
+} from '../../animations/scale';
 import { isNotEmpty } from '../../empty.util';
 import { INotification } from '../models/notification.model';
-import { filter, first } from 'rxjs/operators';
+import { NotificationAnimationsStatus } from '../models/notification-animations-type';
+import { NotificationsService } from '../notifications.service';
 
 @Component({
   selector: 'ds-notification',
@@ -36,12 +78,12 @@ import { filter, first } from 'rxjs/operators';
       fromLeftEnter, fromLeftInState, fromLeftLeave, fromLeftOutState,
       fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState,
       rotateInState, rotateEnter, rotateOutState, rotateLeave,
-      scaleInState, scaleEnter, scaleOutState, scaleLeave
-    ])
+      scaleInState, scaleEnter, scaleOutState, scaleLeave,
+    ]),
   ],
   templateUrl: './notification.component.html',
   styleUrls: ['./notification.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 
 export class NotificationComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
index 08b9585a8c..3d814a996b 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
@@ -1,20 +1,31 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { ChangeDetectorRef } from '@angular/core';
-
-import { NotificationsService } from '../notifications.service';
-import { notificationsReducer } from '../notifications.reducers';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NotificationsBoardComponent } from './notifications-board.component';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { cold } from 'jasmine-marbles';
+import uniqueId from 'lodash/uniqueId';
+
+import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
-import { NotificationComponent } from '../notification/notification.component';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { Notification } from '../models/notification.model';
 import { NotificationType } from '../models/notification-type';
-import uniqueId from 'lodash/uniqueId';
-import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { cold } from 'jasmine-marbles';
+import { NotificationComponent } from '../notification/notification.component';
+import { notificationsReducer } from '../notifications.reducers';
+import { NotificationsService } from '../notifications.service';
+import { NotificationsBoardComponent } from './notifications-board.component';
 
 export const bools = { f: false, t: true };
 
@@ -30,13 +41,13 @@ describe('NotificationsBoardComponent', () => {
         StoreModule.forRoot({ notificationsReducer }, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         })],
       declarations: [NotificationsBoardComponent, NotificationComponent], // declare the test component
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        ChangeDetectorRef]
+        ChangeDetectorRef],
     }).compileComponents();  // compile template and css
   }));
 
@@ -45,7 +56,7 @@ describe('NotificationsBoardComponent', () => {
       .subscribe((state) => {
         const notifications = [
           new Notification(uniqueId(), NotificationType.Success, 'title1', 'content1'),
-          new Notification(uniqueId(), NotificationType.Info, 'title2', 'content2')
+          new Notification(uniqueId(), NotificationType.Info, 'title2', 'content2'),
         ];
         state.notifications = notifications;
       });
@@ -58,7 +69,7 @@ describe('NotificationsBoardComponent', () => {
       maxStack: 5,
       timeOut: 5000,
       clickToClose: true,
-      animate: 'scale'
+      animate: 'scale',
     } as INotificationBoardOptions;
 
     fixture.detectChanges();
@@ -99,10 +110,10 @@ describe('NotificationsBoardComponent', () => {
 
     it('should be passed to all notifications', () => {
       fixture.debugElement.queryAll(By.css('ds-notification'))
-                          .map(node => node.componentInstance)
-                          .forEach(notification => {
-                            expect(notification.isPaused$).toEqual(comp.isPaused$);
-                          });
+        .map(node => node.componentInstance)
+        .forEach(notification => {
+          expect(notification.isPaused$).toEqual(comp.isPaused$);
+        });
     });
   });
 
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 97ae09c1a6..589e1780db 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -5,26 +5,31 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-
-import { select, Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import difference from 'lodash/difference';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
 
-import { NotificationsService } from '../notifications.service';
+import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
-import { notificationsStateSelector } from '../selectors';
 import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
-import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
+import { NotificationsService } from '../notifications.service';
+import { notificationsStateSelector } from '../selectors';
 
 @Component({
   selector: 'ds-notifications-board',
   encapsulation: ViewEncapsulation.None,
   templateUrl: './notifications-board.component.html',
   styleUrls: ['./notifications-board.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NotificationsBoardComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/notifications/notifications.actions.ts b/src/app/shared/notifications/notifications.actions.ts
index bf47ee3ad7..1fa1fab9c7 100644
--- a/src/app/shared/notifications/notifications.actions.ts
+++ b/src/app/shared/notifications/notifications.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 import { INotification } from './models/notification.model';
 
diff --git a/src/app/shared/notifications/notifications.effects.ts b/src/app/shared/notifications/notifications.effects.ts
index 20f2b618cb..c9449af24a 100644
--- a/src/app/shared/notifications/notifications.effects.ts
+++ b/src/app/shared/notifications/notifications.effects.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Actions } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
+
 import { AppState } from '../../app.reducer';
 
 @Injectable()
@@ -10,7 +11,7 @@ export class NotificationsEffects {
    * Authenticate user.
    * @method authenticate
    */
- /* @Effect()
+  /* @Effect()
   public timer: Observable<Action> = this.actions$
     .pipe(ofType(NotificationsActionTypes.NEW_NOTIFICATION_WITH_TIMER),
     // .debounceTime((action: any) => action.payload.options.timeOut)
diff --git a/src/app/shared/notifications/notifications.reducers.spec.ts b/src/app/shared/notifications/notifications.reducers.spec.ts
index fde92e8891..7bfebf2a65 100644
--- a/src/app/shared/notifications/notifications.reducers.spec.ts
+++ b/src/app/shared/notifications/notifications.reducers.spec.ts
@@ -1,17 +1,22 @@
-import { notificationsReducer } from './notifications.reducers';
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
-import { NotificationsService } from './notifications.service';
-import { fakeAsync, flush, inject, TestBed, tick } from '@angular/core/testing';
-import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
-import { StoreModule } from '@ngrx/store';
-import { NotificationComponent } from './notification/notification.component';
-import { NotificationOptions } from './models/notification-options.model';
-import { NotificationAnimationsType } from './models/notification-animations-type';
-import { NotificationType } from './models/notification-type';
-import { Notification } from './models/notification.model';
-import uniqueId from 'lodash/uniqueId';
 import { ChangeDetectorRef } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { StoreModule } from '@ngrx/store';
+import uniqueId from 'lodash/uniqueId';
+
 import { storeModuleConfig } from '../../app.reducer';
+import { Notification } from './models/notification.model';
+import { NotificationAnimationsType } from './models/notification-animations-type';
+import { NotificationOptions } from './models/notification-options.model';
+import { NotificationType } from './models/notification-type';
+import { NotificationComponent } from './notification/notification.component';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
+import { notificationsReducer } from './notifications.reducers';
+import { NotificationsService } from './notifications.service';
+import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
 
 describe('Notifications reducer', () => {
 
@@ -31,7 +36,7 @@ describe('Notifications reducer', () => {
       ],
       imports: [
         StoreModule.forRoot({ notificationsReducer }, storeModuleConfig),
-      ]
+      ],
     });
 
     options = new NotificationOptions(
@@ -106,38 +111,4 @@ describe('Notifications reducer', () => {
     expect(state3.length).toEqual(0);
   });
 
-  it('should create 2 notifications and check they close after different timeout', fakeAsync(() => {
-    inject([ChangeDetectorRef], (cdr: ChangeDetectorRef) => {
-      const optionsWithTimeout = new NotificationOptions(
-        1000,
-        true,
-        NotificationAnimationsType.Rotate);
-      // Timeout 1000ms
-      const notification = new Notification(uniqueId(), NotificationType.Success, 'title', 'content', optionsWithTimeout, null);
-      const state = notificationsReducer(undefined, new NewNotificationAction(notification));
-      expect(state.length).toEqual(1);
-
-      // Timeout default 5000ms
-      const notificationBis = new Notification(uniqueId(), NotificationType.Success, 'title', 'content');
-      const stateBis = notificationsReducer(state, new NewNotificationAction(notification));
-      expect(stateBis.length).toEqual(2);
-
-      tick(1000);
-      cdr.detectChanges();
-
-      const action = new NewNotificationAction(notification);
-      action.type = 'NothingToDo, return only the state';
-
-      const lastState = notificationsReducer(stateBis, action);
-      expect(lastState.length).toEqual(1);
-
-      flush();
-      cdr.detectChanges();
-
-      const finalState = notificationsReducer(lastState, action);
-      expect(finalState.length).toEqual(0);
-    });
-
-  }));
-
 });
diff --git a/src/app/shared/notifications/notifications.reducers.ts b/src/app/shared/notifications/notifications.reducers.ts
index f64cd891eb..02a41023eb 100644
--- a/src/app/shared/notifications/notifications.reducers.ts
+++ b/src/app/shared/notifications/notifications.reducers.ts
@@ -1,5 +1,9 @@
-import { NotificationsActions, NotificationsActionTypes, RemoveNotificationAction } from './notifications.actions';
 import { INotification } from './models/notification.model';
+import {
+  NotificationsActions,
+  NotificationsActionTypes,
+  RemoveNotificationAction,
+} from './notifications.actions';
 
 /**
  * The notification state.
diff --git a/src/app/shared/notifications/notifications.service.spec.ts b/src/app/shared/notifications/notifications.service.spec.ts
index 92c74e0017..fb7c9e4f5a 100644
--- a/src/app/shared/notifications/notifications.service.spec.ts
+++ b/src/app/shared/notifications/notifications.service.spec.ts
@@ -1,21 +1,36 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NotificationsService } from './notifications.service';
-import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
-import { NotificationComponent } from './notification/notification.component';
-import { Store, StoreModule } from '@ngrx/store';
-import { notificationsReducer } from './notifications.reducers';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
+
+import { storeModuleConfig } from '../../app.reducer';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { Notification } from './models/notification.model';
 import { NotificationType } from './models/notification-type';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { storeModuleConfig } from '../../app.reducer';
+import { NotificationComponent } from './notification/notification.component';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
+import { notificationsReducer } from './notifications.reducers';
+import { NotificationsService } from './notifications.service';
+import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
 
 describe('NotificationsService test', () => {
   const store: Store<Notification> = jasmine.createSpyObj('store', {
     dispatch: {},
-    select: observableOf(true)
+    select: observableOf(true),
   });
   let service: NotificationsService;
 
@@ -26,16 +41,16 @@ describe('NotificationsService test', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [NotificationComponent, NotificationsBoardComponent],
       providers: [
         { provide: Store, useValue: store },
         NotificationsService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     });
 
     service = TestBed.inject(NotificationsService);
diff --git a/src/app/shared/notifications/notifications.service.ts b/src/app/shared/notifications/notifications.service.ts
index d37d6a349b..a2498a61e9 100644
--- a/src/app/shared/notifications/notifications.service.ts
+++ b/src/app/shared/notifications/notifications.service.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
-import { first } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import uniqueId from 'lodash/uniqueId';
+import { of as observableOf } from 'rxjs';
+import { first } from 'rxjs/operators';
 
-import { INotification, Notification } from './models/notification.model';
-import { NotificationType } from './models/notification-type';
-import { NotificationOptions } from './models/notification-options.model';
-
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
 import { environment } from '../../../environments/environment';
+import {
+  INotification,
+  Notification,
+} from './models/notification.model';
+import { NotificationOptions } from './models/notification-options.model';
+import { NotificationType } from './models/notification-type';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
 
 @Injectable()
 export class NotificationsService {
@@ -21,15 +26,14 @@ export class NotificationsService {
   }
 
   private add(notification: Notification) {
-    let notificationAction;
-    notificationAction = new NewNotificationAction(notification);
+    const notificationAction = new NewNotificationAction(notification);
     this.store.dispatch(notificationAction);
   }
 
   success(title: any = observableOf(''),
-          content: any = observableOf(''),
-          options: Partial<NotificationOptions> = {},
-          html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Success, title, content, notificationOptions, html);
     this.add(notification);
@@ -37,9 +41,9 @@ export class NotificationsService {
   }
 
   error(title: any = observableOf(''),
-        content: any = observableOf(''),
-        options: Partial<NotificationOptions> = {},
-        html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Error, title, content, notificationOptions, html);
     this.add(notification);
@@ -47,9 +51,9 @@ export class NotificationsService {
   }
 
   info(title: any = observableOf(''),
-       content: any = observableOf(''),
-       options: Partial<NotificationOptions> = {},
-       html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Info, title, content, notificationOptions, html);
     this.add(notification);
@@ -57,9 +61,9 @@ export class NotificationsService {
   }
 
   warning(title: any = observableOf(''),
-          content: any = observableOf(''),
-          options: NotificationOptions = this.getDefaultOptions(),
-          html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: NotificationOptions = this.getDefaultOptions(),
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Warning, title, content, notificationOptions, html);
     this.add(notification);
@@ -67,11 +71,11 @@ export class NotificationsService {
   }
 
   notificationWithAnchor(notificationType: NotificationType,
-                         options: NotificationOptions,
-                         href: string,
-                         hrefTranslateLabel: string,
-                         messageTranslateLabel: string,
-                         interpolateParam: string) {
+    options: NotificationOptions,
+    href: string,
+    hrefTranslateLabel: string,
+    messageTranslateLabel: string,
+    interpolateParam: string) {
     this.translate.get(hrefTranslateLabel)
       .pipe(first())
       .subscribe((hrefMsg) => {
@@ -115,7 +119,7 @@ export class NotificationsService {
     return new NotificationOptions(
       environment.notifications.timeOut,
       environment.notifications.clickToClose,
-      environment.notifications.animate
+      environment.notifications.animate,
     );
   }
 }
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 3b0dca80ac..179a70bfd7 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -58,3 +58,19 @@
 </ds-object-detail>
 
 
+<ds-object-table  [config]="config"
+                  [sortConfig]="sortConfig"
+                  [objects]="objects"
+                  [hideGear]="hideGear"
+                  [linkType]="linkType"
+                  [context]="context"
+                  [hidePaginationDetail]="hidePaginationDetail"
+                  [showPaginator]="showPaginator"
+                  [showThumbnails]="showThumbnails"
+                  (paginationChange)="onPaginationChange($event)"
+                  (pageChange)="onPageChange($event)"
+                  (pageSizeChange)="onPageSizeChange($event)"
+                  (sortDirectionChange)="onSortDirectionChange($event)"
+                  (sortFieldChange)="onSortFieldChange($event)"
+                  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
+</ds-object-table>
diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
index 1619e56b0d..a5fda69061 100644
--- a/src/app/shared/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -1,11 +1,19 @@
-import { ObjectCollectionComponent } from './object-collection.component';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
-import { RouterStub } from '../testing/router.stub';
+
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { RouterStub } from '../testing/router.stub';
+import { ObjectCollectionComponent } from './object-collection.component';
 
 describe('ObjectCollectionComponent', () => {
   let fixture: ComponentFixture<ObjectCollectionComponent>;
@@ -16,17 +24,17 @@ describe('ObjectCollectionComponent', () => {
   const activatedRouteStub = {
     queryParams: observableOf({
       query: queryParam,
-      scope: scopeParam
-    })
+      scope: scopeParam,
+    }),
   };
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ObjectCollectionComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Router, useClass: RouterStub }
+        { provide: Router, useClass: RouterStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index e1f9182562..e957431c70 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,28 +1,39 @@
+import { isPlatformBrowser } from '@angular/common';
 import {
   ChangeDetectorRef,
-  Component, ElementRef,
-  EventEmitter, Inject,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Inject,
   Input,
   OnInit,
-  Output, PLATFORM_ID,
+  Output,
+  PLATFORM_ID,
 } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 
-import { RemoteData } from '../../core/data/remote-data';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { ListableObject } from './shared/listable-object.model';
-import { isEmpty } from '../empty.util';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { CollectionElementLinkType } from './collection-element-link.type';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { Context } from '../../core/shared/context.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { isEmpty } from '../empty.util';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { setPlaceHolderAttributes } from '../utils/object-list-utils';
-import { isPlatformBrowser } from '@angular/common';
+import { CollectionElementLinkType } from './collection-element-link.type';
+import { ListableObject } from './shared/listable-object.model';
 
 /**
  * Component that can render a list of listable objects in different view modes
@@ -189,7 +200,7 @@ export class ObjectCollectionComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private elementRef: ElementRef,
-    @Inject(PLATFORM_ID) private platformId: Object) {
+    @Inject(PLATFORM_ID) private platformId: any) {
   }
 
   ngOnInit(): void {
@@ -197,7 +208,7 @@ export class ObjectCollectionComponent implements OnInit {
       .queryParams
       .pipe(
         map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
-        distinctUntilChanged()
+        distinctUntilChanged(),
       );
     if (isPlatformBrowser(this.platformId)) {
       const width = this.elementRef.nativeElement.offsetWidth;
@@ -248,14 +259,14 @@ export class ObjectCollectionComponent implements OnInit {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
index a0180a761a..5b20860684 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="showAccessStatus">
   <span *ngIf="accessStatus$ | async as accessStatus">
-    <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
+    <span [class]="'badge badge-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
   </span>
 </ng-container>
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
index f661ed6e00..90b2f373a0 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
@@ -1,15 +1,20 @@
-import { Item } from '../../../../../core/shared/item.model';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { AccessStatusBadgeComponent } from './access-status-badge.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AccessStatusObject } from './access-status.model';
+import { TranslateModule } from '@ngx-translate/core';
 import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
 import { environment } from 'src/environments/environment';
 
+import { Item } from '../../../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { AccessStatusObject } from './access-status.model';
+import { AccessStatusBadgeComponent } from './access-status-badge.component';
+
 describe('ItemAccessStatusBadgeComponent', () => {
   let component: AccessStatusBadgeComponent;
   let fixture: ComponentFixture<AccessStatusBadgeComponent>;
@@ -26,32 +31,32 @@ describe('ItemAccessStatusBadgeComponent', () => {
 
   function init() {
     unknownStatus = Object.assign(new AccessStatusObject(), {
-      status: 'unknown'
+      status: 'unknown',
     });
 
     metadataOnlyStatus = Object.assign(new AccessStatusObject(), {
-      status: 'metadata.only'
+      status: 'metadata.only',
     });
 
     openAccessStatus = Object.assign(new AccessStatusObject(), {
-      status: 'open.access'
+      status: 'open.access',
     });
 
     embargoStatus = Object.assign(new AccessStatusObject(), {
-      status: 'embargo'
+      status: 'embargo',
     });
 
     restrictedStatus = Object.assign(new AccessStatusObject(), {
-      status: 'restricted'
+      status: 'restricted',
     });
 
     accessStatusDataService = jasmine.createSpyObj('accessStatusDataService', {
-      findAccessStatusFor: createSuccessfulRemoteDataObject$(unknownStatus)
+      findAccessStatusFor: createSuccessfulRemoteDataObject$(unknownStatus),
     });
 
     item = Object.assign(new Item(), {
       uuid: 'item-uuid',
-      type: 'item'
+      type: 'item',
     });
   }
 
@@ -61,8 +66,8 @@ describe('ItemAccessStatusBadgeComponent', () => {
       declarations: [AccessStatusBadgeComponent, TruncatePipe],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
-        {provide: AccessStatusDataService, useValue: accessStatusDataService}
-      ]
+        { provide: AccessStatusDataService, useValue: accessStatusDataService },
+      ],
     }).compileComponents();
   }
 
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 2be44669b0..e76ab1eaa8 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,17 +1,29 @@
-import { Component, Input } from '@angular/core';
-import { catchError, map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
-import { AccessStatusObject } from './access-status.model';
-import { hasValue } from '../../../../empty.util';
-import { environment } from 'src/environments/environment';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
+import { environment } from 'src/environments/environment';
+
 import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ITEM } from '../../../../../core/shared/item.resource-type';
+import { hasValue } from '../../../../empty.util';
+import { AccessStatusObject } from './access-status.model';
 
 @Component({
   selector: 'ds-access-status-badge',
-  templateUrl: './access-status-badge.component.html'
+  templateUrl: './access-status-badge.component.html',
+  styleUrls: ['./access-status-badge.component.scss'],
 })
 /**
  * Component rendering the access status of an item as a badge
@@ -26,6 +38,16 @@ export class AccessStatusBadgeComponent {
    */
   showAccessStatus: boolean;
 
+  /**
+   * Value based stylesheet class for access status badge
+   */
+  accessStatusClass: string;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
   /**
    * Initialize instance variables
    *
@@ -55,7 +77,20 @@ export class AccessStatusBadgeComponent {
       }),
       map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
       map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
-      catchError(() => observableOf('access-status.unknown.listelement.badge'))
+      catchError(() => observableOf('access-status.unknown.listelement.badge')),
+    );
+
+    // stylesheet based on the access status value
+    this.subs.push(
+      this.accessStatus$.pipe(
+        map((accessStatusClass: string) => accessStatusClass.replace(/\./g, '-')),
+      ).subscribe((accessStatusClass: string) => {
+        this.accessStatusClass = accessStatusClass;
+      }),
     );
   }
+
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
 }
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
index 69b5e920d0..aee3967d0f 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
@@ -1,9 +1,13 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 import { typedObject } from 'src/app/core/cache/builders/build-decorators';
 import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
 import { HALLink } from 'src/app/core/shared/hal-link.model';
 import { ResourceType } from 'src/app/core/shared/resource-type';
 import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+
 import { ACCESS_STATUS } from './access-status.resource-type';
 
 @typedObject
@@ -15,19 +19,19 @@ export class AccessStatusObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The access status value
    */
   @autoserialize
-  status: string;
+    status: string;
 
   /**
    * The {@link HALLink}s for this AccessStatusObject
    */
    @deserialize
-   _links: {
+     _links: {
      self: HALLink;
    };
 }
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts
index ad8dfd7cb0..c44ca18b13 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { AccessStatusBadgeComponent } from './access-status-badge.component';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 /**
  * Themed wrapper for AccessStatusBadgeComponent
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.spec.ts b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
index 9e0c277a08..4f212f7f57 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BadgesComponent } from './badges.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ThemeService } from '../../../theme-support/theme.service';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
 import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { BadgesComponent } from './badges.component';
 
 describe('BadgesComponent', () => {
   let component: BadgesComponent;
@@ -12,10 +15,10 @@ describe('BadgesComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [ BadgesComponent ],
-      providers: [{provide: ThemeService, useValue: getMockThemeService()}],
-      schemas: [NO_ERRORS_SCHEMA]
+      providers: [{ provide: ThemeService, useValue: getMockThemeService() }],
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts
index c66fed35fc..a0d8326276 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,5 +1,9 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Context } from 'src/app/core/shared/context.model';
+
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 
 /**
@@ -12,7 +16,7 @@ const MY_DSPACE_STATUS_CONTEXTS = [
   Context.MyDSpaceDeclined,
   Context.MyDSpaceApproved,
   Context.MyDSpaceWaitingController,
-  Context.MyDSpaceValidation
+  Context.MyDSpaceValidation,
 ];
 
 /**
@@ -21,7 +25,7 @@ const MY_DSPACE_STATUS_CONTEXTS = [
 @Component({
   selector: 'ds-badges',
   templateUrl: './badges.component.html',
-  styleUrls: ['./badges.component.scss']
+  styleUrls: ['./badges.component.scss'],
 })
 export class BadgesComponent {
   /**
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
index 65fe5b7ef1..276b0e9fe3 100644
--- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
@@ -1,17 +1,26 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { Context } from '../../../../../core/shared/context.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../../core/tasks/models/pool-task-object.model';
+import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
 import { EPersonMock } from '../../../../testing/eperson.mock';
 import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
-import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
-import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { Context } from '../../../../../core/shared/context.model';
 
 let component: MyDSpaceStatusBadgeComponent;
 let fixture: ComponentFixture<MyDSpaceStatusBadgeComponent>;
@@ -30,14 +39,14 @@ describe('MyDSpaceItemStatusComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [MyDSpaceStatusBadgeComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MyDSpaceStatusBadgeComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
index 744a927812..5996deaba6 100644
--- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Context } from 'src/app/core/shared/context.model';
 
 /**
@@ -7,7 +11,7 @@ import { Context } from 'src/app/core/shared/context.model';
 @Component({
   selector: 'ds-my-dspace-status-badge',
   styleUrls: ['./my-dspace-status-badge.component.scss'],
-  templateUrl: './my-dspace-status-badge.component.html'
+  templateUrl: './my-dspace-status-badge.component.html',
 })
 export class MyDSpaceStatusBadgeComponent implements OnInit {
 
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
index 4c375746c8..5589645505 100644
--- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
@@ -1,5 +1,9 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Context } from 'src/app/core/shared/context.model';
+
 import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
 
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
index f3115073c3..f5de762353 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
@@ -1,9 +1,17 @@
-import { Item } from '../../../../../core/shared/item.model';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { StatusBadgeComponent } from './status-badge.component';
 
 let comp: StatusBadgeComponent;
@@ -19,9 +27,9 @@ describe('ItemStatusBadgeComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [StatusBadgeComponent, TruncatePipe],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(StatusBadgeComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
     init();
   }));
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index a52f3f6f32..5f188f6281 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,10 +1,15 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { hasValue } from '../../../../empty.util';
 
 @Component({
   selector: 'ds-status-badge',
-  templateUrl: './status-badge.component.html'
+  templateUrl: './status-badge.component.html',
 })
 /**
  * Component rendering the status of an item as a badge
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
index f50d029fff..0c56472618 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { StatusBadgeComponent } from './status-badge.component';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 /**
  * Themed wrapper for StatusBadgeComponent
diff --git a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
index 1671b0c5b0..c3157318e6 100644
--- a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
@@ -1,9 +1,13 @@
-import { Component, Input } from '@angular/core';
-import { BadgesComponent } from './badges.component';
-import { ThemedComponent } from '../../../theme-support/themed.component';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Context } from 'src/app/core/shared/context.model';
 
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../theme-support/themed.component';
+import { BadgesComponent } from './badges.component';
+
 /**
  * Themed wrapper for BadgesComponent
  */
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
index a8dd0ee04c..b5c7263014 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { TypeBadgeComponent } from './type-badge.component';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 /**
  * Themed wrapper for TypeBadgeComponent
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
index 87adc3761a..ed13384b7f 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
@@ -1,10 +1,18 @@
-import { Item } from '../../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TypeBadgeComponent } from './type-badge.component';
 
 let comp: TypeBadgeComponent;
@@ -18,10 +26,10 @@ const mockItemWithEntityType = Object.assign(new Item(), {
     'dspace.entity.type': [
       {
         language: 'en_US',
-        value: type
-      }
-    ]
-  }
+        value: type,
+      },
+    ],
+  },
 });
 
 const mockItemWithoutEntityType = Object.assign(new Item(), {
@@ -30,10 +38,10 @@ const mockItemWithoutEntityType = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ItemTypeBadgeComponent', () => {
@@ -41,9 +49,9 @@ describe('ItemTypeBadgeComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [TypeBadgeComponent, TruncatePipe],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TypeBadgeComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index ea912063b6..4e10267ed1 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,11 +1,18 @@
-import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
-import { hasValue, isEmpty } from '../../../../empty.util';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { getResourceTypeValueFor } from '../../../../../core/cache/object-cache.reducer';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../empty.util';
 
 @Component({
   selector: 'ds-type-badge',
-  templateUrl: './type-badge.component.html'
+  templateUrl: './type-badge.component.html',
 })
 /**
  * Component rendering the type of an item as a badge
diff --git a/src/app/shared/object-collection/shared/collection-search-result.model.ts b/src/app/shared/object-collection/shared/collection-search-result.model.ts
index 615ef0809c..bd2f547808 100644
--- a/src/app/shared/object-collection/shared/collection-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/collection-search-result.model.ts
@@ -1,5 +1,5 @@
-import { SearchResult } from '../../search/models/search-result.model';
 import { Collection } from '../../../core/shared/collection.model';
+import { SearchResult } from '../../search/models/search-result.model';
 import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Collection)
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
index f381a02d86..2e169e091b 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
@@ -1,9 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-importable-list-item-control',
-  templateUrl: './importable-list-item-control.component.html'
+  templateUrl: './importable-list-item-control.component.html',
 })
 /**
  * Component adding an import button to a list item
diff --git a/src/app/shared/object-collection/shared/item-search-result.model.ts b/src/app/shared/object-collection/shared/item-search-result.model.ts
index 66f3eb1513..5409bdbec7 100644
--- a/src/app/shared/object-collection/shared/item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/item-search-result.model.ts
@@ -1,9 +1,9 @@
-import { SearchResult } from '../../search/models/search-result.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { Item } from '../../../core/shared/item.model';
 import { inheritEquatable } from '../../../core/utilities/equals.decorators';
-import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { ListableObject } from './listable-object.model';
+import { SearchResult } from '../../search/models/search-result.model';
 import { searchResultFor } from '../../search/search-result-element-decorator';
+import { ListableObject } from './listable-object.model';
 
 @searchResultFor(Item)
 @inheritEquatable(SearchResult)
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
deleted file mode 100644
index 58561f0277..0000000000
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-template dsListableObject></ng-template>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e893fe807b..929644661b 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -1,24 +1,32 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
-import { ListableObject } from '../listable-object.model';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { Context } from '../../../../core/shared/context.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 import {
-  ItemListElementComponent
-} from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
-import { ListableObjectDirective } from './listable-object.directive';
-import { TranslateModule } from '@ngx-translate/core';
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { ItemListElementComponent } from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { ListableObject } from '../listable-object.model';
+import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
 
 const testType = 'TestType';
 const testContext = Context.Search;
 const testViewMode = ViewMode.StandalonePage;
 
-class TestType extends ListableObject {
+export class TestType extends ListableObject {
   getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
     return [testType];
   }
@@ -36,17 +44,17 @@ describe('ListableObjectComponentLoaderComponent', () => {
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, ListableObjectDirective],
+      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, DynamicComponentLoaderDirective],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         provideMockStore({}),
         { provide: ThemeService, useValue: themeService },
-      ]
+      ],
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ItemListElementComponent]
-      }
+        entryComponents: [ItemListElementComponent],
+      },
     }).compileComponents();
   }));
 
@@ -65,7 +73,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
 
   describe('When the component is rendered', () => {
     it('should call the getListableObjectComponent function with the right types, view mode and context', () => {
-      expect(comp.getComponent).toHaveBeenCalledWith([testType], testViewMode, testContext);
+      expect(comp.getComponent).toHaveBeenCalled();
     });
 
     it('should connectInputsAndOutputs of loaded component', () => {
@@ -78,29 +86,29 @@ describe('ListableObjectComponentLoaderComponent', () => {
     let reloadedObject: any;
 
     beforeEach(() => {
-      spyOn((comp as any), 'instantiateComponent').and.returnValue(null);
-      spyOn((comp as any).contentChange, 'emit').and.returnValue(null);
+      spyOn(comp, 'instantiateComponent').and.returnValue(null);
+      spyOn(comp.contentChange, 'emit').and.returnValue(null);
 
       listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
       reloadedObject = 'object';
     });
 
     it('should re-instantiate the listable component', fakeAsync(() => {
-      expect((comp as any).instantiateComponent).not.toHaveBeenCalled();
+      expect(comp.instantiateComponent).not.toHaveBeenCalled();
 
-      (listableComponent as any).reloadedObject.emit(reloadedObject);
+      listableComponent.reloadedObject.emit(reloadedObject);
       tick(200);
 
-      expect((comp as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject, undefined);
+      expect(comp.instantiateComponent).toHaveBeenCalledWith();
     }));
 
     it('should re-emit it as a contentChange', fakeAsync(() => {
-      expect((comp as any).contentChange.emit).not.toHaveBeenCalled();
+      expect(comp.contentChange.emit).not.toHaveBeenCalled();
 
-      (listableComponent as any).reloadedObject.emit(reloadedObject);
+      listableComponent.reloadedObject.emit(reloadedObject);
       tick(200);
 
-      expect((comp as any).contentChange.emit).toHaveBeenCalledWith(reloadedObject);
+      expect(comp.contentChange.emit).toHaveBeenCalledWith(reloadedObject);
     }));
 
   });
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 7a3cc42bf5..0f3d95e5cd 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -1,40 +1,32 @@
 import {
   ChangeDetectorRef,
   Component,
-  ComponentRef,
   EventEmitter,
   Input,
-  OnChanges,
-  OnDestroy,
-  OnInit,
   Output,
-  SimpleChanges,
-  ViewChild
 } from '@angular/core';
-
-import { Subscription, combineLatest, of as observableOf, Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import { ListableObject } from '../listable-object.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Context } from '../../../../core/shared/context.model';
-import { getListableObjectComponent } from './listable-object.decorator';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from './listable-object.directive';
-import { CollectionElementLinkType } from '../../collection-element-link.type';
-import { hasValue, isNotEmpty, hasNoValue } from '../../../empty.util';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+import { getListableObjectComponent } from './listable-object.decorator';
 
 @Component({
   selector: 'ds-listable-object-component-loader',
   styleUrls: ['./listable-object-component-loader.component.scss'],
-  templateUrl: './listable-object-component-loader.component.html'
+  templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
  */
-export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges, OnDestroy {
+export class ListableObjectComponentLoaderComponent extends AbstractComponentLoaderComponent<Component> {
+
   /**
    * The item or metadata to determine the component for
    */
@@ -73,115 +65,60 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
   /**
    * Whether to show the thumbnail preview
    */
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   /**
    * The value to display for this element
    */
   @Input() value: string;
 
-  /**
-   * Directive hook used to place the dynamic child component
-   */
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
-
   /**
    * Emit when the listable object has been reloaded.
    */
   @Output() contentChange = new EventEmitter<ListableObject>();
 
-  /**
-   * Array to track all subscriptions and unsubscribe them onDestroy
-   * @type {Array}
-   */
-  protected subs: Subscription[] = [];
-
-  /**
-   * The reference to the dynamic component
-   */
-  protected compRef: ComponentRef<Component>;
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'object',
+    'viewMode',
+    'context',
+  ];
 
   /**
    * The list of input and output names for the dynamic component
    */
-  protected inAndOutputNames: string[] = [
+  protected inputNames: (keyof this & string)[] = [
     'object',
     'index',
+    'context',
     'linkType',
     'listID',
     'showLabel',
     'showThumbnails',
-    'context',
     'viewMode',
     'value',
-    'hideBadges',
+  ];
+
+  protected outputNames: (keyof this & string)[] = [
     'contentChange',
   ];
 
-  constructor(private cdr: ChangeDetectorRef, private themeService: ThemeService) {
+  constructor(
+    protected themeService: ThemeService,
+    protected cdr: ChangeDetectorRef,
+  ) {
+    super(themeService);
   }
 
-  /**
-   * Setup the dynamic child component
-   */
-  ngOnInit(): void {
-    this.instantiateComponent(this.object);
-  }
-
-  /**
-   * Whenever the inputs change, update the inputs of the dynamic component
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.compRef)) {
-      // sometimes the component has not been initialized yet, so it first needs to be initialized
-      // before being called again
-      this.instantiateComponent(this.object, changes);
-    } else {
-      // if an input or output has changed
-      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
-        this.connectInputsAndOutputs();
-        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
-          (this.compRef.instance as any).ngOnChanges(changes);
-        }
-      }
-    }
-  }
-
-  ngOnDestroy() {
-    this.subs
-      .filter((subscription) => hasValue(subscription))
-      .forEach((subscription) => subscription.unsubscribe());
-  }
-
-  private instantiateComponent(object: ListableObject, changes?: SimpleChanges): void {
-
-    const component = this.getComponent(object.getRenderTypes(), this.viewMode, this.context);
-
-    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-    viewContainerRef.clear();
-
-    this.compRef = viewContainerRef.createComponent(
-      component, {
-        index: 0,
-        injector: undefined
-      }
-    );
-
-    if (hasValue(changes)) {
-      this.ngOnChanges(changes);
-    } else {
-      this.connectInputsAndOutputs();
-    }
-
+  public instantiateComponent(): void {
+    super.instantiateComponent();
     if ((this.compRef.instance as any).reloadedObject) {
-      combineLatest([
-        observableOf(changes),
-        (this.compRef.instance as any).reloadedObject.pipe(take(1)) as Observable<DSpaceObject>,
-      ]).subscribe(([simpleChanges, reloadedObject]: [SimpleChanges, DSpaceObject]) => {
+      (this.compRef.instance as any).reloadedObject.pipe(
+        take(1),
+      ).subscribe((reloadedObject: DSpaceObject) => {
         if (reloadedObject) {
-          this.compRef.destroy();
+          this.destroyComponentInstance();
           this.object = reloadedObject;
-          this.instantiateComponent(reloadedObject, simpleChanges);
+          this.instantiateComponent();
           this.cdr.detectChanges();
           this.contentChange.emit(reloadedObject);
         }
@@ -189,26 +126,8 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
     }
   }
 
-  /**
-   * Fetch the component depending on the item's entity type, view mode and context
-   * @returns {GenericConstructor<Component>}
-   */
-  getComponent(renderTypes: (string | GenericConstructor<ListableObject>)[],
-               viewMode: ViewMode,
-               context: Context): GenericConstructor<Component> {
-    return getListableObjectComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
-  }
-
-  /**
-   * Connect the in and outputs of this component to the dynamic component,
-   * to ensure they're in sync
-   */
-  protected connectInputsAndOutputs(): void {
-    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
-      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
-        this.compRef.instance[name] = this[name];
-      });
-    }
+  public getComponent(): GenericConstructor<Component> {
+    return getListableObjectComponent(this.object.getRenderTypes(), this.viewMode, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
index f7d00510f6..4487b24033 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
@@ -1,8 +1,12 @@
-  /* eslint-disable max-classes-per-file */
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { DEFAULT_VIEW_MODE, getListableObjectComponent, listableObjectComponent } from './listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
+/* eslint-disable max-classes-per-file */
 import { environment } from '../../../../../environments/environment';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  DEFAULT_VIEW_MODE,
+  getListableObjectComponent,
+  listableObjectComponent,
+} from './listable-object.decorator';
 
 let ogEnvironmentThemes;
 
@@ -145,7 +149,7 @@ describe('ListableObject decorator function', () => {
           },
           {
             name: 'ancestor',         // Matches typeAncestor, but not typeUnthemed
-          }
+          },
         ];
       });
 
@@ -174,7 +178,7 @@ describe('ListableObject decorator function', () => {
         expect(() => {
           getListableObjectComponent([typeAncestor], ViewMode.ListElement, Context.Any, 'extension-cycle');
         }).toThrowError(
-          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1'
+          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1',
         );
       });
     });
@@ -185,7 +189,7 @@ describe('ListableObject decorator function', () => {
       environment.themes = [
         {
           name: 'custom',
-        }
+        },
       ];
     });
 
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index e5654e63e0..8038833902 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -1,12 +1,17 @@
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Context } from '../../../../core/shared/context.model';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { ListableObject } from '../listable-object.model';
-import { environment } from '../../../../../environments/environment';
-import { ThemeConfig } from '../../../../../config/theme.model';
 import { InjectionToken } from '@angular/core';
 
+import { ThemeConfig } from '../../../../../config/theme.config';
+import { environment } from '../../../../../environments/environment';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ListableObject } from '../listable-object.model';
+
 export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
 export const DEFAULT_CONTEXT = Context.Any;
 export const DEFAULT_THEME = '*';
@@ -34,7 +39,7 @@ export const DEFAULT_THEME = '*';
  * - { level: 1, relevancy: 1 } is less relevant than { level: 2, relevancy: 0 }
  * - { level: 1, relevancy: 1 } is more relevant than null
  */
-class MatchRelevancy {
+export class MatchRelevancy {
   constructor(public match: any,
               public level: number,
               public relevancy: number) {
@@ -63,7 +68,7 @@ class MatchRelevancy {
  */
 export const GET_THEME_CONFIG_FOR_FACTORY = new InjectionToken<(str) => ThemeConfig>('getThemeConfigFor', {
   providedIn: 'root',
-  factory: () => getThemeConfigFor
+  factory: () => getThemeConfigFor,
 });
 
 const map = new Map();
@@ -133,7 +138,7 @@ export function getListableObjectComponent(types: (string | GenericConstructor<L
  * @param defaults        the default values to use for each level, in case no value is found for the key at that index
  * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
  */
-function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
+export function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
   let currentMap = typeMap;
   let level = -1;
   let relevancy = 0;
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
index 87f79d3570..386e6b0877 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
@@ -1,16 +1,25 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { EMPTY, Observable } from 'rxjs';
-import { map, mergeMap } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotEmpty } from '../../../empty.util';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { Collection } from '../../../../core/shared/collection.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { LinkService } from '../../../../core/cache/builders/link.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { isNotEmpty } from '../../../empty.util';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 /**
  * This component represents a badge with collection information.
@@ -18,7 +27,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-item-collection',
   styleUrls: ['./item-collection.component.scss'],
-  templateUrl: './item-collection.component.html'
+  templateUrl: './item-collection.component.html',
 })
 export class ItemCollectionComponent implements OnInit {
 
@@ -44,9 +53,9 @@ export class ItemCollectionComponent implements OnInit {
   ngOnInit() {
 
     this.linkService.resolveLinks(this.object, followLink('workflowitem', {
-      isOptional: true
+      isOptional: true,
     },
-      followLink('collection',{})
+    followLink('collection',{}),
     ));
     this.collection$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
       getFirstCompletedRemoteData(),
@@ -60,7 +69,7 @@ export class ItemCollectionComponent implements OnInit {
               } else {
                 return null;
               }
-            })
+            }),
           );
         } else {
           return EMPTY;
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
index abaf029155..9c588e49a5 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
@@ -1,18 +1,29 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { ItemSubmitterComponent } from './item-submitter.component';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
-import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { EPersonMock } from '../../../testing/eperson.mock';
+import { ItemSubmitterComponent } from './item-submitter.component';
 
 let component: ItemSubmitterComponent;
 let fixture: ComponentFixture<ItemSubmitterComponent>;
@@ -30,17 +41,17 @@ describe('ItemSubmitterComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ItemSubmitterComponent],
       providers: [
         { provide: LinkService, useValue: getMockLinkService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSubmitterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -56,7 +67,7 @@ describe('ItemSubmitterComponent', () => {
 
   it('should init submitter properly', () => {
     expect(component.submitter$).toBeObservable(cold('(b|)', {
-      b: EPersonMock
+      b: EPersonMock,
     }));
   });
 
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
index 990aa9906b..ea504679c3 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
@@ -1,16 +1,25 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { EMPTY, Observable } from 'rxjs';
-import { map, mergeMap } from 'rxjs/operators';
-
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotEmpty } from '../../../empty.util';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { followLink } from '../../../utils/follow-link-config.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { isNotEmpty } from '../../../empty.util';
+import { followLink } from '../../../utils/follow-link-config.model';
 
 /**
  * This component represents a badge with submitter information.
@@ -18,7 +27,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-item-submitter',
   styleUrls: ['./item-submitter.component.scss'],
-  templateUrl: './item-submitter.component.html'
+  templateUrl: './item-submitter.component.html',
 })
 export class ItemSubmitterComponent implements OnInit {
 
@@ -43,7 +52,7 @@ export class ItemSubmitterComponent implements OnInit {
    */
   ngOnInit() {
     this.linkService.resolveLinks(this.object, followLink('workflowitem', {},
-      followLink('submitter',{})
+      followLink('submitter',{}),
     ));
     this.submitter$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
       getFirstCompletedRemoteData(),
@@ -57,7 +66,7 @@ export class ItemSubmitterComponent implements OnInit {
               } else {
                 return null;
               }
-            })
+            }),
           );
         } else {
           return EMPTY;
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
index 4614adcf43..f7b9561269 100644
--- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
+++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
@@ -1,10 +1,16 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ListableObject } from '../listable-object.model';
-import { CollectionElementLinkType } from '../../collection-element-link.type';
-import { Context } from '../../../../core/shared/context.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Context } from '../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-abstract-object-element',
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
new file mode 100644
index 0000000000..84042358b3
--- /dev/null
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -0,0 +1,88 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+
+@Component({
+  selector: 'ds-objects-collection-tabulatable',
+  template: ``,
+})
+
+/**
+ * Abstract class that describe the properties for the rendering of search result's paginated lists of objects in a table.
+ * To be used as descriptor of the actual result component e.g. TabulatableResultListElementsComponent
+ */
+export class AbstractTabulatableElementComponent<T extends PaginatedList<ListableObject>> {
+
+  /**
+   * The object to render in this list element
+   */
+  @Input() objects: T;
+
+  /**
+   * The link type to determine the type of link rendered in this element
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The context we matched on to get this component
+   */
+  @Input() context: Context;
+
+  /**
+   * The viewmode we matched on to get this component
+   */
+  @Input() viewMode: ViewMode;
+
+  /**
+   * Emit when the object has been reloaded.
+   */
+  @Output() reloadedObject = new EventEmitter<RemoteData<PaginatedList<ListableObject>>>();
+
+  /**
+   * The available link types
+   */
+  linkTypes = CollectionElementLinkType;
+
+  /**
+   * The available view modes
+   */
+  viewModes = ViewMode;
+
+  /**
+   * The available contexts
+   */
+  contexts = Context;
+
+
+}
+
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index 56a83913a7..a90f375c6a 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <input *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+    <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+           [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
            [name]="'checkbox' + index"
            [id]="'object' + index"
            [ngModel]="selected$ | async"
            (ngModelChange)="selectCheckbox($event)">
     <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
+           [attr.aria-label]="'selectable-list-item-control.select' | translate"
            [name]="'radio' + index"
            [id]="'object' + index"
            [checked]="selected$ | async"
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
index c8756567b8..1a39cf61cf 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
@@ -1,12 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { SelectableListItemControlComponent } from './selectable-list-item-control.component';
-import { Item } from '../../../../core/shared/item.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { VarDirective } from '../../../utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../core/shared/item.model';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { VarDirective } from '../../../utils/var.directive';
 import { ListableObject } from '../listable-object.model';
+import { SelectableListItemControlComponent } from './selectable-list-item-control.component';
 
 describe('SelectableListItemControlComponent', () => {
   let comp: SelectableListItemControlComponent;
@@ -33,11 +42,11 @@ describe('SelectableListItemControlComponent', () => {
     index = 0;
     selection = [otherObject];
     selectionService = jasmine.createSpyObj('selectionService', {
-        selectSingle: jasmine.createSpy('selectSingle'),
-        deselectSingle: jasmine.createSpy('deselectSingle'),
-        isObjectSelected: observableOf(true),
-        getSelectableList: observableOf({ selection })
-      }
+      selectSingle: jasmine.createSpy('selectSingle'),
+      deselectSingle: jasmine.createSpy('deselectSingle'),
+      isObjectSelected: observableOf(true),
+      getSelectableList: observableOf({ selection }),
+    },
     );
   }
 
@@ -45,14 +54,17 @@ describe('SelectableListItemControlComponent', () => {
     init();
     TestBed.configureTestingModule({
       declarations: [SelectableListItemControlComponent, VarDirective],
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       providers: [
         {
           provide: SelectableListService,
-          useValue: selectionService
-        }
+          useValue: selectionService,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
index ebe49331d5..0a68d0e953 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
@@ -1,13 +1,24 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ListableObject } from '../listable-object.model';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { map, skip, take } from 'rxjs/operators';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import {
+  map,
+  skip,
+  take,
+} from 'rxjs/operators';
+
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-selectable-list-item-control',
   // styleUrls: ['./selectable-list-item-control.component.scss'],
-  templateUrl: './selectable-list-item-control.component.html'
+  templateUrl: './selectable-list-item-control.component.html',
 })
 /**
  * Component for rendering list item that has a control (checkbox or radio button) because it's selectable
@@ -41,12 +52,12 @@ export class SelectableListItemControlComponent implements OnInit {
     this.selected$ = this.selectionService.isObjectSelected(this.selectionConfig.listId, this.object);
     this.selected$
       .pipe(skip(1)).subscribe((selected: boolean) => {
-      if (selected) {
-        this.selectObject.emit(this.object);
-      } else {
-        this.deselectObject.emit(this.object);
-      }
-    });
+        if (selected) {
+          this.selectObject.emit(this.object);
+        } else {
+          this.deselectObject.emit(this.object);
+        }
+      });
   }
 
   selectCheckbox(value: boolean) {
@@ -62,16 +73,16 @@ export class SelectableListItemControlComponent implements OnInit {
       const selected$ = this.selectionService.getSelectableList(this.selectionConfig.listId);
       selected$.pipe(
         take(1),
-        map((selected) => selected ? selected.selection : [])
+        map((selected) => selected ? selected.selection : []),
       ).subscribe((selection) => {
-          // First deselect any existing selections, this is a radio button
-          selection.forEach((selectedObject) => {
-            this.selectionService.deselectSingle(this.selectionConfig.listId, selectedObject);
-            this.deselectObject.emit(selectedObject);
-          });
-          this.selectionService.selectSingle(this.selectionConfig.listId, this.object);
-          this.selectObject.emit(this.object);
-        }
+        // First deselect any existing selections, this is a radio button
+        selection.forEach((selectedObject) => {
+          this.selectionService.deselectSingle(this.selectionConfig.listId, selectedObject);
+          this.deselectObject.emit(selectedObject);
+        });
+        this.selectionService.selectSingle(this.selectionConfig.listId, this.object);
+        this.selectObject.emit(this.object);
+      },
       );
     }
   }
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
new file mode 100644
index 0000000000..ff51746cb9
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
@@ -0,0 +1 @@
+<ng-template dsTabulatableObjects></ng-template>
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
new file mode 100644
index 0000000000..d5fd3fd7b8
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -0,0 +1,108 @@
+import { ChangeDetectionStrategy } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { provideMockStore } from '@ngrx/store/testing';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { TabulatableResultListElementsComponent } from '../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { ListableObject } from '../listable-object.model';
+import { TestType } from '../listable-object/listable-object-component-loader.component.spec';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+import { TabulatableObjectsLoaderComponent } from './tabulatable-objects-loader.component';
+
+
+const testType = 'TestType';
+const testContext = Context.CoarNotify;
+const testViewMode = ViewMode.Table;
+
+class TestTypes extends PaginatedList<ListableObject> {
+  page: TestType[] = [new TestType()];
+}
+
+
+describe('TabulatableObjectsLoaderComponent', () => {
+  let component: TabulatableObjectsLoaderComponent;
+  let fixture: ComponentFixture<TabulatableObjectsLoaderComponent>;
+
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    themeService = jasmine.createSpyObj('themeService', {
+      getThemeName: 'dspace',
+    });
+    await TestBed.configureTestingModule({
+      declarations: [ TabulatableObjectsLoaderComponent, TabulatableObjectsDirective ],
+      providers: [
+        provideMockStore({}),
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).overrideComponent(TabulatableObjectsLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [TabulatableResultListElementsComponent],
+      },
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent);
+    component = fixture.componentInstance;
+    component.objects = new TestTypes();
+    component.context = Context.CoarNotify;
+    spyOn(component, 'getComponent').and.returnValue(TabulatableResultListElementsComponent as any);
+    spyOn(component as any, 'connectInputsAndOutputs').and.callThrough();
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('When the component is rendered', () => {
+    it('should call the getTabulatableObjectComponent function with the right types, view mode and context', () => {
+      expect(component.getComponent).toHaveBeenCalledWith([testType], testViewMode, testContext);
+    });
+
+    it('should connectInputsAndOutputs of loaded component', () => {
+      expect((component as any).connectInputsAndOutputs).toHaveBeenCalled();
+    });
+  });
+
+  describe('When a reloadedObject is emitted', () => {
+    let tabulatableComponent;
+    let reloadedObject: any;
+
+    beforeEach(() => {
+      spyOn((component as any), 'instantiateComponent').and.returnValue(null);
+      spyOn((component as any).contentChange, 'emit').and.returnValue(null);
+
+      tabulatableComponent = fixture.debugElement.query(By.css('ds-search-result-table-element')).componentInstance;
+      reloadedObject = 'object';
+    });
+
+    it('should re-instantiate the listable component', fakeAsync(() => {
+      expect((component as any).instantiateComponent).not.toHaveBeenCalled();
+
+      (tabulatableComponent as any).reloadedObject.emit(reloadedObject);
+      tick(200);
+
+      expect((component as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject, undefined);
+    }));
+
+    it('should re-emit it as a contentChange', fakeAsync(() => {
+      expect((component as any).contentChange.emit).not.toHaveBeenCalled();
+
+      (tabulatableComponent as any).reloadedObject.emit(reloadedObject);
+      tick(200);
+
+      expect((component as any).contentChange.emit).toHaveBeenCalledWith(reloadedObject);
+    }));
+
+  });
+});
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
new file mode 100644
index 0000000000..7b8e45a17a
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -0,0 +1,218 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  ComponentRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewChild,
+} from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+
+@Component({
+  selector: 'ds-tabulatable-objects-loader',
+  templateUrl: './tabulatable-objects-loader.component.html',
+})
+/**
+ * Component to load the matching component flagged by the tabulatableObjectsComponent decorator.
+ * Each component flagged by the decorator needs to have a ViewMode set as Table in order to be matched by the loader.
+ * e.g. @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
+ */
+export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnDestroy {
+  /**
+   * The items to determine the component for
+   */
+  @Input() objects: PaginatedList<ListableObject>;
+
+
+  /**
+   * The context of tabulatable object
+   */
+  @Input() context: Context;
+
+  /**
+   * The type of link used to render the links inside the listable object
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Directive hook used to place the dynamic child component
+   */
+  @ViewChild(TabulatableObjectsDirective, { static: true }) tabulatableObjectsDirective: TabulatableObjectsDirective;
+
+  /**
+   * Emit when the listable object has been reloaded.
+   */
+  @Output() contentChange = new EventEmitter<PaginatedList<ListableObject>>();
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
+  /**
+   * The view mode used to identify the components
+   */
+  protected viewMode: ViewMode = ViewMode.Table;
+
+  /**
+   * The list of input and output names for the dynamic component
+   */
+  protected inAndOutputNames: string[] = [
+    'objects',
+    'linkType',
+    'listID',
+    'showLabel',
+    'showThumbnails',
+    'context',
+    'viewMode',
+    'value',
+    'hideBadges',
+    'contentChange',
+  ];
+
+  constructor(private cdr: ChangeDetectorRef, private themeService: ThemeService) {
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    this.instantiateComponent(this.objects);
+  }
+
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasNoValue(this.compRef)) {
+      // sometimes the component has not been initialized yet, so it first needs to be initialized
+      // before being called again
+      this.instantiateComponent(this.objects, changes);
+    } else {
+      // if an input or output has changed
+      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
+        this.connectInputsAndOutputs();
+        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
+          (this.compRef.instance as any).ngOnChanges(changes);
+        }
+      }
+    }
+  }
+
+  ngOnDestroy() {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  private instantiateComponent(objects: PaginatedList<ListableObject>, changes?: SimpleChanges): void {
+    // objects need to have same render type so we access just the first in the page
+    const component = this.getComponent(objects?.page[0]?.getRenderTypes(), this.viewMode, this.context);
+
+    const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+      },
+    );
+
+    if (hasValue(changes)) {
+      this.ngOnChanges(changes);
+    } else {
+      this.connectInputsAndOutputs();
+    }
+
+    if ((this.compRef.instance as any).reloadedObject) {
+      combineLatest([
+        observableOf(changes),
+        (this.compRef.instance as any).reloadedObject.pipe(take(1)) as Observable<PaginatedList<ListableObject>>,
+      ]).subscribe(([simpleChanges, reloadedObjects]: [SimpleChanges, PaginatedList<ListableObject>]) => {
+        if (reloadedObjects) {
+          this.compRef.destroy();
+          this.objects = reloadedObjects;
+          this.instantiateComponent(reloadedObjects, simpleChanges);
+          this.cdr.detectChanges();
+          this.contentChange.emit(reloadedObjects);
+        }
+      });
+    }
+  }
+
+  /**
+   * Fetch the component depending on the item's entity type, view mode and context
+   * @returns {GenericConstructor<Component>}
+   */
+  getComponent(renderTypes: (string | GenericConstructor<ListableObject>)[],
+    viewMode: ViewMode,
+    context: Context): GenericConstructor<Component> {
+    return getTabulatableObjectsComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
+  }
+
+  /**
+   * Connect the in and outputs of this component to the dynamic component,
+   * to ensure they're in sync
+   */
+  protected connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
+}
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts
new file mode 100644
index 0000000000..a972c02907
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts
@@ -0,0 +1,26 @@
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  getTabulatableObjectsComponent,
+  tabulatableObjectsComponent,
+} from './tabulatable-objects.decorator';
+
+const type = 'TestType';
+
+@tabulatableObjectsComponent(PaginatedList<any>, ViewMode.Table, Context.Search)
+class TestTable {
+}
+describe('TabulatableObject decorator function', () => {
+
+  it('should have a decorator for table', () => {
+    const tableDecorator = tabulatableObjectsComponent('Item', ViewMode.Table);
+    expect(tableDecorator.length).not.toBeNull();
+  });
+
+
+  it('should return the matching class', () => {
+    const component = getTabulatableObjectsComponent([type], ViewMode.Table, Context.Search);
+    expect(component).toEqual(TestTable);
+  });
+});
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
new file mode 100644
index 0000000000..fe40a99d9c
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
@@ -0,0 +1,69 @@
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { ListableObject } from '../listable-object.model';
+import {
+  DEFAULT_CONTEXT,
+  DEFAULT_THEME,
+  DEFAULT_VIEW_MODE,
+  getMatch,
+  MatchRelevancy,
+} from '../listable-object/listable-object.decorator';
+
+const map = new Map();
+
+/**
+ * Decorator used for rendering tabulatable objects
+ * @param objectsType The object type or entity type the component represents
+ * @param viewMode The view mode the component represents
+ * @param context The optional context the component represents
+ * @param theme The optional theme for the component
+ */
+export function tabulatableObjectsComponent(objectsType: string | GenericConstructor<PaginatedList<ListableObject>>, viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
+  return function decorator(component: any) {
+    if (hasNoValue(objectsType)) {
+      return;
+    }
+    if (hasNoValue(map.get(objectsType))) {
+      map.set(objectsType, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode))) {
+      map.get(objectsType).set(viewMode, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode).get(context))) {
+      map.get(objectsType).get(viewMode).set(context, new Map());
+    }
+    map.get(objectsType).get(viewMode).get(context).set(theme, component);
+  };
+}
+
+/**
+ * Getter to retrieve the matching tabulatable objects component
+ *
+ * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
+ * The most relevant match between types is kept and eventually returned
+ *
+ * @param types The types of which one should match the tabulatable component
+ * @param viewMode The view mode that should match the components
+ * @param context The context that should match the components
+ * @param theme The theme that should match the components
+ */
+export function getTabulatableObjectsComponent(types: (string | GenericConstructor<ListableObject>)[], viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme: string = DEFAULT_THEME) {
+  let currentBestMatch: MatchRelevancy = null;
+  for (const type of types) {
+    const typeMap = map.get(PaginatedList<typeof type>);
+
+    if (hasValue(typeMap)) {
+      const match = getMatch(typeMap, [viewMode, context, theme], [DEFAULT_VIEW_MODE, DEFAULT_CONTEXT, DEFAULT_THEME]);
+      if (hasNoValue(currentBestMatch) || currentBestMatch.isLessRelevantThan(match)) {
+        currentBestMatch = match;
+      }
+    }
+  }
+  return hasValue(currentBestMatch) ? currentBestMatch.match : null;
+}
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
similarity index 54%
rename from src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts
rename to src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
index 93c06961f4..b859f5b3e6 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
@@ -1,11 +1,14 @@
-import { Directive, ViewContainerRef } from '@angular/core';
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsListableObject]',
+  selector: '[dsTabulatableObjects]',
 })
 /**
  * Directive used as a hook to know where to inject the dynamic listable object component
  */
-export class ListableObjectDirective {
+export class TabulatableObjectsDirective {
   constructor(public viewContainerRef: ViewContainerRef) { }
 }
diff --git a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
index fddd5dc203..3f57d2f4cd 100644
--- a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
@@ -1,6 +1,6 @@
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { searchResultFor } from '../../search/search-result-element-decorator';
 import { SearchResult } from '../../search/models/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a WorkspaceItem object
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
index 5d39dd909a..de13541916 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
@@ -1,30 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
 import {
   ComponentFixture,
   fakeAsync,
   flush,
   TestBed,
   tick,
-  waitForAsync
+  waitForAsync,
 } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { ClaimedTaskSearchResultDetailElementComponent } from './claimed-task-search-result-detail-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { VarDirective } from '../../../utils/var.directive';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { Context } from '../../../../core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { VarDirective } from '../../../utils/var.directive';
+import { ClaimedTaskSearchResultDetailElementComponent } from './claimed-task-search-result-detail-element.component';
 
 let component: ClaimedTaskSearchResultDetailElementComponent;
 let fixture: ComponentFixture<ClaimedTaskSearchResultDetailElementComponent>;
@@ -40,28 +42,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -69,7 +71,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('ClaimedTaskSearchResultDetailElementComponent', () => {
@@ -80,11 +82,11 @@ describe('ClaimedTaskSearchResultDetailElementComponent', () => {
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: LinkService, useValue: linkService },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -103,7 +105,7 @@ describe('ClaimedTaskSearchResultDetailElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
@@ -115,7 +117,7 @@ describe('ClaimedTaskSearchResultDetailElementComponent', () => {
 
   it('should forward claimed-task-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-claimed-task-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index 7e463d3b3b..fb230a2b2d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -1,23 +1,36 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { isNotEmpty, hasValue } from '../../../empty.util';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { Context } from 'src/app/core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders claimed task object for the search result in the detail view.
@@ -25,7 +38,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-claimed-task-search-result-detail-element',
   styleUrls: ['../search-result-detail-element.component.scss'],
-  templateUrl: './claimed-task-search-result-detail-element.component.html'
+  templateUrl: './claimed-task-search-result-detail-element.component.html',
 })
 
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.DetailedListElement)
@@ -66,7 +79,7 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -75,7 +88,7 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -85,7 +98,7 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
   }
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
index 56a0df1faa..01deadb305 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component';
 
 let component: ItemDetailPreviewFieldComponent;
 let fixture: ComponentFixture<ItemDetailPreviewFieldComponent>;
@@ -20,28 +29,28 @@ const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 
 describe('ItemDetailPreviewFieldComponent', () => {
@@ -52,19 +61,19 @@ describe('ItemDetailPreviewFieldComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ItemDetailPreviewFieldComponent, TruncatePipe],
       providers: [
-        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } }
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
 
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemDetailPreviewFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 5faf02eac0..7a0578313b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { Item } from '../../../../../core/shared/item.model';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { SearchResult } from '../../../../search/models/search-result.model';
 
 /**
@@ -9,7 +12,7 @@ import { SearchResult } from '../../../../search/models/search-result.model';
  */
 @Component({
   selector: 'ds-item-detail-preview-field',
-  templateUrl: './item-detail-preview-field.component.html'
+  templateUrl: './item-detail-preview-field.component.html',
 })
 export class ItemDetailPreviewFieldComponent {
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
index 0b5acd343b..1362eb65ca 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
@@ -1,10 +1,19 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
@@ -13,6 +22,7 @@ import { BitstreamDataService } from '../../../../core/data/bitstream-data.servi
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -22,21 +32,20 @@ import { Item } from '../../../../core/shared/item.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
+import { createPaginatedList } from '../../../testing/utils.test';
 import { FileSizePipe } from '../../../utils/file-size-pipe';
 import { FollowLinkConfig } from '../../../utils/follow-link-config.model';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { VarDirective } from '../../../utils/var.directive';
-import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/item-detail-preview-field.component';
 import { ItemDetailPreviewComponent } from './item-detail-preview.component';
-import { createPaginatedList } from '../../../testing/utils.test';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/item-detail-preview-field.component';
 
 function getMockFileService(): FileService {
   return jasmine.createSpyObj('FileService', {
     downloadFile: jasmine.createSpy('downloadFile'),
-    getFileNameFromResponseContentDisposition: jasmine.createSpy('getFileNameFromResponseContentDisposition')
+    getFileNameFromResponseContentDisposition: jasmine.createSpy('getFileNameFromResponseContentDisposition'),
   });
 }
 
@@ -49,28 +58,28 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 
 describe('ItemDetailPreviewComponent', () => {
@@ -89,8 +98,8 @@ describe('ItemDetailPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ItemDetailPreviewComponent, ItemDetailPreviewFieldComponent, TruncatePipe, FileSizePipe, VarDirective],
@@ -109,9 +118,9 @@ describe('ItemDetailPreviewComponent', () => {
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemDetailPreviewComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 2e290bfffa..f0f60561ed 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,18 +1,20 @@
-import { Component, Input } from '@angular/core';
-
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Context } from '../../../../core/shared/context.model';
+import { FileService } from '../../../../core/shared/file.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 import { fadeInOut } from '../../../animations/fade';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { FileService } from '../../../../core/shared/file.service';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SearchResult } from '../../../search/models/search-result.model';
-import { Context } from '../../../../core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 /**
  * This component show metadata for the given item object in the detail view.
@@ -21,7 +23,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
   selector: 'ds-item-detail-preview',
   styleUrls: ['./item-detail-preview.component.scss'],
   templateUrl: './item-detail-preview.component.html',
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemDetailPreviewComponent {
   /**
@@ -79,7 +81,7 @@ export class ItemDetailPreviewComponent {
     return this.bitstreamDataService
       .findAllByItemAndBundleName(this.item, 'ORIGINAL', { elementsPerPage: Number.MAX_SAFE_INTEGER })
       .pipe(
-        getFirstSucceededRemoteListPayload()
+        getFirstSucceededRemoteListPayload(),
       );
   }
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
index 2c8039c923..48dc0b438b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
@@ -1,15 +1,21 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
-
-import { Item } from '../../../../core/shared/item.model';
-import { ItemSearchResultDetailElementComponent } from './item-search-result-detail-element.component';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { Context } from 'src/app/core/shared/context.model';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { ItemSearchResultDetailElementComponent } from './item-search-result-detail-element.component';
 
 let component: ItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<ItemSearchResultDetailElementComponent>;
@@ -25,28 +31,28 @@ mockResultObject.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 describe('ItemSearchResultDetailElementComponent', () => {
@@ -57,9 +63,9 @@ describe('ItemSearchResultDetailElementComponent', () => {
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
index 40ed72dcf1..05916cdaff 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Item } from '../../../../core/shared/item.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders item object for the search result in the detail view.
@@ -13,7 +13,7 @@ import { Context } from '../../../../core/shared/context.model';
 @Component({
   selector: 'ds-item-search-result-detail-element',
   styleUrls: ['../search-result-detail-element.component.scss', './item-search-result-detail-element.component.scss'],
-  templateUrl: './item-search-result-detail-element.component.html'
+  templateUrl: './item-search-result-detail-element.component.html',
 })
 
 @listableObjectComponent(ItemSearchResult, ViewMode.DetailedListElement, Context.Workspace)
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
index a10e13f63e..b7b229e6ad 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
@@ -1,23 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { of as observableOf } from 'rxjs';
-
-import { Item } from '../../../../core/shared/item.model';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
-import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
-import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
 import { Context } from 'src/app/core/shared/context.model';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { VarDirective } from '../../../utils/var.directive';
+import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
 
 let component: PoolSearchResultDetailElementComponent;
 let fixture: ComponentFixture<PoolSearchResultDetailElementComponent>;
@@ -33,28 +42,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -62,7 +71,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('PoolSearchResultDetailElementComponent', () => {
@@ -75,11 +84,11 @@ describe('PoolSearchResultDetailElementComponent', () => {
         { provide: 'objectElementProvider', useValue: (mockResultObject) },
         { provide: 'indexElementProvider', useValue: (compIndex) },
         { provide: LinkService, useValue: linkService },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -98,7 +107,7 @@ describe('PoolSearchResultDetailElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
@@ -110,7 +119,7 @@ describe('PoolSearchResultDetailElementComponent', () => {
 
   it('should forward pool-task-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
     const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions'));
     actionsComponents.triggerEventHandler('processCompleted', actionPayload);
     tick();
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index 80a81efa81..26ea26c6a7 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -1,23 +1,36 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { isNotEmpty, hasValue } from '../../../empty.util';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { Context } from 'src/app/core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders pool task object for the search result in the detail view.
@@ -66,7 +79,7 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -75,7 +88,7 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -85,7 +98,7 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
 
   }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
index 5b0bd2c39b..1880da1eb0 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
@@ -1,9 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { SearchResult } from '../../search/models/search-result.model';
 
 /**
@@ -11,7 +14,7 @@ import { SearchResult } from '../../search/models/search-result.model';
  */
 @Component({
   selector: 'ds-search-result-detail-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultDetailElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
index f4bc6b88fa..8fb826f69b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
@@ -1,19 +1,25 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component';
 
 let component: WorkflowItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultDetailElementComponent>;
@@ -30,28 +36,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
@@ -67,9 +73,9 @@ describe('WorkflowItemSearchResultDetailElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
index bad0fcee87..976b630acf 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
@@ -1,19 +1,19 @@
 import { Component } from '@angular/core';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { find } from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { Context } from 'src/app/core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders workflowitem object for the search result in the detail view.
@@ -39,7 +39,7 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
 
   constructor(
     public dsoNameService: DSONameService,
-    protected linkService: LinkService
+    protected linkService: LinkService,
   ) {
     super(dsoNameService);
   }
@@ -58,7 +58,7 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
    */
   initItem(item$: Observable<RemoteData<Item>>) {
     item$.pipe(
-      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
+      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload)),
     ).subscribe((rd: RemoteData<Item>) => {
       this.item = rd.payload;
     });
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
index e86bfdb5e6..9fdf1b126d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
@@ -1,20 +1,26 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
-
-import { Item } from '../../../../core/shared/item.model';
-import { WorkspaceItemSearchResultDetailElementComponent } from './workspace-item-search-result-detail-element.component';
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { Context } from 'src/app/core/shared/context.model';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { WorkspaceItemSearchResultDetailElementComponent } from './workspace-item-search-result-detail-element.component';
+
 let component: WorkspaceItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultDetailElementComponent>;
 
@@ -30,28 +36,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
@@ -67,9 +73,9 @@ describe('WorkspaceItemSearchResultDetailElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
index 03b41e795c..a6218fd9e8 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
@@ -1,20 +1,19 @@
 import { Component } from '@angular/core';
-
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { Item } from '../../../../core/shared/item.model';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotUndefined } from '../../../empty.util';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { Context } from '../../../../core/shared/context.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders workspace item object for the search result in the detail view.
@@ -40,7 +39,7 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
 
   constructor(
     public dsoNameService: DSONameService,
-    protected linkService: LinkService
+    protected linkService: LinkService,
   ) {
     super(dsoNameService);
   }
@@ -59,7 +58,7 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
    */
   initItem(item$: Observable<RemoteData<Item>>) {
     item$.pipe(
-      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
+      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload)),
     ).subscribe((rd: RemoteData<Item>) => {
       this.item = rd.payload;
     });
diff --git a/src/app/shared/object-detail/object-detail.component.spec.ts b/src/app/shared/object-detail/object-detail.component.spec.ts
index d0fcbed4eb..46c8234182 100644
--- a/src/app/shared/object-detail/object-detail.component.spec.ts
+++ b/src/app/shared/object-detail/object-detail.component.spec.ts
@@ -1,14 +1,27 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ObjectDetailComponent } from './object-detail.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { ObjectDetailComponent } from './object-detail.component';
 
 describe('ObjectDetailComponent', () => {
   let comp: ObjectDetailComponent;
@@ -31,7 +44,7 @@ describe('ObjectDetailComponent', () => {
     elementsPerPage: 1,
     totalElements: 10,
     totalPages: 10,
-    currentPage: 1
+    currentPage: 1,
   });
   const mockRD = createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, testObjects));
 
@@ -42,14 +55,14 @@ describe('ObjectDetailComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ObjectDetailComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ObjectDetailComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index 1a32be74b8..800a003c21 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -1,16 +1,24 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
 
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-
 import { RemoteData } from '../../core/data/remote-data';
-import { fadeIn } from '../animations/fade';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
 import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 /**
  * This component renders a paginated set of results in the detail view.
@@ -21,7 +29,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-detail',
   styleUrls: [ './object-detail.component.scss' ],
   templateUrl: './object-detail.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class ObjectDetailComponent {
   /**
@@ -190,14 +198,14 @@ export class ObjectDetailComponent {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index d80c9a66e9..e74631dfa7 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,17 +1,17 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
     <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
     <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </span>
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
     <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
index e5420f7d4f..85b448e9d5 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
@@ -1,11 +1,19 @@
-import { CollectionGridElementComponent } from './collection-grid-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Collection } from '../../../core/shared/collection.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { CollectionGridElementComponent } from './collection-grid-element.component';
+
 let collectionGridElementComponent: CollectionGridElementComponent;
 let fixture: ComponentFixture<CollectionGridElementComponent>;
 
@@ -14,10 +22,10 @@ const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
@@ -25,31 +33,31 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection()
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCollectionWithAbstract
+  resolveLink: mockCollectionWithAbstract,
 });
 
 describe('CollectionGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CollectionGridElementComponent],
       providers: [
         { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index e2ecf7b1ae..2d70fe7b60 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,12 +1,19 @@
-import { Component, Input } from '@angular/core';
-import { Collection } from '../../../core/shared/collection.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { hasNoValue, hasValue } from '../../empty.util';
-import { followLink } from '../../utils/follow-link-config.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * Component representing a grid element for collection
@@ -35,7 +42,7 @@ export class CollectionGridElementComponent extends AbstractListableElementCompo
     if (hasValue(this._object) && hasNoValue(this._object.logo)) {
       this.linkService.resolveLink<Collection>(
         this._object,
-        followLink('logo')
+        followLink('logo'),
       );
     }
   }
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index 8bb3763a2b..d45ae05cd4 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,17 +1,17 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
     <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
     <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </span>
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
     <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
index 2bf682350e..628fbe268e 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
@@ -1,11 +1,19 @@
-import { CommunityGridElementComponent } from './community-grid-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Community } from '../../../core/shared/community.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Community } from '../../../core/shared/community.model';
+import { CommunityGridElementComponent } from './community-grid-element.component';
+
 let communityGridElementComponent: CommunityGridElementComponent;
 let fixture: ComponentFixture<CommunityGridElementComponent>;
 
@@ -14,10 +22,10 @@ const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
@@ -25,31 +33,31 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCommunityWithAbstract
+  resolveLink: mockCommunityWithAbstract,
 });
 
 describe('CommunityGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CommunityGridElementComponent],
       providers: [
         { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunityGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index 59ac0693eb..58fbde43c1 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,12 +1,19 @@
-import { Component, Input } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { followLink } from '../../utils/follow-link-config.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { hasNoValue, hasValue } from '../../empty.util';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Community } from '../../../core/shared/community.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * Component representing a grid element for a community
@@ -14,7 +21,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-community-grid-element',
   styleUrls: ['./community-grid-element.component.scss'],
-  templateUrl: './community-grid-element.component.html'
+  templateUrl: './community-grid-element.component.html',
 })
 
 @listableObjectComponent(Community, ViewMode.GridElement)
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
index b137c2e708..b104778e8b 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
@@ -1,17 +1,24 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ItemGridElementComponent } from './item-grid-element.component';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemGridElementComponent } from './item-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -19,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is an abstract'
-      }
-    ]
-  }
+        value: 'This is an abstract',
+      },
+    ],
+  },
 });
 
 describe('ItemGridElementComponent', () => {
@@ -59,9 +66,9 @@ describe('ItemGridElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
index c8a58c5a89..fd2c498c9a 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
-import { focusShadow } from '../../../../animations/focus';
+
+import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { focusShadow } from '../../../../animations/focus';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../../core/shared/item.model';
 
 @listableObjectComponent('Publication', ViewMode.GridElement)
 @listableObjectComponent(Item, ViewMode.GridElement)
@@ -11,7 +12,7 @@ import { Item } from '../../../../../core/shared/item.model';
   selector: 'ds-item-grid-element',
   styleUrls: ['./item-grid-element.component.scss'],
   templateUrl: './item-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item of the type Publication
diff --git a/src/app/shared/object-grid/object-grid.component.spec.ts b/src/app/shared/object-grid/object-grid.component.spec.ts
index 61571f334d..11281207b3 100644
--- a/src/app/shared/object-grid/object-grid.component.spec.ts
+++ b/src/app/shared/object-grid/object-grid.component.spec.ts
@@ -1,5 +1,9 @@
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { map } from 'rxjs/operators';
+
 import { WidthCategory } from '../host-window.service';
 import { ObjectGridComponent } from './object-grid.component';
 
@@ -14,12 +18,12 @@ describe('ObjectGridComponent', () => {
     { seven: 7 },
     { eight: 8 },
     { nine: 9 },
-    { ten: 10 }
+    { ten: 10 },
   ];
   const mockRD = {
     payload: {
-      page: testObjects
-    }
+      page: testObjects,
+    },
   } as any;
 
   describe('the number of columns', () => {
@@ -37,7 +41,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 3 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -56,7 +60,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 3 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -75,7 +79,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 2 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -94,7 +98,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 2 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -113,7 +117,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 1 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -136,8 +140,8 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[3], testObjects[6], testObjects[9]],
           [testObjects[1], testObjects[4], testObjects[7]],
-          [testObjects[2], testObjects[5], testObjects[8]]
-        ]
+          [testObjects[2], testObjects[5], testObjects[8]],
+        ],
       });
 
       const result = comp.columns$;
@@ -159,8 +163,8 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[3], testObjects[6], testObjects[9]],
           [testObjects[1], testObjects[4], testObjects[7]],
-          [testObjects[2], testObjects[5], testObjects[8]]
-        ]
+          [testObjects[2], testObjects[5], testObjects[8]],
+        ],
       });
 
       const result = comp.columns$;
@@ -182,7 +186,7 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[2], testObjects[4], testObjects[6], testObjects[8]],
           [testObjects[1], testObjects[3], testObjects[5], testObjects[7], testObjects[9]],
-        ]
+        ],
       });
 
       const result = comp.columns$;
@@ -204,7 +208,7 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[2], testObjects[4], testObjects[6], testObjects[8]],
           [testObjects[1], testObjects[3], testObjects[5], testObjects[7], testObjects[9]],
-        ]
+        ],
       });
 
       const result = comp.columns$;
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index 91630ca007..e292cd07f0 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -1,6 +1,3 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
-
-import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -8,22 +5,39 @@ import {
   Input,
   OnInit,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  startWith,
+} from 'rxjs/operators';
 
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-
 import { RemoteData } from '../../core/data/remote-data';
-import { fadeIn } from '../animations/fade';
-import { hasNoValue, hasValue } from '../empty.util';
-import { HostWindowService, WidthCategory } from '../host-window.service';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
 import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
+import {
+  hasNoValue,
+  hasValue,
+} from '../empty.util';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../host-window.service';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -31,7 +45,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-grid',
   styleUrls: ['./object-grid.component.scss'],
   templateUrl: './object-grid.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 
 export class ObjectGridComponent implements OnInit {
@@ -183,7 +197,7 @@ export class ObjectGridComponent implements OnInit {
           }
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     ).pipe(startWith(3));
 
     this.columns$ = observableCombineLatest(
@@ -251,14 +265,14 @@ export class ObjectGridComponent implements OnInit {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index b00e67679a..5874ec8d67 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,9 +1,9 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
     <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
     <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </span>
@@ -11,8 +11,8 @@
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
     <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
   <ng-content></ng-content>
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index 15548d6608..f1e2eaa47f 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -1,12 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -18,9 +29,6 @@ import { CollectionSearchResult } from '../../../object-collection/shared/collec
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CollectionSearchResultGridElementComponent } from './collection-search-result-grid-element.component';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TranslateModule } from '@ngx-translate/core';
 
 let collectionSearchResultGridElementComponent: CollectionSearchResultGridElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultGridElementComponent>;
@@ -36,10 +44,10 @@ mockCollectionWithAbstract.indexableObject = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
@@ -49,20 +57,20 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCollectionWithAbstract
+  resolveLink: mockCollectionWithAbstract,
 });
 
 describe('CollectionSearchResultGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CollectionSearchResultGridElementComponent, TruncatePipe],
       providers: [
@@ -80,12 +88,12 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionSearchResultGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index e4ea2e48f5..26098c8f96 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -1,20 +1,27 @@
-import { Component, Input } from '@angular/core';
-import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { hasNoValue, hasValue } from '../../../empty.util';
-import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 
 @Component({
   selector: 'ds-collection-search-result-grid-element',
   styleUrls: ['../search-result-grid-element.component.scss', 'collection-search-result-grid-element.component.scss'],
-  templateUrl: 'collection-search-result-grid-element.component.html'
+  templateUrl: 'collection-search-result-grid-element.component.html',
 })
 /**
  * Component representing a grid element for a collection search result
@@ -27,7 +34,7 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid
     public dsoNameService: DSONameService,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
   }
@@ -38,7 +45,7 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid
     if (hasValue(this._dso) && hasNoValue(this._dso.logo)) {
       this.linkService.resolveLink<Collection>(
         this._dso,
-        followLink('logo')
+        followLink('logo'),
       );
     }
   }
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index 478db93c34..f4bf02e845 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,9 +1,9 @@
 <div class="card">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
         <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
         </ds-themed-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top">
     <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
     </ds-themed-thumbnail>
   </span>
@@ -11,8 +11,8 @@
         <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
         <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
         <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-        <div *ngIf="linkType != linkTypes.None" class="text-center">
-            <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        <div *ngIf="linkType !== linkTypes.None" class="text-center">
+            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
         </div>
     </div>
     <ng-content></ng-content>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index 710fbf3f67..5ba283ebde 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -1,12 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -18,9 +29,6 @@ import { CommunitySearchResult } from '../../../object-collection/shared/communi
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CommunitySearchResultGridElementComponent } from './community-search-result-grid-element.component';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TranslateModule } from '@ngx-translate/core';
 
 let communitySearchResultGridElementComponent: CommunitySearchResultGridElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultGridElementComponent>;
@@ -36,10 +44,10 @@ mockCommunityWithAbstract.indexableObject = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
@@ -49,20 +57,20 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCommunityWithAbstract
+  resolveLink: mockCommunityWithAbstract,
 });
 
 describe('CommunitySearchResultGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CommunitySearchResultGridElementComponent, TruncatePipe],
       providers: [
@@ -80,12 +88,12 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunitySearchResultGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index 039b01c567..dc813efd4b 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,15 +1,22 @@
-import { Component, Input } from '@angular/core';
-import { Community } from '../../../../core/shared/community.model';
-import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { hasNoValue, hasValue } from '../../../empty.util';
-import { followLink } from '../../../utils/follow-link-config.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Community } from '../../../../core/shared/community.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 
 @Component({
   selector: 'ds-community-search-result-grid-element',
@@ -30,7 +37,7 @@ export class CommunitySearchResultGridElementComponent extends SearchResultGridE
     public dsoNameService: DSONameService,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
   }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 3e6efbf765..bd11121c74 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -2,14 +2,14 @@
     <div class="position-absolute ml-1">
         <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
         class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
         <div>
               <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
               </ds-themed-thumbnail>
         </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
         <div>
               <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
               </ds-themed-thumbnail>
@@ -35,8 +35,8 @@
                 </p>
             </ds-truncatable-part>
         </ds-truncatable>
-        <div *ngIf="linkType != linkTypes.None" class="text-center">
-            <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        <div *ngIf="linkType !== linkTypes.None" class="text-center">
+            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
                 class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
         </div>
     </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index dc42b033d8..ec4a7899c8 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -1,11 +1,21 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -32,7 +42,7 @@ const dcTitle = 'This is just another <em>title</em>';
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
   hitHighlights: {
     'dc.title': [{
-      value: dcTitle
+      value: dcTitle,
     }],
   },
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -40,33 +50,33 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: dcTitle
-      }
+        value: dcTitle,
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is an abstract'
-      }
-    ]
-  }
+        value: 'This is an abstract',
+      },
+    ],
+  },
 });
 const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
     'person.familyName': [{
-      value: '<em>Michel</em>'
+      value: '<em>Michel</em>',
     }],
   },
   indexableObject:
@@ -77,50 +87,50 @@ const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
+            value: 'This is the abstract',
+          },
         ],
         'dspace.entity.type': [
           {
-            value: 'Person'
-          }
+            value: 'Person',
+          },
         ],
         'person.familyName': [
           {
-            value: 'Michel'
-          }
-        ]
-      }
-    })
+            value: 'Michel',
+          },
+        ],
+      },
+    }),
 });
 const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
     'organization.legalName': [{
-      value: '<em>Science</em>'
+      value: '<em>Science</em>',
     }],
   },
   indexableObject:
@@ -131,45 +141,45 @@ const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
+            value: 'This is the abstract',
+          },
         ],
         'organization.legalName': [
           {
-            value: 'Science'
-          }
+            value: 'Science',
+          },
         ],
         'dspace.entity.type': [
           {
-            value: 'OrgUnit'
-          }
-        ]
-      }
-    })
+            value: 'OrgUnit',
+          },
+        ],
+      },
+    }),
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -180,10 +190,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ItemGridElementComponent', getEntityGridElementTestComponent(ItemSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['authors', 'date', 'abstract']));
@@ -209,14 +219,14 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
 
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
           NoopAnimationsModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [component, TruncatePipe],
         providers: [
@@ -233,9 +243,9 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
           { provide: DefaultChangeAnalyzer, useValue: {} },
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).overrideComponent(component, {
-        set: { changeDetection: ChangeDetectionStrategy.Default }
+        set: { changeDetection: ChangeDetectionStrategy.Default },
       }).compileComponents();
     }));
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index 7d237e3f79..f37b7a21eb 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -1,16 +1,15 @@
 import { Component } from '@angular/core';
-import { focusShadow } from '../../../../animations/focus';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { SearchResultGridElementComponent } from '../../search-result-grid-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
+import { focusShadow } from '../../../../animations/focus';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { SearchResultGridElementComponent } from '../../search-result-grid-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
@@ -18,7 +17,7 @@ import { BitstreamDataService } from '../../../../../core/data/bitstream-data.se
   selector: 'ds-item-search-result-grid-element',
   styleUrls: ['./item-search-result-grid-element.component.scss'],
   templateUrl: './item-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Publication
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 4c3431bb55..95d233c22e 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -1,18 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../search/models/search-result.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { SearchResult } from '../../search/models/search-result.model';
 import { TruncatableService } from '../../truncatable/truncatable.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-search-result-grid-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultGridElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
   /**
@@ -28,7 +31,7 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
   public constructor(
     public dsoNameService: DSONameService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService);
   }
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts
index 906add6578..fba72f8585 100644
--- a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts
+++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts
@@ -1,12 +1,15 @@
-import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {RouterTestingModule} from '@angular/router/testing';
-import {TranslateModule} from '@ngx-translate/core';
-import {SharedModule} from '../../shared.module';
+import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
-import {BitstreamListItemComponent} from './bitstream-list-item.component';
-import {DSONameService} from '../../../core/breadcrumbs/dso-name.service';
-import {DSONameServiceMock} from '../../mocks/dso-name.service.mock';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { SharedModule } from '../../shared.module';
+import { BitstreamListItemComponent } from './bitstream-list-item.component';
 
 describe('BitstreamListItemComponent', () => {
   let component: BitstreamListItemComponent;
@@ -16,16 +19,16 @@ describe('BitstreamListItemComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [ BitstreamListItemComponent ],
       imports: [ CommonModule, SharedModule, TranslateModule, RouterTestingModule ],
-      providers: [{ provide: DSONameService, useValue: new DSONameServiceMock() }]
+      providers: [{ provide: DSONameService, useValue: new DSONameServiceMock() }],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BitstreamListItemComponent);
     component = fixture.componentInstance;
     // @ts-ignore
-    component.object = {name: 'test'};
+    component.object = { name: 'test' };
     fixture.detectChanges();
   });
 
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts
index f281c0bd77..28c83e9662 100644
--- a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts
+++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts
@@ -1,17 +1,16 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import {
-  AbstractListableElementComponent
-} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Context } from '../../../core/shared/context.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 
 @listableObjectComponent(Bitstream, ViewMode.ListElement, Context.Bitstream)
 @Component({
   selector: 'ds-bitstream-list-item',
   template: ` {{object.name}} `,
-  styleUrls: ['./bitstream-list-item.component.scss']
+  styleUrls: ['./bitstream-list-item.component.scss'],
 })
 export class BitstreamListItemComponent extends AbstractListableElementComponent<Bitstream>{}
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index ff7efcc309..757135d809 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -1,8 +1,8 @@
 <div class="d-flex flex-row">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
         {{object.value}}
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="lead">
+    <span *ngIf="linkType === linkTypes.None" class="lead">
         {{object.value}}
     </span>
     <span class="pr-2">&nbsp;</span>
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
index 15d1d9df39..1919f6ad78 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
@@ -1,20 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../utils/truncate.pipe';
-import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
-import { BrowseEntry } from '../../../core/shared/browse-entry.model';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { RouteService } from '../../../core/services/route.service';
-import { of as observableOf } from 'rxjs';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BrowseEntry } from '../../../core/shared/browse-entry.model';
 import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { TruncatePipe } from '../../utils/truncate.pipe';
+import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
+
 let browseEntryListElementComponent: BrowseEntryListElementComponent;
 let fixture: ComponentFixture<BrowseEntryListElementComponent>;
 
 const mockValue: BrowseEntry = Object.assign(new BrowseEntry(), {
   type: 'browseEntry',
-  value: 'De Langhe Kristof'
+  value: 'De Langhe Kristof',
 });
 
 let paginationService;
@@ -23,11 +32,11 @@ const pageParam = 'bbm.page';
 
 function init() {
   paginationService = jasmine.createSpyObj('paginationService', {
-    getPageParam: pageParam
+    getPageParam: pageParam,
   });
 
   routeService = jasmine.createSpyObj('routeService', {
-    getQueryParameterValue: observableOf('1')
+    getQueryParameterValue: observableOf('1'),
   });
 }
 describe('BrowseEntryListElementComponent', () => {
@@ -38,13 +47,13 @@ describe('BrowseEntryListElementComponent', () => {
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: 'objectElementProvider', useValue: { mockValue } },
-        {provide: PaginationService, useValue: paginationService},
-        {provide: RouteService, useValue: routeService},
+        { provide: PaginationService, useValue: paginationService },
+        { provide: RouteService, useValue: routeService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(BrowseEntryListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index e67dd4489e..ccbb927f03 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,21 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RouteService } from 'src/app/core/services/route.service';
 
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata/browse-by-metadata.component';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { BrowseEntry } from '../../../core/shared/browse-entry.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { Params } from '@angular/router';
-import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-import { RouteService } from 'src/app/core/services/route.service';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @Component({
   selector: 'ds-browse-entry-list-element',
   styleUrls: ['./browse-entry-list-element.component.scss'],
-  templateUrl: './browse-entry-list-element.component.html'
+  templateUrl: './browse-entry-list-element.component.html',
 })
 
 /**
@@ -49,12 +52,12 @@ export class BrowseEntryListElementComponent extends AbstractListableElementComp
       map((currentPage) => {
         return {
           value: this.object.value,
-          authority: !!this.object.authority ? this.object.authority : undefined,
+          authority: this.object.authority ? this.object.authority : undefined,
           startsWith: undefined,
           [pageParamName]: null,
-          [BBM_PAGINATION_ID + '.return']: currentPage
+          [BBM_PAGINATION_ID + '.return']: currentPage,
         };
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
index 55eb5b116e..ad8fcc1e66 100644
--- a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
+++ b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
@@ -1,12 +1,13 @@
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Bundle } from '../../../core/shared/bundle.model';
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+
+import { Bundle } from '../../../core/shared/bundle.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @Component({
   selector: 'ds-bundle-list-element',
-  templateUrl: './bundle-list-element.component.html'
+  templateUrl: './bundle-list-element.component.html',
 })
 /**
  * This component is automatically used to create a list view for Bundle objects
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
index c50b382495..1c4f68fbcc 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -1,8 +1,8 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
     {{ dsoNameService.getName(object) }}
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="lead">
+  <span *ngIf="linkType === linkTypes.None" class="lead">
     {{ dsoNameService.getName(object) }}
   </span>
   <span class="pr-2">&nbsp;</span>
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
index 97f9eb88c2..dcbd4ce641 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
@@ -1,10 +1,18 @@
-import { CollectionListElementComponent } from './collection-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Collection } from '../../../core/shared/collection.model';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../core/shared/collection.model';
 import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { CollectionListElementComponent } from './collection-list-element.component';
 
 let collectionListElementComponent: CollectionListElementComponent;
 let fixture: ComponentFixture<CollectionListElementComponent>;
@@ -14,10 +22,10 @@ const mockCollectionWithArchivedItems: Collection = Object.assign(new Collection
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }, archivedItemsCount: 1
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: 1,
 });
 
 const mockCollectionWithArchivedItemsDisabledAtBackend: Collection = Object.assign(new Collection(), {
@@ -25,10 +33,10 @@ const mockCollectionWithArchivedItemsDisabledAtBackend: Collection = Object.assi
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }, archivedItemsCount: -1
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: -1,
 });
 
 
@@ -37,10 +45,10 @@ const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }, archivedItemsCount: 1
+        value: 'Short description',
+      },
+    ],
+  }, archivedItemsCount: 1,
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
@@ -48,10 +56,10 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection()
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }, archivedItemsCount: 1
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: 1,
 });
 
 describe('CollectionListElementComponent', () => {
@@ -60,12 +68,12 @@ describe('CollectionListElementComponent', () => {
       declarations: [CollectionListElementComponent],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) }
+        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index c36034ba34..6e531f9abb 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,14 +1,14 @@
 import { Component } from '@angular/core';
 
 import { Collection } from '../../../core/shared/collection.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @Component({
   selector: 'ds-collection-list-element',
   styleUrls: ['./collection-list-element.component.scss'],
-  templateUrl: './collection-list-element.component.html'
+  templateUrl: './collection-list-element.component.html',
 })
 /**
  * Component representing list element for a collection
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
index 2101261bdc..d63abd9672 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.html
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -1,8 +1,8 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
     {{ dsoNameService.getName(object) }}
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="lead">
+  <span *ngIf="linkType === linkTypes.None" class="lead">
     {{ dsoNameService.getName(object) }}
   </span>
   <span class="pr-2">&nbsp;</span>
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
index 8f7350d860..74c8fe59ba 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
@@ -1,10 +1,18 @@
-import { CommunityListElementComponent } from './community-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Community } from '../../../core/shared/community.model';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../core/shared/community.model';
 import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { CommunityListElementComponent } from './community-list-element.component';
 
 let communityListElementComponent: CommunityListElementComponent;
 let fixture: ComponentFixture<CommunityListElementComponent>;
@@ -14,10 +22,10 @@ const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
@@ -25,10 +33,10 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 describe('CommunityListElementComponent', () => {
@@ -37,12 +45,12 @@ describe('CommunityListElementComponent', () => {
       declarations: [CommunityListElementComponent],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) }
+        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunityListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
index 4a83fd2834..8929db48be 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../core/shared/community.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @Component({
   selector: 'ds-community-list-element',
   styleUrls: ['./community-list-element.component.scss'],
-  templateUrl: './community-list-element.component.html'
+  templateUrl: './community-list-element.component.html',
 })
 /**
  * Component representing a list element for a community
diff --git a/src/app/shared/object-list/duplicate-data/duplicate.model.ts b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
new file mode 100644
index 0000000000..9aba0c6871
--- /dev/null
+++ b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
@@ -0,0 +1,61 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { DUPLICATE } from './duplicate.resource-type';
+
+/**
+ * This implements the model of a duplicate preview stub, to be displayed to submitters or reviewers
+ * if duplicate detection is enabled. The metadata map is configurable in the backend at duplicate-detection.cfg
+ */
+export class Duplicate implements CacheableObject {
+
+  static type = DUPLICATE;
+
+  /**
+   * The item title
+   */
+  @autoserialize
+    title: string;
+  /**
+   * The item uuid
+   */
+  @autoserialize
+    uuid: string;
+  /**
+   * The workfow item ID, if any
+   */
+  @autoserialize
+    workflowItemId: number;
+  /**
+   * The workspace item ID, if any
+   */
+  @autoserialize
+    workspaceItemId: number;
+  /**
+   * The owning collection of the item
+   */
+  @autoserialize
+    owningCollection: string;
+  /**
+   * Metadata for the preview item (e.g. dc.title)
+   */
+  @autoserialize
+    metadata: MetadataMap;
+
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The {@link HALLink}s for the URL that generated this item (in context of search results)
+   */
+  @deserialize
+    _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts b/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts
new file mode 100644
index 0000000000..588ca2da55
--- /dev/null
+++ b/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from 'src/app/core/shared/resource-type';
+
+/**
+ * The resource type for Duplicate preview stubs
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const DUPLICATE = new ResourceType('duplicate');
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index cb6d1d97e5..65091b5ee4 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -1,14 +1,18 @@
-import { Component, Input } from '@angular/core';
-import { map } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { hasValue } from '../../empty.util';
+import { map } from 'rxjs/operators';
 import { Item } from 'src/app/core/shared/item.model';
-import { IdentifierData } from './identifier-data.model';
+
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { hasValue } from '../../empty.util';
+import { IdentifierData } from './identifier-data.model';
 
 @Component({
   selector: 'ds-identifier-data',
-  templateUrl: './identifier-data.component.html'
+  templateUrl: './identifier-data.component.html',
 })
 /**
  * Component rendering an identifier, eg. DOI or handle
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.model.ts b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
index e707f396e4..a9e60c0175 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.model.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
@@ -1,11 +1,15 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 import { typedObject } from 'src/app/core/cache/builders/build-decorators';
 import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
 import { HALLink } from 'src/app/core/shared/hal-link.model';
 import { ResourceType } from 'src/app/core/shared/resource-type';
 import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+
+import { Identifier } from './identifier.model';
 import { IDENTIFIERS } from './identifier-data.resource-type';
-import {Identifier} from './identifier.model';
 
 @typedObject
 export class IdentifierData implements CacheableObject {
@@ -15,19 +19,19 @@ export class IdentifierData implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The
    */
   @autoserialize
-  identifiers: Identifier[];
+    identifiers: Identifier[];
 
   /**
    * The {@link HALLink}s for this IdentifierData
    */
    @deserialize
-   _links: {
+     _links: {
      self: HALLink;
    };
 }
diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/shared/object-list/identifier-data/identifier.model.ts
index f528824b36..fedf2990c1 100644
--- a/src/app/shared/object-list/identifier-data/identifier.model.ts
+++ b/src/app/shared/object-list/identifier-data/identifier.model.ts
@@ -10,21 +10,21 @@ export class Identifier {
    * The value of the identifier, eg. http://hdl.handle.net/123456789/123 or https://doi.org/test/doi/1234
    */
   @autoserialize
-  value: string;
+    value: string;
   /**
    * The type of identiifer, eg. "doi", or "handle", or "other"
    */
   @autoserialize
-  identifierType: string;
+    identifierType: string;
   /**
    * The status of the identifier. Some schemes, like DOI, will have a different status based on whether it is
    * queued for remote registration, reservation, or update, or has been registered, simply minted locally, etc.
    */
   @autoserialize
-  identifierStatus: string;
+    identifierStatus: string;
   /**
    * The type of resource, in this case Identifier
    */
   @autoserialize
-  type: string;
+    type: string;
 }
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index d75576e8eb..25a31967f2 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -1,13 +1,20 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ItemListElementComponent } from './item-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemListElementComponent } from './item-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -15,34 +22,34 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.publisher': [
       {
         language: 'en_US',
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.date.issued': [
       {
         language: 'en_US',
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is the abstract'
-      }
-    ]
-  }
+        value: 'This is the abstract',
+      },
+    ],
+  },
 });
 
 describe('ItemListElementComponent', () => {
@@ -60,9 +67,9 @@ describe('ItemListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
index a3bd2a1ce0..981a03eb4a 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
@@ -1,15 +1,16 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../../core/shared/item.model';
 
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
 @Component({
   selector: 'ds-item-list-element',
   styleUrls: ['./item-list-element.component.scss'],
-  templateUrl: './item-list-element.component.html'
+  templateUrl: './item-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Publication
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts
index 3cf05f7fec..b3044e6ced 100644
--- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts
@@ -1,10 +1,14 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ListableNotificationObjectComponent } from './listable-notification-object.component';
-import { NotificationType } from '../../notifications/models/notification-type';
-import { ListableNotificationObject } from './listable-notification-object.model';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { NotificationType } from '../../notifications/models/notification-type';
+import { ListableNotificationObjectComponent } from './listable-notification-object.component';
+import { ListableNotificationObject } from './listable-notification-object.model';
+
 describe('ListableNotificationObjectComponent', () => {
   let component: ListableNotificationObjectComponent;
   let fixture: ComponentFixture<ListableNotificationObjectComponent>;
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
index ca23ee76a2..8912b4867c 100644
--- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
-import {
-  AbstractListableElementComponent
-} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ListableNotificationObject } from './listable-notification-object.model';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { ListableNotificationObject } from './listable-notification-object.model';
 import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
 
 /**
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts
index 163d9096a2..b90b37e6a6 100644
--- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts
@@ -1,10 +1,10 @@
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { TypedObject } from '../../../core/cache/typed-object.model';
-import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { NotificationType } from '../../notifications/models/notification-type';
 import { ResourceType } from '../../../core/shared/resource-type';
+import { NotificationType } from '../../notifications/models/notification-type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
 
 /**
  * Object representing a notification message inside a list of objects
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
index e2f55ce10c..bdf14463ad 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
@@ -1,5 +1,5 @@
 <div>
-  <a *ngIf="(mdRepresentation.representationType=='browse_link')"
+  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
      target="_blank" class="dont-break-out"
      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
      [queryParams]="getQueryParams()">
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
index 3527b9fddd..a6c0a55977 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
@@ -1,61 +1,82 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowseLinkMetadataListElementComponent } from './browse-link-metadata-list-element.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { ValueListBrowseDefinition } from '../../../../core/shared/value-list-browse-definition.model';
+import { BrowseLinkMetadataListElementComponent } from './browse-link-metadata-list-element.component';
 
 const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type'), {
   key: 'dc.contributor.author',
-  value: 'Test Author'
-});
+  value: 'Test Author',
+  browseDefinition: Object.assign(new ValueListBrowseDefinition(), {
+    id: 'author',
+  }),
+} as Partial<MetadatumRepresentation>);
 
 const mockMetadataRepresentationWithUrl = Object.assign(new MetadatumRepresentation('type'), {
   key: 'dc.subject',
-  value: 'http://purl.org/test/subject'
-});
+  value: 'https://purl.org/test/subject',
+  browseDefinition: Object.assign(new ValueListBrowseDefinition(), {
+    id: 'subject',
+  }),
+} as Partial<MetadatumRepresentation>);
 
 describe('BrowseLinkMetadataListElementComponent', () => {
   let comp: BrowseLinkMetadataListElementComponent;
   let fixture: ComponentFixture<BrowseLinkMetadataListElementComponent>;
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [],
       declarations: [BrowseLinkMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(BrowseLinkMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(BrowseLinkMetadataListElementComponent);
     comp = fixture.componentInstance;
-    comp.mdRepresentation = mockMetadataRepresentation;
-    fixture.detectChanges();
-  }));
+  });
+
+  describe('with normal metadata', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentation;
+      spyOnProperty(comp.mdRepresentation, 'representationType', 'get').and.returnValue(MetadataRepresentationType.BrowseLink);
+      fixture.detectChanges();
+    });
 
-  waitForAsync(() => {
     it('should contain the value as a browse link', () => {
       expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentation.value);
     });
+
     it('should NOT match isLink', () => {
-      expect(comp.isLink).toBe(false);
+      expect(comp.isLink()).toBe(false);
     });
   });
 
-  beforeEach(waitForAsync(() => {
-    fixture = TestBed.createComponent(BrowseLinkMetadataListElementComponent);
-    comp = fixture.componentInstance;
-    comp.mdRepresentation = mockMetadataRepresentationWithUrl;
-    fixture.detectChanges();
-  }));
+  describe('with metadata wit an url', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentationWithUrl;
+      spyOnProperty(comp.mdRepresentation, 'representationType', 'get').and.returnValue(MetadataRepresentationType.BrowseLink);
+      fixture.detectChanges();
+    });
 
-  waitForAsync(() => {
     it('should contain the value expected', () => {
       expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentationWithUrl.value);
     });
+
     it('should match isLink', () => {
-      expect(comp.isLink).toBe(true);
+      expect(comp.isLink()).toBe(true);
     });
   });
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
index 8015583767..d206cbf459 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -1,15 +1,16 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
+import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 //@metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
 // For now, authority controlled fields are rendered the same way as plain text fields
 //@metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.BrowseLink)
 @Component({
   selector: 'ds-browse-link-metadata-list-element',
-  templateUrl: './browse-link-metadata-list-element.component.html'
+  templateUrl: './browse-link-metadata-list-element.component.html',
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
@@ -21,9 +22,9 @@ export class BrowseLinkMetadataListElementComponent extends MetadataRepresentati
    * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
    */
   getQueryParams() {
-    let queryParams = {startsWith: this.mdRepresentation.getValue()};
+    const queryParams = { startsWith: this.mdRepresentation.getValue() };
     if (this.mdRepresentation.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
-      return {value: this.mdRepresentation.getValue()};
+      return { value: this.mdRepresentation.getValue() };
     }
     return queryParams;
   }
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
index 99052b6b14..58607a82b4 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
@@ -1,8 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ItemMetadataListElementComponent } from './item-metadata-list-element.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
 import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { ItemMetadataListElementComponent } from './item-metadata-list-element.component';
 
 const mockItemMetadataRepresentation = new ItemMetadataRepresentation(Object.assign({}));
 
@@ -14,9 +22,9 @@ describe('ItemMetadataListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [ItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
index d0bbdf1ded..46230cf6f9 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
@@ -1,13 +1,14 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-item-metadata-list-element',
-  templateUrl: './item-metadata-list-element.component.html'
+  templateUrl: './item-metadata-list-element.component.html',
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of items
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
index c4a6903129..ff54a9e00d 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
@@ -1,11 +1,16 @@
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { Component, OnInit, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @Component({
   selector: 'ds-item-metadata-representation-list-element',
-  template: ''
+  template: '',
 })
 /**
  * An abstract class for displaying a single ItemMetadataRepresentation
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
index dc8febe84a..bcd972eb29 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
@@ -1,5 +1,13 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
 import { mockData } from '../../testing/browse-definition-data-service.stub';
 import { MetadataRepresentationListElementComponent } from './metadata-representation-list-element.component';
@@ -7,11 +15,11 @@ import { MetadataRepresentationListElementComponent } from './metadata-represent
 // Mock metadata representation values
 const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
   key: 'dc.contributor.author',
-  value: 'Test Author'
+  value: 'Test Author',
 });
 const mockMetadataRepresentationUrl = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
   key: 'dc.subject',
-  value: 'https://www.google.com'
+  value: 'https://www.google.com',
 });
 
 describe('MetadataRepresentationListElementComponent', () => {
@@ -19,12 +27,12 @@ describe('MetadataRepresentationListElementComponent', () => {
   let fixture: ComponentFixture<MetadataRepresentationListElementComponent>;
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [],
       declarations: [MetadataRepresentationListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataRepresentationListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -39,9 +47,7 @@ describe('MetadataRepresentationListElementComponent', () => {
       comp.mdRepresentation = mockMetadataRepresentation;
     });
     it('isLink correctly detects a non-URL string as false', () => {
-      waitForAsync(() => {
-        expect(comp.isLink()).toBe(false);
-      });
+      expect(comp.isLink()).toBe(false);
     });
   });
 
@@ -50,9 +56,7 @@ describe('MetadataRepresentationListElementComponent', () => {
       comp.mdRepresentation = mockMetadataRepresentationUrl;
     });
     it('isLink correctly detects a URL string as true', () => {
-      waitForAsync(() => {
-        expect(comp.isLink()).toBe(true);
-      });
+      expect(comp.isLink()).toBe(true);
     });
   });
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
index d8f8621ca6..24f066a2c1 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
@@ -1,10 +1,14 @@
-import { Component, Input } from '@angular/core';
-import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Context } from '../../../core/shared/context.model';
+import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
 
 @Component({
   selector: 'ds-metadata-representation-list-element',
-  template: ''
+  template: '',
 })
 /**
  * An abstract class for displaying a single MetadataRepresentation
@@ -25,7 +29,7 @@ export class MetadataRepresentationListElementComponent {
    */
   isLink(): boolean {
     // Match any string that begins with http:// or https://
-    const linkPattern = new RegExp(/^https?\/\/.*/);
+    const linkPattern = new RegExp(/^https?:\/\/.*/);
     return linkPattern.test(this.mdRepresentation.getValue());
   }
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
index 7d416e9f3e..f88347a8b7 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
@@ -1,14 +1,14 @@
 <div>
   <!-- Because this template is used by default, we will additionally test for representation type and display accordingly -->
-  <span *ngIf="(mdRepresentation.representationType=='plain_text') && !isLink()" class="dont-break-out">
+  <span *ngIf="(mdRepresentation.representationType==='plain_text') && !isLink()" class="dont-break-out">
     {{mdRepresentation.getValue()}}
   </span>
-  <a *ngIf="(mdRepresentation.representationType=='plain_text') && isLink()" class="dont-break-out"
+  <a *ngIf="(mdRepresentation.representationType==='plain_text') && isLink()" class="dont-break-out"
   target="_blank" [href]="mdRepresentation.getValue()">
     {{mdRepresentation.getValue()}}
   </a>
-  <span *ngIf="(mdRepresentation.representationType=='authority_controlled')" class="dont-break-out">{{mdRepresentation.getValue()}}</span>
-  <a *ngIf="(mdRepresentation.representationType=='browse_link')"
+  <span *ngIf="(mdRepresentation.representationType==='authority_controlled')" class="dont-break-out">{{mdRepresentation.getValue()}}</span>
+  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
      class="dont-break-out ds-browse-link"
      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
      [queryParams]="getQueryParams()">
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index 91d7db3562..cc38ad7b35 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component';
-import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
+import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
 import { mockData } from '../../../testing/browse-definition-data-service.stub';
+import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component';
 
 // Render the mock representation with the default mock author browse definition so it is also rendered as a link
 // without affecting other tests
 const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
   key: 'dc.contributor.author',
-  value: 'Test Author'
+  value: 'Test Author',
 });
 
 describe('PlainTextMetadataListElementComponent', () => {
@@ -20,9 +28,9 @@ describe('PlainTextMetadataListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [PlainTextMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PlainTextMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index 8a3e1d51a6..f6e9ca6930 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -1,15 +1,16 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
+import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
 // For now, authority controlled fields are rendered the same way as plain text fields
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
 @Component({
   selector: 'ds-plain-text-metadata-list-element',
-  templateUrl: './plain-text-metadata-list-element.component.html'
+  templateUrl: './plain-text-metadata-list-element.component.html',
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
@@ -21,9 +22,9 @@ export class PlainTextMetadataListElementComponent extends MetadataRepresentatio
    * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
    */
   getQueryParams() {
-    let queryParams = {startsWith: this.mdRepresentation.getValue()};
+    const queryParams = { startsWith: this.mdRepresentation.getValue() };
     if (this.mdRepresentation.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
-      return {value: this.mdRepresentation.getValue()};
+      return { value: this.mdRepresentation.getValue() };
     }
     return queryParams;
   }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
index 777a0258b0..ed836482ed 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
@@ -1,25 +1,31 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { getMockLinkService } from '../../../../mocks/link-service.mock';
-import { VarDirective } from '../../../../utils/var.directive';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
-import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { Context } from '../../../../../core/shared/context.model';
-import { TranslateModule } from '@ngx-translate/core';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
 
 let component: ClaimedApprovedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedApprovedSearchResultListElementComponent>;
@@ -33,28 +39,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -74,11 +80,11 @@ describe('ClaimedApprovedSearchResultListElementComponent', () => {
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedApprovedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -97,7 +103,7 @@ describe('ClaimedApprovedSearchResultListElementComponent', () => {
       expect(linkService.resolveLinks).toHaveBeenCalledWith(
         component.dso,
         jasmine.objectContaining({ name: 'workflowitem' }),
-        jasmine.objectContaining({ name: 'action' })
+        jasmine.objectContaining({ name: 'action' }),
       );
       expect(workflowitemRD.payload).toEqual(workflowitem);
       done();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index 10e29bbab9..48286aebea 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -1,19 +1,26 @@
-import { Component, Inject } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import { Context } from 'src/app/core/shared/context.model';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
-import { Context } from 'src/app/core/shared/context.model';
 
 /**
  * This component renders claimed task approved object for the search result in the list view.
@@ -21,7 +28,7 @@ import { Context } from 'src/app/core/shared/context.model';
 @Component({
   selector: 'ds-claimed-approved-search-result-list-element',
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-approved-search-result-list-element.component.html'
+  templateUrl: './claimed-approved-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
@@ -45,7 +52,7 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -59,9 +66,9 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
       followLink('workflowitem',
         { useCachedVersionIfAvailable: false },
         followLink('item'),
-        followLink('submitter')
+        followLink('submitter'),
       ),
-      followLink('action')
+      followLink('action'),
     );
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
   }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
index ccd742f854..82c659ba63 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
@@ -1,25 +1,31 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { ClaimedDeclinedSearchResultListElementComponent } from './claimed-declined-search-result-list-element.component';
-import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { getMockLinkService } from '../../../../mocks/link-service.mock';
-import { VarDirective } from '../../../../utils/var.directive';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { Context } from '../../../../../core/shared/context.model';
-import { TranslateModule } from '@ngx-translate/core';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedDeclinedSearchResultListElementComponent } from './claimed-declined-search-result-list-element.component';
 
 let component: ClaimedDeclinedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedDeclinedSearchResultListElementComponent>;
@@ -33,28 +39,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -74,11 +80,11 @@ describe('ClaimedDeclinedSearchResultListElementComponent', () => {
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedDeclinedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -97,7 +103,7 @@ describe('ClaimedDeclinedSearchResultListElementComponent', () => {
       expect(linkService.resolveLinks).toHaveBeenCalledWith(
         component.dso,
         jasmine.objectContaining({ name: 'workflowitem' }),
-        jasmine.objectContaining({ name: 'action' })
+        jasmine.objectContaining({ name: 'action' }),
       );
       expect(workflowitemRD.payload).toEqual(workflowitem);
       done();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index 0d24ac9968..009c78d975 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -1,20 +1,26 @@
-import { Component, Inject } from '@angular/core';
-
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
-import { Context } from '../../../../../core/shared/context.model';
 
 /**
  * This component renders claimed task declined object for the search result in the list view.
@@ -22,7 +28,7 @@ import { Context } from '../../../../../core/shared/context.model';
 @Component({
   selector: 'ds-claimed-declined-search-result-list-element',
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-declined-search-result-list-element.component.html'
+  templateUrl: './claimed-declined-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
@@ -46,7 +52,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -60,7 +66,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
       followLink('workflowitem',
         { useCachedVersionIfAvailable: false },
         followLink('item'),
-        followLink('submitter')
+        followLink('submitter'),
       ),
       followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts
index 5e082ef4cf..61b6b8d9e8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts
@@ -1,22 +1,30 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { ClaimedDeclinedTaskSearchResultListElementComponent } from './claimed-declined-task-search-result-list-element.component';
-import { ClaimedDeclinedTaskTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-task-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { getMockLinkService } from '../../../../mocks/link-service.mock';
-import { VarDirective } from '../../../../utils/var.directive';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
-import { TranslateModule } from '@ngx-translate/core';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedDeclinedTaskTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedDeclinedTaskSearchResultListElementComponent } from './claimed-declined-task-search-result-list-element.component';
 
 let component: ClaimedDeclinedTaskSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedDeclinedTaskSearchResultListElementComponent>;
@@ -30,28 +38,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -73,9 +81,9 @@ describe('ClaimedDeclinedTaskSearchResultListElementComponent', () => {
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedDeclinedTaskSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -94,7 +102,7 @@ describe('ClaimedDeclinedTaskSearchResultListElementComponent', () => {
       expect(linkService.resolveLinks).toHaveBeenCalledWith(
         component.dso,
         jasmine.objectContaining({ name: 'workflowitem' }),
-        jasmine.objectContaining({ name: 'action' })
+        jasmine.objectContaining({ name: 'action' }),
       );
       expect(workflowitemRD.payload).toEqual(workflowitem);
       done();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
index fb374ff52d..81059ba736 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
@@ -1,19 +1,27 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
-import { Context } from '../../../../../core/shared/context.model';
 
 /**
  * This component renders claimed task declined task object for the search result in the list view.
@@ -21,7 +29,7 @@ import { Context } from '../../../../../core/shared/context.model';
 @Component({
   selector: 'ds-claimed-declined-task-search-result-list-element',
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-declined-task-search-result-list-element.component.html'
+  templateUrl: './claimed-declined-task-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedDeclinedTaskTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
@@ -59,7 +67,7 @@ export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchR
       followLink('workflowitem',
         { useCachedVersionIfAvailable: false },
         followLink('item'),
-        followLink('submitter')
+        followLink('submitter'),
       ),
       followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index 42af008cdd..9cdeb49e5c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -4,7 +4,17 @@
                                [showSubmitter]="showSubmitter"
                                [badgeContext]="badgeContext"
                                [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
-
+  <!-- Display duplicate alert, if feature enabled and duplicates detected -->
+  <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
+    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
+      <div [ngClass]="'col-2'"></div>
+      <div [ngClass]="'col-10'">
+        <div class="d-flex alert alert-warning w-100">
+          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+        </div>
+      </div>
+    </div>
+  </ng-container>
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-claimed-task-actions [item]="item$.value"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
index c1778c1792..3ba3862812 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
@@ -1,33 +1,42 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
 import {
   ComponentFixture,
   fakeAsync,
   flush,
   TestBed,
   tick,
-  waitForAsync
+  waitForAsync,
 } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../utils/var.directive';
+import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component';
 
 let component: ClaimedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedSearchResultListElementComponent>;
@@ -35,34 +44,49 @@ let fixture: ComponentFixture<ClaimedSearchResultListElementComponent>;
 const mockResultObject: ClaimedTaskSearchResult = new ClaimedTaskSearchResult();
 mockResultObject.hitHighlights = {};
 
+const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
+
+const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+  findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+    name: 'duplicate.enable',
+    values: [
+      'true',
+    ],
+  })),
+});
+const duplicateDataServiceStub = {
+  findListByHref: () => observableOf(emptyList),
+  findDuplicates: () => createSuccessfulRemoteDataObject$({}),
+};
+
 const item = Object.assign(new Item(), {
   bundles: observableOf({}),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -70,7 +94,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('ClaimedSearchResultListElementComponent', () => {
@@ -83,11 +107,13 @@ describe('ClaimedSearchResultListElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SubmissionDuplicateDataService, useValue: duplicateDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -106,7 +132,7 @@ describe('ClaimedSearchResultListElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
@@ -118,7 +144,7 @@ describe('ClaimedSearchResultListElementComponent', () => {
 
   it('should forward claimed-task-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-claimed-task-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 18148b6a8c..0dddacdf58 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,31 +1,54 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { followLink } from '../../../utils/follow-link-config.model';
 import {
-  SearchResultListElementComponent
-} from '../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Item } from '../../../../core/shared/item.model';
-import { mergeMap, tap } from 'rxjs/operators';
-import { isNotEmpty, hasValue } from '../../../empty.util';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { Duplicate } from '../../duplicate-data/duplicate.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 @Component({
   selector: 'ds-claimed-search-result-list-element',
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-search-result-list-element.component.html'
+  templateUrl: './claimed-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit, OnDestroy {
@@ -50,6 +73,11 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
+  /**
+   * The potential duplicates of this item
+   */
+  public duplicates$: Observable<Duplicate[]>;
+
   /**
    * Display thumbnails if required by configuration
    */
@@ -60,7 +88,9 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
     protected truncatableService: TruncatableService,
     public dsoNameService: DSONameService,
     protected objectCache: ObjectCacheService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    protected configService: ConfigurationDataService,
+    protected duplicateDataService: SubmissionDuplicateDataService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -72,7 +102,7 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -81,7 +111,7 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -91,10 +121,45 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
-
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    // Initialise duplicates, if enabled
+    this.duplicates$ = this.initializeDuplicateDetectionIfEnabled();
+  }
+
+  /**
+   * Initialize and set the duplicates observable based on whether the configuration in REST is enabled
+   * and the results returned
+   */
+  initializeDuplicateDetectionIfEnabled() {
+    return combineLatest([
+      this.configService.findByPropertyName('duplicate.enable').pipe(
+        getFirstCompletedRemoteData(),
+        map((remoteData: RemoteData<ConfigurationProperty>) => {
+          return (remoteData.isSuccess && remoteData.payload && remoteData.payload.values[0] === 'true');
+        }),
+      ),
+      this.item$.pipe(),
+    ],
+    ).pipe(
+      map(([enabled, rd]) => {
+        if (enabled) {
+          this.duplicates$ = this.duplicateDataService.findDuplicates(rd.uuid).pipe(
+            getFirstCompletedRemoteData(),
+            map((remoteData: RemoteData<PaginatedList<Duplicate>>) => {
+              if (remoteData.hasSucceeded) {
+                if (remoteData.payload.page) {
+                  return remoteData.payload.page;
+                }
+              }
+            }),
+          );
+        } else {
+          return [] as Duplicate[];
+        }
+      }),
+    );
   }
 
   ngOnDestroy() {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index c8ef730faf..8c8a99aa9e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -21,7 +21,7 @@
                 class="item-list-authors">
                 <span
                   *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors'
-                  | translate}}</span>
+                 | translate}}</span>
                 <span
                   *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                   <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index aa618add35..ae6c4b46a8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -1,16 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemListPreviewComponent } from './item-list-preview.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { Item } from '../../../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { ItemListPreviewComponent } from './item-list-preview.component';
 
 let component: ItemListPreviewComponent;
 let fixture: ComponentFixture<ItemListPreviewComponent>;
@@ -21,16 +30,16 @@ const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -38,16 +47,16 @@ const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 const mockItemWithEntityType: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -55,28 +64,28 @@ const mockItemWithEntityType: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dspace.entity.type': [
       {
         language: null,
-        value: 'Publication'
-      }
-    ]
-  }
+        value: 'Publication',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ItemListPreviewComponent', () => {
@@ -86,20 +95,20 @@ describe('ItemListPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
-        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate }},
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListPreviewComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -192,20 +201,20 @@ describe('ItemListPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
-        {provide: 'objectElementProvider', useValue: {mockItemWithAuthorAndDate}},
-        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListPreviewComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(waitForAsync(() => {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index be94eb85aa..ed17641f10 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,12 +1,20 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
 import { SearchResult } from '../../../search/models/search-result.model';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { Context } from 'src/app/core/shared/context.model';
-import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
 
 /**
  * This component show metadata for the given item object in the list view.
@@ -15,7 +23,7 @@ import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model'
   selector: 'ds-item-list-preview',
   styleUrls: ['item-list-preview.component.scss'],
   templateUrl: 'item-list-preview.component.html',
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemListPreviewComponent implements OnInit {
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
index fc50b49d51..075ce7dc92 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
@@ -1,18 +1,22 @@
-import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../../theme-support/themed.component';
-import { ItemListPreviewComponent } from './item-list-preview.component';
-import { Item } from '../../../../core/shared/item.model';
-import { SearchResult } from '../../../search/models/search-result.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Context } from 'src/app/core/shared/context.model';
 import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
 
+import { Item } from '../../../../core/shared/item.model';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { ThemedComponent } from '../../../theme-support/themed.component';
+import { ItemListPreviewComponent } from './item-list-preview.component';
+
 /**
  * Themed wrapper for ItemListPreviewComponent
  */
 @Component({
   selector: 'ds-themed-item-list-preview',
   styleUrls: [],
-  templateUrl: '../../../theme-support/themed.component.html'
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPreviewComponent> {
   protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'badgeContext', 'showSubmitter', 'workflowItem'];
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
index a26fbaaf57..35165e0639 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
@@ -1,19 +1,27 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component';
 
 let component: ItemSearchResultListElementSubmissionComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementSubmissionComponent>;
@@ -27,28 +35,28 @@ mockResultObject.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 describe('ItemMyDSpaceResultListElementComponent', () => {
@@ -59,11 +67,11 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementSubmissionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -83,7 +91,7 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
 
   it('should forward item-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-item-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index 91c2576dee..44714cfe76 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -1,10 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
@@ -13,7 +16,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 @Component({
   selector: 'ds-item-search-result-list-element-submission',
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss', './item-search-result-list-element-submission.component.scss'],
-  templateUrl: './item-search-result-list-element-submission.component.html'
+  templateUrl: './item-search-result-list-element-submission.component.html',
 })
 
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Workspace)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 9fe6e37c9e..ab7d7a7d8a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -4,6 +4,19 @@
                                [showSubmitter]="showSubmitter"
                                [badgeContext]="badgeContext"
                                [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
+
+  <!-- Display duplicate alert, if feature enabled and duplicates detected -->
+  <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
+    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
+      <div [ngClass]="'col-2'"></div>
+      <div [ngClass]="'col-10'">
+        <div class="d-flex alert alert-warning w-100">
+          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+        </div>
+      </div>
+    </div>
+  </ng-container>
+
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-pool-task-actions id="actions"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index d63ee4ba13..ba2cc0b537 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -1,32 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
 import {
   ComponentFixture,
   fakeAsync,
   flush,
   TestBed,
   tick,
-  waitForAsync
+  waitForAsync,
 } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { Context } from '../../../../core/shared/context.model';
+import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component';
 
 let component: PoolSearchResultListElementComponent;
 let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
@@ -34,40 +43,56 @@ let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
 const mockResultObject: PoolTaskSearchResult = new PoolTaskSearchResult();
 mockResultObject.hitHighlights = {};
 
+const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
+
+const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+  findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+    name: 'duplicate.enable',
+    values: [
+      'true',
+    ],
+  })),
+});
+const duplicateDataServiceStub = {
+  findListByHref: () => observableOf(emptyList),
+  findDuplicates: () => createSuccessfulRemoteDataObject$({}),
+};
+
 const item = Object.assign(new Item(), {
+  duplicates: observableOf([]),
   bundles: observableOf({}),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rdItem = createSuccessfulRemoteDataObject(item);
@@ -76,7 +101,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('PoolSearchResultListElementComponent', () => {
@@ -89,11 +114,13 @@ describe('PoolSearchResultListElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environmentUseThumbs },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SubmissionDuplicateDataService, useValue: duplicateDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -112,7 +139,7 @@ describe('PoolSearchResultListElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
@@ -124,7 +151,7 @@ describe('PoolSearchResultListElementComponent', () => {
 
   it('should forward pool-task-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
     const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions'));
     actionsComponents.triggerEventHandler('processCompleted', actionPayload);
     tick();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 19723a7e49..e623ce19a8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,27 +1,49 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
-import {
-  SearchResultListElementComponent
-} from '../../search-result-list-element/search-result-list-element.component';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Item } from '../../../../core/shared/item.model';
-import { isNotEmpty, hasValue } from '../../../empty.util';
-import { Context } from '../../../../core/shared/context.model';
+import { Duplicate } from '../../duplicate-data/duplicate.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
  * This component renders pool task object for the search result in the list view.
@@ -55,6 +77,11 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
+  /**
+   * The potential duplicates of this workflow item
+   */
+  public duplicates$: Observable<Duplicate[]>;
+
   /**
    * The index of this list element
    */
@@ -70,7 +97,9 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
     protected truncatableService: TruncatableService,
     public dsoNameService: DSONameService,
     protected objectCache: ObjectCacheService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    protected configService: ConfigurationDataService,
+    protected duplicateDataService: SubmissionDuplicateDataService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -82,7 +111,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -91,7 +120,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -101,10 +130,45 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
-
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    // Initialise duplicates, if enabled
+    this.duplicates$ = this.initializeDuplicateDetectionIfEnabled();
+  }
+
+  /**
+   * Initialize and set the duplicates observable based on whether the configuration in REST is enabled
+   * and the results returned
+   */
+  initializeDuplicateDetectionIfEnabled() {
+    return combineLatest([
+      this.configService.findByPropertyName('duplicate.enable').pipe(
+        getFirstCompletedRemoteData(),
+        map((remoteData: RemoteData<ConfigurationProperty>) => {
+          return (remoteData.isSuccess && remoteData.payload && remoteData.payload.values[0] === 'true');
+        }),
+      ),
+      this.item$.pipe(),
+    ],
+    ).pipe(
+      map(([enabled, rd]) => {
+        if (enabled) {
+          this.duplicates$ = this.duplicateDataService.findDuplicates(rd.uuid).pipe(
+            getFirstCompletedRemoteData(),
+            map((remoteData: RemoteData<PaginatedList<Duplicate>>) => {
+              if (remoteData.hasSucceeded) {
+                if (remoteData.payload.page) {
+                  return remoteData.payload.page;
+                }
+              }
+            }),
+          );
+        } else {
+          return [] as Duplicate[];
+        }
+      }),
+    );
   }
 
   ngOnDestroy() {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index ffc3df53f8..2b4d60bb24 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -11,5 +11,5 @@
 </ng-container>
 
 <ds-themed-loading
-        *ngIf="!(derivedSearchResult$ | async)"
+        *ngIf="(derivedSearchResult$ | async) === undefined"
         [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index 52a13a69e1..17e286935a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -1,24 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { WorkflowItemSearchResultListElementComponent } from './workflow-item-search-result-list-element.component';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { Context } from '../../../../core/shared/context.model';
 
 let component: WorkflowItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultListElementComponent>;
@@ -32,34 +40,34 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rd = createSuccessfulRemoteDataObject(item);
@@ -78,11 +86,11 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -111,7 +119,7 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
 
   it('should forward workflowitem-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-workflowitem-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 6218f69490..f0144dbd45 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,23 +1,27 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { Context } from '../../../../core/shared/context.model';
 
 /**
  * This component renders workflowitem object for the search result in the list view.
@@ -37,7 +41,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
   /**
    * The item search result derived from the WorkspaceItemSearchResult
    */
-  derivedSearchResult$: Observable<ItemSearchResult>;
+  derivedSearchResult$: BehaviorSubject<ItemSearchResult> = new BehaviorSubject(undefined);
 
   /**
    * Represents the badge context
@@ -53,7 +57,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -69,13 +73,14 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
 
   private deriveSearchResult() {
     this.linkService.resolveLink(this.object.indexableObject, followLink('item'));
-    this.derivedSearchResult$ = this.object.indexableObject.item.pipe(
+    this.object.indexableObject.item.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => {
-        const result = new ItemSearchResult();
-        result.indexableObject = item;
-        result.hitHighlights = this.object.hitHighlights;
-        return result;
+    ).subscribe((item: Item) => {
+      const result = new ItemSearchResult();
+      this.derivedSearchResult$.next(Object.assign(new ItemSearchResult(), {
+        indexableObject: item,
+        hitHighlights: this.object.hitHighlights,
       }));
+    });
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 724db2892d..2363c837a3 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -10,5 +10,5 @@
     </div>
 </ng-container>
 <ds-themed-loading
-        *ngIf="!(derivedSearchResult$ | async)"
+        *ngIf="(derivedSearchResult$ | async) === undefined"
         [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index 54344bb879..cb585f719d 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -1,24 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { WorkspaceItemSearchResultListElementComponent } from './workspace-item-search-result-list-element.component';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { Context } from '../../../../core/shared/context.model';
 
 let component: WorkspaceItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultListElementComponent>;
@@ -32,34 +40,34 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rd = createSuccessfulRemoteDataObject(item);
@@ -77,11 +85,11 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -111,7 +119,7 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
   it('should forward workspaceitem-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
 
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-workspaceitem-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 7ff9a2ef3d..e74cd45ed6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,23 +1,27 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Observable } from 'rxjs';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { map } from 'rxjs/operators';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { Context } from '../../../../core/shared/context.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
  * This component renders workspaceitem object for the search result in the list view.
@@ -37,7 +41,7 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
   /**
    * The item search result derived from the WorkspaceItemSearchResult
    */
-  derivedSearchResult$: Observable<ItemSearchResult>;
+  derivedSearchResult$: BehaviorSubject<ItemSearchResult> = new BehaviorSubject(undefined);
 
   /**
    * Represents the badge context
@@ -53,7 +57,7 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
     public dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -69,13 +73,14 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
 
   private deriveSearchResult() {
     this.linkService.resolveLink(this.object.indexableObject, followLink('item'));
-    this.derivedSearchResult$ = this.object.indexableObject.item.pipe(
+    this.object.indexableObject.item.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => {
+    ).subscribe((item: Item) => {
       const result = new ItemSearchResult();
-      result.indexableObject = item;
-      result.hitHighlights = this.object.hitHighlights;
-      return result;
-    }));
+      this.derivedSearchResult$.next(Object.assign(new ItemSearchResult(), {
+        indexableObject: item,
+        hitHighlights: this.object.hitHighlights,
+      }));
+    });
   }
 }
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index b8712b85c5..5fe57e1369 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -15,7 +15,7 @@
         (paginationChange)="onPaginationChange($event)"
         (prev)="goPrev()"
         (next)="goNext()">
-    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}">
+    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
         <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
           <ds-selectable-list-item-control *ngIf="selectable" [index]="i"
                                            [object]="object"
diff --git a/src/app/shared/object-list/object-list.component.spec.ts b/src/app/shared/object-list/object-list.component.spec.ts
index ef04582695..86f681ce11 100644
--- a/src/app/shared/object-list/object-list.component.spec.ts
+++ b/src/app/shared/object-list/object-list.component.spec.ts
@@ -1,7 +1,17 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ObjectListComponent } from './object-list.component';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
+import { ObjectListComponent } from './object-list.component';
 import { SelectableListService } from './selectable-list/selectable-list.service';
 
 describe('ObjectListComponent', () => {
@@ -14,9 +24,9 @@ describe('ObjectListComponent', () => {
       imports: [],
       declarations: [ObjectListComponent],
       providers: [{ provide: SelectableListService, useValue: {} }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ObjectListComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 5161b75459..1600ec3243 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,14 +1,25 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
 import { fadeIn } from '../animations/fade';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { SelectableListService } from './selectable-list/selectable-list.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { Context } from '../../core/shared/context.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -16,7 +27,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-list',
   styleUrls: ['./object-list.component.scss'],
   templateUrl: './object-list.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class ObjectListComponent {
   /**
@@ -217,14 +228,14 @@ export class ObjectListComponent {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 0bcb890f7d..08f7cee933 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -2,8 +2,8 @@
   <div *ngIf="showThumbnails" class="offset-3 offset-md-2 "></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
     <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index e5ea60b35d..4788f8ecbd 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Collection } from '../../../../core/shared/collection.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component';
 
 let collectionSearchResultListElementComponent: CollectionSearchResultListElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultListElementComponent>;
@@ -25,10 +34,10 @@ mockCollectionWithAbstract.indexableObject = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
@@ -38,16 +47,16 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 describe('CollectionSearchResultListElementComponent', () => {
@@ -57,11 +66,11 @@ describe('CollectionSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -98,7 +107,8 @@ describe('CollectionSearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'));
+      const offset: DebugElement = fixture.debugElement.query(By.css('.offset-md-2'));
+      expect(offset).not.toBeNull();
     });
   });
 
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 23e9e5ee57..7e8294de2f 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { SearchResultListElementComponent } from '../search-result-list-element.component';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
 
 @Component({
   selector: 'ds-collection-search-result-list-element',
   styleUrls: ['../search-result-list-element.component.scss', 'collection-search-result-list-element.component.scss'],
-  templateUrl: 'collection-search-result-list-element.component.html'
+  templateUrl: 'collection-search-result-list-element.component.html',
 })
 /**
  * Component representing a collection search result in list view
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index d38170e863..c66cf21e5a 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -2,8 +2,8 @@
   <div *ngIf="showThumbnails" class="offset-md-2"></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
     <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index ce12f5f7da..f434d9d756 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Community } from '../../../../core/shared/community.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../../core/shared/community.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component';
 
 let communitySearchResultListElementComponent: CommunitySearchResultListElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultListElementComponent>;
@@ -25,10 +34,10 @@ mockCommunityWithAbstract.indexableObject = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
@@ -38,16 +47,16 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 describe('CommunitySearchResultListElementComponent', () => {
@@ -57,12 +66,12 @@ describe('CommunitySearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunitySearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -99,7 +108,8 @@ describe('CommunitySearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'));
+      const offset: DebugElement = fixture.debugElement.query(By.css('.offset-md-2'));
+      expect(offset).not.toBeNull();
     });
   });
 });
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index f31e36ce82..41d354c55c 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { SearchResultListElementComponent } from '../search-result-list-element.component';
+
 import { Community } from '../../../../core/shared/community.model';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
 
 @Component({
   selector: 'ds-community-search-result-list-element',
   styleUrls: ['../search-result-list-element.component.scss', 'community-search-result-list-element.component.scss'],
-  templateUrl: 'community-search-result-list-element.component.html'
+  templateUrl: 'community-search-result-list-element.component.html',
 })
 /**
  * Component representing a community search result in list view
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index f7a687048a..78a33b5a5d 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,11 +1,11 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </span>
@@ -16,10 +16,10 @@
     </div>
 
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 7665b7d64e..c28d63c79c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -1,15 +1,26 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
-import { Item } from '../../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../utils/truncate.pipe';
-import { TruncatableService } from '../../../../../truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import {
+  DSONameServiceMock,
+  UNDEFINED_NAME,
+} from '../../../../../mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../utils/truncate.pipe';
+import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
@@ -17,7 +28,7 @@ const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
     'dc.title': [{
-      value: dcTitle
+      value: dcTitle,
     }],
   },
   indexableObject:
@@ -27,47 +38,47 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: dcTitle
-          }
+            value: dcTitle,
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
-        ]
-      }
-    })
+            value: 'This is the abstract',
+          },
+        ],
+      },
+    }),
 });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   indexableObject:
     Object.assign(new Item(), {
       bundles: observableOf({}),
-      metadata: {}
-    })
+      metadata: {},
+    }),
 });
 const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
     'person.familyName': [{
-      value: '<em>Michel</em>'
+      value: '<em>Michel</em>',
     }],
   },
   indexableObject:
@@ -78,50 +89,50 @@ const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
+            value: 'This is the abstract',
+          },
         ],
         'person.familyName': [
           {
-            value: 'Michel'
-          }
+            value: 'Michel',
+          },
         ],
         'dspace.entity.type': [
           {
-            value: 'Person'
-          }
-        ]
-      }
-    })
+            value: 'Person',
+          },
+        ],
+      },
+    }),
 });
 const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
     'organization.legalName': [{
-      value: '<em>Science</em>'
+      value: '<em>Science</em>',
     }],
   },
   indexableObject:
@@ -132,56 +143,56 @@ const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
+            value: 'This is the abstract',
+          },
         ],
         'organization.legalName': [
           {
-            value: 'Science'
-          }
+            value: 'Science',
+          },
         ],
         'dspace.entity.type': [
           {
-            value: 'OrgUnit'
-          }
-        ]
-      }
-    })
+            value: 'OrgUnit',
+          },
+        ],
+      },
+    }),
 });
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ItemSearchResultListElementComponent', () => {
@@ -191,12 +202,12 @@ describe('ItemSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -372,14 +383,14 @@ describe('ItemSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ItemSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 99251d3c24..0dc1e6d541 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../../core/shared/view-mode.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
+
 import { Item } from '../../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
 @Component({
   selector: 'ds-item-search-result-list-element',
   styleUrls: ['./item-search-result-list-element.component.scss'],
-  templateUrl: './item-search-result-list-element.component.html'
+  templateUrl: './item-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Publication
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index e13be91e63..5573dfad6c 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -1,18 +1,25 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../search/models/search-result.model';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { SearchResult } from '../../search/models/search-result.model';
 import { TruncatableService } from '../../truncatable/truncatable.service';
-import { Metadata } from '../../../core/shared/metadata.utils';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search-result-list-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
new file mode 100644
index 0000000000..262df49bbf
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { AbstractTabulatableElementComponent } from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
+import { SearchResult } from '../../../search/models/search-result.model';
+
+@Component({
+  selector: 'ds-search-result-table-element',
+  template: ``,
+})
+/**
+ * Component that describes the implementations and interfaces needed from any extension of this class to be used in search results for visualization in ViewMode.Table
+ */
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {}
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
index 9aa7d46543..68762ab6f4 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../ngrx/type';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 
@@ -17,7 +18,7 @@ export const SelectableListActionTypes = {
   DESELECT: type('dspace/selectable-lists/DESELECT'),
   DESELECT_SINGLE: type('dspace/selectable-lists/DESELECT_SINGLE'),
   SET_SELECTION: type('dspace/selectable-lists/SET_SELECTION'),
-  DESELECT_ALL: type('dspace/selectable-lists/DESELECT_ALL')
+  DESELECT_ALL: type('dspace/selectable-lists/DESELECT_ALL'),
 };
 
 /**
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts b/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
index 052caad62d..7d1a8e86d4 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
@@ -1,4 +1,6 @@
 /* eslint-disable max-classes-per-file */
+import { hasValue } from '../../empty.util';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListAction,
   SelectableListDeselectAction,
@@ -6,11 +8,9 @@ import {
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
   SelectableListSelectSingleAction,
-  SelectableListSetSelectionAction
+  SelectableListSetSelectionAction,
 } from './selectable-list.actions';
 import { selectableListReducer } from './selectable-list.reducer';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { hasValue } from '../../empty.util';
 
 class SelectableObject extends ListableObject {
   constructor(private value: string) {
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
index e24dd906d3..427f6395a0 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
@@ -1,13 +1,14 @@
+import { hasNoValue } from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListAction,
   SelectableListActionTypes,
+  SelectableListDeselectAction,
+  SelectableListDeselectSingleAction,
   SelectableListSelectAction,
   SelectableListSelectSingleAction,
-  SelectableListDeselectAction,
-  SelectableListDeselectSingleAction, SelectableListSetSelectionAction
+  SelectableListSetSelectionAction,
 } from './selectable-list.actions';
-import { hasNoValue } from '../../empty.util';
 
 /**
  * Represents the state of all selectable lists in the store
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
index 496ef28761..23d2baaf00 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
@@ -1,15 +1,19 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { SelectableListService } from './selectable-list.service';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
+
+import { AppState } from '../../../app.reducer';
 import { hasValue } from '../../empty.util';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListDeselectAction,
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
-  SelectableListSelectSingleAction
+  SelectableListSelectSingleAction,
 } from './selectable-list.actions';
-import { AppState } from '../../../app.reducer';
+import { SelectableListService } from './selectable-list.service';
 
 export class SelectableObject extends ListableObject {
   constructor(private value: string) {
@@ -48,9 +52,9 @@ describe('SelectableListService', () => {
 
       providers: [
         {
-          provide: Store, useValue: store
-        }
-      ]
+          provide: Store, useValue: store,
+        },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.ts
index 91ecdf1a1a..7fd25c3550 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.service.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.ts
@@ -1,18 +1,32 @@
 import { Injectable } from '@angular/core';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
+import {
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { SelectableListState } from './selectable-list.reducer';
-import { AppState, keySelector } from '../../../app.reducer';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../../app.reducer';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListDeselectAction,
   SelectableListDeselectAllAction,
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
-  SelectableListSelectSingleAction
+  SelectableListSelectSingleAction,
 } from './selectable-list.actions';
-import { hasValue, isNotEmpty } from '../../empty.util';
+import { SelectableListState } from './selectable-list.reducer';
 
 const selectableListsStateSelector = (state: AppState) => state.selectableLists;
 
@@ -88,7 +102,7 @@ export class SelectableListService {
   isObjectSelected(id: string, object: ListableObject): Observable<boolean> {
     return this.getSelectableList(id).pipe(
       map((state: SelectableListState) => hasValue(state) && isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected.equals(object)))),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -99,7 +113,7 @@ export class SelectableListService {
    */
   findSelectedByCondition(id: string, condition: (object: ListableObject) => boolean): Observable<ListableObject> {
     return this.getSelectableList(id).pipe(
-      map((state: SelectableListState) => (hasValue(state) && isNotEmpty(state.selection)) ? state.selection.find((selected) => condition(selected)) : undefined)
+      map((state: SelectableListState) => (hasValue(state) && isNotEmpty(state.selection)) ? state.selection.find((selected) => condition(selected)) : undefined),
     );
   }
 }
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
index be3ee7d1bb..5b0e07ba23 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
@@ -1,8 +1,8 @@
-import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
+import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
 
 const object = Object.assign(new CollectionSearchResult(), {
   indexableObject: Object.assign(new Collection(), {
@@ -10,28 +10,28 @@ const object = Object.assign(new CollectionSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description.abstract': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Community(), {
   id: 'test-community',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('CollectionSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
index 13703240f4..bd17dffa4c 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-collection-sidebar-search-list-element',
-  templateUrl: '../sidebar-search-list-element.component.html'
+  templateUrl: '../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
index d6bcfc8581..f3114feda4 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
@@ -1,7 +1,7 @@
 import { Community } from '../../../../core/shared/community.model';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
 import { CommunitySidebarSearchListElementComponent } from './community-sidebar-search-list-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 
 const object = Object.assign(new CommunitySearchResult(), {
   indexableObject: Object.assign(new Community(), {
@@ -9,28 +9,28 @@ const object = Object.assign(new CommunitySearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description.abstract': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Community(), {
   id: 'test-parent-community',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('CommunitySidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 14c8ec09cd..9bd907e8f1 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+
+import { Community } from '../../../../core/shared/community.model';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { Community } from '../../../../core/shared/community.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
-  selector: 'ds-collection-sidebar-search-list-element',
-  templateUrl: '../sidebar-search-list-element.component.html'
+  selector: 'ds-community-sidebar-search-list-element',
+  templateUrl: '../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
index 106289bba6..d078d8e1c5 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
@@ -1,8 +1,8 @@
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../sidebar-search-list-element.component.spec';
 import { PublicationSidebarSearchListElementComponent } from './publication-sidebar-search-list-element.component';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Collection } from '../../../../../core/shared/collection.model';
 
 const object = Object.assign(new ItemSearchResult(), {
   indexableObject: Object.assign(new Item(), {
@@ -10,38 +10,38 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.publisher': [
         {
-          value: 'publisher'
-        }
+          value: 'publisher',
+        },
       ],
       'dc.date.issued': [
         {
-          value: 'date'
-        }
+          value: 'date',
+        },
       ],
       'dc.contributor.author': [
         {
-          value: 'author'
-        }
-      ]
-    }
-  })
+          value: 'author',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('PublicationSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author')
+  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author'),
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index 0822accc50..9f6a42808d 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,9 +1,10 @@
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Component } from '@angular/core';
+
 import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SidebarSearchListElementComponent } from '../../sidebar-search-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
@@ -12,7 +13,7 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-publication-sidebar-search-list-element',
-  templateUrl: '../../sidebar-search-list-element.component.html'
+  templateUrl: '../../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
index 226c1be33e..e3e5825b2e 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
@@ -1,16 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SearchResult } from '../../search/models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { TruncatableService } from '../../truncatable/truncatable.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { HALResource } from '../../../core/shared/hal-resource.model';
-import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { HALResource } from '../../../core/shared/hal-resource.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SearchResult } from '../../search/models/search-result.model';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { VarDirective } from '../../utils/var.directive';
 
 export function createSidebarSearchListElementTests(
   componentClass: any,
@@ -19,7 +24,7 @@ export function createSidebarSearchListElementTests(
   expectedParentTitle: string,
   expectedTitle: string,
   expectedDescription: string,
-  extraProviders: any[] = []
+  extraProviders: any[] = [],
 ) {
   return () => {
     let component;
@@ -30,8 +35,8 @@ export function createSidebarSearchListElementTests(
     beforeEach(waitForAsync(() => {
       linkService = jasmine.createSpyObj('linkService', {
         resolveLink: Object.assign(new HALResource(), {
-          [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent)
-        })
+          [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent),
+        }),
       });
       TestBed.configureTestingModule({
         declarations: [componentClass, VarDirective],
@@ -40,9 +45,9 @@ export function createSidebarSearchListElementTests(
           { provide: TruncatableService, useValue: {} },
           { provide: LinkService, useValue: linkService },
           DSONameService,
-          ...extraProviders
+          ...extraProviders,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index 0ffe2d58b4..5ab6f4018d 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,21 +1,31 @@
-import { SearchResult } from '../../search/models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
 import { Component } from '@angular/core';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { Observable, of as observableOf } from 'rxjs';
-import { TruncatableService } from '../../truncatable/truncatable.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { find, map } from 'rxjs/operators';
-import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
-import { followLink } from '../../utils/follow-link-config.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Context } from '../../../core/shared/context.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { SearchResult } from '../../search/models/search-result.model';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { followLink } from '../../utils/follow-link-config.model';
+import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
 
 @Component({
   selector: 'ds-sidebar-search-list-element',
-  templateUrl: './sidebar-search-list-element.component.html'
+  templateUrl: './sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
@@ -66,7 +76,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     return this.getParent().pipe(
       map((parentRD: RemoteData<DSpaceObject>) => {
         return hasValue(parentRD) && hasValue(parentRD.payload) ? this.dsoNameService.getName(parentRD.payload) : undefined;
-      })
+      }),
     );
   }
 
@@ -77,7 +87,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     if (typeof (this.dso as any).getParentLinkKey === 'function') {
       const propertyName = (this.dso as any).getParentLinkKey();
       return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe(
-        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204)
+        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204),
       );
     }
     return observableOf(undefined);
diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts
index 14ddf474ad..a59f045b37 100644
--- a/src/app/shared/object-list/themed-object-list.component.ts
+++ b/src/app/shared/object-list/themed-object-list.component.ts
@@ -1,13 +1,22 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ObjectListComponent } from './object-list.component';
-import { ThemedComponent } from '../theme-support/themed.component';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { Context } from '../../core/shared/context.model';
-import { RemoteData } from '../../core/data/remote-data';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { ObjectListComponent } from './object-list.component';
 
 /**
  * Themed wrapper for ObjectListComponent
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9b87f69c04..135579aff7 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -11,13 +11,13 @@
       <table id="collection-select" class="table table-striped table-hover">
         <thead>
           <tr>
-            <th></th>
+            <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
             <th scope="col">{{'collection.select.table.title' | translate}}</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let collection of collectionsRD?.payload?.page">
-            <td><input class="collection-checkbox" [ngModel]="getSelected(collection.id) | async" (change)="switch(collection.id)" type="checkbox" name="{{collection.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" class="collection-checkbox" [ngModel]="getSelected(collection.id) | async" (change)="switch(collection.id)" type="checkbox" name="{{collection.id}}"></td>
             <td><a [routerLink]="['/collections', collection.id]">{{ dsoNameService.getName(collection) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
index 0b1ae83ca7..1d064f240a 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
@@ -1,28 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared.module';
-import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
-import { ObjectSelectService } from '../object-select.service';
-import { HostWindowService } from '../../host-window.service';
-import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CollectionSelectComponent } from './collection-select.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { LinkHeadService } from '../../../core/services/link-head.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
+
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../core/services/link-head.service';
+import { Collection } from '../../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../host-window.service';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SharedModule } from '../../shared.module';
+import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
+import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
+import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../testing/utils.test';
+import { ObjectSelectService } from '../object-select.service';
+import { CollectionSelectComponent } from './collection-select.component';
 
 describe('CollectionSelectComponent', () => {
   let comp: CollectionSelectComponent;
@@ -32,26 +37,26 @@ describe('CollectionSelectComponent', () => {
   const mockCollectionList = [
     Object.assign(new Collection(), {
       id: 'id1',
-      name: 'name1'
+      name: 'name1',
     }),
     Object.assign(new Collection(), {
       id: 'id2',
-      name: 'name2'
-    })
+      name: 'name2',
+    }),
   ];
   const mockCollections = createSuccessfulRemoteDataObject$(createPaginatedList(mockCollectionList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -64,9 +69,9 @@ describe('CollectionSelectComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -84,7 +89,7 @@ describe('CollectionSelectComponent', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 2d36f80274..fdb3103748 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { Collection } from '../../../core/shared/collection.model';
-import { ObjectSelectComponent } from '../object-select/object-select.component';
 import { isNotEmpty } from '../../empty.util';
 import { ObjectSelectService } from '../object-select.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ObjectSelectComponent } from '../object-select/object-select.component';
 
 @Component({
   selector: 'ds-collection-select',
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 7f8ff943a3..54ce54d9f3 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -11,7 +11,7 @@
       <table id="item-select" class="table table-striped table-hover">
         <thead>
         <tr>
-          <th></th>
+          <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
           <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
           <th scope="col">{{'item.select.table.author' | translate}}</th>
           <th scope="col">{{'item.select.table.title' | translate}}</th>
@@ -19,7 +19,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let item of itemsRD?.payload?.page">
-          <td><input [disabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(canSelect(item) | async) !== true" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(item.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 5131060cb2..4969121bf8 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -1,29 +1,34 @@
-import { ItemSelectComponent } from './item-select.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Item } from '../../../core/shared/item.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared.module';
-import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
-import { ObjectSelectService } from '../object-select.service';
-import { HostWindowService } from '../../host-window.service';
-import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { LinkHeadService } from '../../../core/services/link-head.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../host-window.service';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SharedModule } from '../../shared.module';
+import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
+import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
+import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../testing/utils.test';
+import { ObjectSelectService } from '../object-select.service';
+import { ItemSelectComponent } from './item-select.component';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -39,14 +44,14 @@ describe('ItemSelectComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'This is just a title'
+          value: 'This is just a title',
         },
         {
           key: 'dc.type',
           language: null,
-          value: 'Article'
+          value: 'Article',
         }],
-      _links: { self: { href: 'selfId1' } }
+      _links: { self: { href: 'selfId1' } },
     }),
     Object.assign(new Item(), {
       id: 'id2',
@@ -55,21 +60,21 @@ describe('ItemSelectComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'This is just another title'
+          value: 'This is just another title',
         },
         {
           key: 'dc.type',
           language: null,
-          value: 'Article'
+          value: 'Article',
         }],
-      _links: { self: { href: 'selfId2' } }
-    })
+      _links: { self: { href: 'selfId2' } },
+    }),
   ];
   const mockItems = createSuccessfulRemoteDataObject$(createPaginatedList(mockItemList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   paginationService = new PaginationServiceStub(mockPaginationOptions);
@@ -77,7 +82,7 @@ describe('ItemSelectComponent', () => {
   const authorizationDataService = new AuthorizationDataService(null, null, null, null, null);
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -90,9 +95,9 @@ describe('ItemSelectComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -109,7 +114,7 @@ describe('ItemSelectComponent', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index dd0266ff83..18eda8374f 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -1,18 +1,25 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { Item } from '../../../core/shared/item.model';
+import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import {
+  hasValueOperator,
+  isNotEmpty,
+} from '../../empty.util';
 import { ObjectSelectService } from '../object-select.service';
 import { ObjectSelectComponent } from '../object-select/object-select.component';
-import { hasValueOperator, isNotEmpty } from '../../empty.util';
-import { Observable } from 'rxjs';
-import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { map } from 'rxjs/operators';
-import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-item-select',
-  templateUrl: './item-select.component.html'
+  templateUrl: './item-select.component.html',
 })
 
 /**
@@ -24,7 +31,7 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
    * Whether or not to hide the collection column
    */
   @Input()
-  hideCollection = false;
+    hideCollection = false;
 
   /**
    * The routes to the items their pages
@@ -55,7 +62,7 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
         const itemPageRoutes = {};
         items.page.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
         return itemPageRoutes;
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/object-select/object-select.actions.ts b/src/app/shared/object-select/object-select.actions.ts
index a8c50ef55d..2128cec878 100644
--- a/src/app/shared/object-select/object-select.actions.ts
+++ b/src/app/shared/object-select/object-select.actions.ts
@@ -1,14 +1,15 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../ngrx/type';
+
 export const ObjectSelectionActionTypes = {
   INITIAL_DESELECT: type('dspace/object-select/INITIAL_DESELECT'),
   INITIAL_SELECT: type('dspace/object-select/INITIAL_SELECT'),
   SELECT: type('dspace/object-select/SELECT'),
   DESELECT: type('dspace/object-select/DESELECT'),
   SWITCH: type('dspace/object-select/SWITCH'),
-  RESET: type('dspace/object-select/RESET')
+  RESET: type('dspace/object-select/RESET'),
 };
 
 export class ObjectSelectionAction implements Action {
diff --git a/src/app/shared/object-select/object-select.reducer.spec.ts b/src/app/shared/object-select/object-select.reducer.spec.ts
index dce66f25dd..fd67f4af64 100644
--- a/src/app/shared/object-select/object-select.reducer.spec.ts
+++ b/src/app/shared/object-select/object-select.reducer.spec.ts
@@ -4,7 +4,7 @@ import {
   ObjectSelectionInitialSelectAction,
   ObjectSelectionResetAction,
   ObjectSelectionSelectAction,
-  ObjectSelectionSwitchAction
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
 import { objectSelectionReducer } from './object-select.reducer';
 
diff --git a/src/app/shared/object-select/object-select.reducer.ts b/src/app/shared/object-select/object-select.reducer.ts
index 0157ef0be3..103fbcf21b 100644
--- a/src/app/shared/object-select/object-select.reducer.ts
+++ b/src/app/shared/object-select/object-select.reducer.ts
@@ -1,5 +1,8 @@
 import { isEmpty } from '../empty.util';
-import { ObjectSelectionAction, ObjectSelectionActionTypes } from './object-select.actions';
+import {
+  ObjectSelectionAction,
+  ObjectSelectionActionTypes,
+} from './object-select.actions';
 
 /**
  * Interface that represents the state for a single selection of an object
@@ -39,9 +42,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return Object.assign({}, state, {
           [action.key]: Object.assign({}, state[action.key], {
             [action.id]: {
-              checked: true
-            }
-          })
+              checked: true,
+            },
+          }),
         });
       }
       return state;
@@ -52,9 +55,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return Object.assign({}, state, {
           [action.key]: Object.assign({}, state[action.key], {
             [action.id]: {
-              checked: false
-            }
-          })
+              checked: false,
+            },
+          }),
         });
       }
       return state;
@@ -64,9 +67,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: true
-          }
-        })
+            checked: true,
+          },
+        }),
       });
     }
 
@@ -74,9 +77,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: false
-          }
-        })
+            checked: false,
+          },
+        }),
       });
     }
 
@@ -84,9 +87,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: (isEmpty(state) || isEmpty(state[action.key]) || isEmpty(state[action.key][action.id])) ? true : !state[action.key][action.id].checked
-          }
-        })
+            checked: (isEmpty(state) || isEmpty(state[action.key]) || isEmpty(state[action.key][action.id])) ? true : !state[action.key][action.id].checked,
+          },
+        }),
       });
     }
 
@@ -95,7 +98,7 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return {};
       } else {
         return Object.assign({}, state, {
-          [action.key]: {}
+          [action.key]: {},
         });
       }
     }
diff --git a/src/app/shared/object-select/object-select.service.spec.ts b/src/app/shared/object-select/object-select.service.spec.ts
index 35c46c48e6..ace1bcdd23 100644
--- a/src/app/shared/object-select/object-select.service.spec.ts
+++ b/src/app/shared/object-select/object-select.service.spec.ts
@@ -1,6 +1,6 @@
-import { ObjectSelectService } from './object-select.service';
 import { Store } from '@ngrx/store';
-import { ObjectSelectionListState, ObjectSelectionsState } from './object-select.reducer';
+import { of } from 'rxjs';
+
 import { AppState } from '../../app.reducer';
 import {
   ObjectSelectionDeselectAction,
@@ -8,9 +8,13 @@ import {
   ObjectSelectionInitialSelectAction,
   ObjectSelectionResetAction,
   ObjectSelectionSelectAction,
-  ObjectSelectionSwitchAction
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
-import { of } from 'rxjs';
+import {
+  ObjectSelectionListState,
+  ObjectSelectionsState,
+} from './object-select.reducer';
+import { ObjectSelectService } from './object-select.service';
 
 describe('ObjectSelectService', () => {
   let service: ObjectSelectService;
@@ -22,21 +26,21 @@ describe('ObjectSelectService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   const store: Store<ObjectSelectionsState> = jasmine.createSpyObj('store', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   const appStore: Store<AppState> = jasmine.createSpyObj('appStore', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/object-select/object-select.service.ts b/src/app/shared/object-select/object-select.service.ts
index 8e30bca24d..ec5eb7b0ca 100644
--- a/src/app/shared/object-select/object-select.service.ts
+++ b/src/app/shared/object-select/object-select.service.ts
@@ -1,16 +1,27 @@
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
-import { ObjectSelectionListState, ObjectSelectionsState, ObjectSelectionState } from './object-select.reducer';
+import {
+  createSelector,
+  MemoizedSelector,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AppState } from '../../app.reducer';
+import { hasValue } from '../empty.util';
 import {
   ObjectSelectionDeselectAction,
   ObjectSelectionInitialDeselectAction,
-  ObjectSelectionInitialSelectAction, ObjectSelectionResetAction,
-  ObjectSelectionSelectAction, ObjectSelectionSwitchAction
+  ObjectSelectionInitialSelectAction,
+  ObjectSelectionResetAction,
+  ObjectSelectionSelectAction,
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
-import { Observable } from 'rxjs';
-import { hasValue } from '../empty.util';
-import { map } from 'rxjs/operators';
-import { AppState } from '../../app.reducer';
+import {
+  ObjectSelectionListState,
+  ObjectSelectionsState,
+  ObjectSelectionState,
+} from './object-select.reducer';
 
 const objectSelectionsStateSelector = (state: ObjectSelectionListState) => state.objectSelection;
 const objectSelectionListStateSelector = (state: AppState) => state.objectSelection;
@@ -23,7 +34,7 @@ export class ObjectSelectService {
 
   constructor(
     private store: Store<ObjectSelectionListState>,
-    private appStore: Store<AppState>
+    private appStore: Store<AppState>,
   ) {
   }
 
@@ -41,7 +52,7 @@ export class ObjectSelectService {
         } else {
           return false;
         }
-      })
+      }),
     );
   }
 
@@ -57,7 +68,7 @@ export class ObjectSelectService {
         } else {
           return [];
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/object-select/object-select/object-select.component.ts b/src/app/shared/object-select/object-select/object-select.component.ts
index 6fb795690d..12a4baf66a 100644
--- a/src/app/shared/object-select/object-select/object-select.component.ts
+++ b/src/app/shared/object-select/object-select/object-select.component.ts
@@ -1,21 +1,35 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { startWith, take } from 'rxjs/operators';
-import { of, Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  startWith,
+  take,
+} from 'rxjs/operators';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { ObjectSelectService } from '../object-select.service';
-import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
 /**
  * An abstract component used to select DSpaceObjects from a specific list and returning the UUIDs of the selected DSpaceObjects
  */
 @Component({
   selector: 'ds-object-select-abstract',
-  template: ''
+  template: '',
 })
 export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestroy {
 
@@ -23,65 +37,65 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    * A unique key used for the object select service
    */
   @Input()
-  key: string;
+    key: string;
 
   /**
    * The list of DSpaceObjects to display
    */
   @Input()
-  dsoRD$: Observable<RemoteData<PaginatedList<TDomain>>>;
+    dsoRD$: Observable<RemoteData<PaginatedList<TDomain>>>;
 
   /**
    * The pagination options used to display the DSpaceObjects
    */
   @Input()
-  paginationOptions: PaginationComponentOptions;
+    paginationOptions: PaginationComponentOptions;
 
   /**
    * The sorting options used to display the DSpaceObjects
    */
   @Input()
-  sortOptions: SortOptions;
+    sortOptions: SortOptions;
 
   /**
    * The message key used for the confirm button
    * @type {string}
    */
   @Input()
-  confirmButton: string;
+    confirmButton: string;
 
   /**
    * Authorize check to enable the selection when present.
    */
   @Input()
-  featureId: FeatureID;
+    featureId: FeatureID;
 
   /**
    * The message key used for the cancel button
    * @type {string}
    */
   @Input()
-  cancelButton: string;
+    cancelButton: string;
 
   /**
    * An event fired when the cancel button is clicked
    */
   @Output()
-  cancel = new EventEmitter<any>();
+    cancel = new EventEmitter<any>();
 
   /**
    * EventEmitter to return the selected UUIDs when the confirm button is pressed
    * @type {EventEmitter<string[]>}
    */
   @Output()
-  confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
+    confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
 
   /**
    * Whether or not to render the confirm button as danger (for example if confirm deletes objects)
    * Defaults to false
    */
   @Input()
-  dangerConfirm = false;
+    dangerConfirm = false;
 
   /**
    * The list of selected UUIDs
@@ -133,7 +147,7 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    */
   confirmSelected() {
     this.selectedIds$.pipe(
-      take(1)
+      take(1),
     ).subscribe((ids: string[]) => {
       this.confirm.emit(ids);
       this.objectSelectService.reset(this.key);
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
new file mode 100644
index 0000000000..39743a5922
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.html
@@ -0,0 +1,33 @@
+<ds-pagination
+  [paginationOptions]="config"
+  [pageInfoState]="objects?.payload"
+  [collectionSize]="objects?.payload?.totalElements"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [objects]="objects"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  (paginationChange)="onPaginationChange($event)"
+  (prev)="goPrev()"
+  (next)="goNext()"
+  [retainScrollPosition]="true"
+>
+  <div *ngIf="objects?.hasSucceeded">
+    <div @fadeIn>
+      <ds-tabulatable-objects-loader [objects]="objects.payload"
+                                     [context]="context"
+                                     [showThumbnails]="showThumbnails"
+                                     [linkType]="linkType">
+      </ds-tabulatable-objects-loader>
+    </div>
+  </div>
+  <ds-error *ngIf="objects?.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
+  <ds-themed-loading *ngIf="objects?.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
+</ds-pagination>
+
+
diff --git a/src/app/shared/object-table/object-table.component.scss b/src/app/shared/object-table/object-table.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-table/object-table.component.spec.ts b/src/app/shared/object-table/object-table.component.spec.ts
new file mode 100644
index 0000000000..de4719fc2e
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.spec.ts
@@ -0,0 +1,157 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+
+import { ObjectTableComponent } from './object-table.component';
+
+describe('ObjectTableComponent', () => {
+  let component: ObjectTableComponent;
+  let fixture: ComponentFixture<ObjectTableComponent>;
+  const testEvent: any = { test: 'test' };
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ObjectTableComponent ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(ObjectTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+
+  describe('when the pageChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPageChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('pageChange', testEvent);
+    });
+
+    it('should call onPageChange on the componentonent', () => {
+      expect(component.onPageChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the pageSizeChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPageSizeChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('pageSizeChange', testEvent);
+    });
+
+    it('should call onPageSizeChange on the componentonent', () => {
+      expect(component.onPageSizeChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the sortDirectionChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onSortDirectionChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('sortDirectionChange', testEvent);
+    });
+
+    it('should call onSortDirectionChange on the componentonent', () => {
+      expect(component.onSortDirectionChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the sortFieldChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onSortFieldChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('sortFieldChange', testEvent);
+    });
+
+    it('should call onSortFieldChange on the componentonent', () => {
+      expect(component.onSortFieldChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the paginationChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPaginationChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('paginationChange', testEvent);
+    });
+
+    it('should call onPaginationChange on the componentonent', () => {
+      expect(component.onPaginationChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when onPageChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.pageChange, 'emit');
+      component.onPageChange(testEvent);
+    });
+
+    it('should emit the value from the pageChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.pageChange.emit).toHaveBeenCalled();
+      expect(component.pageChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onPageSizeChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.pageSizeChange, 'emit');
+      component.onPageSizeChange(testEvent);
+    });
+
+    it('should emit the value from the pageSizeChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.pageSizeChange.emit).toHaveBeenCalled();
+      expect(component.pageSizeChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onSortDirectionChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.sortDirectionChange, 'emit');
+      component.onSortDirectionChange(testEvent);
+    });
+
+    it('should emit the value from the sortDirectionChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.sortDirectionChange.emit).toHaveBeenCalled();
+      expect(component.sortDirectionChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onSortFieldChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.sortFieldChange, 'emit');
+      component.onSortFieldChange(testEvent);
+    });
+
+    it('should emit the value from the sortFieldChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.sortFieldChange.emit).toHaveBeenCalled();
+      expect(component.sortFieldChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onPaginationChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.paginationChange, 'emit');
+      component.onPaginationChange(testEvent);
+    });
+
+    it('should emit the value from the paginationChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.paginationChange.emit).toHaveBeenCalled();
+      expect(component.paginationChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+});
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
new file mode 100644
index 0000000000..94e2a9d093
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -0,0 +1,216 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.Default,
+  encapsulation: ViewEncapsulation.Emulated,
+  selector: 'ds-object-table',
+  templateUrl: './object-table.component.html',
+  styleUrls: ['./object-table.component.scss'],
+  animations: [fadeIn],
+})
+
+/**
+ * Component used to wrap and load paginated search results if the ViewMode is set to Table.
+ * Each ViewMode has a different type of wrapper that can be checked in ObjectCollectionComponent
+ */
+export class ObjectTableComponent {
+  /**
+   * The view mode of this component
+   */
+  viewMode = ViewMode.Table;
+
+  /**
+   * The current pagination configuration
+   */
+  @Input() config: PaginationComponentOptions;
+
+  /**
+   * The current sort configuration
+   */
+  @Input() sortConfig: SortOptions;
+
+  /**
+   * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
+   */
+  @Input() showPaginator = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The whether or not the gear is hidden
+   */
+  @Input() hideGear = false;
+
+  /**
+   * Whether or not the pager is visible when there is only a single page of results
+   */
+  @Input() hidePagerWhenSinglePage = true;
+
+  /**
+   * The link type of the listable elements
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The context of the listable elements
+   */
+  @Input() context: Context;
+
+  /**
+   * Option for hiding the pagination detail
+   */
+  @Input() hidePaginationDetail = false;
+
+  /**
+   * Behavior subject to output the current listable objects
+   */
+  private _objects$: BehaviorSubject<RemoteData<PaginatedList<ListableObject>>>;
+
+  /**
+   * Setter to make sure the observable is turned into an observable
+   * @param objects The new objects to output
+   */
+  @Input() set objects(objects: RemoteData<PaginatedList<ListableObject>>) {
+    this._objects$.next(objects);
+  }
+
+  /**
+   * Getter to return the current objects
+   */
+  get objects() {
+    return this._objects$.getValue();
+  }
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() change: EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }> = new EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }>();
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the page wsize is changed.
+   * Event's payload equals to the newly selected page size.
+   */
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the sort direction is changed.
+   * Event's payload equals to the newly selected sort direction.
+   */
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter<SortDirection>();
+
+  /**
+   * An event fired when on of the pagination parameters changes
+   */
+  @Output() paginationChange: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * An event fired when the sort field is changed.
+   * Event's payload equals to the newly selected sort field.
+   */
+  @Output() sortFieldChange: EventEmitter<string> = new EventEmitter<string>();
+
+  /**
+   * If showPaginator is set to true, emit when the previous button is clicked
+   */
+  @Output() prev = new EventEmitter<boolean>();
+
+  /**
+   * If showPaginator is set to true, emit when the next button is clicked
+   */
+  @Output() next = new EventEmitter<boolean>();
+
+  data: any = {};
+
+  constructor() {
+    this._objects$ = new BehaviorSubject(undefined);
+  }
+
+  /**
+   * Emits the current page when it changes
+   * @param event The new page
+   */
+  onPageChange(event) {
+    this.pageChange.emit(event);
+  }
+  /**
+   * Emits the current page size when it changes
+   * @param event The new page size
+   */
+  onPageSizeChange(event) {
+    this.pageSizeChange.emit(event);
+  }
+  /**
+   * Emits the current sort direction when it changes
+   * @param event The new sort direction
+   */
+  onSortDirectionChange(event) {
+    this.sortDirectionChange.emit(event);
+  }
+
+  /**
+   * Emits the current sort field when it changes
+   * @param event The new sort field
+   */
+  onSortFieldChange(event) {
+    this.sortFieldChange.emit(event);
+  }
+
+  /**
+   * Emits the current pagination when it changes
+   * @param event The new pagination
+   */
+  onPaginationChange(event) {
+    this.paginationChange.emit(event);
+  }
+
+  /**
+   * Go to the previous page
+   */
+  goPrev() {
+    this.prev.emit(true);
+  }
+
+  /**
+   * Go to the next page
+   */
+  goNext() {
+    this.next.emit(true);
+  }
+}
diff --git a/src/app/shared/object.util.spec.ts b/src/app/shared/object.util.spec.ts
index 9d7f9dee37..817b875667 100644
--- a/src/app/shared/object.util.spec.ts
+++ b/src/app/shared/object.util.spec.ts
@@ -1,4 +1,8 @@
-import { deleteProperty, difference, hasOnlyEmptyProperties } from './object.util';
+import {
+  deleteProperty,
+  difference,
+  hasOnlyEmptyProperties,
+} from './object.util';
 
 describe('Object Utils', () => {
   let object: any = {};
diff --git a/src/app/shared/object.util.ts b/src/app/shared/object.util.ts
index 4f8954259e..38827f9a14 100644
--- a/src/app/shared/object.util.ts
+++ b/src/app/shared/object.util.ts
@@ -1,8 +1,9 @@
-import { isNotEmpty } from './empty.util';
 import isEqual from 'lodash/isEqual';
 import isObject from 'lodash/isObject';
 import transform from 'lodash/transform';
 
+import { isNotEmpty } from './empty.util';
+
 /**
  * Returns passed object without specified property
  */
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
index 6b0e9d265b..13c54e890c 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
@@ -1,19 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { first, take } from 'rxjs/operators';
-import { PageSizeSelectorComponent } from './page-size-selector.component';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  first,
+  take,
+} from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { EnumKeysPipe } from '../utils/enum-keys-pipe';
 import { VarDirective } from '../utils/var.directive';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { PageSizeSelectorComponent } from './page-size-selector.component';
 
 describe('PageSizeSelectorComponent', () => {
 
@@ -32,7 +43,7 @@ describe('PageSizeSelectorComponent', () => {
     query: queryParam,
     scope: scopeParam,
     pagination,
-    sort
+    sort,
   };
 
   const paginationService = new PaginationServiceStub(pagination, sort);
@@ -40,8 +51,8 @@ describe('PageSizeSelectorComponent', () => {
   const activatedRouteStub = {
     queryParams: observableOf({
       query: queryParam,
-      scope: scopeParam
-    })
+      scope: scopeParam,
+    }),
   };
 
   beforeEach(waitForAsync(() => {
@@ -55,10 +66,10 @@ describe('PageSizeSelectorComponent', () => {
           provide: SEARCH_CONFIG_SERVICE,
           useValue: {
             paginatedSearchOptions: observableOf(paginatedSearchOptions),
-          }
+          },
         },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -73,12 +84,12 @@ describe('PageSizeSelectorComponent', () => {
 
   it('it should show the size settings with the respective selectable options', (done) => {
     comp.paginationOptions$.pipe(first()).subscribe((options: PaginationComponentOptions) => {
-        const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
-        expect(pageSizeSetting).not.toBeNull();
-        const childElements = pageSizeSetting.queryAll(By.css('option'));
-        expect(childElements.length).toEqual(options.pageSizeOptions.length);
-        done();
-      }
+      const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+      expect(pageSizeSetting).not.toBeNull();
+      const childElements = pageSizeSetting.queryAll(By.css('option'));
+      expect(childElements.length).toEqual(options.pageSizeOptions.length);
+      done();
+    },
     );
   });
 
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 0dce32a4ba..fe17095afc 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -1,17 +1,28 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { map, take } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 
 @Component({
   selector: 'ds-page-size-selector',
   styleUrls: ['./page-size-selector.component.scss'],
-  templateUrl: './page-size-selector.component.html'
+  templateUrl: './page-size-selector.component.html',
 })
 
 /**
@@ -44,9 +55,9 @@ export class PageSizeSelectorComponent implements OnInit {
   reloadRPP(event: Event) {
     const value = (event.target as HTMLInputElement).value;
     this.paginationOptions$.pipe(
-      take(1)
+      take(1),
     ).subscribe((pagination: PaginationComponentOptions) => {
-      this.paginationService.updateRoute(pagination.id, {page: 1, pageSize: +value});
+      this.paginationService.updateRoute(pagination.id, { page: 1, pageSize: +value });
     }) ;
   }
 }
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
index bac6b89583..dc8a413f1f 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
@@ -1,22 +1,30 @@
-import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  Component,
+  ElementRef,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
 import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { Component, ElementRef } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { take } from 'rxjs/operators';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { PaginationComponent } from '../pagination/pagination.component';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
 
 @Component({
   selector: 'ds-mock-paginated-drag-drop-abstract',
-  template: ''
+  template: '',
 })
 class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
 
@@ -55,7 +63,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
   const updates = {
     [object1.uuid]: { field: object1, changeType: undefined },
-    [object2.uuid]: { field: object2, changeType: undefined }
+    [object2.uuid]: { field: object2, changeType: undefined },
   } as FieldUpdates;
 
   let paginationComponent: PaginationComponent;
@@ -63,16 +71,16 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
   beforeEach(() => {
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
       initialize: {},
-      getFieldUpdatesExclusive: observableOf(updates)
+      getFieldUpdatesExclusive: observableOf(updates),
     });
     elRef = {
       nativeElement: jasmine.createSpyObj('nativeElement', {
-        querySelector: {}
-      })
+        querySelector: {},
+      }),
     };
     objectValuesPipe = new ObjectValuesPipe();
     paginationComponent = jasmine.createSpyObj('paginationComponent', {
-      doPageChange: {}
+      doPageChange: {},
     });
     paginationService = new PaginationServiceStub();
     objectsRD$ = new BehaviorSubject(objectsRD);
@@ -96,7 +104,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
     const event = {
       previousIndex: 0,
       currentIndex: 1,
-      item: { element: { nativeElement: { id: object1.uuid } } }
+      item: { element: { nativeElement: { id: object1.uuid } } },
     } as any;
 
     describe('when the user is hovering over a new page', () => {
@@ -113,7 +121,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
         expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
           fromIndex: ((component.currentPage$.value.currentPage - 1) * component.pageSize) + event.previousIndex,
           toIndex: ((hoverPage - 1) * component.pageSize),
-          finish: jasmine.anything()
+          finish: jasmine.anything(),
         }));
       });
     });
@@ -128,7 +136,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
         expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
           fromIndex: event.previousIndex,
           toIndex: event.currentIndex,
-          finish: jasmine.anything()
+          finish: jasmine.anything(),
         }));
       });
     });
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
index 8dba47566f..1ebf626484 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
@@ -1,24 +1,43 @@
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
-import { hasValue } from '../empty.util';
 import {
-  paginatedListToArray,
-  getFirstSucceededRemoteData,
-  getAllSucceededRemoteData
-} from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
-import { Component, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
+  CdkDragDrop,
+  moveItemInArray,
+} from '@angular/cdk/drag-drop';
+import {
+  Component,
+  ElementRef,
+  EventEmitter,
+  OnDestroy,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { FieldUpdate } from '../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteData,
+  paginatedListToArray,
+} from '../../core/shared/operators';
+import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
+import { hasValue } from '../empty.util';
+import { PaginationComponent } from '../pagination/pagination.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
 
 /**
  * Operator used for comparing {@link FieldUpdate}s by their field's UUID
@@ -44,7 +63,7 @@ export const compareArraysUsingFieldUuids = () =>
  */
 @Component({
   selector: 'ds-paginated-drag-drop-abstract',
-  template: ''
+  template: '',
 })
 export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
   /**
@@ -92,7 +111,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   options = Object.assign(new PaginationComponentOptions(),{
     id: 'dad',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.pageSize,
   });
 
   /**
@@ -116,8 +135,8 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   protected constructor(protected objectUpdatesService: ObjectUpdatesService,
                         protected elRef: ElementRef,
                         protected objectValuesPipe: ObjectValuesPipe,
-                        protected paginationService: PaginationService
-                        ) {
+                        protected paginationService: PaginationService,
+  ) {
   }
 
   /**
@@ -162,19 +181,19 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
     this.updates$ = this.objectsRD$.pipe(
       getAllSucceededRemoteData(),
       paginatedListToArray(),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
+      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects)),
     );
     this.subs.push(
       this.updates$.pipe(
         map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
-        distinctUntilChanged(compareArraysUsingFieldUuids())
+        distinctUntilChanged(compareArraysUsingFieldUuids()),
       ).subscribe((updateValues) => {
         this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
         // We received new values, stop displaying a loading indicator if it's present
         this.loading$.next(false);
       }),
       // Disable the pagination when objects are loading
-      this.loading$.subscribe((loading) => this.options.disabled = loading)
+      this.loading$.subscribe((loading) => this.options.disabled = loading),
     );
   }
 
@@ -224,7 +243,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
           if (isNewPage) {
             this.paginationComponent.doPageChange(redirectPage);
           }
-        }
+        },
       }));
     }
   }
diff --git a/src/app/shared/pagination/pagination-component-options.model.ts b/src/app/shared/pagination/pagination-component-options.model.ts
index 2b60c93275..b964b50fda 100644
--- a/src/app/shared/pagination/pagination-component-options.model.ts
+++ b/src/app/shared/pagination/pagination-component-options.model.ts
@@ -1,5 +1,5 @@
-import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap';
 import { Injectable } from '@angular/core';
+import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap';
 
 @Injectable()
 export class PaginationComponentOptions extends NgbPaginationConfig {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 7d90c6a439..9ae978c41b 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="currentPageState == undefined || currentPageState == (currentPage$|async)" [id]="'p-' + id">
+<div *ngIf="currentPageState === undefined || currentPageState === (currentPage$|async)" [id]="'p-' + id">
   <div *ngIf="(!hidePaginationDetail && collectionSize > 0) || !hideGear" class="pagination-masked clearfix top">
     <div class="row">
       <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
@@ -7,13 +7,29 @@
       </div>
       <div class="col">
         <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <div id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
-            <h6 class="dropdown-header">{{ 'pagination.results-per-page' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let item of pageSizeOptions" (click)="doPageSizeChange(item)"><i [ngClass]="{'invisible': item != (pageSize$|async)}" class="fas fa-check" aria-hidden="true"></i> {{item}} </button>
-            <h6 class="dropdown-header">{{ 'pagination.sort-direction' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let direction of (sortDirections | dsKeys)" (click)="doSortDirectionChange(direction.value)"><i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}} </button>
-          </div>
+          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
+          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+            <li role="menuitem">
+              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
+                  <button (click)="doPageSizeChange(item)" class="dropdown-item">
+                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+            <li *ngIf="hideSortOptions === false" role="menuitem">
+              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+                <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
+                  <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
+                    <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+          </ul>
         </div>
         <ds-rss></ds-rss>
       </div>
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index 30ace4b2b9..36b0313ddf 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -1,40 +1,51 @@
 // Load the implementations that should be tested
 import { CommonModule } from '@angular/common';
-
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { StoreModule } from '@ngrx/store';
-
-import { NgxPaginationModule } from 'ngx-pagination';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { BehaviorSubject } from 'rxjs';
 
+import { storeModuleConfig } from '../../app.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { HostWindowService } from '../host-window.service';
+import { MockActivatedRoute } from '../mocks/active-router.mock';
+import { HostWindowServiceMock } from '../mocks/host-window-service.mock';
+import { RouterMock } from '../mocks/router.mock';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createTestComponent } from '../testing/utils.test';
+import { EnumKeysPipe } from '../utils/enum-keys-pipe';
 import { PaginationComponent } from './pagination.component';
 import { PaginationComponentOptions } from './pagination-component-options.model';
 
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { HostWindowServiceMock } from '../mocks/host-window-service.mock';
-import { MockActivatedRoute } from '../mocks/active-router.mock';
-import { RouterMock } from '../mocks/router.mock';
-
-import { HostWindowService } from '../host-window.service';
-import { EnumKeysPipe } from '../utils/enum-keys-pipe';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-
-import { createTestComponent } from '../testing/utils.test';
-import { storeModuleConfig } from '../../app.reducer';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { BehaviorSubject } from 'rxjs';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-
 function expectPages(fixture: ComponentFixture<any>, pagesDef: string[]): void {
   const de = fixture.debugElement.query(By.css('.pagination'));
   const pages = de.nativeElement.querySelectorAll('li');
@@ -140,7 +151,7 @@ describe('Pagination component', () => {
       getFindListOptions: currentFindListOptions,
       resetPage: {},
       updateRoute: {},
-      updateRouteWithUrl: {}
+      updateRouteWithUrl: {},
     });
 
     TestBed.configureTestingModule({
@@ -150,18 +161,18 @@ describe('Pagination component', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         NgxPaginationModule,
         NgbModule,
         RouterTestingModule.withRoutes([
-          { path: 'home', component: TestComponent }
+          { path: 'home', component: TestComponent },
         ])],
       declarations: [
         PaginationComponent,
         TestComponent,
-        EnumKeysPipe
+        EnumKeysPipe,
       ], // declare the test component
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -169,9 +180,9 @@ describe('Pagination component', () => {
         { provide: HostWindowService, useValue: hostWindowServiceStub },
         { provide: PaginationService, useValue: paginationService },
         ChangeDetectorRef,
-        PaginationComponent
+        PaginationComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -212,12 +223,12 @@ describe('Pagination component', () => {
       testFixture.detectChanges();
 
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {currentPage: 3}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { currentPage: 3 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['« Previous', '1', '2', '+3', '-» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {currentPage: 2}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { currentPage: 2 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['« Previous', '1', '+2', '3', '» Next']);
@@ -241,16 +252,16 @@ describe('Pagination component', () => {
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 5}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 5 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '5', '6', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 10}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 10 }));
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 20}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 20 }));
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '» Next']);
     });
@@ -271,11 +282,11 @@ describe('Pagination component', () => {
 
       changePage(testFixture, 3);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '3'}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 3 }), {},  false);
 
       changePage(testFixture, 0);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '2'}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 2 }), {},  false);
     }));
 
     it('should set correct pageSize route parameters', fakeAsync(() => {
@@ -285,7 +296,7 @@ describe('Pagination component', () => {
 
       changePageSize(testFixture, '20');
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ pageId: 'test', page: 1, pageSize: 20}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 1, pageSize: 20 }), {},  false);
     }));
 
     it('should respond to windows resize', () => {
@@ -390,8 +401,8 @@ class TestComponent {
   objects = {
     payload: {
       currentPage: 2,
-      totalPages: 100
-    }
+      totalPages: 100,
+    },
   };
 
   constructor() {
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 6da813cbc7..04f7e446e6 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -7,23 +7,33 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { HostWindowState } from '../search/host-window.reducer';
 import { PaginationComponentOptions } from './pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { hasValue } from '../empty.util';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
 
 /**
  * The default pagination controls component.
@@ -34,7 +44,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
   styleUrls: ['pagination.component.scss'],
   templateUrl: 'pagination.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
@@ -122,6 +132,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   @Input() public hideGear = false;
 
+  /**
+   * Option for hiding the gear
+   */
+  @Input() public hideSortOptions = false;
+
   /**
    * Option for hiding the pager when there is less than 2 pages
    */
@@ -162,7 +177,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Number of items per page.
    */
-  public pageSize$;
+  public pageSize$: Observable<number>;
 
   /**
    * Declare SortDirection enumeration to use it in the template
@@ -183,7 +198,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Name of the field that's used to sort by
    */
-  public sortField$;
+  public sortField$: Observable<string>;
   public defaultSortField = 'name';
 
   /**
@@ -231,10 +246,10 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.id = this.paginationOptions.id || null;
     this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
     this.currentPage$ = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPagination) => currentPagination.currentPage)
+      map((currentPagination) => currentPagination.currentPage),
     );
     this.pageSize$ = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPagination) => currentPagination.pageSize)
+      map((currentPagination) => currentPagination.pageSize),
     );
 
     let sortOptions;
@@ -243,12 +258,12 @@ export class PaginationComponent implements OnDestroy, OnInit {
     } else {
       sortOptions = new SortOptions(this.defaultSortField, this.defaultsortDirection);
     }
-      this.sortDirection$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
-        map((currentSort) => currentSort.direction)
-      );
-      this.sortField$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
-        map((currentSort) => currentSort.field)
-      );
+    this.sortDirection$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
+      map((currentSort) => currentSort.direction),
+    );
+    this.sortField$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
+      map((currentSort) => currentSort.field),
+    );
   }
 
   /**
@@ -273,7 +288,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page being navigated to.
    */
   public doPageChange(page: number) {
-    this.updateParams({page: page.toString()});
+    this.updateParams({ page: page });
     this.emitPaginationChange();
   }
 
@@ -284,7 +299,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page size being navigated to.
    */
   public doPageSizeChange(pageSize: number) {
-    this.updateParams({ pageId: this.id, page: 1, pageSize: pageSize });
+    this.updateParams({ page: 1, pageSize: pageSize });
     this.emitPaginationChange();
   }
 
@@ -295,7 +310,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort direction being navigated to.
    */
   public doSortDirectionChange(sortDirection: SortDirection) {
-    this.updateParams({ pageId: this.id, page: 1, sortDirection: sortDirection });
+    this.updateParams({ page: 1, sortDirection: sortDirection });
     this.emitPaginationChange();
   }
 
@@ -306,7 +321,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort field being navigated to.
    */
   public doSortFieldChange(field: string) {
-    this.updateParams({ pageId: this.id, page: 1, sortField: field });
+    this.updateParams({ page: 1, sortField: field });
     this.emitPaginationChange();
   }
 
@@ -321,7 +336,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    * Update the current query params and optionally update the route
    * @param params
    */
-  private updateParams(params: {}) {
+  private updateParams(params: PaginationRouteParams) {
     this.paginationService.updateRoute(this.id, params, {}, this.retainScrollPosition);
   }
 
@@ -333,18 +348,17 @@ export class PaginationComponent implements OnDestroy, OnInit {
     if (collectionSize) {
       showingDetails = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
         map((currentPaginationOptions) => {
-          let firstItem;
           let lastItem;
           const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
 
-          firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
+          const firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
           if (collectionSize > pageMax) {
             lastItem = pageMax;
           } else {
             lastItem = collectionSize;
           }
-          return {range: firstItem + ' - ' + lastItem, total: collectionSize};
-        })
+          return { range: firstItem + ' - ' + lastItem, total: collectionSize };
+        }),
       );
     }
     return showingDetails;
@@ -372,7 +386,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   get hasMultiplePages(): Observable<boolean> {
     return this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPaginationOptions) =>  this.collectionSize > currentPaginationOptions.pageSize)
+      map((currentPaginationOptions) =>  this.collectionSize > currentPaginationOptions.pageSize),
     );
   }
 
@@ -382,14 +396,14 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   get shouldShowBottomPager(): Observable<boolean> {
     return this.hasMultiplePages.pipe(
-      map((hasMultiplePages) => hasMultiplePages || !this.hidePagerWhenSinglePage)
+      map((hasMultiplePages) => hasMultiplePages || !this.hidePagerWhenSinglePage),
     );
   }
 
   /**
    * Go to the previous page
    */
-   goPrev() {
+  goPrev() {
     this.prev.emit(true);
     this.updatePagination(-1);
   }
@@ -408,7 +422,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   updatePagination(value: number) {
     this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(take(1)).subscribe((currentPaginationOptions) => {
-      this.updateParams({page: (currentPaginationOptions.currentPage + value).toString()});
+      this.updateParams({ page: (currentPaginationOptions.currentPage + value) });
     });
   }
 
diff --git a/src/app/shared/pagination/pagination.utils.ts b/src/app/shared/pagination/pagination.utils.ts
index f70a3d1030..2add33e2ea 100644
--- a/src/app/shared/pagination/pagination.utils.ts
+++ b/src/app/shared/pagination/pagination.utils.ts
@@ -1,5 +1,5 @@
-import { PaginationComponentOptions } from './pagination-component-options.model';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationComponentOptions } from './pagination-component-options.model';
 
 /**
  * Transform a PaginationComponentOptions object into a FindListOptions object
@@ -9,6 +9,6 @@ import { FindListOptions } from '../../core/data/find-list-options.model';
 export function toFindListOptions(pagination: PaginationComponentOptions, original?: FindListOptions): FindListOptions {
   return Object.assign(new FindListOptions(), original, {
     currentPage: pagination.currentPage,
-    elementsPerPage: pagination.pageSize
+    elementsPerPage: pagination.pageSize,
   });
 }
diff --git a/src/app/shared/pagination/paginationChangeEvent.interface.ts b/src/app/shared/pagination/paginationChangeEvent.interface.ts
index ccd2f2174d..a6b10f9cff 100644
--- a/src/app/shared/pagination/paginationChangeEvent.interface.ts
+++ b/src/app/shared/pagination/paginationChangeEvent.interface.ts
@@ -1,5 +1,5 @@
-import {PaginationComponentOptions} from './pagination-component-options.model';
-import {SortOptions} from '../../core/cache/models/sort-options.model';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from './pagination-component-options.model';
 
 
 /**
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index 50b7d7f9f9..3ec7ace051 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -1,6 +1,10 @@
-import { RemoteData } from '../core/data/remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { environment } from '../../environments/environment';
+import { RemoteData } from '../core/data/remote-data';
 import { RequestEntryState } from '../core/data/request-entry-state.model';
 
 /**
@@ -21,7 +25,7 @@ export function createSuccessfulRemoteDataObject<T>(object: T, timeCompleted = F
     RequestEntryState.Success,
     undefined,
     object,
-    200
+    200,
   );
 }
 
@@ -49,7 +53,7 @@ export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCod
     RequestEntryState.Error,
     errorMessage,
     undefined,
-    statusCode
+    statusCode,
   );
 }
 
@@ -76,7 +80,7 @@ export function createPendingRemoteDataObject<T>(lastVerified = FIXED_TIMESTAMP)
     RequestEntryState.ResponsePending,
     undefined,
     undefined,
-    undefined
+    undefined,
   );
 }
 
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
index b60e7f64c0..82ff15dc9c 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
@@ -1,33 +1,51 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { NotificationsService } from '../../notifications/notifications.service';
 import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../../testing/utils.test';
-import { ResourcePolicyCreateComponent } from './resource-policy-create.component';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
-import { getMockLinkService } from '../../mocks/link-service.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { GroupMock } from '../../testing/group-mock';
-import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
 import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../testing/utils.test';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { ResourcePolicyCreateComponent } from './resource-policy-create.component';
 
 describe('ResourcePolicyCreateComponent test suite', () => {
   let comp: ResourcePolicyCreateComponent;
@@ -49,17 +67,17 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const item = Object.assign(new Item(), {
@@ -67,34 +85,34 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     id: 'itemUUID',
     metadata: {
       'dc.title': [{
-        value: 'test item'
-      }]
+        value: 'test item',
+      }],
     },
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   });
 
   const resourcePolicyService: any = getMockResourcePolicyService();
   const linkService: any = getMockLinkService();
   const routeStub = {
     data: observableOf({
-      resourcePolicyTarget: createSuccessfulRemoteDataObject(item)
-    })
+      resourcePolicyTarget: createSuccessfulRemoteDataObject(item),
+    }),
   };
   const routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyCreateComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -104,11 +122,11 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         ResourcePolicyCreateComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -168,7 +186,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     it('should return true when is Processing', (done) => {
       compAsAny.processing$.next(true);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
       done();
     });
@@ -176,7 +194,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     it('should return false when is not Processing', (done) => {
       compAsAny.processing$.next(false);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
       done();
     });
@@ -191,7 +209,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'group',
-          uuid: GroupMock.id
+          uuid: GroupMock.id,
         };
       });
 
@@ -229,7 +247,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'eperson',
-          uuid: EPersonMock.id
+          uuid: EPersonMock.id,
         };
       });
 
@@ -262,7 +280,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
index 236351571f..7156d9b00c 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
@@ -1,23 +1,34 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 
 @Component({
   selector: 'ds-resource-policy-create',
-  templateUrl: './resource-policy-create.component.html'
+  templateUrl: './resource-policy-create.component.html',
 })
 export class ResourcePolicyCreateComponent implements OnInit {
 
@@ -62,7 +73,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
   ngOnInit(): void {
     this.route.data.pipe(
       map((data) => data),
-      take(1)
+      take(1),
     ).subscribe((data: any) => {
       this.targetResourceUUID = (data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload.id;
       this.targetResourceName = this.dsoNameService.getName((data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload);
@@ -99,7 +110,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
       response$ = this.resourcePolicyService.create(event.object, this.targetResourceUUID, null, event.target.uuid);
     }
     response$.pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((responseRD: RemoteData<ResourcePolicy>) => {
       this.processing$.next(false);
       if (responseRD.hasSucceeded) {
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
index 0f285c4948..a820fa481a 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h4 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h4>
+  <h1 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h1>
 
   <ds-resource-policy-form [resourcePolicy]="resourcePolicy"
                            [isProcessing]="isProcessing()"
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
index ff473d5c49..432bff56ae 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
@@ -1,28 +1,46 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
 
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { createTestComponent } from '../../testing/utils.test';
 import { LinkService } from '../../../core/cache/builders/link.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
-import { getMockLinkService } from '../../mocks/link-service.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { GroupMock } from '../../testing/group-mock';
-import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { ResourcePolicyEditComponent } from './resource-policy-edit.component';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../remote-data.utils';
+import { GroupMock } from '../../testing/group-mock';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { createTestComponent } from '../../testing/utils.test';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { ResourcePolicyEditComponent } from './resource-policy-edit.component';
 
 describe('ResourcePolicyEditComponent test suite', () => {
   let comp: ResourcePolicyEditComponent;
@@ -45,38 +63,38 @@ describe('ResourcePolicyEditComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const resourcePolicyService: any = getMockResourcePolicyService();
   const linkService: any = getMockLinkService();
   const routeStub = {
     data: observableOf({
-      resourcePolicy: createSuccessfulRemoteDataObject(resourcePolicy)
-    })
+      resourcePolicy: createSuccessfulRemoteDataObject(resourcePolicy),
+    }),
   };
   const routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyEditComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -86,11 +104,11 @@ describe('ResourcePolicyEditComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         ResourcePolicyEditComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -149,7 +167,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
     it('should return true when is Processing', (done) => {
       compAsAny.processing$.next(true);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
       done();
     });
@@ -157,7 +175,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
     it('should return false when is not Processing', (done) => {
       compAsAny.processing$.next(false);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
       done();
     });
@@ -173,7 +191,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'group',
-          uuid: GroupMock.id
+          uuid: GroupMock.id,
         };
 
         compAsAny.resourcePolicy = resourcePolicy;
@@ -181,7 +199,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         updatedObject = Object.assign({}, submittedResourcePolicy, {
           id: resourcePolicy.id,
           type: RESOURCE_POLICY.value,
-          _links: resourcePolicy._links
+          _links: resourcePolicy._links,
         });
       });
 
@@ -214,7 +232,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
index a16f409bcb..59c80ea755 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
@@ -1,22 +1,35 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Observable, of, combineLatest as observableCombineLatest, } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 
 @Component({
   selector: 'ds-resource-policy-edit',
-  templateUrl: './resource-policy-edit.component.html'
+  templateUrl: './resource-policy-edit.component.html',
 })
 export class ResourcePolicyEditComponent implements OnInit {
 
@@ -54,7 +67,7 @@ export class ResourcePolicyEditComponent implements OnInit {
   ngOnInit(): void {
     this.route.data.pipe(
       map((data) => data),
-      take(1)
+      take(1),
     ).subscribe((data: any) => {
       this.resourcePolicy = (data.resourcePolicy as RemoteData<ResourcePolicy>).payload;
     });
@@ -86,19 +99,19 @@ export class ResourcePolicyEditComponent implements OnInit {
     const updatedObject = Object.assign({}, event.object, {
       id: this.resourcePolicy.id,
       type: RESOURCE_POLICY.value,
-      _links: this.resourcePolicy._links
+      _links: this.resourcePolicy._links,
     });
 
     const updateTargetSucceeded$ = event.updateTarget ? this.resourcePolicyService.updateTarget(
-      this.resourcePolicy.id, this.resourcePolicy._links.self.href, event.target.uuid, event.target.type
+      this.resourcePolicy.id, this.resourcePolicy._links.self.href, event.target.uuid, event.target.type,
     ).pipe(
       getFirstCompletedRemoteData(),
-      map((responseRD) => responseRD && responseRD.hasSucceeded)
+      map((responseRD) => responseRD && responseRD.hasSucceeded),
     ) : of(true);
 
     const updateResourcePolicySucceeded$ = this.resourcePolicyService.update(updatedObject).pipe(
       getFirstCompletedRemoteData(),
-      map((responseRD) => responseRD && responseRD.hasSucceeded)
+      map((responseRD) => responseRD && responseRD.hasSucceeded),
     );
 
     observableCombineLatest([updateTargetSucceeded$, updateResourcePolicySucceeded$]).subscribe(
@@ -114,7 +127,7 @@ export class ResourcePolicyEditComponent implements OnInit {
         } else { // nothing has been updated
           this.notificationsService.error(null, this.translate.get('resource-policies.edit.page.failure.content'));
         }
-      }
+      },
     );
   }
 }
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index 5a9494fe00..cd3b5b932f 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -5,7 +5,9 @@
            [id]="entry.id"
            [ngModel]="entry.checked"
            (ngModelChange)="this.toggleCheckbox.emit($event);">
-    <label class="custom-control-label" [for]="entry.id"></label>
+    <label class="custom-control-label" [for]="entry.id">
+      <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
+    </label>
   </div>
 </td>
 <th scope="row">
@@ -28,12 +30,12 @@
     <button class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.policy' | translate"
             (click)="redirectToResourcePolicyEditPage()">
-      <i class="fas fa-edit fa-fw"></i>
+      <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
-    <button *ngIf="(groupName$ | async) !== undefined" class="btn btn-outline-primary btn-sm"
+    <button *ngIf="groupName$ | async | dsHasValue" class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.group' | translate"
             (click)="redirectToGroupEditPage()">
-      <i class="fas fa-users fa-fw"></i>
+      <i class="fas fa-users fa-fw" aria-hidden="true"></i>
     </button>
   </div>
 </td>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
index b5232459f5..71b4ae9368 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
@@ -6,23 +6,31 @@
  * http://www.dspace.org/license/
  */
 
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { GroupMock } from '../../testing/group-mock';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { EPersonMock } from '../../testing/eperson.mock';
-import { ResourcePolicyEntryComponent } from './resource-policy-entry.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { cold } from 'jasmine-marbles';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
+import { RouterStub } from '../../testing/router.stub';
+import { HasValuePipe } from '../../utils/has-value.pipe';
+import { ResourcePolicyEntryComponent } from './resource-policy-entry.component';
 import createSpyObj = jasmine.createSpyObj;
 
 const groupRP: any = {
@@ -37,17 +45,17 @@ const groupRP: any = {
   uuid: 'resource-policy-1',
   _links: {
     eperson: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson',
     },
     group: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group',
     },
     self: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1'
+      href: 'https://rest.api/rest/api/resourcepolicies/1',
     },
   },
   eperson: observableOf(createSuccessfulRemoteDataObject(undefined)),
-  group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
 };
 
 const epersonRP: any = {
@@ -62,24 +70,24 @@ const epersonRP: any = {
   uuid: 'resource-policy-1',
   _links: {
     eperson: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson',
     },
     group: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group',
     },
     self: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1'
+      href: 'https://rest.api/rest/api/resourcepolicies/1',
     },
   },
   eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
-  group: observableOf(createSuccessfulRemoteDataObject(undefined))
+  group: observableOf(createSuccessfulRemoteDataObject(undefined)),
 };
 
 const item = Object.assign(new Item(), {
   uuid: 'itemUUID',
   id: 'itemUUID',
   _links: {
-    self: { href: 'item-selflink' }
+    self: { href: 'item-selflink' },
   },
 });
 
@@ -99,34 +107,35 @@ describe('ResourcePolicyEntryComponent', () => {
 
   beforeEach(() => {
     dsoNameService = createSpyObj('dsoNameMock', {
-      getName: 'NAME'
+      getName: 'NAME',
     });
     groupService = jasmine.createSpyObj('groupService', {
       findByHref: jasmine.createSpy('findByHref'),
     });
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject(item)
-      })
+        item: createSuccessfulRemoteDataObject(item),
+      }),
     };
     routerStub = Object.assign(new RouterStub(), {
-      url: `url/edit`
+      url: `url/edit`,
     });
 
 
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyEntryComponent,
+        HasValuePipe,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: Router, useValue: routerStub },
         { provide: GroupDataService, useValue: groupService },
-        { provide: DSONameService, useValue: dsoNameService }
+        { provide: DSONameService, useValue: dsoNameService },
       ],
       // schemas: [
       //   NO_ERRORS_SCHEMA
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
index 904a79cbe6..7afff302d9 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -5,21 +5,39 @@
  *
  * http://www.dspace.org/license/
  */
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { dateToString, stringToNgbDateStruct } from '../../date.util';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getAllSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+
+import { getGroupEditRoute } from '../../../access-control/access-control-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Group } from '../../../core/eperson/models/group.model';
-import { ACCESS_CONTROL_MODULE_PATH } from '../../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../../access-control/access-control-routing-paths';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  dateToString,
+  stringToNgbDateStruct,
+} from '../../date.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 
 export interface ResourcePolicyCheckboxEntry {
   id: string;
@@ -34,7 +52,7 @@ export interface ResourcePolicyCheckboxEntry {
 })
 export class ResourcePolicyEntryComponent implements OnInit {
   @Input()
-  entry: ResourcePolicyCheckboxEntry;
+    entry: ResourcePolicyCheckboxEntry;
 
   @Output()
   public toggleCheckbox: EventEmitter<boolean> = new EventEmitter();
@@ -97,7 +115,7 @@ export class ResourcePolicyEntryComponent implements OnInit {
       getFirstSucceededRemoteDataPayload(),
       map((group: Group) => group.id),
     ).subscribe((groupUUID) => {
-      this.router.navigate([ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]);
+      void this.router.navigate([getGroupEditRoute(groupUUID)]);
     });
   }
 }
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 66c1fc400e..3d5465f0e6 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -9,13 +9,13 @@
     <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
     <input id="ResourcePolicyObject" class="form-control mb-3" type="text" [value]="resourcePolicyTargetName$ | async">
     <ul ngbNav #nav="ngbNav" class="nav-pills" [(activeId)]="navActiveId" (navChange)="onNavChange($event)">
-      <li [ngbNavItem]="'eperson'">
+      <li [ngbNavItem]="'eperson'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.eperson' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list (select)="updateObjectSelected($event, true)"></ds-eperson-group-list>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'group'">
+      <li [ngbNavItem]="'group'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.group' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list [isListOfEPerson]="false"
@@ -35,12 +35,12 @@
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  [disabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
-            <span *ngIf="!(isProcessing | async)">
+            <span *ngIf="(isProcessing | async) !== true">
                   {{'form.submit' | translate}}
                 </span>
           </button>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 1cc908cc6d..86577e0645 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -1,44 +1,67 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
 import { delay } from 'rxjs/operators';
-import { TranslateModule } from '@ngx-translate/core';
+import { TestScheduler } from 'rxjs/testing';
 
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { createTestComponent } from '../../testing/utils.test';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { GroupMock } from '../../testing/group-mock';
-import { ResourcePolicyEvent, ResourcePolicyFormComponent } from './resource-policy-form.component';
-import { FormService } from '../../form/form.service';
-import { getMockFormService } from '../../mocks/form-service.mock';
-import { FormBuilderService } from '../../form/builder/form-builder.service';
-import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
-import { FormComponent } from '../../form/form.component';
-import { dateToISOFormat, stringToNgbDateStruct } from '../../date.util';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { EPersonMock } from '../../testing/eperson.mock';
+import {
+  dateToISOFormat,
+  stringToNgbDateStruct,
+} from '../../date.util';
 import { isNotEmptyOperator } from '../../empty.util';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../core/data/remote-data';
+import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
+import { FormBuilderService } from '../../form/builder/form-builder.service';
+import { FormComponent } from '../../form/form.component';
+import { FormService } from '../../form/form.service';
+import { getMockFormService } from '../../mocks/form-service.mock';
+import { getMockRequestService } from '../../mocks/request.service.mock';
 import { RouterMock } from '../../mocks/router.mock';
-import { Store } from '@ngrx/store';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreMock } from '../../testing/store.mock';
+import { createTestComponent } from '../../testing/utils.test';
+import {
+  ResourcePolicyEvent,
+  ResourcePolicyFormComponent,
+} from './resource-policy-form.component';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -49,8 +72,8 @@ export const mockResourcePolicyFormData = {
       display: 'name',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   description: [
     {
@@ -60,8 +83,8 @@ export const mockResourcePolicyFormData = {
       display: 'description',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   policyType: [
     {
@@ -71,8 +94,8 @@ export const mockResourcePolicyFormData = {
       display: 'TYPE_WORKFLOW',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   action: [
     {
@@ -82,8 +105,8 @@ export const mockResourcePolicyFormData = {
       display: 'WRITE',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   date: {
     start: [
@@ -94,8 +117,8 @@ export const mockResourcePolicyFormData = {
         display: '2019-04-14',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
     end: [
       {
@@ -105,10 +128,10 @@ export const mockResourcePolicyFormData = {
         display: '2020-04-14',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
-  }
+  },
 };
 
 export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
@@ -118,7 +141,7 @@ export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
   action: ActionType.WRITE,
   startDate: dateToISOFormat('2019-04-14T00:00:00Z'),
   endDate: dateToISOFormat('2020-04-14T00:00:00Z'),
-  type: RESOURCE_POLICY
+  type: RESOURCE_POLICY,
 });
 
 describe('ResourcePolicyFormComponent test suite', () => {
@@ -142,36 +165,36 @@ describe('ResourcePolicyFormComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const epersonService = jasmine.createSpyObj('epersonService', {
     findByHref: jasmine.createSpy('findByHref'),
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const groupService = jasmine.createSpyObj('groupService', {
     findByHref: jasmine.createSpy('findByHref'),
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const mockPolicyRD: RemoteData<ResourcePolicy> = createSuccessfulRemoteDataObject(resourcePolicy);
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockPolicyRD
-      })
-    }
+        dso: mockPolicyRD,
+      }),
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -183,13 +206,13 @@ describe('ResourcePolicyFormComponent test suite', () => {
         NgbModule,
         NoopAnimationsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         EpersonGroupListComponent,
         ResourcePolicyFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -202,11 +225,11 @@ describe('ResourcePolicyFormComponent test suite', () => {
         { provide: RequestService, useValue: getMockRequestService() },
         FormBuilderService,
         ChangeDetectorRef,
-        ResourcePolicyFormComponent
+        ResourcePolicyFormComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -307,7 +330,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       compAsAny.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
     });
@@ -340,7 +363,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       compAsAny.isActive = true;
       comp.ngOnInit();
       comp.resourcePolicyTargetName$.pipe(
-        isNotEmptyOperator()
+        isNotEmptyOperator(),
       ).subscribe(() => {
         expect(compAsAny.resourcePolicyGrant).toEqual(GroupMock);
         done();
@@ -368,7 +391,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       comp.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
       compAsAny.formService.isValid.and.returnValue(observableOf(true));
@@ -400,7 +423,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       eventPayload.object = submittedResourcePolicy;
       eventPayload.target = {
         type: 'group',
-        uuid: GroupMock.id
+        uuid: GroupMock.id,
       };
       eventPayload.updateTarget = false;
 
@@ -424,7 +447,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       comp.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
       compAsAny.formService.isValid.and.returnValue(observableOf(false));
@@ -452,7 +475,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 223e610908..477706ec1e 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -1,22 +1,58 @@
-import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-
 import {
-  Observable,
-  of as observableOf,
-  combineLatest as observableCombineLatest,
-  Subscription,
-  BehaviorSubject
-} from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbNavChangeEvent,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicDatePickerModel,
   DynamicFormControlModel,
   DynamicFormGroupModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  dateToISOFormat,
+  stringToNgbDateStruct,
+} from '../../date.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import { DsDynamicInputModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DsDynamicTextAreaModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { FormService } from '../../form/form.service';
 import {
   RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG,
   RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG,
@@ -27,21 +63,8 @@ import {
   RESOURCE_POLICY_FORM_NAME_CONFIG,
   RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG,
   RESOURCE_POLICY_FORM_START_DATE_CONFIG,
-  RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+  RESOURCE_POLICY_FORM_START_DATE_LAYOUT,
 } from './resource-policy-form.model';
-import { DsDynamicTextAreaModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { hasValue, isEmpty, isNotEmpty, hasValueOperator } from '../../empty.util';
-import { FormService } from '../../form/form.service';
-import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { RemoteData } from '../../../core/data/remote-data';
-import { dateToISOFormat, stringToNgbDateStruct } from '../../date.util';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { RequestService } from '../../../core/data/request.service';
-import { NgbModal, NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap';
 
 export interface ResourcePolicyEvent {
   object: ResourcePolicy;
@@ -163,10 +186,10 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
 
     if (this.isBeingEdited()) {
       const epersonRD$ = this.ePersonService.findByHref(this.resourcePolicy._links.eperson.href, false).pipe(
-        getFirstSucceededRemoteData()
+        getFirstSucceededRemoteData(),
       );
       const groupRD$ = this.groupService.findByHref(this.resourcePolicy._links.group.href, false).pipe(
-        getFirstSucceededRemoteData()
+        getFirstSucceededRemoteData(),
       );
       const dsoRD$: Observable<RemoteData<DSpaceObject>> = observableCombineLatest([epersonRD$, groupRD$]).pipe(
         map((rdArr: RemoteData<DSpaceObject>[]) => {
@@ -181,7 +204,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
           this.resourcePolicyGrant = dsoRD.payload;
           this.navActiveId = String(dsoRD.payload.type);
           this.resourcePolicyTargetName$.next(this.getResourcePolicyTargetName());
-        })
+        }),
       );
     }
   }
@@ -193,7 +216,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
    */
   isFormValid(): Observable<boolean> {
     return this.formService.isValid(this.formId).pipe(
-      map((isValid: boolean) => isValid && isNotEmpty(this.resourcePolicyGrant))
+      map((isValid: boolean) => isValid && isNotEmpty(this.resourcePolicyGrant)),
     );
   }
 
@@ -209,16 +232,16 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
       new DsDynamicInputModel(RESOURCE_POLICY_FORM_NAME_CONFIG),
       new DsDynamicTextAreaModel(RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG),
       new DynamicSelectModel(RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG),
-      new DynamicSelectModel(RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG)
+      new DynamicSelectModel(RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG),
     );
 
     const startDateModel = new DynamicDatePickerModel(
       RESOURCE_POLICY_FORM_START_DATE_CONFIG,
-      RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+      RESOURCE_POLICY_FORM_START_DATE_LAYOUT,
     );
     const endDateModel = new DynamicDatePickerModel(
       RESOURCE_POLICY_FORM_END_DATE_CONFIG,
-      RESOURCE_POLICY_FORM_END_DATE_LAYOUT
+      RESOURCE_POLICY_FORM_END_DATE_LAYOUT,
     );
     const dateGroupConfig = Object.assign({}, RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG, { group: [] });
     dateGroupConfig.group.push(startDateModel, endDateModel);
@@ -301,7 +324,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
         eventPayload.object = this.createResourcePolicyByFormData(data);
         eventPayload.target = {
           type: this.resourcePolicyGrantType,
-          uuid: this.resourcePolicyGrant.id
+          uuid: this.resourcePolicyGrant.id,
         };
         eventPayload.updateTarget = this.resourcePolicyTargetUpdated;
         this.submit.emit(eventPayload);
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
index 0967a4e70d..64237f9e23 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -6,63 +6,63 @@ import {
   DynamicSelectModelConfig,
 } from '@ng-dynamic-forms/core';
 
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { DsDynamicInputModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
 
 const policyTypeList: DynamicFormOptionConfig<any>[] = [
   {
     label: PolicyType.TYPE_SUBMISSION,
-    value: PolicyType.TYPE_SUBMISSION
+    value: PolicyType.TYPE_SUBMISSION,
   },
   {
     label: PolicyType.TYPE_WORKFLOW,
-    value: PolicyType.TYPE_WORKFLOW
+    value: PolicyType.TYPE_WORKFLOW,
   },
   {
     label: PolicyType.TYPE_INHERITED,
-    value: PolicyType.TYPE_INHERITED
+    value: PolicyType.TYPE_INHERITED,
   },
   {
     label: PolicyType.TYPE_CUSTOM,
-    value: PolicyType.TYPE_CUSTOM
+    value: PolicyType.TYPE_CUSTOM,
   },
 ];
 
 const policyActionList: DynamicFormOptionConfig<any>[] = [
   {
     label: ActionType.READ.toString(),
-    value: ActionType.READ
+    value: ActionType.READ,
   },
   {
     label: ActionType.WRITE.toString(),
-    value: ActionType.WRITE
+    value: ActionType.WRITE,
   },
   {
     label: ActionType.REMOVE.toString(),
-    value: ActionType.REMOVE
+    value: ActionType.REMOVE,
   },
   {
     label: ActionType.ADMIN.toString(),
-    value: ActionType.ADMIN
+    value: ActionType.ADMIN,
   },
   {
     label: ActionType.DELETE.toString(),
-    value: ActionType.DELETE
+    value: ActionType.DELETE,
   },
   {
     label: ActionType.WITHDRAWN_READ.toString(),
-    value: ActionType.WITHDRAWN_READ
+    value: ActionType.WITHDRAWN_READ,
   },
   {
     label: ActionType.DEFAULT_BITSTREAM_READ.toString(),
-    value: ActionType.DEFAULT_BITSTREAM_READ
+    value: ActionType.DEFAULT_BITSTREAM_READ,
   },
   {
     label: ActionType.DEFAULT_ITEM_READ.toString(),
-    value: ActionType.DEFAULT_ITEM_READ
-  }
+    value: ActionType.DEFAULT_ITEM_READ,
+  },
 ];
 
 export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
@@ -71,7 +71,7 @@ export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
   metadataFields: [],
   repeatable: false,
   submissionId: '',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG: DsDynamicTextAreaModelConfig = {
@@ -81,7 +81,7 @@ export const RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG: DsDynamicTextAreaModelConf
   repeatable: false,
   rows: 10,
   submissionId: '',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
@@ -90,11 +90,11 @@ export const RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG: DynamicSelectModelConfig<a
   options: policyTypeList,
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'resource-policies.form.policy-type.required'
-  }
+    required: 'resource-policies.form.policy-type.required',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
@@ -103,21 +103,21 @@ export const RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG: DynamicSelectModelConfig<a
   options: policyActionList,
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'resource-policies.form.action-type.required'
-  }
+    required: 'resource-policies.form.action-type.required',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'date',
-  group: []
+  group: [],
 };
 export const RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     control: 'form-row',
-  }
+  },
 };
 
 export const RESOURCE_POLICY_FORM_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -125,17 +125,17 @@ export const RESOURCE_POLICY_FORM_START_DATE_CONFIG: DynamicDatePickerModelConfi
   label: 'resource-policies.form.date.start.label',
   placeholder: 'resource-policies.form.date.start.label',
   inline: false,
-  toggleIcon: 'far fa-calendar-alt'
+  toggleIcon: 'far fa-calendar-alt',
 };
 
 export const RESOURCE_POLICY_FORM_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'p-0',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-md-6'
-  }
+    host: 'col-md-6',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -143,14 +143,14 @@ export const RESOURCE_POLICY_FORM_END_DATE_CONFIG: DynamicDatePickerModelConfig
   label: 'resource-policies.form.date.end.label',
   placeholder: 'resource-policies.form.date.end.label',
   inline: false,
-  toggleIcon: 'far fa-calendar-alt'
+  toggleIcon: 'far fa-calendar-alt',
 };
 export const RESOURCE_POLICY_FORM_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'p-0',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-md-6'
-  }
+    host: 'col-md-6',
+  },
 };
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
index 95f27c7934..4f587a3ed4 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
@@ -1,15 +1,22 @@
-import { Injectable, Injector } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
-import { ResourceType } from '../../../core/shared/resource-type';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { isEmpty } from '../../empty.util';
-import { RemoteData } from '../../../core/data/remote-data';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
 import { getDataServiceFor } from '../../../core/data/base/data-service.decorator';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { isEmpty } from '../../empty.util';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -42,7 +49,7 @@ export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceOb
     const provider = getDataServiceFor(new ResourceType(targetType));
     this.dataService = Injector.create({
       providers: [],
-      parent: this.parentInjector
+      parent: this.parentInjector,
     }).get(provider);
 
     return this.dataService.findById(policyTargetId).pipe(
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
index 3b7ac692fb..ee8525d422 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
@@ -1,14 +1,18 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
-import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { followLink } from '../../utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { isEmpty } from '../../empty.util';
+import { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 277f6e4998..bb6073df85 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -7,20 +7,20 @@
             <span>
               {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }}
               <span class="text-info"> {{resourceName}} </span>
-              <ng-container *ngIf="resourceType != 'item'">
+              <ng-container *ngIf="resourceType !== 'item'">
                 ({{resourceUUID}})
               </ng-container>
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [disabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
-                  <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                  <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
-                <span *ngIf="!(isProcessingDelete() | async)">
-                  <i class='fas fa-trash-alt fa-fw'></i>
+                <span *ngIf="(isProcessingDelete() | async) !== true">
+                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
                   {{'resource-policies.delete.btn' | translate}}
                 </span>
               </button>
@@ -28,7 +28,7 @@
                       [disabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
-                <i class='fas fa-plus'></i>
+                <i class='fas fa-plus' aria-hidden="true"></i>
                 {{'resource-policies.add.button' | translate}}
               </button>
             </div>
@@ -38,11 +38,13 @@
       <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
         <th>
           <div class="custom-control custom-checkbox">
-            <input type="checkbox"
+            <input #selectAllBtn type="checkbox"
                    class="custom-control-input"
                    [id]="'selectAll_' + resourceUUID"
                    (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"></label>
+            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+              <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
+            </label>
           </div>
         </th>
         <th>{{'resource-policies.table.headers.id' | translate}}</th>
diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
index 77eaffd413..35f42dbd73 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -1,40 +1,65 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { RequestService } from '../../core/data/request.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { ActionType } from '../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../core/resource-policy/models/policy-type.model';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
-import { LinkService } from '../../core/cache/builders/link.service';
-import { getMockLinkService } from '../mocks/link-service.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../testing/utils.test';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../notifications/notifications.service';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { RequestService } from '../../core/data/request.service';
-import { getMockRequestService } from '../mocks/request.service.mock';
-import { RouterStub } from '../testing/router.stub';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { ResourcePoliciesComponent } from './resource-policies.component';
-import { PolicyType } from '../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../core/resource-policy/models/action-type.model';
+import { getMockLinkService } from '../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 import { EPersonMock } from '../testing/eperson.mock';
 import { GroupMock } from '../testing/group-mock';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../testing/utils.test';
+import { HasValuePipe } from '../utils/has-value.pipe';
 import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ResourcePoliciesComponent } from './resource-policies.component';
 
 describe('ResourcePoliciesComponent test suite', () => {
   let comp: ResourcePoliciesComponent;
@@ -59,17 +84,17 @@ describe('ResourcePoliciesComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const anotherResourcePolicy: any = {
@@ -84,65 +109,65 @@ describe('ResourcePoliciesComponent test suite', () => {
     uuid: 'resource-policy-2',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
-    group: observableOf(createSuccessfulRemoteDataObject({}))
+    group: observableOf(createSuccessfulRemoteDataObject({})),
   };
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'bitstream1',
-    uuid: 'bitstream1'
+    uuid: 'bitstream1',
   });
   const bitstream2 = Object.assign(new Bitstream(), {
     id: 'bitstream2',
-    uuid: 'bitstream2'
+    uuid: 'bitstream2',
   });
   const bitstream3 = Object.assign(new Bitstream(), {
     id: 'bitstream3',
-    uuid: 'bitstream3'
+    uuid: 'bitstream3',
   });
   const bitstream4 = Object.assign(new Bitstream(), {
     id: 'bitstream4',
-    uuid: 'bitstream4'
+    uuid: 'bitstream4',
   });
   const bundle1 = Object.assign(new Bundle(), {
     id: 'bundle1',
     uuid: 'bundle1',
     _links: {
-      self: { href: 'bundle1-selflink' }
+      self: { href: 'bundle1-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
   });
   const bundle2 = Object.assign(new Bundle(), {
     id: 'bundle2',
     uuid: 'bundle2',
     _links: {
-      self: { href: 'bundle2-selflink' }
+      self: { href: 'bundle2-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4])),
   });
 
   const item = Object.assign(new Item(), {
     uuid: 'itemUUID',
     id: 'itemUUID',
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2])),
   });
 
   const routeStub = {
     data: observableOf({
-      item: createSuccessfulRemoteDataObject(item)
-    })
+      item: createSuccessfulRemoteDataObject(item),
+    }),
   };
 
   const epersonService = jasmine.createSpyObj('epersonService', {
@@ -154,7 +179,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   });
 
   routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   const getInitEntries = () => {
@@ -162,13 +187,13 @@ describe('ResourcePoliciesComponent test suite', () => {
       Object.assign({}, {
         id: resourcePolicy.id,
         policy: resourcePolicy,
-        checked: false
+        checked: false,
       }),
       Object.assign({}, {
         id: anotherResourcePolicy.id,
         policy: anotherResourcePolicy,
-        checked: false
-      })
+        checked: false,
+      }),
     ];
   };
 
@@ -176,13 +201,13 @@ describe('ResourcePoliciesComponent test suite', () => {
     {
       id: resourcePolicy.id,
       policy: resourcePolicy,
-      checked: true
+      checked: true,
     },
     {
       id: anotherResourcePolicy.id,
       policy: anotherResourcePolicy,
-      checked: false
-    }
+      checked: false,
+    },
   ];
 
   const pageInfo = new PageInfo();
@@ -191,7 +216,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
 
   const dsoNameService = jasmine.createSpyObj('dsoNameMock', {
-    getName: 'NAME'
+    getName: 'NAME',
   });
 
   beforeEach(waitForAsync(() => {
@@ -200,12 +225,13 @@ describe('ResourcePoliciesComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePoliciesComponent,
         ResourcePolicyEntryComponent,
-        TestComponent
+        TestComponent,
+        HasValuePipe,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -218,10 +244,10 @@ describe('ResourcePoliciesComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         { provide: DSONameService, useValue: dsoNameService },
         ChangeDetectorRef,
-        ResourcePoliciesComponent
+        ResourcePoliciesComponent,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -232,7 +258,7 @@ describe('ResourcePoliciesComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       resourcePolicyService.searchByResource.and.returnValue(hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }));
       const html = `
         <ds-resource-policies [resourceUUID]="resourceUUID" [resourceType]="resourceType"></ds-resource-policies>`;
@@ -278,7 +304,7 @@ describe('ResourcePoliciesComponent test suite', () => {
       const expected = getInitEntries();
       compAsAny.isActive = true;
       resourcePolicyService.searchByResource.and.returnValue(hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }));
 
       scheduler = getTestScheduler();
@@ -326,7 +352,7 @@ describe('ResourcePoliciesComponent test suite', () => {
 
       it('should return false when no row is selected', () => {
         expect(comp.canDelete()).toBeObservable(cold('(a|)', {
-          a: false
+          a: false,
         }));
       });
 
@@ -335,7 +361,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         const event = { target: { checked: true } };
         checkbox.triggerEventHandler('change', event);
         expect(comp.canDelete()).toBeObservable(cold('(a|)', {
-          a: true
+          a: true,
         }));
       });
     });
@@ -387,7 +413,7 @@ describe('ResourcePoliciesComponent test suite', () => {
     it('should get the resource\'s policy list', () => {
       const initResourcePolicyEntries = getInitEntries();
       expect(comp.getResourcePolicies()).toBeObservable(cold('a', {
-        a: initResourcePolicyEntries
+        a: initResourcePolicyEntries,
       }));
 
     });
@@ -421,7 +447,7 @@ describe('ResourcePoliciesComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index afe23b13d1..2f5e1fd7d6 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -1,18 +1,43 @@
-import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, from as observableFrom, Observable, Subscription } from 'rxjs';
-import { concatMap, distinctUntilChanged, filter, map, reduce, scan, take } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  from as observableFrom,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  concatMap,
+  distinctUntilChanged,
+  filter,
+  map,
+  reduce,
+  scan,
+  take,
+} from 'rxjs/operators';
 
-import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
-import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { RequestService } from '../../core/data/request.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import { NotificationsService } from '../notifications/notifications.service';
 import { followLink } from '../utils/follow-link-config.model';
 import { ResourcePolicyCheckboxEntry } from './entry/resource-policy-entry.component';
@@ -94,7 +119,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
-    private translate: TranslateService
+    private translate: TranslateService,
   ) {
   }
 
@@ -116,7 +141,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
       filter((entry: ResourcePolicyCheckboxEntry) => entry.checked),
       reduce((acc: any, value: any) => [...acc, value], []),
       map((entries: ResourcePolicyCheckboxEntry[]) => isNotEmpty(entries)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -141,7 +166,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
           this.notificationsService.error(null, this.translate.get('resource-policies.delete.failure.content'));
         }
         this.processingDelete$.next(false);
-      })
+      }),
     );
   }
 
@@ -160,15 +185,15 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
   initResourcePolicyList() {
     this.subs.push(this.resourcePolicyService.searchByResource(
       this.resourceUUID, null, false, true,
-      followLink('eperson'), followLink('group')
+      followLink('eperson'), followLink('group'),
     ).pipe(
       filter(() => this.isActive),
-      getAllSucceededRemoteData()
+      getAllSucceededRemoteData(),
     ).subscribe((result) => {
       const entries = result.payload.page.map((policy: ResourcePolicy) => ({
         id: policy.id,
         policy: policy,
-        checked: false
+        checked: false,
       }));
       this.resourcePoliciesEntries$.next(entries);
       // TODO detectChanges still needed?
@@ -193,8 +218,8 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
       relativeTo: this.route,
       queryParams: {
         policyTargetId: this.resourceUUID,
-        targetType: this.resourceType
-      }
+        targetType: this.resourceType,
+      },
     });
   }
 
diff --git a/src/app/shared/resource-policies/resource-policies.module.ts b/src/app/shared/resource-policies/resource-policies.module.ts
index 8a7f6dca79..7d7e440cff 100644
--- a/src/app/shared/resource-policies/resource-policies.module.ts
+++ b/src/app/shared/resource-policies/resource-policies.module.ts
@@ -1,18 +1,17 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-
+import { NgModule } from '@angular/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { ResourcePoliciesComponent } from './resource-policies.component';
-import { ResourcePolicyFormComponent } from './form/resource-policy-form.component';
-import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component';
-import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component';
 import { FormModule } from '../form/form.module';
+import { SharedModule } from '../shared.module';
+import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component';
+import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
+import { ResourcePolicyFormComponent } from './form/resource-policy-form.component';
 import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver';
 import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SharedModule } from '../shared.module';
-import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
+import { ResourcePoliciesComponent } from './resource-policies.component';
 
 const COMPONENTS = [
   ResourcePoliciesComponent,
@@ -24,25 +23,25 @@ const COMPONENTS = [
 
 const PROVIDERS = [
   ResourcePolicyResolver,
-  ResourcePolicyTargetResolver
+  ResourcePolicyTargetResolver,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     NgbModule,
     CommonModule,
     FormModule,
     TranslateModule,
-    SharedModule
+    SharedModule,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 export class ResourcePoliciesModule { }
diff --git a/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts b/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
index b68774d46f..8004ae0f67 100644
--- a/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
+++ b/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
@@ -1,5 +1,5 @@
-import { ResponsiveColumnSizes } from './responsive-column-sizes';
 import { hasValue } from '../empty.util';
+import { ResponsiveColumnSizes } from './responsive-column-sizes';
 
 /**
  * A helper class storing the sizes in which to render a table
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
index 11928a03c4..17284ff5eb 100644
--- a/src/app/shared/results-back-button/results-back-button.component.spec.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -1,10 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ResultsBackButtonComponent } from './results-back-button.component';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import { ResultsBackButtonComponent } from './results-back-button.component';
+
 describe('ResultsBackButtonComponent', () => {
 
   let component: ResultsBackButtonComponent;
@@ -21,12 +29,12 @@ describe('ResultsBackButtonComponent', () => {
       TestBed.configureTestingModule({
         declarations: [ResultsBackButtonComponent],
         imports: [TranslateModule.forRoot(),
-          RouterTestingModule.withRoutes([])
+          RouterTestingModule.withRoutes([]),
         ],
         providers: [
-          { provide: TranslateService, useValue: translate }
+          { provide: TranslateService, useValue: translate },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index cf29cf2f4a..2fdc7b2c8a 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -1,6 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'ds-results-back-button',
diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
index 91f387c56e..cfb6024248 100644
--- a/src/app/shared/results-back-button/results-back-button.module.ts
+++ b/src/app/shared/results-back-button/results-back-button.module.ts
@@ -1,21 +1,22 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
+
 import { ResultsBackButtonComponent } from './results-back-button.component';
 import { ThemedResultsBackButtonComponent } from './themed-results-back-button.component';
 
 @NgModule({
   declarations: [
     ResultsBackButtonComponent,
-    ThemedResultsBackButtonComponent
+    ThemedResultsBackButtonComponent,
   ],
   imports: [
     CommonModule,
-    TranslateModule
+    TranslateModule,
   ],
   exports: [
-    ThemedResultsBackButtonComponent
-  ]
+    ThemedResultsBackButtonComponent,
+  ],
 })
 export class ResultsBackButtonModule {
 
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index fa9fac8e70..1067faa833 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
-import { Observable } from 'rxjs';
 
 @Component({
   selector: 'ds-themed-results-back-button',
diff --git a/src/app/shared/roles/role.directive.ts b/src/app/shared/roles/role.directive.ts
index 3ee99959d1..7f9d00fde4 100644
--- a/src/app/shared/roles/role.directive.ts
+++ b/src/app/shared/roles/role.directive.ts
@@ -6,18 +6,25 @@ import {
   OnDestroy,
   SimpleChanges,
   TemplateRef,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  first,
+  map,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable, Subscription } from 'rxjs';
-import { filter, first, map } from 'rxjs/operators';
-
-import { hasValue } from '../empty.util';
 import { RoleService } from '../../core/roles/role.service';
 import { RoleType } from '../../core/roles/role-types';
+import { hasValue } from '../empty.util';
 
 @Directive({
-  selector: '[dsShowOnlyForRole],[dsShowExceptForRole]'
+  selector: '[dsShowOnlyForRole],[dsShowExceptForRole]',
 })
 /**
  * Structural Directive for showing or hiding a template based on current user role
@@ -40,7 +47,7 @@ export class RoleDirective implements OnChanges, OnDestroy {
     private roleService: RoleService,
     private viewContainer: ViewContainerRef,
     private changeDetector: ChangeDetectorRef,
-    private templateRef: TemplateRef<any>
+    private templateRef: TemplateRef<any>,
   ) {
   }
 
@@ -108,7 +115,7 @@ export class RoleDirective implements OnChanges, OnDestroy {
 
     return combineLatest(checks).pipe(
       map((permissions: boolean[]) => permissions.includes(true)),
-      first()
+      first(),
     );
   }
 }
diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts
index 61b54a1125..aeb8c19a0c 100644
--- a/src/app/shared/rss-feed/rss.component.spec.ts
+++ b/src/app/shared/rss-feed/rss.component.spec.ts
@@ -1,4 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -7,103 +14,104 @@ import { LinkHeadService } from '../../core/services/link-head.service';
 import { Collection } from '../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { RouterMock } from '../mocks/router.mock';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { RSSComponent } from './rss.component';
-import { of as observableOf } from 'rxjs';
-import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { Router } from '@angular/router';
-import { RouterMock } from '../mocks/router.mock';
 
 
 
 describe('RssComponent', () => {
-    let comp: RSSComponent;
-    let fixture: ComponentFixture<RSSComponent>;
-    let uuid: string;
-    let query: string;
-    let groupDataService: GroupDataService;
-    let linkHeadService: LinkHeadService;
-    let configurationDataService: ConfigurationDataService;
-    let paginationService;
+  let comp: RSSComponent;
+  let fixture: ComponentFixture<RSSComponent>;
+  let uuid: string;
+  let query: string;
+  let groupDataService: GroupDataService;
+  let linkHeadService: LinkHeadService;
+  let configurationDataService: ConfigurationDataService;
+  let paginationService;
 
-    beforeEach(waitForAsync(() => {
-        const mockCollection: Collection = Object.assign(new Collection(), {
-            id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
-            name: 'test-collection',
-            _links: {
-              mappedItems: {
-                href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems'
-              },
-              self: {
-                href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4'
-              }
-            }
-          });
-        configurationDataService = jasmine.createSpyObj('configurationDataService', {
-            findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-              name: 'test',
-              values: [
-                'org.dspace.ctask.general.ProfileFormats = test'
-              ]
-            }))
-          });
-        linkHeadService = jasmine.createSpyObj('linkHeadService', {
-            addTag: ''
-        });
-        const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
-        const mockSearchOptions = observableOf(new PaginatedSearchOptions({
-            pagination: Object.assign(new PaginationComponentOptions(), {
-              id: 'search-page-configuration',
-              pageSize: 10,
-              currentPage: 1
-            }),
-          }));
-        groupDataService = jasmine.createSpyObj('groupsDataService', {
-            findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-            getGroupRegistryRouterLink: '',
-            getUUIDFromString: '',
-          });
-        paginationService = new PaginationServiceStub();
-        const searchConfigService = {
-            paginatedSearchOptions: mockSearchOptions
-          };
-        TestBed.configureTestingModule({
-          providers: [
-            { provide: GroupDataService, useValue: groupDataService },
-            { provide: LinkHeadService, useValue: linkHeadService },
-            { provide: ConfigurationDataService, useValue: configurationDataService },
-            { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-            { provide: PaginationService, useValue: paginationService },
-            { provide: Router, useValue: new RouterMock() }
-          ],
-          declarations: [RSSComponent]
-        }).compileComponents();
-      }));
-
-    beforeEach(() => {
-        uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
-        query = 'test';
-        fixture = TestBed.createComponent(RSSComponent);
-        comp = fixture.componentInstance;
+  beforeEach(waitForAsync(() => {
+    const mockCollection: Collection = Object.assign(new Collection(), {
+      id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+      name: 'test-collection',
+      _links: {
+        mappedItems: {
+          href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems',
+        },
+        self: {
+          href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+        },
+      },
     });
-
-    it('should formulate the correct url given params in url', () => {
-        const route = comp.formulateRoute(uuid, 'opensearch/search', query);
-        expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test');
+    configurationDataService = jasmine.createSpyObj('configurationDataService', {
+      findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'test',
+        values: [
+          'org.dspace.ctask.general.ProfileFormats = test',
+        ],
+      })),
     });
-
-    it('should skip uuid if its null', () => {
-        const route = comp.formulateRoute(null, 'opensearch/search', query);
-        expect(route).toBe('/opensearch/search?format=atom&query=test');
+    linkHeadService = jasmine.createSpyObj('linkHeadService', {
+      addTag: '',
     });
-
-    it('should default to query * if none provided', () => {
-        const route = comp.formulateRoute(null, 'opensearch/search', null);
-        expect(route).toBe('/opensearch/search?format=atom&query=*');
+    const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
+    const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+      pagination: Object.assign(new PaginationComponentOptions(), {
+        id: 'search-page-configuration',
+        pageSize: 10,
+        currentPage: 1,
+      }),
+    }));
+    groupDataService = jasmine.createSpyObj('groupsDataService', {
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      getGroupRegistryRouterLink: '',
+      getUUIDFromString: '',
     });
+    paginationService = new PaginationServiceStub();
+    const searchConfigService = {
+      paginatedSearchOptions: mockSearchOptions,
+    };
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: Router, useValue: new RouterMock() },
+      ],
+      declarations: [RSSComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
+    query = 'test';
+    fixture = TestBed.createComponent(RSSComponent);
+    comp = fixture.componentInstance;
+  });
+
+  it('should formulate the correct url given params in url', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', query);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test');
+  });
+
+  it('should skip uuid if its null', () => {
+    const route = comp.formulateRoute(null, 'opensearch/search', query);
+    expect(route).toBe('/opensearch/search?format=atom&query=test');
+  });
+
+  it('should default to query * if none provided', () => {
+    const route = comp.formulateRoute(null, 'opensearch/search', null);
+    expect(route).toBe('/opensearch/search?format=atom&query=*');
+  });
 });
 
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index 7f27a32b9f..6f53346dcf 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -3,20 +3,28 @@ import {
   Component,
   OnDestroy,
   OnInit,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { environment } from '../../../../src/environments/environment';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../src/environments/environment';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 
 
 /**
@@ -28,7 +36,7 @@ import { RemoteData } from '../../core/data/remote-data';
   styleUrls: ['rss.component.scss'],
   templateUrl: 'rss.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 export class RSSComponent implements OnInit, OnDestroy  {
 
@@ -83,8 +91,8 @@ export class RSSComponent implements OnInit, OnDestroy  {
       }),
       switchMap((openSearchUri: string) =>
         this.searchConfigurationService.paginatedSearchOptions.pipe(
-          map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri,  searchOptions }))
-        )
+          map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri,  searchOptions })),
+        ),
       ),
     ).subscribe(({ openSearchUri,  searchOptions }) => {
       if (!openSearchUri) {
@@ -97,7 +105,7 @@ export class RSSComponent implements OnInit, OnDestroy  {
         href: environment.rest.baseUrl + '/' + openSearchUri + '/service',
         type: 'application/atom+xml',
         rel: 'search',
-        title: 'Dspace'
+        title: 'Dspace',
       });
       this.route$.next(route);
     }));
@@ -144,14 +152,14 @@ export class RSSComponent implements OnInit, OnDestroy  {
       href: route,
       type: 'application/atom+xml',
       rel: 'alternate',
-      title: 'Sitewide Atom feed'
+      title: 'Sitewide Atom feed',
     });
     route = route.replace('format=atom', 'format=rss');
     this.linkHeadService.addTag({
       href: route,
       type: 'application/rss+xml',
       rel: 'alternate',
-      title: 'Sitewide RSS feed'
+      title: 'Sitewide RSS feed',
     });
   }
 }
diff --git a/src/app/shared/sass-helper/css-variable.actions.ts b/src/app/shared/sass-helper/css-variable.actions.ts
index 2d58a2978b..f8b135a959 100644
--- a/src/app/shared/sass-helper/css-variable.actions.ts
+++ b/src/app/shared/sass-helper/css-variable.actions.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
-import { type } from '../ngrx/type';
+
 import { KeyValuePair } from '../key-value-pair.model';
+import { type } from '../ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
@@ -25,7 +26,7 @@ export class AddCSSVariableAction implements Action {
   };
 
   constructor(name: string, value: string) {
-    this.payload = {name, value};
+    this.payload = { name, value };
   }
 }
 export class AddAllCSSVariablesAction implements Action {
diff --git a/src/app/shared/sass-helper/css-variable.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts
index 449a936b4e..15bb179fb1 100644
--- a/src/app/shared/sass-helper/css-variable.reducer.ts
+++ b/src/app/shared/sass-helper/css-variable.reducer.ts
@@ -1,5 +1,8 @@
-import { CSSVariableAction, CSSVariableActionTypes } from './css-variable.actions';
 import { KeyValuePair } from '../key-value-pair.model';
+import {
+  CSSVariableAction,
+  CSSVariableActionTypes,
+} from './css-variable.actions';
 
 export interface CSSVariablesState {
   [name: string]: string;
@@ -19,7 +22,7 @@ export function cssVariablesReducer(state = initialState, action: CSSVariableAct
       return Object.assign({}, state, { [variable.name]: variable.value });
     } case CSSVariableActionTypes.ADD_ALL: {
       const variables = action.payload;
-      return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair<string, string>) => {return {[key]: value};}));
+      return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair<string, string>) => {return { [key]: value };}));
     } case CSSVariableActionTypes.CLEAR: {
       return initialState;
     }
diff --git a/src/app/shared/sass-helper/css-variable.service.spec.ts b/src/app/shared/sass-helper/css-variable.service.spec.ts
index 559384a5d7..1b56527c48 100644
--- a/src/app/shared/sass-helper/css-variable.service.spec.ts
+++ b/src/app/shared/sass-helper/css-variable.service.spec.ts
@@ -1,10 +1,14 @@
 import { TestBed } from '@angular/core/testing';
-import { CSSVariableService } from './css-variable.service';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
 import { getTestScheduler } from 'jasmine-marbles';
+
 import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { KeyValuePair } from '../key-value-pair.model';
+import { CSSVariableService } from './css-variable.service';
 
 describe('CSSVariableService', () => {
   let store: MockStore;
@@ -26,7 +30,7 @@ describe('CSSVariableService', () => {
         [varKey1]: varValue1,
         [varKey2]: varValue2,
         [varKey3]: varValue3,
-      }
+      },
     };
   }
 
diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts
index 0190a05036..a2be806285 100644
--- a/src/app/shared/sass-helper/css-variable.service.ts
+++ b/src/app/shared/sass-helper/css-variable.service.ts
@@ -1,20 +1,39 @@
 import { Injectable } from '@angular/core';
-import { AppState, keySelector } from '../../app.reducer';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { AddAllCSSVariablesAction, AddCSSVariableAction, ClearCSSVariablesAction } from './css-variable.actions';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { KeyValuePair } from '../key-value-pair.model';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { KeyValuePair } from '../key-value-pair.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import {
+  AddAllCSSVariablesAction,
+  AddCSSVariableAction,
+  ClearCSSVariablesAction,
+} from './css-variable.actions';
 import { CSSVariablesState } from './css-variable.reducer';
 
 /**
  * This service deals with adding and retrieving CSS variables to and from the store
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CSSVariableService {
   isSameDomain = (styleSheet) => {
@@ -26,6 +45,19 @@ export class CSSVariableService {
     return styleSheet.href.indexOf(window.location.origin) === 0;
   };
 
+  /**
+   * Checks whether the specific stylesheet object has the property cssRules
+   * @param styleSheet The stylesheet
+   */
+  hasCssRules = (styleSheet) => {
+    // Injected (cross-origin) styles might have no css rules value and throw some exception
+    try {
+      return styleSheet.cssRules;
+    } catch (e) {
+      return false;
+    }
+  };
+
   /*
    Determine if the given rule is a CSSStyleRule
    See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants
@@ -93,8 +125,10 @@ export class CSSVariableService {
     if (isNotEmpty(document.styleSheets)) {
       // styleSheets is array-like, so we convert it to an array.
       // Filter out any stylesheets not on this domain
+      // Filter out any stylesheets that have no cssRules property
       return [...document.styleSheets]
         .filter(this.isSameDomain)
+        .filter(this.hasCssRules)
         .reduce(
           (finalArr, sheet) =>
             finalArr.concat(
@@ -102,19 +136,19 @@ export class CSSVariableService {
               [...sheet.cssRules].filter(this.isStyleRule).reduce((propValArr, rule: any) => {
                 const props = [...rule.style]
                   .map((propName) => {
-                      return {
-                        key: propName.trim(),
-                        value: rule.style.getPropertyValue(propName).trim()
-                      } as KeyValuePair<string, string>;
-                    }
+                    return {
+                      key: propName.trim(),
+                      value: rule.style.getPropertyValue(propName).trim(),
+                    } as KeyValuePair<string, string>;
+                  },
                   )
                   // Discard any props that don't start with "--". Custom props are required to.
                   .filter(({ key }: KeyValuePair<string, string>) => key.indexOf('--') === 0);
 
                 return [...propValArr, ...props];
-              }, [])
+              }, []),
             ),
-          []
+          [],
         );
     } else {
       return [];
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
index 42d00aaa08..ac1aa8ef58 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ScopeSelectorModalComponent } from './scope-selector-modal.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../core/shared/community.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
 import { RouterStub } from '../../testing/router.stub';
+import { ScopeSelectorModalComponent } from './scope-selector-modal.component';
 
 describe('ScopeSelectorModalComponent', () => {
   let component: ScopeSelectorModalComponent;
@@ -19,8 +30,8 @@ describe('ScopeSelectorModalComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -41,14 +52,14 @@ describe('ScopeSelectorModalComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 3301435956..c947c2abae 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -1,11 +1,22 @@
-import { Component, EventEmitter, OnInit } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+
 import { environment } from '../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a button - to select the entire repository -
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 584b7c5584..61cb44c7b0 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -1,22 +1,29 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { SearchFormComponent } from './search-form.component';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SearchService } from '../../core/shared/search/search.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
-import { SearchServiceStub } from '../testing/search-service.stub';
-import { Router } from '@angular/router';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { RouterStub } from '../testing/router.stub';
+import { SearchServiceStub } from '../testing/search-service.stub';
+import { SearchFormComponent } from './search-form.component';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
@@ -28,6 +35,7 @@ describe('SearchFormComponent', () => {
   const searchService = new SearchServiceStub();
   const paginationService = new PaginationServiceStub();
   const searchConfigService = { paginationID: 'test-id' };
+  const firstPage = { 'spc.page': 1 };
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
   };
@@ -45,7 +53,7 @@ describe('SearchFormComponent', () => {
       declarations: [
         SearchFormComponent,
         BrowserOnlyMockPipe,
-      ]
+      ],
     }).compileComponents();
   }));
 
@@ -104,38 +112,38 @@ describe('SearchFormComponent', () => {
     const scope = 'MCU';
     let searchQuery = {};
 
-    it('should navigate to the search page even when no parameters are provided', () => {
+    it('should navigate to the search first page even when no parameters are provided', () => {
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
+        queryParams: { ...searchQuery, ...firstPage },
+        queryParamsHandling: 'merge',
       });
     });
 
-    it('should navigate to the search page with parameters only query if only query is provided', () => {
+    it('should navigate to the search first page with parameters only query if only query is provided', () => {
       searchQuery = {
-        query: query
+        query: query,
       };
 
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
+        queryParams: { ...searchQuery, ...firstPage },
+        queryParamsHandling: 'merge',
       });
     });
 
-    it('should navigate to the search page with parameters only query if only scope is provided', () => {
+    it('should navigate to the search first page with parameters only query if only scope is provided', () => {
       searchQuery = {
-        scope: scope
+        scope: scope,
       };
 
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
+        queryParams: { ...searchQuery, ...firstPage },
+        queryParamsHandling: 'merge',
       });
     });
   });
@@ -152,7 +160,7 @@ describe('SearchFormComponent', () => {
     it('should only search in the provided scope', () => {
       searchQuery = {
         query: query,
-        scope: scope
+        scope: scope,
       };
 
       comp.scope = scope;
@@ -163,7 +171,7 @@ describe('SearchFormComponent', () => {
 
     it('should not create searchQuery with the scope if an empty scope is provided', () => {
       searchQuery = {
-        query: query
+        query: query,
       };
 
       comp.scope = '';
@@ -180,15 +188,15 @@ const objects: DSpaceObject[] = [
       self: {
         _isScalar: true,
         value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     collections: {
       self: {
         _isScalar: true,
         value: '1506937433727',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     _links: {
       self: {
@@ -202,40 +210,40 @@ const objects: DSpaceObject[] = [
       'dc.description': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.description.abstract': [
         {
           language: null,
-          value: 'This is a test community to hold content for the OR2017 demostration'
-        }
+          value: 'This is a test community to hold content for the OR2017 demostration',
+        },
       ],
       'dc.description.tableofcontents': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.rights': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.title': [
         {
           language: null,
-          value: 'OR2017 - Demonstration'
-        }
+          value: 'OR2017 - Demonstration',
+        },
       ],
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://localhost:4000/handle/10673/11'
-        }
+          value: 'http://localhost:4000/handle/10673/11',
+        },
       ],
-    }
+    },
   }),
   Object.assign(new Community(),
     {
@@ -243,15 +251,15 @@ const objects: DSpaceObject[] = [
         self: {
           _isScalar: true,
           value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       collections: {
         self: {
           _isScalar: true,
           value: '1506937433727',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       _links: {
         self: {
@@ -265,40 +273,40 @@ const objects: DSpaceObject[] = [
         'dc.description': [
           {
             language: null,
-            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-          }
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>',
+          },
         ],
         'dc.description.abstract': [
           {
             language: null,
-            value: 'This is a sample top-level community'
-          }
+            value: 'This is a sample top-level community',
+          },
         ],
         'dc.description.tableofcontents': [
           {
             language: null,
-            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-          }
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>',
+          },
         ],
         'dc.rights': [
           {
             language: null,
-            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-          }
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>',
+          },
         ],
         'dc.title': [
           {
             language: null,
-            value: 'Sample Community'
-          }
+            value: 'Sample Community',
+          },
         ],
         'dc.identifier.uri': [
           {
             language: null,
-            value: 'http://localhost:4000/handle/10673/1'
-          }
+            value: 'http://localhost:4000/handle/10673/1',
+          },
         ],
-      }
-    }
-  )
+      },
+    },
+  ),
 ];
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 151ded6f9e..8f06b73a35 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,23 +1,33 @@
-import { Component, EventEmitter, Input, Output, OnChanges } from '@angular/core';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { isNotEmpty } from '../empty.util';
-import { SearchService } from '../../core/shared/search/search.service';
-import { currentPath } from '../utils/route.utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-selector-modal.component';
-import { take } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { take } from 'rxjs/operators';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { currentPath } from '../utils/route.utils';
+import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-selector-modal.component';
 
 @Component({
   selector: 'ds-search-form',
   styleUrls: ['./search-form.component.scss'],
-  templateUrl: './search-form.component.html'
+  templateUrl: './search-form.component.html',
 })
 /**
  * Component that represents the search form
@@ -37,7 +47,12 @@ export class SearchFormComponent implements OnChanges {
    * The currently selected scope object's UUID
    */
   @Input()
-  scope = '';
+    scope = '';
+
+  /**
+   * Hides the scope in the url, this can be useful when you hardcode the scope in another way
+   */
+  @Input() hideScopeInUrl = false;
 
   selectedScope: BehaviorSubject<DSpaceObject> = new BehaviorSubject<DSpaceObject>(undefined);
 
@@ -114,11 +129,21 @@ export class SearchFormComponent implements OnChanges {
    * @param data Updated parameters
    */
   updateSearch(data: any) {
-    const queryParams = Object.assign({}, data);
+    const goToFirstPage = { 'spc.page': 1 };
+
+    const queryParams = Object.assign(
+      {
+        ...goToFirstPage,
+      },
+      data,
+    );
+    if (hasValue(data.scope) && this.hideScopeInUrl) {
+      delete queryParams.scope;
+    }
 
     void this.router.navigate(this.getSearchLinkParts(), {
       queryParams: queryParams,
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
   }
 
diff --git a/src/app/shared/search-form/themed-search-form.component.ts b/src/app/shared/search-form/themed-search-form.component.ts
index 50b3751b06..adddf29de6 100644
--- a/src/app/shared/search-form/themed-search-form.component.ts
+++ b/src/app/shared/search-form/themed-search-form.component.ts
@@ -1,4 +1,10 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { ThemedComponent } from '../theme-support/themed.component';
 import { SearchFormComponent } from './search-form.component';
 
@@ -18,6 +24,8 @@ export class ThemedSearchFormComponent extends ThemedComponent<SearchFormCompone
 
   @Input() scope: string;
 
+  @Input() hideScopeInUrl: boolean;
+
   @Input() currentUrl: string;
 
   @Input() large: boolean;
@@ -31,7 +39,15 @@ export class ThemedSearchFormComponent extends ThemedComponent<SearchFormCompone
   @Output() submitSearch: EventEmitter<any> = new EventEmitter();
 
   protected inAndOutputNames: (keyof SearchFormComponent & keyof this)[] = [
-    'query', 'inPlaceSearch', 'scope', 'currentUrl', 'large', 'brandColor', 'searchPlaceholder', 'showScopeSelector',
+    'query',
+    'inPlaceSearch',
+    'scope',
+    'hideScopeInUrl',
+    'currentUrl',
+    'large',
+    'brandColor',
+    'searchPlaceholder',
+    'showScopeSelector',
     'submitSearch',
   ];
 
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
new file mode 100644
index 0000000000..e03fb40532
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -0,0 +1,51 @@
+<div class="facet-filter d-block mb-3 p-3" [ngClass]="{ 'focus': focusBox }" role="region">
+    <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false" class="filter-name d-flex"
+        [attr.aria-expanded]="false" 
+        [attr.aria-label]="((collapsedSearch ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.advanced.filters.head') | translate | lowercase)" 
+        [attr.data-test]="'filter-toggle' | dsBrowserOnly">
+        <span class="h4 d-inline-block text-left mt-auto mb-auto">
+            {{'search.advanced.filters.head' | translate}}
+        </span>
+        <i class="filter-toggle flex-grow-1 fas p-auto" aria-hidden="true" [ngClass]="collapsedSearch ? 'fa-plus' : 'fa-minus'"
+            [title]="(collapsedSearch ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+        </i>
+    </button>
+    <div [@slide]="collapsedSearch ? 'collapsed' : 'expanded'" (@slide.start)="startSlide($event)"
+        (@slide.done)="finishSlide($event)" class="search-filter-wrapper"
+        [ngClass]="{ 'closed' : closed, 'notab': notab }">
+        <form [class]="'ng-invalid'" [formGroup]="advSearchForm" (ngSubmit)="onSubmit(advSearchForm.value)">
+            <div class="row">
+                <div class="col-lg-12">
+                    <select
+                        [className]="(filter.invalid) && (filter.dirty || filter.touched) ? 'form-control is-invalid' :'form-control'"
+                        aria-label="filter" name="filter" id="filter" placeholder="select operator"
+                        formControlName="filter" required>
+                        <ng-container *ngFor="let filter of appConfig.search.advancedFilters.filter;">
+                            <option [value]="filter">
+                                {{'search.filters.filter.' + filter + '.text'| translate}}
+                            </option>
+                        </ng-container>
+                    </select>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <select
+                        [className]="(operator.invalid) && (operator.dirty || operator.touched) ? 'form-control is-invalid' :'form-control'"
+                        aria-label="operator" name="operator" id="operator" formControlName="operator" required>
+                        <option value="equals">{{'search.filters.operator.equals.text'| translate}}</option>
+                        <option value="notequals">{{'search.filters.operator.notequals.text'| translate}}</option>
+                        <option value="contains">{{'search.filters.operator.contains.text'| translate}}</option>
+                        <option value="notcontains">{{'search.filters.operator.notcontains.text'| translate}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <input type="text" aria-label="textsearch" class="form-control" id="textsearch" name="textsearch"
+                        formControlName="textsearch" #text [placeholder]="('filter.search.text.placeholder' | translate)" required>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <button class="form-control btn w-50 float-right btn-primary" type="submit"
+                        [disabled]="advSearchForm.invalid">{{'advancesearch.form.submit'| translate}}</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.scss b/src/app/shared/search/advanced-search/advanced-search.component.scss
new file mode 100644
index 0000000000..13ca767b2b
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.scss
@@ -0,0 +1 @@
+@import '../search-filters/search-filter/search-filter.component.scss';
\ No newline at end of file
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.spec.ts b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts
new file mode 100644
index 0000000000..0832b61efe
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts
@@ -0,0 +1,86 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  FormBuilder,
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { BrowserOnlyMockPipe } from '../../testing/browser-only-mock.pipe';
+import { RouterStub } from '../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { AdvancedSearchComponent } from './advanced-search.component';
+
+describe('AdvancedSearchComponent', () => {
+  let component: AdvancedSearchComponent;
+  let fixture: ComponentFixture<AdvancedSearchComponent>;
+  let builderService: FormBuilderService = getMockFormBuilderService();
+  let searchService: SearchService;
+  let router;
+  const searchServiceStub = {
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+    getClearFiltersQueryParams: () => {
+    },
+    getSearchLink: () => {
+    },
+    getConfigurationSearchConfig: () => { },
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  };
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AdvancedSearchComponent, BrowserOnlyMockPipe],
+      imports: [FormsModule, RouterTestingModule, TranslateModule.forRoot(), BrowserAnimationsModule, ReactiveFormsModule],
+      providers: [
+        FormBuilder,
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: FormBuilderService, useValue: builderService },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: SearchService, useValue: searchServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdvancedSearchComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedSearchComponent);
+    component = fixture.componentInstance;
+    router = TestBed.inject(Router);
+    fixture.detectChanges();
+  });
+  describe('when the getSearchLink method is called', () => {
+    const data = { filter: 'title', textsearch: 'demo', operator: 'equals' };
+    it('should call navigate on the router with the right searchlink and parameters when the filter is provided with a valid operator', () => {
+      component.advSearchForm.get('textsearch').patchValue('1');
+      component.advSearchForm.get('filter').patchValue('1');
+      component.advSearchForm.get('operator').patchValue('1');
+
+      component.onSubmit(data);
+      expect(router.navigate).toHaveBeenCalledWith([undefined], {
+        queryParams: { ['f.' + data.filter]: data.textsearch + ',' + data.operator },
+        queryParamsHandling: 'merge',
+      });
+
+    });
+  });
+});
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
new file mode 100644
index 0000000000..f00748afa3
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -0,0 +1,129 @@
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { slide } from '../../animations/slide';
+
+@Component({
+  selector: 'ds-advanced-search',
+  templateUrl: './advanced-search.component.html',
+  styleUrls: ['./advanced-search.component.scss'],
+  animations: [slide],
+})
+/**
+   * This component represents the part of the search sidebar that contains advanced filters.
+   */
+export class AdvancedSearchComponent implements OnInit {
+  /**
+   * True when the search component should show results on the current page
+   */
+  @Input() inPlaceSearch;
+
+
+  /**
+   * Link to the search page
+   */
+  notab: boolean;
+
+  closed: boolean;
+  collapsedSearch = false;
+  focusBox = false;
+
+  advSearchForm: FormGroup;
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    private formBuilder: FormBuilder,
+    protected searchService: SearchService,
+    protected router: Router,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+
+  ngOnInit(): void {
+
+    this.advSearchForm = this.formBuilder.group({
+      textsearch: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      filter: new FormControl('title', {
+        validators: [Validators.required],
+      }),
+      operator: new FormControl('equals',
+        { validators: [Validators.required] }),
+
+    });
+    this.collapsedSearch = this.isCollapsed();
+
+  }
+
+  get textsearch() {
+    return this.advSearchForm.get('textsearch');
+  }
+
+  get filter() {
+    return this.advSearchForm.get('filter');
+  }
+
+  get operator() {
+    return this.advSearchForm.get('operator');
+  }
+  paramName(filter) {
+    return 'f.' + filter;
+  }
+  onSubmit(data) {
+    if (this.advSearchForm.valid) {
+      const queryParams = { [this.paramName(data.filter)]: data.textsearch + ',' + data.operator };
+      if (!this.inPlaceSearch) {
+        this.router.navigate([this.searchService.getSearchLink()], { queryParams: queryParams, queryParamsHandling: 'merge' });
+      } else {
+        if (!this.router.url.includes('?')) {
+          this.router.navigateByUrl(this.router.url + '?f.' + data.filter + '=' + data.textsearch + ',' + data.operator);
+        } else {
+          this.router.navigateByUrl(this.router.url + '&f.' + data.filter + '=' + data.textsearch + ',' + data.operator);
+        }
+      }
+
+      this.advSearchForm.reset({ operator: data.operator, filter: data.filter, textsearch: '' });
+    }
+  }
+  startSlide(event: any): void {
+    if (event.toState === 'collapsed') {
+      this.closed = true;
+    }
+    if (event.fromState === 'collapsed') {
+      this.notab = false;
+    }
+  }
+  finishSlide(event: any): void {
+    if (event.fromState === 'collapsed') {
+      this.closed = false;
+    }
+    if (event.toState === 'collapsed') {
+      this.notab = true;
+    }
+  }
+  toggle() {
+    this.collapsedSearch = !this.collapsedSearch;
+  }
+  private isCollapsed(): boolean {
+    return !this.collapsedSearch;
+  }
+
+}
+
diff --git a/src/app/shared/search/host-window.reducer.ts b/src/app/shared/search/host-window.reducer.ts
index 17be02c992..a8cefb992a 100644
--- a/src/app/shared/search/host-window.reducer.ts
+++ b/src/app/shared/search/host-window.reducer.ts
@@ -1,4 +1,7 @@
-import { HostWindowAction, HostWindowActionTypes } from '../host-window.actions';
+import {
+  HostWindowAction,
+  HostWindowActionTypes,
+} from '../host-window.actions';
 
 export interface HostWindowState {
   width: number;
@@ -7,7 +10,7 @@ export interface HostWindowState {
 
 const initialState: HostWindowState = {
   width: null,
-  height: null
+  height: null,
 };
 
 export function hostWindowReducer(state = initialState, action: HostWindowAction): HostWindowState {
diff --git a/src/app/shared/search/models/facet-config-response.model.ts b/src/app/shared/search/models/facet-config-response.model.ts
index deb86def22..6b1cc37997 100644
--- a/src/app/shared/search/models/facet-config-response.model.ts
+++ b/src/app/shared/search/models/facet-config-response.model.ts
@@ -1,10 +1,11 @@
+import { deserialize } from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { FACET_CONFIG_RESPONSE } from './types/facet-config-response.resouce-type';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { SearchFilterConfig } from './search-filter-config.model';
-import { deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
-import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { FACET_CONFIG_RESPONSE } from './types/facet-config-response.resouce-type';
 
 /**
  * The response from the discover/facets endpoint
@@ -18,7 +19,7 @@ export class FacetConfigResponse implements CacheableObject {
    * hardcoded because rest doesn't a unique one.
    */
   @excludeFromEquals
-  type = FACET_CONFIG_RESPONSE;
+    type = FACET_CONFIG_RESPONSE;
 
   /**
    * the filters in this response
@@ -29,7 +30,7 @@ export class FacetConfigResponse implements CacheableObject {
    * The {@link HALLink}s for this SearchFilterConfig
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/shared/search/models/facet-value.model.ts b/src/app/shared/search/models/facet-value.model.ts
index 6c1d353480..a343e007c9 100644
--- a/src/app/shared/search/models/facet-value.model.ts
+++ b/src/app/shared/search/models/facet-value.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { HALLink } from '../../../core/shared/hal-link.model';
 import { HALResource } from '../../../core/shared/hal-resource.model';
 
@@ -10,31 +15,31 @@ export class FacetValue implements HALResource {
    * The display label of the facet value
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The value of the facet value
    */
   @autoserializeAs(String, 'label')
-  value: string;
+    value: string;
 
   /**
    * The number of results this facet value would have if selected
    */
   @autoserialize
-  count: number;
+    count: number;
 
   /**
    * The Authority Value for this facet
    */
   @autoserialize
-  authorityKey?: string;
+    authorityKey?: string;
 
   /**
    * The {@link HALLink}s for this FacetValue
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
     search: HALLink
   };
diff --git a/src/app/shared/search/models/facet-values.model.ts b/src/app/shared/search/models/facet-values.model.ts
index 09bef25876..4c14c7d90c 100644
--- a/src/app/shared/search/models/facet-values.model.ts
+++ b/src/app/shared/search/models/facet-values.model.ts
@@ -1,11 +1,16 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { FACET_VALUES } from './types/facet-values.resource-type';
-import { FacetValue } from './facet-value.model';
-import { SearchQueryResponse } from './search-query-response.model';
-import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
-import { FilterType } from './filter-type.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { FacetValue } from './facet-value.model';
+import { FilterType } from './filter-type.model';
+import { SearchQueryResponse } from './search-query-response.model';
+import { FACET_VALUES } from './types/facet-values.resource-type';
 
 @typedObject
 @inheritSerialization(PaginatedList)
@@ -24,23 +29,23 @@ export class FacetValues extends SearchQueryResponse<FacetValue> {
    * The name of the facet the values are for
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The type of facet the values are for
    */
   @autoserializeAs(String, 'facetType')
-  filterType: FilterType;
+    filterType: FilterType;
 
   /**
    * The max number of returned facetValues
    */
   @autoserialize
-  facetLimit: number;
+    facetLimit: number;
 
   /**
    * The results for this query
    */
   @autoserializeAs(FacetValue, 'values')
-  page: FacetValue[];
+    page: FacetValue[];
 }
diff --git a/src/app/shared/search/models/paginated-search-options.model.spec.ts b/src/app/shared/search/models/paginated-search-options.model.spec.ts
index 7afee06abf..d39e3c958e 100644
--- a/src/app/shared/search/models/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/models/paginated-search-options.model.spec.ts
@@ -1,7 +1,10 @@
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { SearchFilter } from './search-filter.model';
 
 describe('PaginatedSearchOptions', () => {
@@ -44,7 +47,7 @@ describe('PaginatedSearchOptions', () => {
         'f.test=value&' +
         'f.example=another%20value&' +
         'f.example=second%20value&' +
-        'f.range=%5B2002%20TO%202021%5D,equals'
+        'f.range=%5B2002%20TO%202021%5D,equals',
       );
     });
 
diff --git a/src/app/shared/search/models/paginated-search-options.model.ts b/src/app/shared/search/models/paginated-search-options.model.ts
index 76ed6cdaa8..2c8546d202 100644
--- a/src/app/shared/search/models/paginated-search-options.model.ts
+++ b/src/app/shared/search/models/paginated-search-options.model.ts
@@ -1,10 +1,10 @@
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { isNotEmpty } from '../../empty.util';
-import { SearchOptions } from './search-options.model';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { isNotEmpty } from '../../empty.util';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { SearchFilter } from './search-filter.model';
+import { SearchOptions } from './search-options.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain page of a search request, in a certain order
diff --git a/src/app/shared/search/models/search-filter-config.model.ts b/src/app/shared/search/models/search-filter-config.model.ts
index 59512ee29d..4498ba5763 100644
--- a/src/app/shared/search/models/search-filter-config.model.ts
+++ b/src/app/shared/search/models/search-filter-config.model.ts
@@ -1,72 +1,77 @@
-import { FilterType } from './filter-type.model';
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { SEARCH_FILTER_CONFIG } from './types/search-filter-config.resource-type';
 import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { FilterType } from './filter-type.model';
+import { SEARCH_FILTER_CONFIG } from './types/search-filter-config.resource-type';
 
 /**
  * The configuration for a search filter
  */
 @typedObject
-  export class SearchFilterConfig implements CacheableObject {
-    static type = SEARCH_FILTER_CONFIG;
+export class SearchFilterConfig implements CacheableObject {
+  static type = SEARCH_FILTER_CONFIG;
 
     /**
      * The object type,
      * hardcoded because rest doesn't set one.
      */
     @excludeFromEquals
-    type = SEARCH_FILTER_CONFIG;
+      type = SEARCH_FILTER_CONFIG;
 
     /**
      * The name of this filter
      */
     @autoserialize
-    name: string;
+      name: string;
 
     /**
      * The FilterType of this filter
      */
     @autoserializeAs(String, 'facetType')
-    filterType: FilterType;
+      filterType: FilterType;
 
     /**
      * True if the filter has facets
      */
     @autoserialize
-    hasFacets: boolean;
+      hasFacets: boolean;
 
     /**
      * @type {number} The page size used for this facet
      */
     @autoserializeAs(String, 'facetLimit')
-    pageSize = 5;
+      pageSize = 5;
 
     /**
      * Defines if the item facet is collapsed by default or not on the search page
      */
     @autoserialize
-    isOpenByDefault: boolean;
+      isOpenByDefault: boolean;
 
     /**
      * Minimum value possible for this facet in the repository
      */
     @autoserialize
-    maxValue: string;
+      maxValue: string;
 
     /**
      * Maximum value possible for this facet in the repository
      */
     @autoserialize
-    minValue: string;
+      minValue: string;
 
     /**
      * The {@link HALLink}s for this SearchFilterConfig
      */
     @deserialize
-    _links: {
+      _links: {
       self: HALLink;
     };
 
@@ -77,4 +82,4 @@ import { CacheableObject } from '../../../core/cache/cacheable-object.model';
     get paramName(): string {
       return 'f.' + this.name;
     }
-  }
+}
diff --git a/src/app/shared/search/models/search-objects.model.ts b/src/app/shared/search/models/search-objects.model.ts
index 2afbab372b..fa483017ee 100644
--- a/src/app/shared/search/models/search-objects.model.ts
+++ b/src/app/shared/search/models/search-objects.model.ts
@@ -1,11 +1,15 @@
-import { autoserializeAs, inheritSerialization } from 'cerialize';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SearchResult } from './search-result.model';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { SEARCH_OBJECTS } from './types/search-objects.resource-type';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { SearchQueryResponse } from './search-query-response.model';
+import { SearchResult } from './search-result.model';
+import { SEARCH_OBJECTS } from './types/search-objects.resource-type';
 
 /**
  * Class representing the response returned by the server when performing a search request
@@ -27,5 +31,5 @@ export class SearchObjects<T extends DSpaceObject> extends SearchQueryResponse<S
    * The results for this query
    */
   @autoserializeAs(SearchResult, 'objects')
-  page: SearchResult<T>[];
+    page: SearchResult<T>[];
 }
diff --git a/src/app/shared/search/models/search-options.model.spec.ts b/src/app/shared/search/models/search-options.model.spec.ts
index 176d321999..614ca89160 100644
--- a/src/app/shared/search/models/search-options.model.spec.ts
+++ b/src/app/shared/search/models/search-options.model.spec.ts
@@ -1,6 +1,6 @@
-import { SearchOptions } from './search-options.model';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { SearchFilter } from './search-filter.model';
+import { SearchOptions } from './search-options.model';
 
 describe('SearchOptions', () => {
   let options: SearchOptions;
@@ -36,7 +36,7 @@ describe('SearchOptions', () => {
         'f.test=value&' +
         'f.example=another%20value&' +
         'f.example=second%20value&' +
-        'f.range=%5B2002%20TO%202021%5D,equals'
+        'f.range=%5B2002%20TO%202021%5D,equals',
       );
     });
 
diff --git a/src/app/shared/search/models/search-options.model.ts b/src/app/shared/search/models/search-options.model.ts
index 470ef8a06f..88866e7ef2 100644
--- a/src/app/shared/search/models/search-options.model.ts
+++ b/src/app/shared/search/models/search-options.model.ts
@@ -1,8 +1,11 @@
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { SearchFilter } from './search-filter.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain search request
@@ -20,14 +23,14 @@ export class SearchOptions {
     options: {
       configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[],
       fixedFilter?: string
-    }
+    },
   ) {
-      this.configuration = options.configuration;
-      this.scope = options.scope;
-      this.query = options.query;
-      this.dsoTypes = options.dsoTypes;
-      this.filters = options.filters;
-      this.fixedFilter = options.fixedFilter;
+    this.configuration = options.configuration;
+    this.scope = options.scope;
+    this.query = options.query;
+    this.dsoTypes = options.dsoTypes;
+    this.filters = options.filters;
+    this.fixedFilter = options.fixedFilter;
   }
 
   /**
diff --git a/src/app/shared/search/models/search-query-response.model.ts b/src/app/shared/search/models/search-query-response.model.ts
index a436a7c045..961095e5f3 100644
--- a/src/app/shared/search/models/search-query-response.model.ts
+++ b/src/app/shared/search/models/search-query-response.model.ts
@@ -1,6 +1,7 @@
 import { autoserialize } from 'cerialize';
-import { PageInfo } from '../../../core/shared/page-info.model';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 
 /**
  * Class representing the response returned by the server when performing a search request
@@ -10,44 +11,44 @@ export abstract class SearchQueryResponse<T> extends PaginatedList<T> {
    * The scope used in the search request represented by the UUID of a DSpaceObject
    */
   @autoserialize
-  scope: string;
+    scope: string;
 
   /**
    * The search query used in the search request
    */
   @autoserialize
-  query: string;
+    query: string;
 
   /**
    * The currently active filters used in the search request
    */
   @autoserialize
-  appliedFilters: any[]; // TODO
+    appliedFilters: any[]; // TODO
 
   /**
    * The sort parameters used in the search request
    */
   @autoserialize
-  sort: any; // TODO
+    sort: any; // TODO
 
   /**
    * The sort parameters used in the search request
    */
   @autoserialize
-  configuration: string;
+    configuration: string;
 
   /**
    * Pagination configuration for this response
    */
   @autoserialize
-  pageInfo: PageInfo;
+    pageInfo: PageInfo;
 
   /**
    * The results for this query
    */
   @autoserialize
-  page: T[];
+    page: T[];
 
   @autoserialize
-  facets: any; // TODO
+    facets: any; // TODO
 }
diff --git a/src/app/shared/search/models/search-result.model.ts b/src/app/shared/search/models/search-result.model.ts
index 6079c4af63..b2bc167c81 100644
--- a/src/app/shared/search/models/search-result.model.ts
+++ b/src/app/shared/search/models/search-result.model.ts
@@ -1,12 +1,19 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { HALLink } from '../../../core/shared/hal-link.model';
-import { MetadataMap } from '../../../core/shared/metadata.models';
-import { excludeFromEquals, fieldsForEquals } from '../../../core/utilities/equals.decorators';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { HALResource } from '../../../core/shared/hal-resource.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import {
+  excludeFromEquals,
+  fieldsForEquals,
+} from '../../../core/utilities/equals.decorators';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { SEARCH_RESULT } from './types/search-result.resource-type';
 
 /**
@@ -26,13 +33,13 @@ export class SearchResult<T extends DSpaceObject> extends ListableObject impleme
    */
   @excludeFromEquals
   @autoserialize
-  hitHighlights: MetadataMap;
+    hitHighlights: MetadataMap;
 
   /**
    * The {@link HALLink}s for this SearchResult
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     indexableObject: HALLink;
   };
@@ -41,7 +48,7 @@ export class SearchResult<T extends DSpaceObject> extends ListableObject impleme
    * The DSpaceObject that was found
    */
   @fieldsForEquals('uuid')
-  indexableObject: T;
+    indexableObject: T;
 
   /**
    * Method that returns as which type of object this object should be rendered
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index 82c15feeac..1172db80de 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { SearchExportCsvComponent } from './search-export-csv.component';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Script } from '../../../process-page/scripts/script.model';
-import { Process } from '../../../process-page/processes/process.model';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
-import { SearchFilter } from '../models/search-filter.model';
+import { Process } from '../../../process-page/processes/process.model';
+import { Script } from '../../../process-page/scripts/script.model';
+import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
+import { SearchExportCsvComponent } from './search-export-csv.component';
 
 describe('SearchExportCsvComponent', () => {
   let component: SearchExportCsvComponent;
@@ -25,8 +33,8 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), {id: 'metadata-export-search', name: 'metadata-export-search'});
-  const process = Object.assign(new Process(), {processId: 5, scriptName: 'metadata-export-search'});
+  const script = Object.assign(new Script(), { id: 'metadata-export-search', name: 'metadata-export-search' });
+  const process = Object.assign(new Process(), { processId: 5, scriptName: 'metadata-export-search' });
 
   const searchConfig = new PaginatedSearchOptions({
     configuration: 'test-configuration',
@@ -35,17 +43,17 @@ describe('SearchExportCsvComponent', () => {
     filters: [
       new SearchFilter('f.filter1', ['filter1value1,equals', 'filter1value2,equals']),
       new SearchFilter('f.filter2', ['filter2value1,contains']),
-      new SearchFilter('f.filter3', ['[2000 TO 2001]'], 'equals')
-    ]
+      new SearchFilter('f.filter3', ['[2000 TO 2001]'], 'equals'),
+    ],
   });
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
       findById: createSuccessfulRemoteDataObject$(script),
-      invoke: createSuccessfulRemoteDataObject$(process)
+      invoke: createSuccessfulRemoteDataObject$(process),
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     notificationsService = new NotificationsServiceStub();
@@ -55,11 +63,11 @@ describe('SearchExportCsvComponent', () => {
       declarations: [SearchExportCsvComponent],
       imports: [TranslateModule.forRoot(), NgbModule],
       providers: [
-        {provide: ScriptDataService, useValue: scriptDataService},
-        {provide: AuthorizationDataService, useValue: authorizationDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: Router, useValue: router},
-      ]
+        { provide: ScriptDataService, useValue: scriptDataService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
+      ],
     }).compileComponents();
   }
 
@@ -132,13 +140,13 @@ describe('SearchExportCsvComponent', () => {
       component.export();
       expect(scriptDataService.invoke).toHaveBeenCalledWith('metadata-export-search',
         [
-          {name: '-q', value: searchConfig.query},
-          {name: '-s', value: searchConfig.scope},
-          {name: '-c', value: searchConfig.configuration},
-          {name: '-f', value: 'filter1,equals=filter1value1'},
-          {name: '-f', value: 'filter1,equals=filter1value2'},
-          {name: '-f', value: 'filter2,contains=filter2value1'},
-          {name: '-f', value: 'filter3,equals=[2000 TO 2001]'},
+          { name: '-q', value: searchConfig.query },
+          { name: '-s', value: searchConfig.scope },
+          { name: '-c', value: searchConfig.configuration },
+          { name: '-f', value: 'filter1,equals=filter1value1' },
+          { name: '-f', value: 'filter1,equals=filter1value2' },
+          { name: '-f', value: 'filter2,contains=filter2value1' },
+          { name: '-f', value: 'filter3,equals=[2000 TO 2001]' },
         ], []);
 
       component.searchConfig = null;
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 6ad105342f..69272b4ac4 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,17 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { map } from 'rxjs/operators';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Process } from '../../../process-page/processes/process.model';
-import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
+import { Process } from '../../../process-page/processes/process.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { NotificationsService } from '../../notifications/notifications.service';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 
 @Component({
@@ -43,20 +54,20 @@ export class SearchExportCsvComponent implements OnInit {
               private authorizationDataService: AuthorizationDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
-              private router: Router
+              private router: Router,
   ) {
   }
 
   ngOnInit(): void {
     const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
       getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload))
+      map((rd) => rd.isSuccess && hasValue(rd.payload)),
     );
 
     const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
 
     this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
+      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized),
     );
   }
 
@@ -67,13 +78,13 @@ export class SearchExportCsvComponent implements OnInit {
     const parameters = [];
     if (hasValue(this.searchConfig)) {
       if (isNotEmpty(this.searchConfig.query)) {
-        parameters.push({name: '-q', value: this.searchConfig.query});
+        parameters.push({ name: '-q', value: this.searchConfig.query });
       }
       if (isNotEmpty(this.searchConfig.scope)) {
-        parameters.push({name: '-s', value: this.searchConfig.scope});
+        parameters.push({ name: '-s', value: this.searchConfig.scope });
       }
       if (isNotEmpty(this.searchConfig.configuration)) {
-        parameters.push({name: '-c', value: this.searchConfig.configuration});
+        parameters.push({ name: '-c', value: this.searchConfig.configuration });
       }
       if (isNotEmpty(this.searchConfig.filters)) {
         this.searchConfig.filters.forEach((filter) => {
@@ -89,15 +100,28 @@ export class SearchExportCsvComponent implements OnInit {
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
               const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
-              parameters.push({name: '-f', value: valueToAdd});
+              parameters.push({ name: '-f', value: valueToAdd });
             });
           }
         });
       }
+      if (isNotEmpty(this.searchConfig.fixedFilter)) {
+        const fixedFilter = this.searchConfig.fixedFilter.substring(2);
+        const keyAndValue = fixedFilter.split('=');
+        if (keyAndValue.length > 1) {
+          const key = keyAndValue[0];
+          const valueAndOperator = keyAndValue[1].split(',');
+          if (valueAndOperator.length > 1) {
+            const value = valueAndOperator[0];
+            const operator = valueAndOperator[1];
+            parameters.push({ name: '-f', value: `${key},${operator}=${value}` });
+          }
+        }
+      }
     }
 
     this.scriptDataService.invoke('metadata-export-search', parameters, []).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Process>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('metadata-export-search.submit.success'));
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index fdf154bc04..cdba401743 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 6dcb47ce9f..f19b9b67d4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,13 +1,20 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
 
 @Component({
   selector: 'ds-search-authority-filter',
   styleUrls: ['./search-authority-filter.component.scss'],
   templateUrl: './search-authority-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 7d0ad89914..aaf533e481 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -7,7 +7,7 @@
         </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index c9da8500d0..10fbdcb570 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -1,13 +1,20 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 
 @Component({
   selector: 'ds-search-boolean-filter',
   styleUrls: ['./search-boolean-filter.component.scss'],
   templateUrl: './search-boolean-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 53acb1d911..c387be3eb9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -1,24 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { RouterStub } from '../../../../../testing/router.stub';
 import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { FilterType } from '../../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchFacetOptionComponent } from './search-facet-option.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -44,7 +52,7 @@ describe('SearchFacetOptionComponent', () => {
     filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const value: FacetValue = {
@@ -53,8 +61,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link2' },
-      search: { href: `` }
-    }
+      search: { href: `` },
+    },
   };
 
   const selectedValue: FacetValue = {
@@ -63,8 +71,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1},${operator}` },
+    },
   };
 
   const authorityValue: FacetValue = {
@@ -73,8 +81,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'authorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
 
   const searchLink = '/search';
@@ -98,8 +106,8 @@ describe('SearchFacetOptionComponent', () => {
         {
           provide: SearchConfigurationService, useValue: {
             paginationID: 'page-id',
-            searchOptions: observableOf({})
-          }
+            searchOptions: observableOf({}),
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -110,14 +118,14 @@ describe('SearchFacetOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -139,7 +147,7 @@ describe('SearchFacetOptionComponent', () => {
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
         [mockFilterConfig.paramName]: [`${value1},${operator}`, value.value + ',equals'],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
@@ -154,7 +162,7 @@ describe('SearchFacetOptionComponent', () => {
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
         [mockAuthorityFilterConfig.paramName]: [value1 + ',equals', `${value2},${operator}`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index cdbab61a30..8f2656c56f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -1,16 +1,26 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { FacetValue } from '../../../../models/facet-value.model';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { getFacetValueForType } from '../../../../search.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -67,7 +77,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -109,7 +119,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
     const page = this.paginationService.getPageParam(this.searchConfigService.paginationID);
     this.addQueryParams = {
       [this.filterConfig.paramName]: [...selectedValues.map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), this.getFacetValue()],
-      [page]: 1
+      [page]: 1,
     };
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index b0acf43c32..aeee40f781 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -1,28 +1,36 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
-import { FilterType } from '../../../../models/filter-type.model';
-import { FacetValue } from '../../../../models/facet-value.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { By } from '@angular/platform-browser';
-import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { RouterStub } from '../../../../../testing/router.stub';
+import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { FilterType } from '../../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import {
   RANGE_FILTER_MAX_SUFFIX,
-  RANGE_FILTER_MIN_SUFFIX
+  RANGE_FILTER_MIN_SUFFIX,
 } from '../../search-range-filter/search-range-filter.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
 
 describe('SearchFacetRangeOptionComponent', () => {
   let comp: SearchFacetRangeOptionComponent;
@@ -44,12 +52,12 @@ describe('SearchFacetRangeOptionComponent', () => {
     count: 20,
     _links: {
       self: {
-        href: ''
+        href: '',
       },
       search: {
-        href: ''
-      }
-    }
+        href: '',
+      },
+    },
   };
 
   const searchLink = '/search';
@@ -72,8 +80,8 @@ describe('SearchFacetRangeOptionComponent', () => {
         {
           provide: SearchConfigurationService, useValue: {
             searchOptions: observableOf({}),
-            paginationId: 'page-id'
-          }
+            paginationId: 'page-id',
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -83,14 +91,14 @@ describe('SearchFacetRangeOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetRangeOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -114,18 +122,18 @@ describe('SearchFacetRangeOptionComponent', () => {
         count: 20,
         _links: {
           self: {
-            href: ''
+            href: '',
           },
           search: {
-            href: ''
-          }
-        }
+            href: '',
+          },
+        },
       };
       (comp as any).updateChangeParams();
       expect(comp.changeQueryParams).toEqual({
         [mockFilterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: ['50'],
         [mockFilterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: ['60'],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index b08a54e42b..39bfd6fe8c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,19 +1,28 @@
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { FacetValue } from '../../../../models/facet-value.model';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import {
-  RANGE_FILTER_MAX_SUFFIX,
-  RANGE_FILTER_MIN_SUFFIX
-} from '../../search-range-filter/search-range-filter.component';
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  RANGE_FILTER_MAX_SUFFIX,
+  RANGE_FILTER_MIN_SUFFIX,
+} from '../../search-range-filter/search-range-filter.component';
 
 const rangeDelimiter = '-';
 
@@ -67,7 +76,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -110,7 +119,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
     this.changeQueryParams = {
       [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: [min],
       [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: [max],
-      [page]: 1
+      [page]: 1,
     };
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index d5f88c5333..42fa7f9e6b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -4,7 +4,7 @@
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="filter-value pl-1 text-capitalize break-facet">
+    <span class="filter-value pl-1 break-facet">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
   </label>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index 15e418842f..c5cdd0c0cf 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -1,22 +1,30 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { RouterStub } from '../../../../../testing/router.stub';
 import { SearchServiceStub } from '../../../../../testing/search-service.stub';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { FilterType } from '../../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchFacetSelectedOptionComponent } from './search-facet-selected-option.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
@@ -42,7 +50,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
     filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const searchLink = '/search';
@@ -52,8 +60,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1}` },
+    },
   };
   const selectedValue2: FacetValue = {
     label: value2,
@@ -61,8 +69,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value2}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value2}` },
+    },
   };
   const selectedAuthorityValue: FacetValue = {
     label: label1,
@@ -70,8 +78,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedAuthorityValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value1},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value1},${operator}` },
+    },
   };
   const selectedAuthorityValue2: FacetValue = {
     label: label2,
@@ -79,8 +87,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedAuthorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
   const selectedValues = [selectedValue, selectedValue2];
   const selectedAuthorityValues = [selectedAuthorityValue, selectedAuthorityValue2];
@@ -90,8 +98,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 1,
     _links: {
       self: { href: 'facetValue-self-link2' },
-      search: { href: `` }
-    }
+      search: { href: `` },
+    },
   };
   const authorityValue: FacetValue = {
     label: label2,
@@ -99,8 +107,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'authorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
   const selectedValues$ = observableOf(selectedValues);
   const selectedAuthorityValues$ = observableOf(selectedAuthorityValues);
@@ -122,8 +130,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         {
           provide: SearchConfigurationService, useValue: {
-            searchOptions: observableOf({})
-          }
+            searchOptions: observableOf({}),
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -134,14 +142,14 @@ describe('SearchFacetSelectedOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetSelectedOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -163,7 +171,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
       (comp as any).updateRemoveParams(selectedValues);
       expect(comp.removeQueryParams).toEqual({
         [mockFilterConfig.paramName]: [`${value1},equals`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
@@ -179,7 +187,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
       (comp as any).updateRemoveParams(selectedAuthorityValues);
       expect(comp.removeQueryParams).toEqual({
         [mockAuthorityFilterConfig.paramName]: [`${value1},${operator}`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 4566b882eb..f6f2c35874 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -1,15 +1,25 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { FacetValue } from '../../../../models/facet-value.model';
 import { currentPath } from '../../../../../utils/route.utils';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { getFacetValueForType } from '../../../../search.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -60,7 +70,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -95,7 +105,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
       [this.filterConfig.paramName]: selectedValues
         .filter((facetValue: FacetValue) => facetValue.label !== this.selectedValue.label)
         .map((facetValue: FacetValue) => this.getFacetValue(facetValue)),
-      [page]: 1
+      [page]: 1,
     };
   }
   /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 0aa131d428..896319e666 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -1,19 +1,26 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
-import { renderFilterType } from '../search-filter-type-decorator';
-import { FilterType } from '../../../models/filter-type.model';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
-  REFRESH_FILTER
+  REFRESH_FILTER,
+  SCOPE,
 } from '../../../../../core/shared/search/search-filter.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { BehaviorSubject } from 'rxjs';
+import { renderFilterType } from '../search-filter-type-decorator';
 
 @Component({
   selector: 'ds-search-facet-filter-wrapper',
-  templateUrl: './search-facet-filter-wrapper.component.html'
+  templateUrl: './search-facet-filter-wrapper.component.html',
 })
 
 /**
@@ -35,6 +42,11 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * The constructor of the search facet filter that should be rendered, based on the filter config's type
    */
@@ -56,9 +68,10 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
       providers: [
         { provide: FILTER_CONFIG, useFactory: () => (this.filterConfig), deps: [] },
         { provide: IN_PLACE_SEARCH, useFactory: () => (this.inPlaceSearch), deps: [] },
-        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] }
+        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] },
+        { provide: SCOPE, useFactory: () => (this.scope), deps: [] },
       ],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 92d2e5265b..f130b19f54 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -1,29 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { FormsModule } from '@angular/forms';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RouterStub } from '../../../../testing/router.stub';
-import { Router } from '@angular/router';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { RouterStub } from '../../../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../../testing/search-service.stub';
+import { FacetValue } from '../../../models/facet-value.model';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchFacetFilterComponent } from './search-facet-filter.component';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -37,7 +49,7 @@ describe('SearchFacetFilterComponent', () => {
     filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
   const values: FacetValue[] = [
     {
@@ -46,37 +58,37 @@ describe('SearchFacetFilterComponent', () => {
       count: 52,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value2,
       value: value2,
       count: 20,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value3,
       value: value3,
       count: 5,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
-    }
+          href: '',
+        },
+      },
+    },
   ];
 
   const searchLink = '/search';
@@ -99,6 +111,7 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
@@ -108,14 +121,14 @@ describe('SearchFacetFilterComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -204,7 +217,7 @@ describe('SearchFacetFilterComponent', () => {
       comp.selectedValues$ = observableOf(selectedValues.map((value) =>
         Object.assign(new FacetValue(), {
           label: value,
-          value: value
+          value: value,
         })));
       fixture.detectChanges();
       spyOn(comp, 'getSearchLink').and.returnValue(searchUrl);
@@ -214,7 +227,7 @@ describe('SearchFacetFilterComponent', () => {
       comp.onSubmit(testValue + ',equals');
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
         queryParams: { [mockFilterConfig.paramName]: [...selectedValues.map((value) => `${value},equals`), `${testValue},equals`] },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 2b2eb9b11a..7a1e75dce5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -1,40 +1,67 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subject,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../../empty.util';
-import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
-import { FacetValue } from '../../../models/facet-value.model';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
 import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
-import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
-import { SearchOptions } from '../../../models/search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { currentPath } from '../../../../utils/route.utils';
-import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
+import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
+import { currentPath } from '../../../../utils/route.utils';
+import { FacetValue } from '../../../models/facet-value.model';
 import { FacetValues } from '../../../models/facet-values.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchOptions } from '../../../models/search-options.model';
+import {
+  getFacetValueForType,
+  stripOperatorFromFilterValue,
+} from '../../../search.utils';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -104,7 +131,9 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>) {
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
+  ) {
   }
 
   /**
@@ -114,16 +143,19 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.currentUrl = this.router.url;
     this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
-
-    this.searchOptions$ = this.searchConfigService.searchOptions;
+    this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+        scope: this.scope,
+      })),
+    );
     this.subs.push(
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
       this.refreshFilters.asObservable().pipe(
         filter((toRefresh: boolean) => toRefresh),
         // NOTE This is a workaround, otherwise retrieving filter values returns tha old cached response
         debounceTime((100)),
-        mergeMap(() => this.retrieveFilterValues(false))
-      ).subscribe()
+        mergeMap(() => this.retrieveFilterValues(false)),
+      ).subscribe(),
     );
     this.retrieveFilterValues().subscribe();
   }
@@ -236,12 +268,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
                     return {
                       displayValue: this.getDisplayValue(facet, data),
                       query: this.getFacetValue(facet),
-                      value: stripOperatorFromFilterValue(this.getFacetValue(facet))
+                      value: stripOperatorFromFilterValue(this.getFacetValue(facet)),
                     };
                   });
-                }
+                },
               ));
-        }
+        },
       );
     } else {
       this.filterSearchResults = observableOf([]);
@@ -261,10 +293,10 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               {
                 [this.filterConfig.paramName]: [
                   ...selectedValues.map((facet) => this.getFacetValue(facet)),
-                  data
-                ]
+                  data,
+                ],
               },
-            queryParamsHandling: 'merge'
+            queryParamsHandling: 'merge',
           });
           this.filter = '';
         }
@@ -293,12 +325,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               this.isLastPage$.next(hasNoValue(rd?.payload?.next));
             }),
             map((rd: RemoteData<FacetValues>) => ({
-                values: observableOf(rd),
-                page: page
-              })
-            )
+              values: observableOf(rd),
+              page: page,
+            }),
+            ),
           );
-      })
+      }),
     );
 
     let filterValues = [];
@@ -324,20 +356,20 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
           map((selectedValues) => {
             return selectedValues.map((value: string) => {
               const fValue = [].concat(...rd.payload.map((page) => page.page))
-                               .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
+                .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
               if (hasValue(fValue)) {
                 return fValue;
               }
               const filterValue = stripOperatorFromFilterValue(value);
               return Object.assign(new FacetValue(), { label: filterValue, value: filterValue });
             });
-          })
+          }),
         );
       }),
       tap((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
         this.animationState = 'ready';
         this.filterValues$.next(rd);
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
index e1c8446b3c..1d912150e3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
@@ -19,7 +19,7 @@ export const SearchFilterActionTypes = {
   TOGGLE: type('dspace/search-filter/TOGGLE'),
   DECREMENT_PAGE: type('dspace/search-filter/DECREMENT_PAGE'),
   INCREMENT_PAGE: type('dspace/search-filter/INCREMENT_PAGE'),
-  RESET_PAGE: type('dspace/search-filter/RESET_PAGE')
+  RESET_PAGE: type('dspace/search-filter/RESET_PAGE'),
 };
 
 export class SearchFilterAction implements Action {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index a6fb0021b7..0aefa0c6c1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -2,22 +2,24 @@
      [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
   <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
           class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
-          [attr.aria-expanded]="false"
+          [attr.aria-expanded]="(collapsed$ | async) !== true"
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
-    <h5 class="d-inline-block mb-0">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
-    </h5>
-    <span class="filter-toggle flex-grow-1 fas p-auto"
-          [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-          [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
     </span>
+    <i class="filter-toggle flex-grow-1 fas p-auto"
+       aria-hidden="true"
+       [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
+       [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+    </i>
   </button>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
        (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
        class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
     <ds-search-facet-filter-wrapper
+      [scope]="scope"
       [filterConfig]="filter"
       [inPlaceSearch]="inPlaceSearch"
       [refreshFilters]="refreshFilters" >
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
index 7e2631b55f..6a13d630eb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
@@ -17,7 +17,6 @@
     line-height: var(--bs-line-height-base);
     text-align: right;
     position: relative;
-    top: -0.125rem;           // Fix weird outline shape in Chrome
   }
 
   > button {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 7abe45ca8c..3b622b2582 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -1,19 +1,29 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { SearchFilterComponent } from './search-filter.component';
-import { SearchFilterConfig } from '../../models/search-filter-config.model';
-import { FilterType } from '../../models/filter-type.model';
-import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { SequenceService } from '../../../../core/shared/sequence.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
+import { FilterType } from '../../models/filter-type.model';
+import { SearchFilterConfig } from '../../models/search-filter-config.model';
+import { SearchFilterComponent } from './search-filter.component';
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
@@ -27,7 +37,7 @@ describe('SearchFilterComponent', () => {
     name: filterName1,
     filterType: FilterType.text,
     hasFacets: false,
-    isOpenByDefault: false
+    isOpenByDefault: false,
   });
   const mockFilterService = {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -47,7 +57,7 @@ describe('SearchFilterComponent', () => {
     },
     isCollapsed: (filter) => {
       return observableOf(true);
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
   };
@@ -55,7 +65,7 @@ describe('SearchFilterComponent', () => {
   let sequenceService;
   const mockResults = observableOf(['test', 'data']);
   const searchServiceStub = {
-    getFacetValuesFor: (filter) => mockResults
+    getFacetValuesFor: (filter) => mockResults,
   };
 
   beforeEach(waitForAsync(() => {
@@ -71,14 +81,14 @@ describe('SearchFilterComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         {
           provide: SearchFilterService,
-          useValue: mockFilterService
+          useValue: mockFilterService,
         },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SequenceService, useValue: sequenceService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d1d3bd729d..b67ab1e31a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,16 +1,33 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
-
-import { SearchFilterConfig } from '../../models/search-filter-config.model';
-import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
-import { slide } from '../../../animations/slide';
-import { isNotEmpty } from '../../../empty.util';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { SequenceService } from '../../../../core/shared/sequence.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { slide } from '../../../animations/slide';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { SearchFilterConfig } from '../../models/search-filter-config.model';
 
 @Component({
   selector: 'ds-search-filter',
@@ -38,6 +55,11 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -152,11 +174,20 @@ export class SearchFilterComponent implements OnInit {
   }
 
   get regionId(): string {
-    return `search-filter-region-${this.sequenceId}`;
+    if (this.inPlaceSearch) {
+      return `search-filter-region-${this.sequenceId}`;
+    } else {
+      return `search-filter-region-home-${this.sequenceId}`;
+    }
+
   }
 
   get toggleId(): string {
-    return `search-filter-toggle-${this.sequenceId}`;
+    if (this.inPlaceSearch) {
+      return `search-filter-toggle-${this.sequenceId}`;
+    } else {
+      return `search-filter-toggle-home-${this.sequenceId}`;
+    }
   }
 
   /**
@@ -171,12 +202,15 @@ export class SearchFilterComponent implements OnInit {
         } else {
           return this.searchConfigService.searchOptions.pipe(
             switchMap((options) => {
-                return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
-                  filter((RD) => !RD.isLoading),
-                  map((valuesRD) => {
-                    return valuesRD.payload?.totalElements > 0;
-                  }),);
+              if (hasValue(this.scope)) {
+                options.scope = this.scope;
               }
+              return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
+                filter((RD) => !RD.isLoading),
+                map((valuesRD) => {
+                  return valuesRD.payload?.totalElements > 0;
+                }));
+            },
             ));
         }
       }),
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
index aa64589d2e..114147606e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -7,7 +8,7 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from './search-filter.actions';
 import { filterReducer } from './search-filter.reducer';
 
@@ -60,6 +61,7 @@ describe('filterReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to false in response to the EXPAND action', () => {
@@ -78,6 +80,10 @@ describe('filterReducer', () => {
 
     const action = new SearchFilterExpandAction(filterName1);
     filterReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of filterCollapsed in response to the TOGGLE action', () => {
@@ -99,6 +105,10 @@ describe('filterReducer', () => {
 
     const action = new SearchFilterToggleAction(filterName1);
     filterReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to true in response to the INITIALIZE action with isOpenByDefault to false when no state has been set for this filter', () => {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
index 1109e4ea41..f38db42b26 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
@@ -1,4 +1,8 @@
-import { SearchFilterAction, SearchFilterActionTypes, SearchFilterInitializeAction } from './search-filter.actions';
+import {
+  SearchFilterAction,
+  SearchFilterActionTypes,
+  SearchFilterInitializeAction,
+} from './search-filter.actions';
 
 /**
  * Interface that represents the state for a single filters
@@ -32,8 +36,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: !initAction.initiallyExpanded,
-          page: 1
-        }
+          page: 1,
+        },
       });
       return state;
     }
@@ -42,8 +46,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: true,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
     }
 
@@ -51,8 +55,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: false,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
 
     }
@@ -62,8 +66,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: (page >= 1 ? page : 1)
-        }
+          page: (page >= 1 ? page : 1),
+        },
       });
     }
 
@@ -71,8 +75,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: state[action.filterName].page + 1
-        }
+          page: state[action.filterName].page + 1,
+        },
       });
 
     }
@@ -80,8 +84,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: 1
-        }
+          page: 1,
+        },
       });
 
     }
@@ -90,8 +94,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: !state[action.filterName].filterCollapsed,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
 
     }
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index eb49235641..1dc21d64c3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index e6c74d8047..80ab4bb463 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,31 +1,50 @@
-import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
-import { of as observableOf, BehaviorSubject } from 'rxjs';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterStub } from '../../../../testing/router.stub';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { CommonModule } from '@angular/common';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
+  REFRESH_FILTER,
+  SCOPE,
   SearchFilterService,
-  REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { Router } from '@angular/router';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { FacetValue} from '../../../models/facet-value.model';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { RouterStub } from '../../../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { FacetValue } from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -33,7 +52,7 @@ describe('SearchHierarchyFilterComponent', () => {
   let showVocabularyTreeLink: DebugElement;
 
   const testSearchLink = 'test-search';
-  const testSearchFilter = 'test-search-filter';
+  const testSearchFilter = 'subject';
   const VocabularyTreeViewComponent = {
     select: new EventEmitter<VocabularyEntryDetail>(),
   };
@@ -49,14 +68,14 @@ describe('SearchHierarchyFilterComponent', () => {
   const ngbModal = jasmine.createSpyObj('modal', {
     open: {
       componentInstance: VocabularyTreeViewComponent,
-    }
+    },
   });
   const vocabularyService = {
     searchTopEntries: () => undefined,
   };
 
   beforeEach(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [
         CommonModule,
         NgbModule,
@@ -72,10 +91,12 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: Router, useValue: router },
         { provide: NgbModal, useValue: ngbModal },
         { provide: VocabularyService, useValue: vocabularyService },
+        { provide: APP_CONFIG, useValue: environment },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)}
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -84,14 +105,14 @@ describe('SearchHierarchyFilterComponent', () => {
   function init() {
     fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
     fixture.detectChanges();
-    showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
+    showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
   }
 
   describe('if the vocabulary doesn\'t exist', () => {
 
     beforeEach(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
-        undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404
+        undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404,
       )));
       init();
     });
@@ -105,7 +126,7 @@ describe('SearchHierarchyFilterComponent', () => {
 
     beforeEach(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
-        undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200
+        undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200,
       )));
       init();
     });
@@ -123,10 +144,10 @@ describe('SearchHierarchyFilterComponent', () => {
       const newSelectedValue = 'new-selected-value';
 
       beforeEach(async () => {
-        showVocabularyTreeLink.nativeElement.click();
         fixture.componentInstance.selectedValues$ = observableOf(
-          alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
+          alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value })),
         );
+        showVocabularyTreeLink.nativeElement.click();
         VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
           value: newSelectedValue,
         }));
@@ -138,8 +159,9 @@ describe('SearchHierarchyFilterComponent', () => {
 
       describe('when selecting a value from the vocabulary tree', () => {
 
-        it('should add a new search filter to the existing search filters', () => {
-          waitForAsync(() => expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
+        it('should add a new search filter to the existing search filters', fakeAsync(() => {
+          tick();
+          expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
             queryParams: {
               [`f.${testSearchFilter}`]: [
                 ...alreadySelectedValues,
@@ -147,8 +169,8 @@ describe('SearchHierarchyFilterComponent', () => {
               ].map((value => `${value},equals`)),
             },
             queryParamsHandling: 'merge',
-          }));
-        });
+          });
+        }));
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index f9b3f2bff9..c107083bdd 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -1,44 +1,74 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { renderFacetFor } from '../search-filter-type-decorator';
-import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import {
-  VocabularyEntryDetail
-} from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
-  SearchFilterService, REFRESH_FILTER
+  REFRESH_FILTER,
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { getFacetValueForType } from '../../../search.utils';
-import { filter, map, take } from 'rxjs/operators';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
-import { Observable, BehaviorSubject } from 'rxjs';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { environment } from '../../../../../../environments/environment';
-import { addOperatorToFilterValue } from '../../../search.utils';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../../empty.util';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { FacetValue } from '../../../models/facet-value.model';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  addOperatorToFilterValue,
+  getFacetValueForType,
+} from '../../../search.utils';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
+import { renderFacetFor } from '../search-filter-type-decorator';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
   styleUrls: ['./search-hierarchy-filter.component.scss'],
   templateUrl: './search-hierarchy-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
  * Component that represents a hierarchy facet for a specific filter configuration
  */
 @renderFacetFor(FilterType.hierarchy)
-export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
+export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnDestroy, OnInit {
+
+  subscriptions: Subscription[] = [];
 
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
@@ -46,16 +76,23 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               protected router: Router,
               protected modalService: NgbModal,
               protected vocabularyService: VocabularyService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
   ) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
   }
 
   vocabularyExists$: Observable<boolean>;
 
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
+  }
+
   /**
    * Submits a new active custom value to the filter from the input field
    * Overwritten method from parent component, adds the "query" operator to the received data before passing it on
@@ -65,17 +102,20 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
     super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
-    this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
-      this.getVocabularyEntry(), new PageInfo(), true, false,
-    ).pipe(
-      filter(rd => rd.hasCompleted),
-      take(1),
-      map(rd => {
-        return rd.hasSucceeded;
-      }),
-    );
+    const vocabularyName: string = this.getVocabularyEntry();
+    if (hasValue(vocabularyName)) {
+      this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
+        vocabularyName, new PageInfo(), true, false,
+      ).pipe(
+        filter(rd => rd.hasCompleted),
+        take(1),
+        map(rd => {
+          return rd.hasSucceeded;
+        }),
+      );
+    }
   }
 
   /**
@@ -85,36 +125,35 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
   showVocabularyTree() {
     const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewModalComponent, {
       size: 'lg',
-      windowClass: 'treeview'
+      windowClass: 'treeview',
     });
     modalRef.componentInstance.vocabularyOptions = {
       name: this.getVocabularyEntry(),
-      closed: true
+      closed: true,
     };
-    modalRef.result.then((detail: VocabularyEntryDetail) => {
-      this.selectedValues$
-        .pipe(take(1))
-        .subscribe((selectedValues) => {
-          this.router.navigate(
-            [this.searchService.getSearchLink()],
-            {
-              queryParams: {
-                [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
-                  .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
-              },
-              queryParamsHandling: 'merge',
-            },
-          );
-        });
-    }).catch();
+    this.subscriptions.push(combineLatest([
+      (modalRef.componentInstance as VocabularyTreeviewModalComponent).select,
+      this.selectedValues$.pipe(take(1)),
+    ]).subscribe(([detail, selectedValues]: [VocabularyEntryDetail, FacetValue[]]) => {
+      void this.router.navigate(
+        [this.searchService.getSearchLink()],
+        {
+          queryParams: {
+            [this.filterConfig.paramName]: [...selectedValues, { value: detail.value }]
+              .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
+          },
+          queryParamsHandling: 'merge',
+        },
+      );
+    }));
   }
 
   /**
    * Returns the matching vocabulary entry for the given search filter.
    * These are configurable in the config file.
    */
-  getVocabularyEntry() {
-    const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name);
+  getVocabularyEntry(): string {
+    const foundVocabularyConfig: FilterVocabularyConfig[] = this.appConfig.vocabularies.filter((v: FilterVocabularyConfig) => v.filter === this.filterConfig.name);
     if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
       return foundVocabularyConfig[0].vocabulary;
     }
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 7834c4c557..6d4ba44920 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -9,8 +9,8 @@
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
                          class="form-control" (blur)="onSubmit()"
-                         aria-label="Mininum value"
-                         [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder' | translate"
+                         [attr.aria-label]="minLabel"
+                         [placeholder]="minLabel"
                   />
                 </label>
             </div>
@@ -21,19 +21,18 @@
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
                            class="form-control" (blur)="onSubmit()"
-                           aria-label="Maximum value"
-                           [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder' | translate"
+                           [attr.aria-label]="maxLabel"
+                           [placeholder]="maxLabel"
                     />
                 </label>
             </div>
-            <label class="d-none">
-                <input type="submit" class="d-none"/>
-                <span>{{'search.filters.search.submit' | translate}}</span>
-            </label>
+            <button class="sr-only" type="submit">
+                {{'search.filters.search.submit' | translate}}
+            </button>
         </form>
 
         <ng-container *ngIf="shouldShowSlider()">
-            <nouislider [connect]="true" [min]="min" [max]="max" [step]="1"
+            <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
                         [dsDebounce]="250" (onDebounce)="onSubmit()"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index b1cfa841f8..1240f35678 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -37,4 +37,10 @@
     margin: 0 calc(-1 * (var(--ds-slider-handle-width) / 2));
     width: calc(100% + var(--ds-slider-handle-width));
   }
+  .noUi-handle {
+      border-color: var(--ds-slider-handle-color);
+      &::before, &::after {
+          background-color: var(--ds-slider-handle-color);
+      }
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 3a146f5059..960057f662 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -1,30 +1,42 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RouteService } from '../../../../../core/services/route.service';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { FormsModule } from '@angular/forms';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RouterStub } from '../../../../testing/router.stub';
-import { Router } from '@angular/router';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RouteService } from '../../../../../core/services/route.service';
+import { RouterStub } from '../../../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../../testing/search-service.stub';
+import { FacetValue } from '../../../models/facet-value.model';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchRangeFilterComponent } from './search-range-filter.component';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
@@ -51,37 +63,37 @@ describe('SearchRangeFilterComponent', () => {
       count: 52,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value2,
       value: value2,
       count: 20,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value3,
       value: value3,
       count: 5,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
-    }
+          href: '',
+        },
+      },
+    },
   ];
 
   const searchLink = '/search';
@@ -105,6 +117,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
@@ -114,14 +127,14 @@ describe('SearchRangeFilterComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchRangeFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -148,9 +161,9 @@ describe('SearchRangeFilterComponent', () => {
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
         queryParams: {
           [mockFilterConfig.paramName + minSuffix]: [1900],
-          [mockFilterConfig.paramName + maxSuffix]: [1950]
+          [mockFilterConfig.paramName + maxSuffix]: [1950],
         },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 938f67412e..8831268a37 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -1,25 +1,44 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
-import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+} from 'rxjs/operators';
+import { yearFromString } from 'src/app/shared/date.util';
+
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { FilterType } from '../../../models/filter-type.model';
-import { renderFacetFor } from '../search-filter-type-decorator';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { RouteService } from '../../../../../core/services/route.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { Router } from '@angular/router';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
-import { yearFromString } from 'src/app/shared/date.util';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
+import { renderFacetFor } from '../search-filter-type-decorator';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -40,7 +59,7 @@ export const RANGE_FILTER_MAX_SUFFIX = '.max';
   selector: 'ds-search-range-filter',
   styleUrls: ['./search-range-filter.component.scss'],
   templateUrl: './search-range-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
@@ -53,11 +72,27 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   min = 1950;
 
+  /**
+   * i18n Label to use for minimum field
+   */
+  minLabel: string;
+
   /**
    * Fallback maximum for the range
    */
   max = new Date().getUTCFullYear();
 
+  /**
+   * i18n Label to use for maximum field
+   */
+  maxLabel: string;
+
+  /**
+   * Base configuration for nouislider
+   * https://refreshless.com/nouislider/slider-options/
+   */
+  config = {};
+
   /**
    * The current range of the filter
    */
@@ -78,13 +113,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               protected filterService: SearchFilterService,
               protected router: Router,
               protected rdbs: RemoteDataBuildService,
+              private translateService: TranslateService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
               @Inject(PLATFORM_ID) private platformId: any,
               @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
               private route: RouteService) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
 
   }
 
@@ -96,6 +133,8 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     super.ngOnInit();
     this.min = yearFromString(this.filterConfig.minValue) || this.min;
     this.max = yearFromString(this.filterConfig.maxValue) || this.max;
+    this.minLabel = this.translateService.instant('search.filters.filter.' + this.filterConfig.name + '.min.placeholder');
+    this.maxLabel = this.translateService.instant('search.filters.filter.' + this.filterConfig.name + '.max.placeholder');
     const iniMin = this.route.getQueryParameterValue(this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX).pipe(startWith(undefined));
     const iniMax = this.route.getQueryParameterValue(this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX).pipe(startWith(undefined));
     this.sub = observableCombineLatest(iniMin, iniMax).pipe(
@@ -103,8 +142,17 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
         const minimum = hasValue(min) ? min : this.min;
         const maximum = hasValue(max) ? max : this.max;
         return [minimum, maximum];
-      })
+      }),
     ).subscribe((minmax) => this.range = minmax);
+
+    // Default/base config for nouislider
+    this.config = {
+      // Ensure draggable handles have labels
+      handleAttributes: [
+        { 'aria-label': this.minLabel },
+        { 'aria-label': this.maxLabel },
+      ],
+    };
   }
 
   /**
@@ -121,9 +169,9 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
       queryParams:
         {
           [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
-          [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
+          [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax,
         },
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
     this.filter = '';
   }
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index fdf154bc04..cdba401743 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index cfd81c3750..d7371e8fb1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -1,8 +1,15 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import { addOperatorToFilterValue } from '../../../search.utils';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { addOperatorToFilterValue, } from '../../../search.utils';
 
 /**
  * This component renders a simple item page.
@@ -14,7 +21,7 @@ import { addOperatorToFilterValue, } from '../../../search.utils';
   selector: 'ds-search-text-filter',
   styleUrls: ['./search-text-filter.component.scss'],
   templateUrl: './search-text-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index e392cd2663..3f70a759bc 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,7 +1,10 @@
-<h3>{{"search.filters.head" | translate}}</h3>
+<h3 *ngIf="inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h3>
+<h2 *ngIf="!inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h2>
 <div *ngIf="(filters | async)?.hasSucceeded">
     <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
+<ds-advanced-search *ngIf="appConfig.search.advancedFilters.enabled"
+    [inPlaceSearch]="inPlaceSearch"></ds-advanced-search>
 <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 522459b603..67631d69bb 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -1,14 +1,23 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
-import { SearchFiltersComponent } from './search-filters.component';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
+
 import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchFiltersComponent } from './search-filters.component';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -20,13 +29,14 @@ describe('SearchFiltersComponent', () => {
     getClearFiltersQueryParams: () => {
     },
     getSearchLink: () => {
-    }
+    },
+    getConfigurationSearchConfig: () => { },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
 
   const searchFiltersStub = {
     getSelectedValuesForFilter: (filter) =>
-      []
+      [],
   };
 
   beforeEach(waitForAsync(() => {
@@ -37,11 +47,12 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFiltersStub },
+        { provide: APP_CONFIG, useValue: environment },
 
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFiltersComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 766939226d..3eead1982f 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,17 +1,30 @@
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { SearchService } from '../../../core/shared/search/search.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
+import { currentPath } from '../../utils/route.utils';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
 
 @Component({
   selector: 'ds-search-filters',
@@ -28,7 +41,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * An observable containing configuration about which filters are shown and how they are shown
    */
   @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
-
+  @Input() searchOptions: PaginatedSearchOptions;
   /**
    * List of all filters that are currently active with their value set to null.
    * Used to reset all filters at once
@@ -61,6 +74,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   subs = [];
+  filterLabel = 'search';
 
   /**
    * Initialize instance variables
@@ -70,6 +84,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * @param {SearchConfigurationService} searchConfigService
    */
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private searchService: SearchService,
     private filterService: SearchFilterService,
     private router: Router,
@@ -77,6 +92,9 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    if (!this.inPlaceSearch) {
+      this.filterLabel = 'discover';
+    }
     this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
       Object.keys(filters).forEach((f) => filters[f] = null);
       return filters;
diff --git a/src/app/shared/search/search-filters/themed-search-filters.component.ts b/src/app/shared/search/search-filters/themed-search-filters.component.ts
index a9a9c10e51..5e89c27b26 100644
--- a/src/app/shared/search/search-filters/themed-search-filters.component.ts
+++ b/src/app/shared/search/search-filters/themed-search-filters.component.ts
@@ -1,9 +1,13 @@
-import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../theme-support/themed.component';
-import { SearchFiltersComponent } from './search-filters.component';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { RemoteData } from '../../../core/data/remote-data';
+import { ThemedComponent } from '../../theme-support/themed.component';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchFiltersComponent } from './search-filters.component';
 
 /**
  * Themed wrapper for SearchFiltersComponent
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index bffb7f9329..2269771de1 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,6 +1,7 @@
-<a class="badge badge-primary mr-1 mb-1 text-capitalize"
+<a class="badge badge-primary mr-1 mb-1"
+   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
     {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
-    <span> ×</span>
+    <span aria-hidden="true"> ×</span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
index b2be2ae53f..5642f40057 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
@@ -1,20 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { Observable, of as observableOf } from 'rxjs';
-import { Params, Router } from '@angular/router';
-import { SearchLabelComponent } from './search-label.component';
-import { ObjectKeysPipe } from '../../../utils/object-keys-pipe';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
-import { SearchServiceStub } from '../../../testing/search-service.stub';
-import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  Params,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { ObjectKeysPipe } from '../../../utils/object-keys-pipe';
+import { SearchLabelComponent } from './search-label.component';
 
 describe('SearchLabelComponent', () => {
   let comp: SearchLabelComponent;
@@ -34,7 +48,7 @@ describe('SearchLabelComponent', () => {
   const filter2 = [key2, value2];
   const mockFilters = [
     filter1,
-    filter2
+    filter2,
   ];
 
   const pagination = Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 });
@@ -49,12 +63,12 @@ describe('SearchLabelComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: {} }
+        { provide: Router, useValue: {} },
         // { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  observableOf({})} }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchLabelComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
index ab4c57d9f5..bebf3dd15d 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -1,12 +1,23 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  Params,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Params, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { currentPath } from '../../../utils/route.utils';
+
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { currentPath } from '../../../utils/route.utils';
 import { stripOperatorFromFilterValue } from '../../search.utils';
 
 @Component({
@@ -58,9 +69,9 @@ export class SearchLabelComponent implements OnInit {
         const page = this.paginationService.getPageParam(this.searchConfigurationService.paginationID);
         return {
           [field]: isNotEmpty(newValues) ? newValues : null,
-          [page]: 1
+          [page]: 1,
         };
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts
index e00c56aabc..ec53427f94 100644
--- a/src/app/shared/search/search-labels/search-labels.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts
@@ -1,15 +1,23 @@
-import { SearchLabelsComponent } from './search-labels.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
-import { SearchServiceStub } from '../../testing/search-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SearchServiceStub } from '../../testing/search-service.stub';
+import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
+import { SearchLabelsComponent } from './search-labels.component';
 
 describe('SearchLabelsComponent', () => {
   let comp: SearchLabelsComponent;
@@ -26,7 +34,7 @@ describe('SearchLabelsComponent', () => {
   const filter2 = [field2, value2];
   const mockFilters = [
     filter1,
-    filter2
+    filter2,
   ];
 
   beforeEach(waitForAsync(() => {
@@ -35,11 +43,11 @@ describe('SearchLabelsComponent', () => {
       declarations: [SearchLabelsComponent, ObjectKeysPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
-        { provide: SEARCH_CONFIG_SERVICE, useValue: { getCurrentFrontendFilters: () => observableOf(mockFilters) } }
+        { provide: SEARCH_CONFIG_SERVICE, useValue: { getCurrentFrontendFilters: () => observableOf(mockFilters) } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchLabelsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index 2cc1919f50..2d97731abe 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,10 +1,18 @@
-import { Component, Inject, Input } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import {
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+import {
+  Params,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Params, Router } from '@angular/router';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { map } from 'rxjs/operators';
 
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+
 @Component({
   selector: 'ds-search-labels',
   styleUrls: ['./search-labels.component.scss'],
@@ -39,7 +47,7 @@ export class SearchLabelsComponent {
             labels[key] = [...params[key].map((value) => value)];
           });
         return labels;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/search/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts
index 78305b55f1..5241318122 100644
--- a/src/app/shared/search/search-result-element-decorator.ts
+++ b/src/app/shared/search/search-result-element-decorator.ts
@@ -26,5 +26,5 @@ export function searchResultFor(domainConstructor: GenericConstructor<ListableOb
  * @returns The component's constructor that matches the given DSpaceObject
  */
 export function getSearchResultFor(domainConstructor: GenericConstructor<ListableObject>) {
-    return searchResultMap.get(domainConstructor);
+  return searchResultMap.get(domainConstructor);
 }
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 11c589254a..e3f4d0d883 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -22,7 +22,7 @@
 <ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
+<div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
        [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index 4cc4f84f65..cd11c5eb12 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
-import { SearchResultsComponent } from './search-results.component';
-import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+
+import { Community } from '../../../core/shared/community.model';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
+import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { SearchResultsComponent } from './search-results.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -20,7 +28,7 @@ describe('SearchResultsComponent', () => {
       declarations: [
         SearchResultsComponent,
         QueryParamsDirectiveStub],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,15 +118,15 @@ export const objects = [
       self: {
         _isScalar: true,
         value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     collections: {
       self: {
         _isScalar: true,
         value: '1506937433727',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     _links: {
       self: {
@@ -132,40 +140,40 @@ export const objects = [
       'dc.description': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.description.abstract': [
         {
           language: null,
-          value: 'This is a test community to hold content for the OR2017 demostration'
-        }
+          value: 'This is a test community to hold content for the OR2017 demostration',
+        },
       ],
       'dc.description.tableofcontents': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.rights': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.title': [
         {
           language: null,
-          value: 'OR2017 - Demonstration'
-        }
+          value: 'OR2017 - Demonstration',
+        },
       ],
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://localhost:4000/handle/10673/11'
-        }
-      ]
-    }
+          value: 'http://localhost:4000/handle/10673/11',
+        },
+      ],
+    },
   }),
   Object.assign(new Community(),
     {
@@ -173,15 +181,15 @@ export const objects = [
         self: {
           _isScalar: true,
           value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       collections: {
         self: {
           _isScalar: true,
           value: '1506937433727',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       _links: {
         self: {
@@ -195,40 +203,40 @@ export const objects = [
         'dc.description': [
           {
             language: null,
-            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-          }
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>',
+          },
         ],
         'dc.description.abstract': [
           {
             language: null,
-            value: 'This is a sample top-level community'
-          }
+            value: 'This is a sample top-level community',
+          },
         ],
         'dc.description.tableofcontents': [
           {
             language: null,
-            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-          }
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>',
+          },
         ],
         'dc.rights': [
           {
             language: null,
-            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-          }
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>',
+          },
         ],
         'dc.title': [
           {
             language: null,
-            value: 'Sample Community'
-          }
+            value: 'Sample Community',
+          },
         ],
         'dc.identifier.uri': [
           {
             language: null,
-            value: 'http://localhost:4000/handle/10673/1'
-          }
-        ]
-      }
-    }
-  )
+            value: 'http://localhost:4000/handle/10673/1',
+          },
+        ],
+      },
+    },
+  ),
 ];
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 15d2cc0f00..ba6ba887de 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,16 +1,28 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { fadeIn, fadeInOut } from '../../animations/fade';
-import { SearchResult } from '../models/search-result.model';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { hasNoValue, isNotEmpty } from '../../empty.util';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../animations/fade';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchResult } from '../models/search-result.model';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -22,8 +34,8 @@ export interface SelectionConfig {
   templateUrl: './search-results.component.html',
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 
 /**
diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/src/app/shared/search/search-results/themed-search-results.component.ts
index 01ee5761f3..3ccd066628 100644
--- a/src/app/shared/search/search-results/themed-search-results.component.ts
+++ b/src/app/shared/search/search-results/themed-search-results.component.ts
@@ -1,16 +1,25 @@
-import { ThemedComponent } from '../../theme-support/themed.component';
-import { SearchResultsComponent, SelectionConfig } from './search-results.component';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { SearchResult } from '../models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchResult } from '../models/search-result.model';
+import {
+  SearchResultsComponent,
+  SelectionConfig,
+} from './search-results.component';
 
 /**
  * Themed wrapper for SearchResultsComponent
@@ -21,6 +30,7 @@ import { ListableObject } from '../../object-collection/shared/listable-object.m
   templateUrl: '../../theme-support/themed.component.html',
 })
 export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsComponent> {
+
   protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject'];
 
   @Input() linkType: CollectionElementLinkType;
diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts
index d0b51f04b1..abcd63eee6 100644
--- a/src/app/shared/search/search-settings/search-settings.component.spec.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts
@@ -1,53 +1,47 @@
-import { SearchService } from '../../../core/shared/search/search.service';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { SearchSettingsComponent } from './search-settings.component';
-import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
-import { VarDirective } from '../../utils/var.directive';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { SidebarService } from '../../sidebar/sidebar.service';
-import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { VarDirective } from '../../utils/var.directive';
+import { SearchSettingsComponent } from './search-settings.component';
 
 describe('SearchSettingsComponent', () => {
 
   let comp: SearchSettingsComponent;
   let fixture: ComponentFixture<SearchSettingsComponent>;
-  let searchServiceObject: SearchService;
 
   let pagination: PaginationComponentOptions;
   let sort: SortOptions;
-  let mockResults;
-  let searchServiceStub;
 
   let queryParam;
   let scopeParam;
   let paginatedSearchOptions;
 
-  let paginationService;
+  let paginationService: PaginationServiceStub;
 
-  let activatedRouteStub;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(waitForAsync(async () => {
     pagination = new PaginationComponentOptions();
     pagination.id = 'search-results-pagination';
     pagination.currentPage = 1;
     pagination.pageSize = 10;
     sort = new SortOptions('score', SortDirection.DESC);
-    mockResults = ['test', 'data'];
-    searchServiceStub = {
-      searchOptions: { pagination: pagination, sort: sort },
-      search: () => mockResults,
-    };
 
     queryParam = 'test query';
     scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
@@ -58,30 +52,12 @@ describe('SearchSettingsComponent', () => {
       sort,
     };
 
-    activatedRouteStub = {
-      queryParams: observableOf({
-        query: queryParam,
-        scope: scopeParam,
-      }),
-    };
-
     paginationService = new PaginationServiceStub(pagination, sort);
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       declarations: [SearchSettingsComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: SearchService, useValue: searchServiceStub },
-
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        {
-          provide: SidebarService,
-          useValue: SidebarServiceStub,
-        },
-        {
-          provide: SearchFilterService,
-          useValue: {},
-        },
         {
           provide: PaginationService,
           useValue: paginationService,
@@ -91,7 +67,7 @@ describe('SearchSettingsComponent', () => {
           useValue: {
             paginatedSearchOptions: observableOf(paginatedSearchOptions),
             getCurrentScope: observableOf('test-id'),
-          }
+          },
         },
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -105,16 +81,13 @@ describe('SearchSettingsComponent', () => {
     comp.sortOptionsList = [
       new SortOptions('score', SortDirection.DESC),
       new SortOptions('dc.title', SortDirection.ASC),
-      new SortOptions('dc.title', SortDirection.DESC)
+      new SortOptions('dc.title', SortDirection.DESC),
     ];
     comp.currentSortOption = new SortOptions('score', SortDirection.DESC);
 
     // SearchPageComponent test instance
     fixture.detectChanges();
-    searchServiceObject = (comp as any).service;
     spyOn(comp, 'reloadOrder');
-    spyOn(searchServiceObject, 'search').and.callThrough();
-
   });
 
   it('it should show the order settings with the respective selectable options', () => {
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 0efd38b5b2..45679f95b1 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,15 +1,21 @@
-import { Component, Inject, Input } from '@angular/core';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { PaginationService } from '../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-settings',
   styleUrls: ['./search-settings.component.scss'],
-  templateUrl: './search-settings.component.html'
+  templateUrl: './search-settings.component.html',
 })
 
 /**
@@ -26,11 +32,10 @@ export class SearchSettingsComponent {
    */
   @Input() sortOptionsList: SortOptions[];
 
-  constructor(private service: SearchService,
-              private route: ActivatedRoute,
-              private router: Router,
-              private paginationService: PaginationService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService) {
+  constructor(
+    protected paginationService: PaginationService,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService,
+  ) {
   }
 
   /**
@@ -42,7 +47,7 @@ export class SearchSettingsComponent {
     this.paginationService.updateRoute(this.searchConfigurationService.paginationID, {
       sortField: values[0],
       sortDirection: values[1] as SortDirection,
-      page: 1
+      page: 1,
     });
   }
 }
diff --git a/src/app/shared/search/search-settings/themed-search-settings.component.ts b/src/app/shared/search/search-settings/themed-search-settings.component.ts
index b1f1d08264..ab6f62d56e 100644
--- a/src/app/shared/search/search-settings/themed-search-settings.component.ts
+++ b/src/app/shared/search/search-settings/themed-search-settings.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { SearchSettingsComponent } from './search-settings.component';
-import { SortOptions } from '../../../core/cache/models/sort-options.model';
 
 /**
  * Themed wrapper for SearchSettingsComponent
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index f489de5d28..f14854593e 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -2,9 +2,10 @@
     <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
         <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
         <button (click)="toggleSidebar.emit()"
-                aria-controls="#search-body"
+                [attr.aria-label]="'search.sidebar.close' | translate"
+                aria-controls="search-content"
                 class="btn btn-outline-primary float-right close-sidebar"><i
-                class="fas fa-arrow-right" [title]="'search.sidebar.close' | translate"></i> {{"search.sidebar.close" | translate}}
+                class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
         </button>
     </div>
     <div id="search-sidebar-content">
@@ -22,7 +23,7 @@
                                [filters]="filters"
                                [refreshFilters]="refreshFilters"
                                [inPlaceSearch]="inPlaceSearch"></ds-themed-search-filters>
-            <ds-themed-search-settings [currentSortOption]="currentSortOption"
+            <ds-themed-search-settings *ngIf="inPlaceSearch" [currentSortOption]="currentSortOption"
                                        [sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
         </div>
     </div>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
index a16387cf51..472b249962 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
@@ -1,9 +1,14 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchSidebarComponent } from './search-sidebar.component';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SearchSidebarComponent } from './search-sidebar.component';
 
 describe('SearchSidebarComponent', () => {
   let comp: SearchSidebarComponent;
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index 929f819ca3..23a9e1d012 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -1,12 +1,20 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
-import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
 
 /**
  * This component renders a simple item page.
diff --git a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
index 935f797532..449438ef51 100644
--- a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
@@ -1,13 +1,22 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ThemedComponent } from '../../theme-support/themed.component';
-import { SearchSidebarComponent } from './search-sidebar.component';
-import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
-import { BehaviorSubject, Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
+import { SearchSidebarComponent } from './search-sidebar.component';
 
 /**
  * Themed wrapper for SearchSidebarComponent
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index f63bf9fa84..64c0cd5008 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h5 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h5>
+  <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
 
   <select class="form-control"
           aria-labelledby="configuration-switch"
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index 8fc178c67a..094e95fd8e 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -1,19 +1,31 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { SearchSwitchConfigurationComponent } from './search-switch-configuration.component';
-import { NavigationExtras, Router } from '@angular/router';
-import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
-import { RouterStub } from '../../testing/router.stub';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { Context } from '../../../core/shared/context.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
+import {
+  MYDSPACE_ROUTE,
+  SEARCH_CONFIG_SERVICE,
+} from '../../../my-dspace-page/my-dspace-page.component';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { RouterStub } from '../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchSwitchConfigurationComponent } from './search-switch-configuration.component';
 
 describe('SearchSwitchConfigurationComponent', () => {
 
@@ -23,19 +35,19 @@ describe('SearchSwitchConfigurationComponent', () => {
   let select: any;
 
   const searchServiceStub = jasmine.createSpyObj('SearchService', {
-    getSearchLink: jasmine.createSpy('getSearchLink')
+    getSearchLink: jasmine.createSpy('getSearchLink'),
   });
 
   const configurationList = [
     {
       value: MyDSpaceConfigurationValueType.Workspace,
       label: 'workspace',
-      context: Context.Workspace
+      context: Context.Workspace,
     },
     {
       value: MyDSpaceConfigurationValueType.Workflow,
       label: 'workflow',
-      context: Context.Workflow
+      context: Context.Workflow,
     },
   ];
   beforeEach(waitForAsync(() => {
@@ -44,9 +56,9 @@ describe('SearchSwitchConfigurationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [SearchSwitchConfigurationComponent],
       providers: [
@@ -54,7 +66,7 @@ describe('SearchSwitchConfigurationComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index 0e1b4f221b..2493a627cb 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -1,16 +1,26 @@
-import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
-
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import findIndex from 'lodash/findIndex';
 import { Subscription } from 'rxjs';
 
-import { hasValue } from '../../empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
-import { SearchConfigurationOption } from './search-configuration-option.model';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../empty.util';
 import { currentPath } from '../../utils/route.utils';
-import findIndex from 'lodash/findIndex';
+import { SearchConfigurationOption } from './search-configuration-option.model';
 
 @Component({
   selector: 'ds-search-switch-configuration',
@@ -60,7 +70,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
   ngOnInit() {
     this.searchConfigService.getCurrentConfiguration(this.defaultConfiguration)
       .subscribe((currentConfiguration) => {
-        const index = findIndex(this.configurationList, {value: currentConfiguration });
+        const index = findIndex(this.configurationList, { value: currentConfiguration });
         this.selectedOption = this.configurationList[index];
       });
   }
@@ -70,7 +80,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
    */
   onSelect() {
     const navigationExtras: NavigationExtras = {
-      queryParams: {configuration: this.selectedOption.value},
+      queryParams: { configuration: this.selectedOption.value },
     };
 
     this.changeConfiguration.emit(this.selectedOption);
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index d43f506866..c51acf0a7e 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -10,26 +10,29 @@
   <ng-template *ngTemplateOutlet="searchContent"></ng-template>
 </div>
 
-<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sidebarContent]="sidebarContent">
-  <ng-template *ngTemplateOutlet="searchContent"></ng-template>
+<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sideBarWidth]="sideBarWidth"
+    [sidebarContent]="sidebarContent">
+    <ng-template *ngTemplateOutlet="searchContent"></ng-template>
 </ds-page-with-sidebar>
 
 <ng-template #searchContent>
     <div class="row">
-        <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
+        <div class="col-12" *ngIf="(isXsOrSm$ | async) !== true">
             <ng-template *ngTemplateOutlet="searchForm"></ng-template>
             <ng-content select="[additionalSearchOptions]"></ng-content>
         </div>
         <div id="search-content" class="col-12">
             <div class="d-block d-md-none search-controls clearfix">
-                <ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+                <ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
+                    [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
                 <button (click)="openSidebar()" aria-controls="#search-body"
                         class="btn btn-outline-primary float-right open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"
-                        | translate}}
+                       | translate}}
                 </button>
             </div>
-            <ds-themed-search-results [searchResults]="resultsRD$ | async"
+            <ds-themed-search-results *ngIf="inPlaceSearch"
+                                      [searchResults]="resultsRD$ | async"
                                       [searchConfig]="searchOptions$ | async"
                                       [configuration]="(currentConfiguration$ | async)"
                                       [disableHeader]="!searchEnabled"
@@ -47,7 +50,7 @@
 </ng-template>
 
 <ng-template #sidebarContent>
-    <ds-themed-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
+    <ds-themed-search-sidebar id="search-sidebar" *ngIf="(isXsOrSm$ | async) !== true"
                        [configurationList]="configurationList"
                        [configuration]="(currentConfiguration$ | async)"
                        [currentScope]="(currentScope$ | async)"
@@ -84,6 +87,7 @@
     <ds-themed-search-form *ngIf="searchEnabled" id="search-form"
                     [query]="(searchOptions$ | async)?.query"
                     [scope]="(searchOptions$ | async)?.scope"
+                    [hideScopeInUrl]="hideScopeInUrl"
                     [currentUrl]="searchLink"
                     [showScopeSelector]="showScopeSelector"
                     [inPlaceSearch]="inPlaceSearch"
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index d0d9bdda86..dd1b1dd8a8 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,61 +1,83 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment.test';
+import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../core/shared/search/search-filter.service';
+import {
+  SearchConfig,
+  SortConfig,
+} from '../../core/shared/search/search-filters/search-config.model';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { HostWindowService } from '../host-window.service';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SearchComponent } from './search.component';
-import { SearchService } from '../../core/shared/search/search.service';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ActivatedRoute } from '@angular/router';
-import { By } from '@angular/platform-browser';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 import { SidebarService } from '../sidebar/sidebar.service';
-import { SearchFilterService } from '../../core/shared/search/search-filter.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { RouteService } from '../../core/services/route.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { PaginatedSearchOptions } from './models/paginated-search-options.model';
 import { SidebarServiceStub } from '../testing/sidebar-service.stub';
-import { SearchConfig, SortConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { Item } from '../../core/shared/item.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { SearchObjects } from './models/search-objects.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
-import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
-import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { PaginatedSearchOptions } from './models/paginated-search-options.model';
+import { SearchFilterConfig } from './models/search-filter-config.model';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchComponent } from './search.component';
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
-let searchServiceObject: SearchService;
-let searchConfigurationServiceObject: SearchConfigurationService;
 const store: Store<SearchComponent> = jasmine.createSpyObj('store', {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   dispatch: {},
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-  select: observableOf(true)
+  select: observableOf(true),
 });
 const sortConfigList: SortConfig[] = [
   { name: 'score', sortOrder: SortDirection.DESC },
   { name: 'dc.title', sortOrder: SortDirection.ASC },
-  { name: 'dc.title', sortOrder: SortDirection.DESC }
+  { name: 'dc.title', sortOrder: SortDirection.DESC },
 ];
 const sortOptionsList: SortOptions[] = [
   new SortOptions('score', SortDirection.DESC),
   new SortOptions('dc.title', SortDirection.ASC),
-  new SortOptions('dc.title', SortDirection.DESC)
+  new SortOptions('dc.title', SortDirection.DESC),
 ];
 const searchConfig = Object.assign(new SearchConfig(), {
-  sortOptions: sortConfigList
+  sortOptions: sortConfigList,
 });
 const paginationId = 'search-test-page-id';
 const pagination: PaginationComponentOptions = new PaginationComponentOptions();
@@ -67,15 +89,15 @@ const mockDso = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Item nr 1'
-      }
-    ]
+        value: 'Item nr 1',
+      },
+    ],
   },
   _links: {
     self: {
-      href: 'selfLink1'
-    }
-  }
+      href: 'selfLink1',
+    },
+  },
 });
 
 const mockDso2 = Object.assign(new Item(), {
@@ -83,19 +105,18 @@ const mockDso2 = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Item nr 2'
-      }
-    ]
+        value: 'Item nr 2',
+      },
+    ],
   },
   _links: {
     self: {
-      href: 'selfLink2'
-    }
-  }
+      href: 'selfLink2',
+    },
+  },
 });
-const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
 const mockSearchResults: SearchObjects<DSpaceObject> = Object.assign(new SearchObjects(), {
-  page: [mockDso, mockDso2]
+  page: [mockDso, mockDso2],
 });
 const mockResultsRD: RemoteData<SearchObjects<DSpaceObject>> = createSuccessfulRemoteDataObject(mockSearchResults);
 const mockResultsRD$: Observable<RemoteData<SearchObjects<DSpaceObject>>> = observableOf(mockResultsRD);
@@ -106,34 +127,24 @@ const searchServiceStub = jasmine.createSpyObj('SearchService', {
   getSearchConfigurationFor: createSuccessfulRemoteDataObject$(searchConfig),
   trackSearch: {},
 }) as SearchService;
-const configurationParam = 'default';
 const queryParam = 'test query';
 const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-const fixedFilter = 'fixed filter';
 
 const defaultSearchOptions = new PaginatedSearchOptions({ pagination });
 
 const paginatedSearchOptions$ = new BehaviorSubject(defaultSearchOptions);
 
-const paginatedSearchOptions = new PaginatedSearchOptions({
-  configuration: configurationParam,
-  query: queryParam,
-  scope: scopeParam,
-  fixedFilter: fixedFilter,
-  pagination,
-  sort
-});
 const activatedRouteStub = {
   snapshot: {
     queryParamMap: new Map([
       ['query', queryParam],
-      ['scope', scopeParam]
-    ])
+      ['scope', scopeParam],
+    ]),
   },
   queryParams: observableOf({
     query: queryParam,
-    scope: scopeParam
-  })
+    scope: scopeParam,
+  }),
 };
 
 const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
@@ -141,32 +152,29 @@ const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfi
   filterType: FilterType.text,
   hasFacets: false,
   isOpenByDefault: false,
-  pageSize: 2
+  pageSize: 2,
 });
 const mockFilterConfig2: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
   name: 'test2',
   filterType: FilterType.text,
   hasFacets: false,
   isOpenByDefault: false,
-  pageSize: 1
+  pageSize: 1,
 });
 
 const filtersConfigRD = createSuccessfulRemoteDataObject([mockFilterConfig, mockFilterConfig2]);
 const filtersConfigRD$ = observableOf(filtersConfigRD);
 
 const routeServiceStub = {
-  getRouteParameterValue: () => {
-    return observableOf('');
-  },
   getQueryParameterValue: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   getQueryParamsWithPrefix: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   setParameter: () => {
     return;
-  }
+  },
 };
 
 let searchConfigurationServiceStub;
@@ -180,17 +188,17 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
     getCurrentScope: observableOf('test-id'),
     getCurrentSort: observableOf(sortOptionsList[0]),
     updateFixedFilter: jasmine.createSpy('updateFixedFilter'),
-    setPaginationId: jasmine.createSpy('setPaginationId')
+    setPaginationId: jasmine.createSpy('setPaginationId'),
   });
 
   searchConfigurationServiceStub.setPaginationId.and.callFake((pageId) => {
     paginatedSearchOptions$.next(Object.assign(paginatedSearchOptions$.value, {
       pagination: Object.assign(new PaginationComponentOptions(), {
-        id: pageId
-      })
+        id: pageId,
+      }),
     }));
   });
-  searchConfigurationServiceStub.paginatedSearchOptions = new BehaviorSubject(new PaginatedSearchOptions({pagination: {id: 'default'} as any}));
+  searchConfigurationServiceStub.paginatedSearchOptions = new BehaviorSubject(new PaginatedSearchOptions({ pagination: { id: 'default' } as any }));
 
   TestBed.configureTestingModule({
     imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, NgbCollapseModule],
@@ -199,42 +207,43 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       { provide: SearchService, useValue: searchServiceStub },
       {
         provide: CommunityDataService,
-        useValue: jasmine.createSpyObj('communityService', ['findById', 'findAll'])
+        useValue: jasmine.createSpyObj('communityService', ['findById', 'findAll']),
       },
       { provide: ActivatedRoute, useValue: activatedRouteStub },
       { provide: RouteService, useValue: routeServiceStub },
       {
-        provide: Store, useValue: store
+        provide: Store, useValue: store,
       },
       {
         provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
           {
             isXs: observableOf(true),
             isSm: observableOf(false),
-            isXsOrSm: observableOf(true)
-          })
+            isXsOrSm: observableOf(true),
+          }),
       },
       {
         provide: SidebarService,
-        useValue: SidebarServiceStub
+        useValue: SidebarServiceStub,
       },
       {
         provide: SearchFilterService,
-        useValue: {}
+        useValue: {},
       },
       {
         provide: SEARCH_CONFIG_SERVICE,
-        useValue: searchConfigurationServiceStub
-      }
+        useValue: searchConfigurationServiceStub,
+      },
+      { provide: APP_CONFIG, useValue: environment },
     ],
-    schemas: [NO_ERRORS_SCHEMA]
+    schemas: [NO_ERRORS_SCHEMA],
   }).overrideComponent(compType, {
     set: {
       changeDetection: ChangeDetectionStrategy.Default,
       providers: [{
         provide: SearchConfigurationService,
-        useValue: searchConfigurationServiceStub
-      }]
+        useValue: searchConfigurationServiceStub,
+      }],
     },
 
   }).compileComponents();
@@ -252,16 +261,10 @@ describe('SearchComponent', () => {
     comp.paginationId = paginationId;
 
     spyOn((comp as any), 'getSearchOptions').and.returnValue(paginatedSearchOptions$.asObservable());
-
-    searchServiceObject = TestBed.inject(SearchService);
-    searchConfigurationServiceObject = TestBed.inject(SEARCH_CONFIG_SERVICE);
-
   });
 
   afterEach(() => {
     comp = null;
-    searchServiceObject = null;
-    searchConfigurationServiceObject = null;
   });
 
   it('should init search parameters properly and call retrieveSearchResults', fakeAsync(() => {
@@ -271,19 +274,19 @@ describe('SearchComponent', () => {
 
     const expectedSearchOptions = Object.assign(paginatedSearchOptions$.value, {
       configuration: 'default',
-      sort: sortOptionsList[0]
+      sort: sortOptionsList[0],
     });
     expect(comp.currentConfiguration$).toBeObservable(cold('b', {
-      b: 'default'
+      b: 'default',
     }));
     expect(comp.currentSortOptions$).toBeObservable(cold('b', {
-      b: sortOptionsList[0]
+      b: sortOptionsList[0],
     }));
     expect(comp.sortOptionsList$).toBeObservable(cold('b', {
-      b: sortOptionsList
+      b: sortOptionsList,
     }));
     expect(comp.searchOptions$).toBeObservable(cold('b', {
-      b: expectedSearchOptions
+      b: expectedSearchOptions,
     }));
     expect((comp as any).retrieveSearchResults).toHaveBeenCalledWith(expectedSearchOptions);
   }));
@@ -293,7 +296,7 @@ describe('SearchComponent', () => {
     tick(100);
     const expectedResults = mockResultsRD;
     expect(comp.resultsRD$).toBeObservable(cold('b', {
-      b: expectedResults
+      b: expectedResults,
     }));
   }));
 
@@ -302,7 +305,7 @@ describe('SearchComponent', () => {
     tick(100);
     const expectedResults = filtersConfigRD;
     expect(comp.filtersRD$).toBeObservable(cold('b', {
-      b: expectedResults
+      b: expectedResults,
     }));
   }));
 
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c8..113e788a97 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,43 +1,73 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import { NavigationStart, Router } from '@angular/router';
-
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NavigationStart,
+  Router,
+} from '@angular/router';
 import uniqueId from 'lodash/uniqueId';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { pushInOut } from '../animations/push';
-import { HostWindowService } from '../host-window.service';
-import { SidebarService } from '../sidebar/sidebar.service';
-import { hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
-import { RouteService } from '../../core/services/route.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { PaginatedSearchOptions } from './models/paginated-search-options.model';
-import { SearchResult } from './models/search-result.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { currentPath } from '../utils/route.utils';
-import { Context } from '../../core/shared/context.model';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
-import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { followLink } from '../utils/follow-link-config.model';
-import { Item } from '../../core/shared/item.model';
-import { SearchObjects } from './models/search-objects.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { SelectionConfig } from './search-results/search-results.component';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { environment } from 'src/environments/environment';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { SearchFilterConfig } from './models/search-filter-config.model';
-import { WorkspaceItem } from '../..//core/submission/models/workspaceitem.model';
-import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
+import { Context } from '../../core/shared/context.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { pushInOut } from '../animations/push';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
+import { HostWindowService } from '../host-window.service';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { SidebarService } from '../sidebar/sidebar.service';
+import { followLink } from '../utils/follow-link-config.model';
+import { currentPath } from '../utils/route.utils';
+import { PaginatedSearchOptions } from './models/paginated-search-options.model';
+import { SearchFilterConfig } from './models/search-filter-config.model';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchResult } from './models/search-result.model';
+import { SelectionConfig } from './search-results/search-results.component';
+import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
 
 @Component({
   selector: 'ds-search',
@@ -50,7 +80,7 @@ import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routi
 /**
  * This component renders a sidebar, a search input bar and the search results.
  */
-export class SearchComponent implements OnInit {
+export class SearchComponent implements OnDestroy, OnInit {
 
   /**
    * The list of available configuration options
@@ -166,6 +196,16 @@ export class SearchComponent implements OnInit {
    */
   @Input() query: string;
 
+  /**
+   * The fallback scope when no scope is defined in the url, if this is also undefined no scope will be set
+   */
+  @Input() scope: string;
+
+  /**
+   * Hides the scope in the url, this can be useful when you hardcode the scope in another way
+   */
+  @Input() hideScopeInUrl: boolean;
+
   /**
    * The current configuration used during the search
    */
@@ -179,7 +219,7 @@ export class SearchComponent implements OnInit {
   /**
    * The current sort options used
    */
-  currentScope$: BehaviorSubject<string> = new BehaviorSubject<string>('');
+  currentScope$: Observable<string>;
 
   /**
    * The current sort options used
@@ -273,7 +313,9 @@ export class SearchComponent implements OnInit {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -299,6 +341,10 @@ export class SearchComponent implements OnInit {
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
     }
 
+    this.currentScope$ = this.routeService.getQueryParameterValue('scope').pipe(
+      map((routeValue: string) => hasValue(routeValue) ? routeValue : this.scope),
+    );
+
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.searchLink = this.getSearchLink();
     this.currentContext$.next(this.context);
@@ -306,37 +352,39 @@ export class SearchComponent implements OnInit {
     // Determinate PaginatedSearchOptions and listen to any update on it
     const configuration$: Observable<string> = this.searchConfigService
       .getCurrentConfiguration(this.configuration).pipe(distinctUntilChanged());
-    const searchSortOptions$: Observable<SortOptions[]> = configuration$.pipe(
-      switchMap((configuration: string) => this.searchConfigService
-        .getConfigurationSearchConfig(configuration)),
+    const searchSortOptions$: Observable<SortOptions[]> = combineLatest([configuration$, this.currentScope$]).pipe(
+      switchMap(([configuration, scope]: [string, string]) => this.searchConfigService.getConfigurationSearchConfig(configuration, scope)),
       map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
     const sortOption$: Observable<SortOptions> = searchSortOptions$.pipe(
       switchMap((searchSortOptions: SortOptions[]) => {
         const defaultSort: SortOptions = searchSortOptions[0];
         return this.searchConfigService.getCurrentSort(this.paginationId, defaultSort);
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
     const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
 
-    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$]).pipe(
-      filter(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$]).pipe(
+      filter(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
         // filter for search options related to instanced paginated id
         return searchOptions.pagination.id === this.paginationId;
       }),
-      debounceTime(100)
-    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+      debounceTime(100),
+    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
       // Build the PaginatedSearchOptions object
       const combinedOptions = Object.assign({}, searchOptions,
         {
           configuration: searchOptions.configuration || configuration,
-          sort: sortOption || searchOptions.sort
+          sort: sortOption || searchOptions.sort,
         });
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
+      if (isEmpty(combinedOptions.scope)) {
+        combinedOptions.scope = scope;
+      }
       const newSearchOptions = new PaginatedSearchOptions(combinedOptions);
       // check if search options are changed
       // if so retrieve new related results otherwise skip it
@@ -344,13 +392,12 @@ export class SearchComponent implements OnInit {
         // Initialize variables
         this.currentConfiguration$.next(configuration);
         this.currentSortOptions$.next(newSearchOptions.sort);
-        this.currentScope$.next(newSearchOptions.scope);
         this.sortOptionsList$.next(searchSortOptions);
         this.searchOptions$.next(newSearchOptions);
         this.initialized$.next(true);
         // retrieve results
         this.retrieveSearchResults(newSearchOptions);
-        this.retrieveFilters(searchOptions);
+        this.retrieveFilters(newSearchOptions);
       }
     }));
 
@@ -432,11 +479,13 @@ export class SearchComponent implements OnInit {
   private retrieveSearchResults(searchOptions: PaginatedSearchOptions) {
     this.resultsRD$.next(null);
     this.lastSearchOptions = searchOptions;
-    let followLinks = [
+    const followLinks = [
       followLink<Item>('thumbnail', { isOptional: true }),
       followLink<SubmissionObject>('item', { isOptional: true }, followLink<Item>('thumbnail', { isOptional: true })) as any,
-      followLink<Item>('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses }),
     ];
+    if (this.appConfig.item.showAccessStatuses) {
+      followLinks.push(followLink<Item>('accessStatus', { isOptional: true }));
+    }
     if (this.configuration === 'supervision') {
       followLinks.push(followLink<WorkspaceItem>('supervisionOrders', { isOptional: true }) as any);
     }
@@ -445,8 +494,8 @@ export class SearchComponent implements OnInit {
       undefined,
       this.useCachedVersionIfAvailable,
       true,
-      ...followLinks
-      ).pipe(getFirstCompletedRemoteData())
+      ...followLinks,
+    ).pipe(getFirstCompletedRemoteData())
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         if (results.hasSucceeded) {
           if (this.trackStatistics) {
@@ -466,18 +515,20 @@ export class SearchComponent implements OnInit {
    * This method should only be called once and is essentially what SearchTrackingComponent used to do (now removed)
    * @private
    */
-  private subscribeToRoutingEvents() {
-    this.subs.push(
-      this.router.events.pipe(
-        filter((event) => event instanceof NavigationStart),
-        map((event: NavigationStart) => this.getDsoUUIDFromUrl(event.url)),
-        hasValueOperator(),
-      ).subscribe((uuid) => {
-        if (this.resultsRD$.value.hasSucceeded) {
-          this.service.trackSearch(this.searchOptions$.value, this.resultsRD$.value.payload as SearchObjects<DSpaceObject>, uuid);
-        }
-      }),
-    );
+  private subscribeToRoutingEvents(): void {
+    if (this.trackStatistics) {
+      this.subs.push(
+        this.router.events.pipe(
+          filter((event) => event instanceof NavigationStart),
+          map((event: NavigationStart) => this.getDsoUUIDFromUrl(event.url)),
+          hasValueOperator(),
+        ).subscribe((uuid) => {
+          if (this.resultsRD$.value.hasSucceeded) {
+            this.service.trackSearch(this.searchOptions$.value, this.resultsRD$.value.payload as SearchObjects<DSpaceObject>, uuid);
+          }
+        }),
+      );
+    }
   }
 
   /**
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 69500999a8..18b3f46a0a 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -1,39 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
-import { SearchFiltersComponent } from './search-filters/search-filters.component';
-import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
-import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
-import { SearchLabelsComponent } from './search-labels/search-labels.component';
-import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
-import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
-import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
-import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
-import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
-import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
-import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
-import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
-import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
-import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
-import { SearchSettingsComponent } from './search-settings/search-settings.component';
+import { NgModule } from '@angular/core';
+import {
+  MissingTranslationHandler,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { NouisliderModule } from 'ng2-nouislider';
+
 import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
 import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
-import { SearchObjects } from './models/search-objects.model';
+import { SharedModule } from '../shared.module';
+import { MissingTranslationHelper } from '../translate/missing-translation.helper';
+import { AdvancedSearchComponent } from './advanced-search/advanced-search.component';
 import { FacetConfigResponse } from './models/facet-config-response.model';
 import { FacetValues } from './models/facet-values.model';
+import { SearchObjects } from './models/search-objects.model';
 import { SearchResult } from './models/search-result.model';
-import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
-import { MissingTranslationHelper } from '../translate/missing-translation.helper';
-import { SharedModule } from '../shared.module';
-import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
-import { ThemedSearchComponent } from './themed-search.component';
-import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
-import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component';
-import { NouisliderModule } from 'ng2-nouislider';
+import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
+import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
+import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
+import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
+import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
+import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchFiltersComponent } from './search-filters/search-filters.component';
 import { ThemedSearchFiltersComponent } from './search-filters/themed-search-filters.component';
+import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
+import { SearchLabelsComponent } from './search-labels/search-labels.component';
+import { SearchResultsComponent } from './search-results/search-results.component';
+import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
+import { SearchSettingsComponent } from './search-settings/search-settings.component';
+import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component';
+import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
 import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component';
+import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
+import { ThemedSearchComponent } from './themed-search.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -60,6 +65,7 @@ const COMPONENTS = [
   ThemedConfigurationSearchPageComponent,
   ThemedSearchResultsComponent,
   ThemedSearchSettingsComponent,
+  AdvancedSearchComponent,
   ThemedSearchFiltersComponent,
   ThemedSearchSidebarComponent,
 ];
@@ -83,25 +89,25 @@ export const MODELS = [
   SearchObjects,
   FacetConfigResponse,
   FacetValues,
-  SearchResult
+  SearchResult,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     TranslateModule.forChild({
       missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
-      useDefaultLang: true
+      useDefaultLang: true,
     }),
     SharedModule.withEntryComponents(),
     NouisliderModule,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 export class SearchModule {
   /**
@@ -111,7 +117,7 @@ export class SearchModule {
   static withEntryComponents() {
     return {
       ngModule: SearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/shared/search/search.utils.spec.ts b/src/app/shared/search/search.utils.spec.ts
index 70bf9a43a0..1689fa4cbb 100644
--- a/src/app/shared/search/search.utils.spec.ts
+++ b/src/app/shared/search/search.utils.spec.ts
@@ -4,7 +4,7 @@ import {
   addOperatorToFilterValue,
   escapeRegExp,
   getFacetValueForType,
-  stripOperatorFromFilterValue
+  stripOperatorFromFilterValue,
 } from './search.utils';
 
 describe('Search Utils', () => {
@@ -19,20 +19,20 @@ describe('Search Utils', () => {
         value: 'Value with search href',
         _links: {
           search: {
-            href: 'rest/api/search?f.otherFacet=Other facet value,operator&f.facetName=Value with search href,operator'
-          }
-        }
+            href: 'rest/api/search?f.otherFacet=Other facet value,operator&f.facetName=Value with search href,operator',
+          },
+        },
       });
       facetValueWithSearchHrefAuthority = Object.assign(new FacetValue(), {
         value: 'Value with search href',
         authorityKey: 'uuid',
-        }
+      },
       );
       facetValueWithoutSearchHref = Object.assign(new FacetValue(), {
-        value: 'Value without search href'
+        value: 'Value without search href',
       });
       searchFilterConfig = Object.assign(new SearchFilterConfig(), {
-        name: 'facetName'
+        name: 'facetName',
       });
     });
 
diff --git a/src/app/shared/search/search.utils.ts b/src/app/shared/search/search.utils.ts
index cfb96a5285..f2be597d75 100644
--- a/src/app/shared/search/search.utils.ts
+++ b/src/app/shared/search/search.utils.ts
@@ -1,6 +1,6 @@
+import { isNotEmpty } from '../empty.util';
 import { FacetValue } from './models/facet-value.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
-import { isNotEmpty } from '../empty.util';
 
 /**
  * Get a facet's value by matching its parameter in the search href, this will include the operator of the facet value
@@ -49,7 +49,7 @@ export function stripOperatorFromFilterValue(value: string) {
  * @param operator
  */
 export function addOperatorToFilterValue(value: string, operator: string) {
-  if (!value.match(new RegExp(`^.+,(equals|query|authority)$`))) {
+  if (!value.match(new RegExp(`^.+,(equals|query|authority|contains|notcontains|notequals)$`))) {
     return `${value},${operator}`;
   }
   return value;
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index fe531e4f0f..15a3006de4 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -1,25 +1,59 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ThemedComponent } from '../theme-support/themed.component';
-import { SearchComponent } from './search.component';
-import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { SelectionConfig } from './search-results/search-results.component';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { SearchObjects } from './models/search-objects.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchComponent } from './search.component';
+import { SelectionConfig } from './search-results/search-results.component';
+import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
 
 /**
  * Themed wrapper for {@link SearchComponent}
  */
 @Component({
   selector: 'ds-themed-search',
-  styleUrls: [],
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = [
+    'configurationList',
+    'context',
+    'configuration',
+    'fixedFilterQuery',
+    'useCachedVersionIfAvailable',
+    'inPlaceSearch',
+    'linkType',
+    'paginationId',
+    'searchEnabled',
+    'sideBarWidth',
+    'searchFormPlaceholder',
+    'selectable',
+    'selectionConfig',
+    'showCsvExport',
+    'showSidebar',
+    'showThumbnails',
+    'showViewModes',
+    'useUniquePageId',
+    'viewModeList',
+    'showScopeSelector',
+    'trackStatistics',
+    'query',
+    'scope',
+    'hideScopeInUrl',
+    'resultFound',
+    'deselectObject',
+    'selectObject',
+  ];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -51,7 +85,7 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() showSidebar: boolean;
 
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   @Input() showViewModes: boolean;
 
@@ -65,6 +99,10 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() query: string;
 
+  @Input() scope: string;
+
+  @Input() hideScopeInUrl: boolean;
+
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/selector.util.ts b/src/app/shared/selector.util.ts
new file mode 100644
index 0000000000..a0419086c6
--- /dev/null
+++ b/src/app/shared/selector.util.ts
@@ -0,0 +1,31 @@
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { hasValue } from './empty.util';
+
+/**
+ * Export a function to return a subset of the state by key
+ */
+export function keySelector<T, V>(parentSelector, subState: string, key: string): MemoizedSelector<T, V> {
+  return createSelector(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState][key];
+    } else {
+      return undefined;
+    }
+  });
+}
+/**
+ * Export a function to return a subset of the state
+ */
+export function subStateSelector<T, V>(parentSelector, subState: string): MemoizedSelector<T, V> {
+  return createSelector(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState];
+    } else {
+      return undefined;
+    }
+  });
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0f7871f7f9..7362451676 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,8 +1,11 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { DragDropModule } from '@angular/cdk/drag-drop';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { RouterModule } from '@angular/router';
 import {
   NgbDropdownModule,
   NgbNavModule,
@@ -10,280 +13,185 @@ import {
   NgbTooltipModule,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap';
-import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
+import {
+  MissingTranslationHandler,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
-import {
-  ExportMetadataSelectorComponent
-} from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import {
-  ExportBatchSelectorComponent
-} from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
-import {
-  ImportBatchSelectorComponent
-} from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
-import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
-import { EnumKeysPipe } from './utils/enum-keys-pipe';
-import { FileSizePipe } from './utils/file-size-pipe';
-import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
-import { SafeUrlPipe } from './utils/safe-url-pipe';
-import { ConsolePipe } from './utils/console.pipe';
-import {
-  CollectionListElementComponent
-} from './object-list/collection-list-element/collection-list-element.component';
-import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
-import {
-  SearchResultListElementComponent
-} from './object-list/search-result-list-element/search-result-list-element.component';
-import { ObjectListComponent } from './object-list/object-list.component';
-import { ThemedObjectListComponent } from './object-list/themed-object-list.component';
-import {
-  CollectionGridElementComponent
-} from './object-grid/collection-grid-element/collection-grid-element.component';
-import { CommunityGridElementComponent } from './object-grid/community-grid-element/community-grid-element.component';
-import {
-  AbstractListableElementComponent
-} from './object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ObjectGridComponent } from './object-grid/object-grid.component';
-import { ObjectCollectionComponent } from './object-collection/object-collection.component';
-import { ErrorComponent } from './error/error.component';
-import { LoadingComponent } from './loading/loading.component';
-import { PaginationComponent } from './pagination/pagination.component';
-import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
-import { ThemedThumbnailComponent } from '../thumbnail/themed-thumbnail.component';
-import { SearchFormComponent } from './search-form/search-form.component';
-import { ThemedSearchFormComponent } from './search-form/themed-search-form.component';
-import {
-  SearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/search-result-grid-element.component';
-import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
-import { VarDirective } from './utils/var.directive';
-import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
-import { ThemedAuthNavMenuComponent } from './auth-nav-menu/themed-auth-nav-menu.component';
-import { LogOutComponent } from './log-out/log-out.component';
-import { DragClickDirective } from './utils/drag-click.directive';
-import { TruncatePipe } from './utils/truncate.pipe';
-import { TruncatableComponent } from './truncatable/truncatable.component';
-import { TruncatableService } from './truncatable/truncatable.service';
-import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
-import { MockAdminGuard } from './mocks/admin-guard.service.mock';
-import { AlertComponent } from './alert/alert.component';
-import {
-  SearchResultDetailElementComponent
-} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
-import { ObjectDetailComponent } from './object-detail/object-detail.component';
-import { ObjNgFor } from './utils/object-ngfor.pipe';
-import {
-  BrowseEntryListElementComponent
-} from './object-list/browse-entry-list-element/browse-entry-list-element.component';
-import { DebounceDirective } from './utils/debounce.directive';
-import { ClickOutsideDirective } from './utils/click-outside.directive';
-import { EmphasizePipe } from './utils/emphasize.pipe';
-import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
-import { CapitalizePipe } from './utils/capitalize.pipe';
-import { ObjectKeysPipe } from './utils/object-keys-pipe';
-import { LangSwitchComponent } from './lang-switch/lang-switch.component';
-import {
-  PlainTextMetadataListElementComponent
-} from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
-import {
-  BrowseLinkMetadataListElementComponent
-} from './object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
-import {
-  ItemMetadataListElementComponent
-} from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
-import {
-  MetadataRepresentationListElementComponent
-} from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import { ObjectValuesPipe } from './utils/object-values-pipe';
-import { InListValidator } from './utils/in-list-validator.directive';
-import { AutoFocusDirective } from './utils/auto-focus.directive';
-import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
-import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
-import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
-import {
-  CreateCommunityParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import {
-  ThemedCreateCommunityParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
-import {
-  CreateItemParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import {
-  ThemedCreateItemParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import {
-  CreateCollectionParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import {
-  ThemedCreateCollectionParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
-import {
-  CommunitySearchResultListElementComponent
-} from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
-import {
-  CollectionSearchResultListElementComponent
-} from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
-import {
-  EditItemSelectorComponent
-} from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import {
-  ThemedEditItemSelectorComponent
-} from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
-import {
-  EditCommunitySelectorComponent
-} from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import {
-  ThemedEditCommunitySelectorComponent
-} from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
-import {
-  EditCollectionSelectorComponent
-} from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {
-  ThemedEditCollectionSelectorComponent
-} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
-import { RoleDirective } from './roles/role.directive';
-import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
-import {
-  CollectionSearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
-import {
-  CommunitySearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
-import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
-import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
-import {
-  ComcolMetadataComponent
-} from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { ItemSelectComponent } from './object-select/item-select/item-select.component';
-import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
-import {
-  FilterInputSuggestionsComponent
-} from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
-import {
-  DsoInputSuggestionsComponent
-} from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
-import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import { TypeBadgeComponent } from './object-collection/shared/badges/type-badge/type-badge.component';
-import { AccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/access-status-badge.component';
-import {
-  MetadataRepresentationLoaderComponent
-} from './metadata-representation/metadata-representation-loader.component';
-import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
-import {
-  ListableObjectComponentLoaderComponent
-} from './object-collection/shared/listable-object/listable-object-component-loader.component';
-import {
-  ItemSearchResultListElementComponent
-} from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
-import {
-  ItemMetadataRepresentationListElementComponent
-} from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
-import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
-import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
-import {
-  SelectableListItemControlComponent
-} from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
-import {
-  ImportableListItemControlComponent
-} from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
-import { LogInContainerComponent } from './log-in/container/log-in-container.component';
-import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
-import { LogInComponent } from './log-in/log-in.component';
-import { MissingTranslationHelper } from './translate/missing-translation.helper';
-import { FileValidator } from './utils/require-file.validator';
-import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
-import {
-  ModifyItemOverviewComponent
-} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
-import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
-import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
-import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
-import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
-import { ThemedFileDownloadLinkComponent } from './file-download-link/themed-file-download-link.component';
-import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
-import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
+import { NgxPaginationModule } from 'ngx-pagination';
+
+import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
+import { QualityAssuranceEventDataService } from '../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceSourceDataService } from '../core/notifications/qa/source/quality-assurance-source-data.service';
 import { CurationFormComponent } from '../curation-form/curation-form.component';
-import {
-  PublicationSidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
-import {
-  SidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
-import {
-  CollectionSidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
-import {
-  CommunitySidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
-import {
-  BundleListElementComponent
-} from './object-list/bundle-list-element/bundle-list-element.component';
-import {
-  AuthorizedCollectionSelectorComponent
-} from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
-import { HoverClassDirective } from './hover-class.directive';
-import {
-  ValidationSuggestionsComponent
-} from './input-suggestions/validation-suggestions/validation-suggestions.component';
-import {
-  ItemSearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
+import { ModifyItemOverviewComponent } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
+import { ItemPageTitleFieldComponent } from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+import { ThemedItemPageTitleFieldComponent } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
 import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
 import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
-import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
-import { DsSelectComponent } from './ds-select/ds-select.component';
+import { ThemedThumbnailComponent } from '../thumbnail/themed-thumbnail.component';
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
+import { DynamicComponentLoaderDirective } from './abstract-component-loader/dynamic-component-loader.directive';
+import { AlertComponent } from './alert/alert.component';
+import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
+import { ThemedAuthNavMenuComponent } from './auth-nav-menu/themed-auth-nav-menu.component';
+import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
+import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
+import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
+import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
+import { ComcolMetadataComponent } from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 import { ContextHelpDirective } from './context-help.directive';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
-import { RSSComponent } from './rss-feed/rss.component';
-import { BrowserOnlyPipe } from './utils/browser-only.pipe';
-import { ThemedLoadingComponent } from './loading/themed-loading.component';
-import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
-import {
-  ItemPageTitleFieldComponent
-} from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
-import { MarkdownPipe } from './utils/markdown.pipe';
-import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
-import { MenuModule } from './menu/menu.module';
-import {
-  ListableNotificationObjectComponent
-} from './object-list/listable-notification-object/listable-notification-object.component';
-import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
-import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
-
-import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
-import { BadgesComponent } from './object-collection/shared/badges/badges.component';
-import { ThemedBadgesComponent } from './object-collection/shared/badges/themed-badges.component';
-import { ThemedStatusBadgeComponent } from './object-collection/shared/badges/status-badge/themed-status-badge.component';
-import { ThemedTypeBadgeComponent } from './object-collection/shared/badges/type-badge/themed-type-badge.component';
-import { ThemedMyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component';
-import { ThemedAccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
-import { MyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
-
-import { ShortNumberPipe } from './utils/short-number.pipe';
-import {
-  LogInExternalProviderComponent
-} from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
-import {
-  AdvancedClaimedTaskActionSelectReviewerComponent
-} from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
-import {
-  AdvancedClaimedTaskActionRatingComponent
-} from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
-import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
-import {
-  DsoPageSubscriptionButtonComponent
-} from './dso-page/dso-page-subscription-button/dso-page-subscription-button.component';
+import { DsSelectComponent } from './ds-select/ds-select.component';
+import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
+import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
+import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import { ThemedCreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
+import { CreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import { ThemedCreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
+import { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { ThemedCreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
+import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import { ThemedEditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
+import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import { ThemedEditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
+import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import { ThemedEditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
+import { ExportBatchSelectorComponent } from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { ExportMetadataSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import { ImportBatchSelectorComponent } from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
+import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
 import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
 import { EpersonSearchBoxComponent } from './eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { GroupSearchBoxComponent } from './eperson-group-list/group-search-box/group-search-box.component';
-import {
-  ThemedItemPageTitleFieldComponent
-} from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
+import { ErrorComponent } from './error/error.component';
+import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
+import { ThemedFileDownloadLinkComponent } from './file-download-link/themed-file-download-link.component';
+import { HoverClassDirective } from './hover-class.directive';
+import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
+import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
+import { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
+import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
+import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component';
+import { LangSwitchComponent } from './lang-switch/lang-switch.component';
+import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
+import { LoadingComponent } from './loading/loading.component';
+import { ThemedLoadingComponent } from './loading/themed-loading.component';
+import { LogInContainerComponent } from './log-in/container/log-in-container.component';
+import { LogInComponent } from './log-in/log-in.component';
+import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
+import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
+import { ThemedLogInComponent } from './log-in/themed-log-in.component';
+import { LogOutComponent } from './log-out/log-out.component';
+import { MenuModule } from './menu/menu.module';
+import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataRepresentationLoaderComponent } from './metadata-representation/metadata-representation-loader.component';
+import { MockAdminGuard } from './mocks/admin-guard.service.mock';
+import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
+import { AdvancedClaimedTaskActionRatingComponent } from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
+import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
+import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
+import { NotificationBoxComponent } from './notification-box/notification-box.component';
+import { ObjectCollectionComponent } from './object-collection/object-collection.component';
+import { AccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/access-status-badge.component';
+import { ThemedAccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
+import { BadgesComponent } from './object-collection/shared/badges/badges.component';
+import { MyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+import { ThemedMyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component';
+import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
+import { ThemedStatusBadgeComponent } from './object-collection/shared/badges/status-badge/themed-status-badge.component';
+import { ThemedBadgesComponent } from './object-collection/shared/badges/themed-badges.component';
+import { ThemedTypeBadgeComponent } from './object-collection/shared/badges/type-badge/themed-type-badge.component';
+import { TypeBadgeComponent } from './object-collection/shared/badges/type-badge/type-badge.component';
+import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
+import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
+import { AbstractListableElementComponent } from './object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { AbstractTabulatableElementComponent } from './object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
+import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
+import { TabulatableObjectsDirective } from './object-collection/shared/tabulatable-objects/tabulatable-objects.directive';
+import { TabulatableObjectsLoaderComponent } from './object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component';
+import { SearchResultDetailElementComponent } from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
+import { ObjectDetailComponent } from './object-detail/object-detail.component';
+import { CollectionGridElementComponent } from './object-grid/collection-grid-element/collection-grid-element.component';
+import { CommunityGridElementComponent } from './object-grid/community-grid-element/community-grid-element.component';
+import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { ObjectGridComponent } from './object-grid/object-grid.component';
+import { CollectionSearchResultGridElementComponent } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
+import { CommunitySearchResultGridElementComponent } from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
+import { ItemSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
+import { SearchResultGridElementComponent } from './object-grid/search-result-grid-element/search-result-grid-element.component';
 import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
-import { NgxPaginationModule } from 'ngx-pagination';
+import { BrowseEntryListElementComponent } from './object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
+import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
+import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
+import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
+import { ListableNotificationObjectComponent } from './object-list/listable-notification-object/listable-notification-object.component';
+import { BrowseLinkMetadataListElementComponent } from './object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
+import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
+import { ItemMetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
+import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import { ObjectListComponent } from './object-list/object-list.component';
+import { CollectionSearchResultListElementComponent } from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
+import { CommunitySearchResultListElementComponent } from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
+import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
+import { TabulatableResultListElementsComponent } from './object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
+import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
+import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+import { SidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { ThemedObjectListComponent } from './object-list/themed-object-list.component';
+import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
+import { ItemSelectComponent } from './object-select/item-select/item-select.component';
+import { ObjectTableComponent } from './object-table/object-table.component';
+import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
+import { PaginationComponent } from './pagination/pagination.component';
+import { RoleDirective } from './roles/role.directive';
+import { RSSComponent } from './rss-feed/rss.component';
+import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
+import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
+import { SearchFormComponent } from './search-form/search-form.component';
+import { ThemedSearchFormComponent } from './search-form/themed-search-form.component';
+import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
+import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
+import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
+import { StartsWithLoaderComponent } from './starts-with/starts-with-loader.component';
+import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
+import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
+import { MissingTranslationHelper } from './translate/missing-translation.helper';
+import { TruncatableComponent } from './truncatable/truncatable.component';
+import { TruncatableService } from './truncatable/truncatable.service';
+import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
+import { AutoFocusDirective } from './utils/auto-focus.directive';
+import { BrowserOnlyPipe } from './utils/browser-only.pipe';
+import { CapitalizePipe } from './utils/capitalize.pipe';
+import { ClickOutsideDirective } from './utils/click-outside.directive';
+import { ConsolePipe } from './utils/console.pipe';
+import { DebounceDirective } from './utils/debounce.directive';
+import { DragClickDirective } from './utils/drag-click.directive';
+import { EmphasizePipe } from './utils/emphasize.pipe';
+import { EnumKeysPipe } from './utils/enum-keys-pipe';
+import { FileSizePipe } from './utils/file-size-pipe';
+import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
+import { HasNoValuePipe } from './utils/has-no-value.pipe';
+import { HasValuePipe } from './utils/has-value.pipe';
+import { InListValidator } from './utils/in-list-validator.directive';
+import { IpV4Validator } from './utils/ipV4.validator';
+import { MarkdownPipe } from './utils/markdown.pipe';
+import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
+import { ObjectKeysPipe } from './utils/object-keys-pipe';
+import { ObjNgFor } from './utils/object-ngfor.pipe';
+import { ObjectValuesPipe } from './utils/object-values-pipe';
+import { FileValidator } from './utils/require-file.validator';
+import { SafeUrlPipe } from './utils/safe-url-pipe';
+import { ShortNumberPipe } from './utils/short-number.pipe';
+import { SplitPipe } from './utils/split.pipe';
+import { TruncatePipe } from './utils/truncate.pipe';
+import { VarDirective } from './utils/var.directive';
+import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
 
 const MODULES = [
   CommonModule,
@@ -299,14 +207,14 @@ const MODULES = [
   DragDropModule,
   GoogleRecaptchaModule,
   MenuModule,
-  NgxPaginationModule
+  NgxPaginationModule,
 ];
 
 const ROOT_MODULES = [
   TranslateModule.forChild({
     missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
-    useDefaultLang: true
-  })
+    useDefaultLang: true,
+  }),
 ];
 
 const PIPES = [
@@ -323,7 +231,10 @@ const PIPES = [
   ObjNgFor,
   BrowserOnlyPipe,
   MarkdownPipe,
-  ShortNumberPipe
+  ShortNumberPipe,
+  SplitPipe,
+  HasValuePipe,
+  HasNoValuePipe,
 ];
 
 const COMPONENTS = [
@@ -332,18 +243,23 @@ const COMPONENTS = [
   AuthNavMenuComponent,
   ThemedAuthNavMenuComponent,
   UserMenuComponent,
+  ThemedUserMenuComponent,
   DsSelectComponent,
   ErrorComponent,
   LangSwitchComponent,
+  ThemedLangSwitchComponent,
   LoadingComponent,
   ThemedLoadingComponent,
   LogInComponent,
+  ThemedLogInComponent,
   LogOutComponent,
   ObjectListComponent,
   ThemedObjectListComponent,
   ObjectDetailComponent,
   ObjectGridComponent,
+  ObjectTableComponent,
   AbstractListableElementComponent,
+  AbstractTabulatableElementComponent,
   ObjectCollectionComponent,
   PaginationComponent,
   RSSComponent,
@@ -376,7 +292,7 @@ const COMPONENTS = [
   ThemedStatusBadgeComponent,
   BadgesComponent,
   ThemedBadgesComponent,
-
+  StartsWithLoaderComponent,
   ItemSelectComponent,
   CollectionSelectComponent,
   MetadataRepresentationLoaderComponent,
@@ -395,7 +311,6 @@ const COMPONENTS = [
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
   ListableNotificationObjectComponent,
-  DsoPageSubscriptionButtonComponent,
   MetadataFieldWrapperComponent,
   ContextHelpWrapperComponent,
   EpersonGroupListComponent,
@@ -410,6 +325,7 @@ const ENTRY_COMPONENTS = [
   CollectionListElementComponent,
   CommunityListElementComponent,
   SearchResultListElementComponent,
+  TabulatableResultListElementsComponent,
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
   CollectionGridElementComponent,
@@ -465,13 +381,17 @@ const ENTRY_COMPONENTS = [
   AdvancedClaimedTaskActionRatingComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  NotificationBoxComponent,
+  TabulatableObjectsLoaderComponent,
 ];
 
 const PROVIDERS = [
   TruncatableService,
   MockAdminGuard,
-  AbstractTrackableComponent
+  AbstractTrackableComponent,
+  QualityAssuranceEventDataService,
+  QualityAssuranceSourceDataService,
 ];
 
 const DIRECTIVES = [
@@ -482,21 +402,21 @@ const DIRECTIVES = [
   InListValidator,
   AutoFocusDirective,
   RoleDirective,
-  MetadataRepresentationDirective,
-  ListableObjectDirective,
-  ClaimedTaskActionsDirective,
   FileValueAccessorDirective,
   FileValidator,
   NgForTrackByIdDirective,
   MetadataFieldValidator,
   HoverClassDirective,
   ContextHelpDirective,
+  DynamicComponentLoaderDirective,
+  IpV4Validator,
+  TabulatableObjectsDirective,
 ];
 
 @NgModule({
   imports: [
     ...MODULES,
-    ...ROOT_MODULES
+    ...ROOT_MODULES,
   ],
   declarations: [
     ...PIPES,
@@ -505,7 +425,7 @@ const DIRECTIVES = [
     ...DIRECTIVES,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   exports: [
     ...MODULES,
@@ -514,7 +434,7 @@ const DIRECTIVES = [
     ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
     TranslateModule,
-  ]
+  ],
 })
 
 /**
@@ -528,7 +448,7 @@ export class SharedModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 9feb6c792e..853258e6dd 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -3,10 +3,12 @@
     <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
          [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
       <div id="{{id}}-sidebar-content"
+           [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
            class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
         <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
       </div>
-      <div class="col-12 col-md-{{12 - sideBarWidth}}">
+      <div class="col-12 col-md-{{12 - sideBarWidth}}"
+           [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
index f04632488c..fd0614858c 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
@@ -1,13 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
 
-import { PageWithSidebarComponent } from './page-with-sidebar.component';
-import { SidebarService } from './sidebar.service';
 import { HostWindowService } from '../host-window.service';
 import { SidebarServiceStub } from '../testing/sidebar-service.stub';
+import { PageWithSidebarComponent } from './page-with-sidebar.component';
+import { SidebarService } from './sidebar.service';
 
 describe('PageWithSidebarComponent', () => {
   let comp: PageWithSidebarComponent;
@@ -19,18 +22,18 @@ describe('PageWithSidebarComponent', () => {
       providers: [
         {
           provide: SidebarService,
-          useClass: SidebarServiceStub
+          useClass: SidebarServiceStub,
         },
         {
           provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
             {
               isXs: observableOf(true),
               isSm: observableOf(false),
-              isXsOrSm: observableOf(true)
-            })
+              isXsOrSm: observableOf(true),
+            }),
         },
       ],
-      declarations: [PageWithSidebarComponent]
+      declarations: [PageWithSidebarComponent],
     }).compileComponents().then(() => {
       fixture = TestBed.createComponent(PageWithSidebarComponent);
       comp = fixture.componentInstance;
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index 63b4a6195c..ad5d28197d 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,10 +1,16 @@
-import { Component, Input, OnInit, TemplateRef } from '@angular/core';
-import { SidebarService } from './sidebar.service';
-import { HostWindowService } from '../host-window.service';
+import {
+  Component,
+  Input,
+  OnInit,
+  TemplateRef,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { pushInOut } from '../animations/push';
 import { map } from 'rxjs/operators';
 
+import { pushInOut } from '../animations/push';
+import { HostWindowService } from '../host-window.service';
+import { SidebarService } from './sidebar.service';
+
 @Component({
   selector: 'ds-page-with-sidebar',
   styleUrls: ['./page-with-sidebar.component.scss'],
@@ -30,7 +36,7 @@ export class PageWithSidebarComponent implements OnInit {
    * The width of the sidebar (bootstrap columns)
    */
   @Input()
-  sideBarWidth = 3;
+    sideBarWidth = 3;
 
   /**
    * Observable for whether or not the sidebar is currently collapsed
@@ -48,7 +54,7 @@ export class PageWithSidebarComponent implements OnInit {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.sidebarClasses = this.isSidebarCollapsed$.pipe(
-      map((isCollapsed) => isCollapsed ? '' : 'active')
+      map((isCollapsed) => isCollapsed ? '' : 'active'),
     );
   }
 
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 0c2a1c05d2..88795be121 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.html
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.html
@@ -1,6 +1,6 @@
 <div class="setting-option mb-3 p-3">
-  <h5><label for="{{id}}">{{label | translate}}</label></h5>
+  <h4><label for="{{id}}">{{label | translate}}</label></h4>
   <select id="{{id}}" class="form-control" (change)="change.emit($event)">
     <ng-content></ng-content>
   </select>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.ts b/src/app/shared/sidebar/sidebar-dropdown.component.ts
index 471d357e25..26460276fe 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.ts
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.ts
@@ -1,4 +1,9 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-sidebar-dropdown',
diff --git a/src/app/shared/sidebar/sidebar-effects.service.ts b/src/app/shared/sidebar/sidebar-effects.service.ts
index f6f99ca0fc..e8a0e76357 100644
--- a/src/app/shared/sidebar/sidebar-effects.service.ts
+++ b/src/app/shared/sidebar/sidebar-effects.service.ts
@@ -1,10 +1,18 @@
-import { map, tap, filter } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  filter,
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { SidebarCollapseAction } from './sidebar.actions';
 import { URLBaser } from '../../core/url-baser/url-baser';
+import { SidebarCollapseAction } from './sidebar.actions';
 
 /**
  * Makes sure that if the user navigates to another route, the sidebar is collapsed
@@ -12,14 +20,14 @@ import { URLBaser } from '../../core/url-baser/url-baser';
 @Injectable()
 export class SidebarEffects {
   private previousPath: string;
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(ROUTER_NAVIGATION),
       filter((action) => this.previousPath !== this.getBaseUrl(action)),
       tap((action) => {
         this.previousPath = this.getBaseUrl(action);
       }),
-      map(() => new SidebarCollapseAction())
+      map(() => new SidebarCollapseAction()),
     ));
 
   constructor(private actions$: Actions) {
diff --git a/src/app/shared/sidebar/sidebar.actions.ts b/src/app/shared/sidebar/sidebar.actions.ts
index f9d243223d..c62a45284f 100644
--- a/src/app/shared/sidebar/sidebar.actions.ts
+++ b/src/app/shared/sidebar/sidebar.actions.ts
@@ -14,7 +14,7 @@ import { type } from '../ngrx/type';
 export const SidebarActionTypes = {
   COLLAPSE: type('dspace/sidebar/COLLAPSE'),
   EXPAND: type('dspace/sidebar/EXPAND'),
-  TOGGLE: type('dspace/sidebar/TOGGLE')
+  TOGGLE: type('dspace/sidebar/TOGGLE'),
 };
 
 /**
diff --git a/src/app/shared/sidebar/sidebar.reducer.spec.ts b/src/app/shared/sidebar/sidebar.reducer.spec.ts
index 76962f60c1..a654b0af18 100644
--- a/src/app/shared/sidebar/sidebar.reducer.spec.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.spec.ts
@@ -1,8 +1,12 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+  SidebarToggleAction,
+} from './sidebar.actions';
 import { sidebarReducer } from './sidebar.reducer';
-import { SidebarCollapseAction, SidebarExpandAction, SidebarToggleAction } from './sidebar.actions';
 
 class NullAction extends SidebarCollapseAction {
   type = null;
@@ -47,6 +51,7 @@ describe('sidebarReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set sidebarCollapsed to false in response to the EXPAND action', () => {
@@ -63,6 +68,10 @@ describe('sidebarReducer', () => {
 
     const action = new SidebarExpandAction();
     sidebarReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of sidebarCollapsed in response to the TOGGLE action', () => {
@@ -82,6 +91,10 @@ describe('sidebarReducer', () => {
 
     const action = new SidebarToggleAction();
     sidebarReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
 });
diff --git a/src/app/shared/sidebar/sidebar.reducer.ts b/src/app/shared/sidebar/sidebar.reducer.ts
index 05e7d38d48..3630e7af8e 100644
--- a/src/app/shared/sidebar/sidebar.reducer.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.ts
@@ -1,4 +1,7 @@
-import { SidebarAction, SidebarActionTypes } from './sidebar.actions';
+import {
+  SidebarAction,
+  SidebarActionTypes,
+} from './sidebar.actions';
 
 /**
  * Interface that represents the state of the sidebar
@@ -8,7 +11,7 @@ export interface SidebarState {
 }
 
 const initialState: SidebarState = {
-  sidebarCollapsed: true
+  sidebarCollapsed: true,
 };
 
 /**
@@ -22,20 +25,20 @@ export function sidebarReducer(state = initialState, action: SidebarAction): Sid
 
     case SidebarActionTypes.COLLAPSE: {
       return Object.assign({}, state, {
-        sidebarCollapsed: true
+        sidebarCollapsed: true,
       });
     }
 
     case SidebarActionTypes.EXPAND: {
       return Object.assign({}, state, {
-        sidebarCollapsed: false
+        sidebarCollapsed: false,
       });
 
     }
 
     case SidebarActionTypes.TOGGLE: {
       return Object.assign({}, state, {
-        sidebarCollapsed: !state.sidebarCollapsed
+        sidebarCollapsed: !state.sidebarCollapsed,
       });
 
     }
diff --git a/src/app/shared/sidebar/sidebar.service.spec.ts b/src/app/shared/sidebar/sidebar.service.spec.ts
index 7cb5efbfd1..f5c1b5c733 100644
--- a/src/app/shared/sidebar/sidebar.service.spec.ts
+++ b/src/app/shared/sidebar/sidebar.service.spec.ts
@@ -1,10 +1,17 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { SidebarService } from './sidebar.service';
-import { AppState } from '../../app.reducer';
-import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { SidebarCollapseAction, SidebarExpandAction } from './sidebar.actions';
+
+import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../host-window.service';
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+} from './sidebar.actions';
+import { SidebarService } from './sidebar.service';
 
 describe('SidebarService', () => {
   let service: SidebarService;
@@ -12,25 +19,25 @@ describe('SidebarService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    pipe: observableOf(true)
+    pipe: observableOf(true),
   });
   const windowService = jasmine.createSpyObj('hostWindowService',
     {
       isXs: observableOf(true),
       isSm: observableOf(false),
-      isXsOrSm: observableOf(true)
+      isXsOrSm: observableOf(true),
     });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
 
       providers: [
         {
-          provide: Store, useValue: store
+          provide: Store, useValue: store,
         },
         {
-          provide: HostWindowService, useValue: windowService
+          provide: HostWindowService, useValue: windowService,
         },
-      ]
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/sidebar/sidebar.service.ts b/src/app/shared/sidebar/sidebar.service.ts
index 8e3bbbf117..0007cbdbb4 100644
--- a/src/app/shared/sidebar/sidebar.service.ts
+++ b/src/app/shared/sidebar/sidebar.service.ts
@@ -1,11 +1,22 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { SidebarState } from './sidebar.reducer';
-import { createSelector, select, Store } from '@ngrx/store';
-import { SidebarCollapseAction, SidebarExpandAction } from './sidebar.actions';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../host-window.service';
-import { map } from 'rxjs/operators';
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+} from './sidebar.actions';
+import { SidebarState } from './sidebar.reducer';
 
 const sidebarStateSelector = (state: AppState) => state.sidebar;
 const sidebarCollapsedSelector = createSelector(sidebarStateSelector, (sidebar: SidebarState) => sidebar.sidebarCollapsed);
@@ -37,9 +48,9 @@ export class SidebarService {
   get isCollapsed(): Observable<boolean> {
     return observableCombineLatest(
       this.isXsOrSm$,
-      this.isCollapsedInStore
+      this.isCollapsedInStore,
     ).pipe(
-      map(([mobile, store]) => mobile ? store : true)
+      map(([mobile, store]) => mobile ? store : true),
     );
   }
 
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
index 2407f21fdf..7b54bf1edb 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
@@ -1,56 +1,59 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { StartsWithDateComponent } from './starts-with-date.component';
-import { ActivatedRouteStub } from '../../testing/active-router.stub';
-import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
-import { RouterStub } from '../../testing/router.stub';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { StartsWithDateComponent } from './starts-with-date.component';
 
 describe('StartsWithDateComponent', () => {
   let comp: StartsWithDateComponent;
   let fixture: ComponentFixture<StartsWithDateComponent>;
-  let route: ActivatedRoute;
-  let router: Router;
-  let paginationService;
+
+  let route: ActivatedRouteStub;
+  let paginationService: PaginationServiceStub;
+  let router: RouterStub;
 
   const options = [2019, 2018, 2017, 2016, 2015];
 
-  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({}),
-    queryParams: observableOf({})
-  });
+  beforeEach(waitForAsync(async () => {
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
+    paginationService = new PaginationServiceStub();
 
-  paginationService = new PaginationServiceStub();
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [StartsWithDateComponent, EnumKeysPipe],
       providers: [
-        { provide: 'startsWithOptions', useValue: options },
-        { provide: 'paginationId', useValue: 'page-id' },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ActivatedRoute, useValue: route },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterStub() }
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartsWithDateComponent);
     comp = fixture.componentInstance;
+    comp.paginationId = 'page-id';
+    comp.startsWithOptions = options;
     fixture.detectChanges();
-    route = (comp as any).route;
-    router = (comp as any).router;
   });
 
   it('should create a FormGroup containing a startsWith FormControl', () => {
@@ -98,7 +101,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
 
     it('should automatically fill in the input field', () => {
@@ -120,7 +123,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
       });
 
       it('should automatically fill in the input field', () => {
@@ -144,7 +147,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
       });
 
       it('should automatically fill in the input field', () => {
@@ -156,10 +159,6 @@ describe('StartsWithDateComponent', () => {
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = '2015';
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
 
     beforeEach(() => {
       form = fixture.debugElement.query(By.css('form'));
@@ -173,7 +172,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
   });
 
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.ts b/src/app/shared/starts-with/date/starts-with-date.component.ts
index 89d9361b6a..bcb3dfbcdd 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,10 +1,14 @@
-import { Component, Inject } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
-import { renderStartsWithFor, StartsWithType } from '../starts-with-decorator';
-import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
 import { hasValue } from '../../empty.util';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../starts-with-decorator';
 
 /**
  * A switchable component rendering StartsWith options for the type "Date".
@@ -13,10 +17,10 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
 @Component({
   selector: 'ds-starts-with-date',
   styleUrls: ['./starts-with-date.component.scss'],
-  templateUrl: './starts-with-date.component.html'
+  templateUrl: './starts-with-date.component.html',
 })
 @renderStartsWithFor(StartsWithType.date)
-export class StartsWithDateComponent extends StartsWithAbstractComponent {
+export class StartsWithDateComponent extends StartsWithAbstractComponent implements OnInit {
 
   /**
    * A list of options for months to select from
@@ -33,14 +37,6 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
    */
   startsWithYear: number;
 
-  public constructor(@Inject('startsWithOptions') public startsWithOptions: any[],
-                     @Inject('paginationId') public paginationId: string,
-                     protected paginationService: PaginationService,
-                     protected route: ActivatedRoute,
-                     protected router: Router) {
-    super(startsWithOptions, paginationId, paginationService, route, router);
-  }
-
   ngOnInit() {
     this.monthOptions = [
       'none',
@@ -55,7 +51,7 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
       'september',
       'october',
       'november',
-      'december'
+      'december',
     ];
 
     super.ngOnInit();
@@ -133,13 +129,6 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
     }
   }
 
-  /**
-   * Get startsWithYear as a number;
-   */
-  getStartsWithYear() {
-    return this.startsWithYear;
-  }
-
   /**
    * Get startsWithMonth as a number;
    */
diff --git a/src/app/shared/starts-with/starts-with-abstract.component.ts b/src/app/shared/starts-with/starts-with-abstract.component.ts
index ad9c56c970..35efe312aa 100644
--- a/src/app/shared/starts-with/starts-with-abstract.component.ts
+++ b/src/app/shared/starts-with/starts-with-abstract.component.ts
@@ -1,18 +1,38 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Subscription } from 'rxjs';
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { hasValue } from '../empty.util';
+
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { hasValue } from '../empty.util';
+import { StartsWithType } from './starts-with-decorator';
 
 /**
  * An abstract component to render StartsWith options
  */
 @Component({
   selector: 'ds-start-with-abstract',
-  template: ''
+  template: '',
 })
 export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
+
+  @Input() paginationId: string;
+
+  @Input() startsWithOptions: (string | number)[];
+
+  @Input() type: StartsWithType;
+
   /**
    * The currently selected startsWith in string format
    */
@@ -28,11 +48,11 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
-  public constructor(@Inject('startsWithOptions') public startsWithOptions: any[],
-                     @Inject('paginationId') public paginationId: string,
-                     protected paginationService: PaginationService,
-                     protected route: ActivatedRoute,
-                     protected router: Router) {
+  public constructor(
+    protected paginationService: PaginationService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+  ) {
   }
 
   ngOnInit(): void {
@@ -41,10 +61,10 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
         if (hasValue(params.startsWith)) {
           this.setStartsWith(params.startsWith);
         }
-      })
+      }),
     );
     this.formData = new UntypedFormGroup({
-      startsWith: new UntypedFormControl()
+      startsWith: new UntypedFormControl(),
     });
   }
 
@@ -55,15 +75,6 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
     return this.startsWith;
   }
 
-  /**
-   * Set the startsWith by event
-   * @param event
-   */
-  setStartsWithEvent(event: Event) {
-    this.startsWith = (event.target as HTMLInputElement).value;
-    this.setStartsWithParam();
-  }
-
   /**
    * Set the startsWith by string
    * @param startsWith
@@ -80,11 +91,11 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
       this.startsWith = undefined;
     }
     if (resetPage) {
-      this.paginationService.updateRoute(this.paginationId, {page: 1}, { startsWith: this.startsWith });
+      this.paginationService.updateRoute(this.paginationId, { page: 1 }, { startsWith: this.startsWith });
     } else {
-      this.router.navigate([], {
+      void this.router.navigate([], {
         queryParams: Object.assign({ startsWith: this.startsWith }),
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     }
   }
diff --git a/src/app/shared/starts-with/starts-with-decorator.spec.ts b/src/app/shared/starts-with/starts-with-decorator.spec.ts
index 0ba72d8ac4..c5eac51ffc 100644
--- a/src/app/shared/starts-with/starts-with-decorator.spec.ts
+++ b/src/app/shared/starts-with/starts-with-decorator.spec.ts
@@ -1,4 +1,7 @@
-import { renderStartsWithFor, StartsWithType } from './starts-with-decorator';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from './starts-with-decorator';
 
 describe('BrowseByStartsWithDecorator', () => {
   const textDecorator = renderStartsWithFor(StartsWithType.text);
diff --git a/src/app/shared/starts-with/starts-with-loader.component.spec.ts b/src/app/shared/starts-with/starts-with-loader.component.spec.ts
new file mode 100644
index 0000000000..e8c6cd2be9
--- /dev/null
+++ b/src/app/shared/starts-with/starts-with-loader.component.spec.ts
@@ -0,0 +1,82 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../testing/active-router.stub';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import { ThemeService } from '../theme-support/theme.service';
+import { StartsWithType } from './starts-with-decorator';
+import { StartsWithLoaderComponent } from './starts-with-loader.component';
+import { StartsWithTextComponent } from './text/starts-with-text.component';
+
+describe('StartsWithLoaderComponent', () => {
+  let comp: StartsWithLoaderComponent;
+  let fixture: ComponentFixture<StartsWithLoaderComponent>;
+
+  let paginationService: PaginationServiceStub;
+  let route: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  const type: StartsWithType = StartsWithType.text;
+
+  beforeEach(waitForAsync(() => {
+    paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    themeService = getMockThemeService('dspace');
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        StartsWithLoaderComponent,
+        StartsWithTextComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ThemeService, useValue: themeService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(StartsWithLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [StartsWithTextComponent],
+      },
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(StartsWithLoaderComponent);
+    comp = fixture.componentInstance;
+    comp.type = type;
+    comp.paginationId = 'bbm';
+    comp.startsWithOptions = [];
+    spyOn(comp, 'getComponent').and.returnValue(StartsWithTextComponent);
+
+    fixture.detectChanges();
+  }));
+
+  describe('When the component is rendered', () => {
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/shared/starts-with/starts-with-loader.component.ts b/src/app/shared/starts-with/starts-with-loader.component.ts
new file mode 100644
index 0000000000..663c5e8401
--- /dev/null
+++ b/src/app/shared/starts-with/starts-with-loader.component.ts
@@ -0,0 +1,40 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component';
+import { StartsWithAbstractComponent } from './starts-with-abstract.component';
+import {
+  getStartsWithComponent,
+  StartsWithType,
+} from './starts-with-decorator';
+
+/**
+ * Component for loading a {@link StartsWithAbstractComponent} depending on the "type" input
+ */
+@Component({
+  selector: 'ds-starts-with-loader',
+  templateUrl: '../abstract-component-loader/abstract-component-loader.component.html',
+})
+export class StartsWithLoaderComponent extends AbstractComponentLoaderComponent<StartsWithAbstractComponent> {
+
+  @Input() paginationId: string;
+
+  @Input() startsWithOptions: (string | number)[];
+
+  @Input() type: StartsWithType;
+
+  protected inputNames: (keyof this & string)[] = [
+    ...this.inputNames,
+    'paginationId',
+    'startsWithOptions',
+    'type',
+  ];
+
+  public getComponent(): GenericConstructor<StartsWithAbstractComponent> {
+    return getStartsWithComponent(this.type);
+  }
+
+}
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
index b717c72d76..94fccce55f 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
@@ -1,46 +1,59 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { StartsWithTextComponent } from './starts-with-text.component';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { StartsWithTextComponent } from './starts-with-text.component';
 
 describe('StartsWithTextComponent', () => {
   let comp: StartsWithTextComponent;
   let fixture: ComponentFixture<StartsWithTextComponent>;
-  let route: ActivatedRoute;
-  let router: Router;
+
+  let paginationService: PaginationServiceStub;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
 
   const options = ['0-9', 'A', 'B', 'C'];
 
-  const paginationService = new PaginationServiceStub();
+  beforeEach(waitForAsync(async () => {
+    paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [StartsWithTextComponent, EnumKeysPipe],
       providers: [
-        { provide: 'startsWithOptions', useValue: options },
-        { provide: 'paginationId', useValue: 'page-id' },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartsWithTextComponent);
     comp = fixture.componentInstance;
+    comp.paginationId = 'page-id';
+    comp.startsWithOptions = options;
     fixture.detectChanges();
-    route = (comp as any).route;
-    router = (comp as any).router;
-    spyOn(router, 'navigate');
   });
 
   it('should create a FormGroup containing a startsWith FormControl', () => {
@@ -63,7 +76,7 @@ describe('StartsWithTextComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
   });
 
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.ts b/src/app/shared/starts-with/text/starts-with-text.component.ts
index 9f44fc4d40..0f29f932ad 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
-import { renderStartsWithFor, StartsWithType } from '../starts-with-decorator';
-import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+
 import { hasValue } from '../../empty.util';
+import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../starts-with-decorator';
 
 /**
  * A switchable component rendering StartsWith options for the type "Text".
@@ -9,7 +13,7 @@ import { hasValue } from '../../empty.util';
 @Component({
   selector: 'ds-starts-with-text',
   styleUrls: ['./starts-with-text.component.scss'],
-  templateUrl: './starts-with-text.component.html'
+  templateUrl: './starts-with-text.component.html',
 })
 @renderStartsWithFor(StartsWithType.text)
 export class StartsWithTextComponent extends StartsWithAbstractComponent {
@@ -35,15 +39,4 @@ export class StartsWithTextComponent extends StartsWithAbstractComponent {
     super.setStartsWithParam(resetPage);
   }
 
-  /**
-   * Checks whether the provided option is equal to the current startsWith
-   * @param option
-   */
-  isSelectedOption(option: string): boolean {
-    if (this.startsWith === '0' && option === '0-9') {
-      return true;
-    }
-    return option === this.startsWith;
-  }
-
 }
diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/shared/subscriptions/models/subscription.model.ts
index b460a0418f..cf3ea645dd 100644
--- a/src/app/shared/subscriptions/models/subscription.model.ts
+++ b/src/app/shared/subscriptions/models/subscription.model.ts
@@ -1,14 +1,21 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 
-import { link, typedObject } from '../../../core/cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../../../core/cache/builders/build-decorators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPERSON } from '../../../core/eperson/models/eperson.resource-type';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSPACE_OBJECT } from '../../../core/shared/dspace-object.resource-type';
 import { HALLink } from '../../../core/shared/hal-link.model';
 import { SUBSCRIPTION } from './subscription.resource-type';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { EPERSON } from '../../../core/eperson/models/eperson.resource-type';
-import { DSPACE_OBJECT } from '../../../core/shared/dspace-object.resource-type';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -37,7 +44,7 @@ export class Subscription extends DSpaceObject {
    * The {@link HALLink}s for this Subscription
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     eperson: HALLink;
     resource: HALLink;
@@ -48,14 +55,14 @@ export class Subscription extends DSpaceObject {
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The logo for this Community
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(DSPACE_OBJECT)
-  resource?: Observable<RemoteData<DSpaceObject>>;
+    resource?: Observable<RemoteData<DSpaceObject>>;
   /**
    * The embedded ePerson & dSpaceObject for this Subscription
    */
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 287175bfa1..4894d66de3 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -38,7 +38,7 @@
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
-      <span *ngIf="!(processing$ | async)">
+      <span *ngIf="(processing$ | async) !== true">
         {{'subscriptions.modal.new-subscription-form.submit' | translate}}
       </span>
     </button>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
index 992e0de18d..b069b1efd1 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
@@ -1,22 +1,42 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { UntypedFormControl, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { SubscriptionModalComponent } from './subscription-modal.component';
+import { AuthService } from '../../../core/auth/auth.service';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Item } from '../../../core/shared/item.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { SubscriptionsDataService } from '../subscriptions-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Item } from '../../../core/shared/item.model';
-import { AuthService } from '../../../core/auth/auth.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { By } from '@angular/platform-browser';
-import { subscriptionMock, subscriptionMock2 } from '../../testing/subscriptions-data.mock';
+import {
+  subscriptionMock,
+  subscriptionMock2,
+} from '../../testing/subscriptions-data.mock';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+import { SubscriptionModalComponent } from './subscription-modal.component';
 
 describe('SubscriptionModalComponent', () => {
   let component: SubscriptionModalComponent;
@@ -32,13 +52,13 @@ describe('SubscriptionModalComponent', () => {
 
   const emptyPageInfo = Object.assign(new PageInfo(), {
     'elementsPerPage': 0,
-    'totalElements': 0
+    'totalElements': 0,
   });
 
 
   const pageInfo = Object.assign(new PageInfo(), {
     'elementsPerPage': 2,
-    'totalElements': 2
+    'totalElements': 2,
   });
 
   const mockEperson = Object.assign(new EPerson(), {
@@ -46,9 +66,9 @@ describe('SubscriptionModalComponent', () => {
     uuid: 'fake-id',
     _links: {
       self: {
-        href: 'https://localhost:8000/eperson/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/eperson/fake-id',
+      },
+    },
   });
 
   const mockItem = Object.assign(new Item(), {
@@ -58,13 +78,13 @@ describe('SubscriptionModalComponent', () => {
     lastModified: '2018',
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
   const authService = jasmine.createSpyObj('authService', {
-    getAuthenticatedUserFromStore: createSuccessfulRemoteDataObject$(mockEperson)
+    getAuthenticatedUserFromStore: createSuccessfulRemoteDataObject$(mockEperson),
   });
 
   subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', {
@@ -83,8 +103,8 @@ describe('SubscriptionModalComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [SubscriptionModalComponent],
@@ -95,8 +115,8 @@ describe('SubscriptionModalComponent', () => {
         { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
   }));
@@ -127,7 +147,7 @@ describe('SubscriptionModalComponent', () => {
           frequencies: new UntypedFormGroup({
             f: new UntypedFormControl(false),
             g: new UntypedFormControl(true),
-          })
+          }),
         });
         component.subscriptionForm.addControl(t, formGroup);
         component.subscriptionForm.get('test1').markAsDirty();
@@ -150,7 +170,7 @@ describe('SubscriptionModalComponent', () => {
           frequencies: new UntypedFormGroup({
             f: new UntypedFormControl(false),
             g: new UntypedFormControl(true),
-          })
+          }),
         });
         component.subscriptionForm.addControl(t, formGroup);
         component.subscriptionForm.get('test1').markAsDirty();
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 2413aad36e..0eb17ef835 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -1,28 +1,52 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
-
-import { BehaviorSubject, combineLatest, from, shareReplay } from 'rxjs';
-import { map, mergeMap, take, tap } from 'rxjs/operators';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import findIndex from 'lodash/findIndex';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from,
+  shareReplay,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { Subscription } from '../models/subscription.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SubscriptionsDataService } from '../subscriptions-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { AuthService } from '../../../core/auth/auth.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
 import { isNotEmpty } from '../../empty.util';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
 
 @Component({
   selector: 'ds-subscription-modal',
   templateUrl: './subscription-modal.component.html',
-  styleUrls: ['./subscription-modal.component.scss']
+  styleUrls: ['./subscription-modal.component.scss'],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
@@ -103,7 +127,7 @@ export class SubscriptionModalComponent implements OnInit {
     this.authService.getAuthenticatedUserFromStore().pipe(
       take(1),
       map((ePerson) => ePerson.uuid),
-      shareReplay(),
+      shareReplay({ refCount: false }),  // todo: check if this is ok
     ).subscribe((ePersonId: string) => {
       this.ePersonId = ePersonId;
       if (isNotEmpty(this.subscription)) {
@@ -115,7 +139,7 @@ export class SubscriptionModalComponent implements OnInit {
 
     this.subscriptionForm.valueChanges.subscribe((newValue) => {
       let anyFrequencySelected = false;
-      for (let f of this.frequencyDefaultValues) {
+      for (const f of this.frequencyDefaultValues) {
         anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f];
       }
       this.isValid = anyFrequencySelected;
@@ -124,11 +148,11 @@ export class SubscriptionModalComponent implements OnInit {
 
   initFormByAllSubscriptions(): void {
     this.subscriptionForm = new UntypedFormGroup({});
-    for (let t of this.subscriptionDefaultTypes) {
+    for (const t of this.subscriptionDefaultTypes) {
       const formGroup = new UntypedFormGroup({});
       formGroup.addControl('subscriptionId', this.formBuilder.control(''));
       formGroup.addControl('frequencies', this.formBuilder.group({}));
-      for (let f of this.frequencyDefaultValues) {
+      for (const f of this.frequencyDefaultValues) {
         (formGroup.controls.frequencies as UntypedFormGroup).addControl(f, this.formBuilder.control(false));
       }
       this.subscriptionForm.addControl(t, formGroup);
@@ -145,13 +169,13 @@ export class SubscriptionModalComponent implements OnInit {
     formGroup.addControl('subscriptionId', this.formBuilder.control(this.subscription.id));
     formGroup.addControl('frequencies', this.formBuilder.group({}));
     (formGroup.get('frequencies') as UntypedFormGroup).addValidators(Validators.required);
-    for (let f of this.frequencyDefaultValues) {
+    for (const f of this.frequencyDefaultValues) {
       const value = findIndex(this.subscription.subscriptionParameterList, ['value', f]) !== -1;
       (formGroup.controls.frequencies as UntypedFormGroup).addControl(f, this.formBuilder.control(value));
     }
 
     this.subscriptionForm = this.formBuilder.group({
-      [this.subscription.subscriptionType]: formGroup
+      [this.subscription.subscriptionType]: formGroup,
     });
   }
 
@@ -167,12 +191,12 @@ export class SubscriptionModalComponent implements OnInit {
       next: (res: PaginatedList<Subscription>) => {
         if (res.pageInfo.totalElements > 0) {
           this.showDeleteInfo$.next(true);
-          for (let subscription of res.page) {
+          for (const subscription of res.page) {
             const type = subscription.subscriptionType;
             const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.get(type) as UntypedFormGroup;
             if (isNotEmpty(subscriptionGroup)) {
               subscriptionGroup.controls.subscriptionId.setValue(subscription.id);
-              for (let parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) {
+              for (const parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) {
                 (subscriptionGroup.controls.frequencies as UntypedFormGroup).controls[parameter.value]?.setValue(true);
               }
             }
@@ -180,9 +204,9 @@ export class SubscriptionModalComponent implements OnInit {
         }
         this.processing$.next(false);
       },
-      error: err => {
+      error: (err: unknown) => {
         this.processing$.next(false);
-      }
+      },
     });
   }
 
@@ -201,7 +225,7 @@ export class SubscriptionModalComponent implements OnInit {
         const body = this.createBody(
           subscriptionGroup.controls.subscriptionId.value,
           subscriptionType,
-          subscriptionGroup.controls.frequencies as UntypedFormGroup
+          subscriptionGroup.controls.frequencies as UntypedFormGroup,
         );
 
         if (isNotEmpty(body.id)) {
@@ -218,7 +242,7 @@ export class SubscriptionModalComponent implements OnInit {
       toBeProcessed.push(from(subscriptionsToBeCreated).pipe(
         mergeMap((subscriptionBody) => {
           return this.subscriptionService.createSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         }),
         tap((res: RemoteData<Subscription>) => {
@@ -228,7 +252,7 @@ export class SubscriptionModalComponent implements OnInit {
           } else {
             this.notificationsService.error(null, this.translate.instant('subscriptions.modal.create.error'));
           }
-        })
+        }),
       ));
     }
 
@@ -236,7 +260,7 @@ export class SubscriptionModalComponent implements OnInit {
       toBeProcessed.push(from(subscriptionsToBeUpdated).pipe(
         mergeMap((subscriptionBody) => {
           return this.subscriptionService.updateSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         }),
         tap((res: RemoteData<Subscription>) => {
@@ -249,7 +273,7 @@ export class SubscriptionModalComponent implements OnInit {
           } else {
             this.notificationsService.error(null, this.translate.instant('subscriptions.modal.update.error'));
           }
-        })
+        }),
       ));
     }
 
@@ -263,16 +287,16 @@ export class SubscriptionModalComponent implements OnInit {
     const body = {
       id: (isNotEmpty(subscriptionId) ? subscriptionId : null),
       subscriptionType: subscriptionType,
-      subscriptionParameterList: []
+      subscriptionParameterList: [],
     };
 
-    for (let frequency of this.frequencyDefaultValues) {
+    for (const frequency of this.frequencyDefaultValues) {
       if (frequencies.value[frequency]) {
         body.subscriptionParameterList.push(
           {
             name: 'frequency',
             value: frequency,
-          }
+          },
         );
       }
     }
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 155304154b..b181bcbef6 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -14,7 +14,7 @@
 <td class="subscription-parameters">
   <ng-container *ngIf="!!subscription">
 		<span *ngFor="let parameterList of subscription.subscriptionParameterList; let i = index">
-			{{ 'subscriptions.frequency.' + parameterList.value  | translate}}<span
+			{{ 'subscriptions.frequency.' + parameterList.value | translate}}<span
       *ngIf="i < subscription.subscriptionParameterList.length-1 ">,</span>
 		</span>
   </ng-container>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
index aefdb5772b..acd764c18d 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
@@ -1,31 +1,42 @@
-import { ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing';
-
 // Import modules
 import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  ComponentFixtureAutoDetect,
+  TestBed,
+} from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { SubscriptionViewComponent } from './subscription-view.component';
-
-// Import mocks
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { findByEPersonAndDsoResEmpty, subscriptionMock } from '../../testing/subscriptions-data.mock';
-
-// Import utils
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { SubscriptionsDataService } from '../subscriptions-data.service';
-import { Subscription } from '../models/subscription.model';
-
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
 import { ITEM } from '../../../core/shared/item.resource-type';
+// Import mocks
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+// Import utils
+import { NotificationsService } from '../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import {
+  findByEPersonAndDsoResEmpty,
+  subscriptionMock,
+} from '../../testing/subscriptions-data.mock';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+import { SubscriptionViewComponent } from './subscription-view.component';
 
 describe('SubscriptionViewComponent', () => {
   let component: SubscriptionViewComponent;
@@ -47,9 +58,9 @@ describe('SubscriptionViewComponent', () => {
     type: ITEM,
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
   beforeEach(async () => {
@@ -63,8 +74,8 @@ describe('SubscriptionViewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ SubscriptionViewComponent ],
@@ -73,9 +84,9 @@ describe('SubscriptionViewComponent', () => {
         { provide: NotificationsService, useValue: NotificationsServiceStub },
         { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 072b8d7828..187a9740d0 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -1,24 +1,31 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Subscription } from '../models/subscription.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import { take } from 'rxjs/operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
-import { hasValue } from '../../empty.util';
-import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
-import { SubscriptionsDataService } from '../subscriptions-data.service';
-import { getCommunityModuleRoute } from '../../../community-page/community-page-routing-paths';
 import { getCollectionModuleRoute } from '../../../collection-page/collection-page-routing-paths';
-import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths';
-import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component';
+import { getCommunityModuleRoute } from '../../../community-page/community-page-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths';
+import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
+import { hasValue } from '../../empty.util';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: '[ds-subscription-view]',
   templateUrl: './subscription-view.component.html',
-  styleUrls: ['./subscription-view.component.scss']
+  styleUrls: ['./subscription-view.component.scss'],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
@@ -82,7 +89,7 @@ export class SubscriptionViewComponent {
   deleteSubscriptionPopup(subscription: Subscription) {
     if (hasValue(subscription.id)) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = this.dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(this.dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-subscription.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-subscription.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-subscription.cancel';
diff --git a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts
index 9c4c69123d..860d3ad5ef 100644
--- a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts
+++ b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts
@@ -1,28 +1,29 @@
-import { SubscriptionsDataService } from './subscriptions-data.service';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { Subscription } from './models/subscription.model';
-import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service';
 import { HttpClient } from '@angular/common/http';
-import { NotificationsService } from '../notifications/notifications.service';
-import { RequestService } from '../../core/data/request.service';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { getMockRequestService } from '../mocks/request.service.mock';
-import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock';
-import { SearchDataImpl } from '../../core/data/base/search-data';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub';
-import { createPaginatedList } from '../testing/utils.test';
 
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service';
+import { RequestService } from '../../core/data/request.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { createPaginatedList } from '../testing/utils.test';
+import { Subscription } from './models/subscription.model';
+import { SubscriptionsDataService } from './subscriptions-data.service';
 
 describe('SubscriptionsDataService', () => {
 
 
   let service: SubscriptionsDataService;
-  let searchData: SearchDataImpl<Subscription>;
 
   let comparator: DSOChangeAnalyzer<Subscription>;
   let http: HttpClient;
@@ -121,11 +122,11 @@ describe('SubscriptionsDataService', () => {
     });
 
     it('should get the subscriptions', () => {
+      spyOn((service as any).searchData, 'searchBy');
       const id = 'test-id';
       const ePersonId = 'test-ePersonId';
-      service.getSubscriptionsByPersonDSO(ePersonId, id).subscribe(() => {
-        expect(searchData.searchBy).toHaveBeenCalled();
-      });
+      service.getSubscriptionsByPersonDSO(ePersonId, id);
+      expect((service as any).searchData.searchBy).toHaveBeenCalled();
     });
 
   });
diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts
index 44e306b529..bc46c86835 100644
--- a/src/app/shared/subscriptions/subscriptions-data.service.ts
+++ b/src/app/shared/subscriptions/subscriptions-data.service.ts
@@ -1,44 +1,52 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { sendRequest } from 'src/app/core/shared/request.operators';
 
-
-import { NotificationsService } from '../notifications/notifications.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
 import { RequestParam } from '../../core/cache/models/request-param.model';
 import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { dataService } from '../../core/data/base/data-service.decorator';
+import { DeleteDataImpl } from '../../core/data/base/delete-data';
+import { FindAllData } from '../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { SearchDataImpl } from '../../core/data/base/search-data';
 import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { CreateRequest, PutRequest } from '../../core/data/request.models';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { RestRequest } from '../../core/data/rest-request.model';
-
+import {
+  CreateRequest,
+  PutRequest,
+} from '../../core/data/request.models';
 import { RequestService } from '../../core/data/request.service';
+import { RestRequest } from '../../core/data/rest-request.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { Subscription } from './models/subscription.model';
-import { dataService } from '../../core/data/base/data-service.decorator';
-import { SUBSCRIPTION } from './models/subscription.resource-type';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { NoContent } from '../../core/shared/NoContent.model';
-import { isNotEmpty, isNotEmptyOperator } from '../empty.util';
-
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { sendRequest } from 'src/app/core/shared/request.operators';
-import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
-import { DeleteDataImpl } from '../../core/data/base/delete-data';
-import { SearchDataImpl } from '../../core/data/base/search-data';
-import { FindAllData } from '../../core/data/base/find-all-data';
+import {
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../empty.util';
+import { NotificationsService } from '../notifications/notifications.service';
 import { followLink } from '../utils/follow-link-config.model';
+import { Subscription } from './models/subscription.model';
+import { SUBSCRIPTION } from './models/subscription.resource-type';
 
 /**
  * Provides methods to retrieve subscription resources from the REST API related CRUD actions.
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 @dataService(SUBSCRIPTION)
 export class SubscriptionsDataService extends IdentifiableDataService<Subscription> {
@@ -75,8 +83,8 @@ export class SubscriptionsDataService extends IdentifiableDataService<Subscripti
     const optionsWithObject = Object.assign(new FindListOptions(), {
       searchParams: [
         new RequestParam('resource', uuid),
-        new RequestParam('eperson_id', eperson)
-      ]
+        new RequestParam('eperson_id', eperson),
+      ],
     });
 
     return this.searchData.searchBy('findByEPersonAndDso', optionsWithObject, false, true);
@@ -156,15 +164,15 @@ export class SubscriptionsDataService extends IdentifiableDataService<Subscripti
   findByEPerson(ePersonId: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Subscription>>> {
     const optionsWithObject = Object.assign(new FindListOptions(), options, {
       searchParams: [
-        new RequestParam('uuid', ePersonId)
-      ]
+        new RequestParam('uuid', ePersonId),
+      ],
     });
 
     // return this.searchData.searchBy(this.findByEpersonLinkPath, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson'));
 
     return this.getEndpoint().pipe(
       map(href => `${href}/search/${this.findByEpersonLinkPath}`),
-      switchMap(href => this.findListByHref(href, optionsWithObject, false, true, followLink('resource'), followLink('eperson')))
+      switchMap(href => this.findListByHref(href, optionsWithObject, false, true, followLink('resource'), followLink('eperson'))),
     );
 
 
diff --git a/src/app/shared/subscriptions/subscriptions.module.ts b/src/app/shared/subscriptions/subscriptions.module.ts
index 122bf5ca8d..bf2cbd8eaa 100644
--- a/src/app/shared/subscriptions/subscriptions.module.ts
+++ b/src/app/shared/subscriptions/subscriptions.module.ts
@@ -1,22 +1,22 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-
-import { SubscriptionViewComponent } from './subscription-view/subscription-view.component';
-import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../shared.module';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SharedModule } from '../shared.module';
+import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component';
+import { SubscriptionViewComponent } from './subscription-view/subscription-view.component';
 
 const COMPONENTS = [
   SubscriptionViewComponent,
-  SubscriptionModalComponent
+  SubscriptionModalComponent,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
@@ -24,11 +24,11 @@ const COMPONENTS = [
     ReactiveFormsModule,
     TranslateModule,
     RouterModule,
-    SharedModule
+    SharedModule,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 export class SubscriptionsModule {
 }
diff --git a/src/app/shared/testing/action.mock.ts b/src/app/shared/testing/action.mock.ts
index e227946f64..fc1e741c20 100644
--- a/src/app/shared/testing/action.mock.ts
+++ b/src/app/shared/testing/action.mock.ts
@@ -2,5 +2,5 @@ import { Action } from '@ngrx/store';
 
 export class ActionMock implements Action {
   type = null;
-  payload: {};
+  payload: unknown;
 }
diff --git a/src/app/shared/testing/active-router.stub.ts b/src/app/shared/testing/active-router.stub.ts
index 495920555b..4d58d61769 100644
--- a/src/app/shared/testing/active-router.stub.ts
+++ b/src/app/shared/testing/active-router.stub.ts
@@ -1,19 +1,24 @@
-import { map } from 'rxjs/operators';
-import { convertToParamMap, Params } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  convertToParamMap,
+  Data,
+  Params,
+} from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 export class ActivatedRouteStub {
 
-  private _testParams?: any;
-  private _testData?: any;
+  private _testParams?: Params;
+  private _testData?: Data;
   // ActivatedRoute.params is Observable
-  private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
-  private dataSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testData);
+  private subject?: BehaviorSubject<Params> = new BehaviorSubject(this.testParams);
+  private dataSubject?: BehaviorSubject<Data> = new BehaviorSubject(this.testData);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
   paramMap = this.subject.asObservable().pipe(map((params: Params) => convertToParamMap(params)));
+  parent: ActivatedRoute | ActivatedRouteStub;
   queryParamMap = this.subject.asObservable().pipe(map((params: Params) => convertToParamMap(params)));
   data = this.dataSubject.asObservable();
 
@@ -35,17 +40,17 @@ export class ActivatedRouteStub {
     return this._testParams;
   }
 
-  set testParams(params: {}) {
+  set testParams(params: Params) {
     this._testParams = params;
     this.subject.next(params);
   }
 
   // Test data
   get testData() {
-    return this._testParams;
+    return this._testData;
   }
 
-  set testData(data: {}) {
+  set testData(data: Data) {
     this._testData = data;
     this.dataSubject.next(data);
   }
diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts
index 0094324518..aeebc08df4 100644
--- a/src/app/shared/testing/auth-request-service.stub.ts
+++ b/src/app/shared/testing/auth-request-service.stub.ts
@@ -1,11 +1,15 @@
-import { Observable, of as observableOf } from 'rxjs';
-import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthStatus } from '../../core/auth/models/auth-status.model';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
+import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { isNotEmpty } from '../empty.util';
-import { EPersonMock } from './eperson.mock';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export class AuthRequestServiceStub {
   protected mockUser: EPerson = EPersonMock;
@@ -33,11 +37,11 @@ export class AuthRequestServiceStub {
             href: 'dspace.org/api/status',
           },
           eperson: {
-            href: this.mockUser._links.self.href
+            href: this.mockUser._links.self.href,
           },
           specialGroups: {
-            href: this.mockUser._links.self.href
-          }
+            href: this.mockUser._links.self.href,
+          },
         };
       } else {
         authStatusStub.authenticated = false;
@@ -51,10 +55,11 @@ export class AuthRequestServiceStub {
   public getRequest(method: string, options?: HttpOptions): Observable<any> {
     const authStatusStub: AuthStatus = new AuthStatus();
     switch (method) {
-      case 'logout':
+      case 'logout': {
         authStatusStub.authenticated = false;
         break;
-      case 'status':
+      }
+      case 'status': {
         const token = ((options.headers as any).lazyUpdate[1]) ? (options.headers as any).lazyUpdate[1].value : null;
         if (this.validateToken(token)) {
           authStatusStub.authenticated = true;
@@ -64,16 +69,17 @@ export class AuthRequestServiceStub {
               href: 'dspace.org/api/status',
             },
             eperson: {
-              href: this.mockUser._links.self.href
+              href: this.mockUser._links.self.href,
             },
             specialGroups: {
-              href: this.mockUser._links.self.href
-            }
+              href: this.mockUser._links.self.href,
+            },
           };
         } else {
           authStatusStub.authenticated = false;
         }
         break;
+      }
     }
     return createSuccessfulRemoteDataObject$(authStatusStub);
   }
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 7f3d040042..5a40e05d1d 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -1,15 +1,20 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthMethod } from '../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../core/auth/models/auth.method-type';
 import { AuthStatus } from '../../core/auth/models/auth-status.model';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
-import { EPersonMock } from './eperson.mock';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { AuthMethod } from '../../core/auth/models/auth.method';
 import { hasValue } from '../empty.util';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
-export const authMethodsMock = [
-  new AuthMethod('password'),
-  new AuthMethod('shibboleth', 'dspace.test/shibboleth')
+export const authMethodsMock: AuthMethod[] = [
+  new AuthMethod(AuthMethodType.Password, 0),
+  new AuthMethod(AuthMethodType.Shibboleth, 1, 'dspace.test/shibboleth'),
 ];
 
 export class AuthServiceStub {
diff --git a/src/app/shared/testing/authorization-service.stub.ts b/src/app/shared/testing/authorization-service.stub.ts
index 253599233e..8e7c0e586f 100644
--- a/src/app/shared/testing/authorization-service.stub.ts
+++ b/src/app/shared/testing/authorization-service.stub.ts
@@ -1,4 +1,8 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 export class AuthorizationDataServiceStub {
diff --git a/src/app/shared/testing/base-data-service.stub.ts b/src/app/shared/testing/base-data-service.stub.ts
index f4b6f25923..3df661ba5b 100644
--- a/src/app/shared/testing/base-data-service.stub.ts
+++ b/src/app/shared/testing/base-data-service.stub.ts
@@ -1,4 +1,8 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
 
 /**
diff --git a/src/app/shared/testing/bitstream-data-service.stub.ts b/src/app/shared/testing/bitstream-data-service.stub.ts
index 5b05109b98..932d20b323 100644
--- a/src/app/shared/testing/bitstream-data-service.stub.ts
+++ b/src/app/shared/testing/bitstream-data-service.stub.ts
@@ -1,8 +1,12 @@
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RemoteData } from '../../core/data/remote-data';
-import { NoContent } from '../../core/shared/NoContent.model';
 import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 
 export class BitstreamDataServiceStub {
 
diff --git a/src/app/shared/testing/browse-definition-data-service.stub.ts b/src/app/shared/testing/browse-definition-data-service.stub.ts
index 8d46fcda00..3bad04b668 100644
--- a/src/app/shared/testing/browse-definition-data-service.stub.ts
+++ b/src/app/shared/testing/browse-definition-data-service.stub.ts
@@ -1,35 +1,43 @@
-import { EMPTY, Observable, of as observableOf } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { BrowseService } from '../../core/browse/browse.service';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
 import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 
 // This data is in post-serialized form (metadata -> metadataKeys)
 export const mockData: BrowseDefinition[] = [
-      Object.assign(new FlatBrowseDefinition(), {
-      'id' : 'dateissued',
-      'browseType': 'flatBrowse',
-      'dataType' : 'date',
-      'sortOptions' : EMPTY,
-      'order' : 'ASC',
-      'type' : 'browse',
-      'metadataKeys' : [ 'dc.date.issued' ],
-      '_links' : EMPTY
-     }),
-     Object.assign(new ValueListBrowseDefinition(), {
-      'id' : 'author',
-      'browseType' : 'valueList',
-      'dataType' : 'text',
-      'sortOptions' : EMPTY,
-      'order' : 'ASC',
-      'type' : 'browse',
-      'metadataKeys' : [ 'dc.contributor.*', 'dc.creator' ],
-      '_links' : EMPTY
-    })
+  Object.assign(new FlatBrowseDefinition(), {
+    'id' : 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType' : 'date',
+    'sortOptions' : EMPTY,
+    'order' : 'ASC',
+    'type' : 'browse',
+    'metadataKeys' : [ 'dc.date.issued' ],
+    '_links' : EMPTY,
+  }),
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id' : 'author',
+    'browseType' : 'valueList',
+    'dataType' : 'text',
+    'sortOptions' : EMPTY,
+    'order' : 'ASC',
+    'type' : 'browse',
+    'metadataKeys' : [ 'dc.contributor.*', 'dc.creator' ],
+    '_links' : EMPTY,
+  }),
 ];
 
 export const BrowseDefinitionDataServiceStub: any = {
@@ -60,6 +68,6 @@ export const BrowseDefinitionDataServiceStub: any = {
     });
     // Return just the first, as a pretend match
     return observableOf(createSuccessfulRemoteDataObject(mockData[0]));
-  }
+  },
 
 };
diff --git a/src/app/shared/testing/browser-only-mock.pipe.ts b/src/app/shared/testing/browser-only-mock.pipe.ts
index 12e5a7b2d7..129f666bb1 100644
--- a/src/app/shared/testing/browser-only-mock.pipe.ts
+++ b/src/app/shared/testing/browser-only-mock.pipe.ts
@@ -1,10 +1,13 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 /**
  * Support dsBrowserOnly in unit tests.
  */
 @Pipe({
-  name: 'dsBrowserOnly'
+  name: 'dsBrowserOnly',
 })
 export class BrowserOnlyMockPipe implements PipeTransform {
   transform(value: string): string | undefined {
diff --git a/src/app/shared/testing/claimed-task-data-service.stub.ts b/src/app/shared/testing/claimed-task-data-service.stub.ts
index 3a9f3d852d..610098a337 100644
--- a/src/app/shared/testing/claimed-task-data-service.stub.ts
+++ b/src/app/shared/testing/claimed-task-data-service.stub.ts
@@ -1,7 +1,11 @@
-import { Observable, EMPTY } from 'rxjs';
-import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
-import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
 import { RemoteData } from '../../core/data/remote-data';
+import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
 
 export class ClaimedTaskDataServiceStub {
 
diff --git a/src/app/shared/testing/configuration-data.service.stub.ts b/src/app/shared/testing/configuration-data.service.stub.ts
new file mode 100644
index 0000000000..66324218f5
--- /dev/null
+++ b/src/app/shared/testing/configuration-data.service.stub.ts
@@ -0,0 +1,15 @@
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+export class ConfigurationDataServiceStub {
+
+  findByPropertyName(_name: string): Observable<RemoteData<ConfigurationProperty>> {
+    const configurationProperty = new ConfigurationProperty();
+    configurationProperty.values = [];
+    return createSuccessfulRemoteDataObject$(configurationProperty);
+  }
+
+}
diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts
index 2f5c647945..b1f1ba6ee2 100644
--- a/src/app/shared/testing/css-variable-service.stub.ts
+++ b/src/app/shared/testing/css-variable-service.stub.ts
@@ -1,4 +1,8 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { KeyValuePair } from '../key-value-pair.model';
 
 const variables = {
diff --git a/src/app/shared/testing/dynamic-form-mock-services.ts b/src/app/shared/testing/dynamic-form-mock-services.ts
index 1cbd470e23..7b8573fd6e 100644
--- a/src/app/shared/testing/dynamic-form-mock-services.ts
+++ b/src/app/shared/testing/dynamic-form-mock-services.ts
@@ -4,5 +4,5 @@ export const mockDynamicFormLayoutService = jasmine.createSpyObj('DynamicFormLay
 });
 
 export const mockDynamicFormValidationService = jasmine.createSpyObj('DynamicFormValidationService', {
-  showErrorMessages: jasmine.createSpy('showErrorMessages')
+  showErrorMessages: jasmine.createSpy('showErrorMessages'),
 });
diff --git a/src/app/shared/testing/eperson.mock.ts b/src/app/shared/testing/eperson.mock.ts
index 370c2ff1b9..002ee9326f 100644
--- a/src/app/shared/testing/eperson.mock.ts
+++ b/src/app/shared/testing/eperson.mock.ts
@@ -13,7 +13,7 @@ export const EPersonMock: EPerson = Object.assign(new EPerson(), {
     self: {
       href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid',
     },
-    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid/groups' }
+    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid/groups' },
   },
   id: 'testid',
   uuid: 'testid',
@@ -22,28 +22,28 @@ export const EPersonMock: EPerson = Object.assign(new EPerson(), {
     'dc.title': [
       {
         language: null,
-        value: 'User Test'
-      }
+        value: 'User Test',
+      },
     ],
     'eperson.firstname': [
       {
         language: null,
-        value: 'User'
-      }
+        value: 'User',
+      },
     ],
     'eperson.lastname': [
       {
         language: null,
-        value: 'Test'
+        value: 'Test',
       },
     ],
     'eperson.language': [
       {
         language: null,
-        value: 'en'
+        value: 'en',
       },
-    ]
-  }
+    ],
+  },
 });
 
 export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
@@ -59,7 +59,7 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
     self: {
       href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2',
     },
-    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2/groups' }
+    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2/groups' },
   },
   id: 'testid2',
   uuid: 'testid2',
@@ -68,26 +68,26 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
     'dc.title': [
       {
         language: null,
-        value: 'User Test 2'
-      }
+        value: 'User Test 2',
+      },
     ],
     'eperson.firstname': [
       {
         language: null,
-        value: 'User2'
-      }
+        value: 'User2',
+      },
     ],
     'eperson.lastname': [
       {
         language: null,
-        value: 'MeepMeep'
+        value: 'MeepMeep',
       },
     ],
     'eperson.language': [
       {
         language: null,
-        value: 'fr'
+        value: 'fr',
       },
-    ]
-  }
+    ],
+  },
 });
diff --git a/src/app/shared/testing/form-event.stub.ts b/src/app/shared/testing/form-event.stub.ts
index 908d0df746..6380a4b2ff 100644
--- a/src/app/shared/testing/form-event.stub.ts
+++ b/src/app/shared/testing/form-event.stub.ts
@@ -1,100 +1,106 @@
-import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { DynamicCheckboxModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  DynamicCheckboxModel,
+  DynamicSelectModel,
+} from '@ng-dynamic-forms/core';
 
 export const accessConditionChangeEvent = {
-    $event: {
-        bubbles: true,
-        cancelBubble: false,
-        cancelable: false,
-        composed: false,
-        currentTarget: null,
-        defaultPrevented: false,
-        eventPhase: 0,
-        isTrusted: true,
-        returnValue: true,
-        timeStamp: 143042.8999999999,
-        type: 'change',
-    },
-    context: null,
-    control: new UntypedFormControl({
-        errors: null,
-        pristine: false,
-        status: 'VALID',
-        statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        touched: true,
-        value: { year: 2021, month: 12, day: 30 },
-        valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        _updateOn: 'change',
-    }),
-    group: new UntypedFormGroup({}),
-    model: new DynamicSelectModel({
-        additional: null,
-        asyncValidators: null,
-        controlTooltip: null,
-        errorMessages: { required: 'submission.sections.upload.form.date-required-until' },
-        hidden: false,
-        hint: null,
-        id: 'endDate',
-        label: 'submission.sections.upload.form.until-label',
-        labelTooltip: null,
-        name: 'endDate',
-        placeholder: 'Until',
-        prefix: null,
-        relations: [],
-        required: true,
-        suffix: null,
-        tabIndex: null,
-        updateOn: null,
-        validators: { required: null },
-    }),
-    type: 'change'
+  $event: {
+    bubbles: true,
+    cancelBubble: false,
+    cancelable: false,
+    composed: false,
+    currentTarget: null,
+    defaultPrevented: false,
+    eventPhase: 0,
+    isTrusted: true,
+    returnValue: true,
+    timeStamp: 143042.8999999999,
+    type: 'change',
+  },
+  context: null,
+  control: new UntypedFormControl({
+    errors: null,
+    pristine: false,
+    status: 'VALID',
+    statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    touched: true,
+    value: { year: 2021, month: 12, day: 30 },
+    valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    _updateOn: 'change',
+  }),
+  group: new UntypedFormGroup({}),
+  model: new DynamicSelectModel({
+    additional: null,
+    asyncValidators: null,
+    controlTooltip: null,
+    errorMessages: { required: 'submission.sections.upload.form.date-required-until' },
+    hidden: false,
+    hint: null,
+    id: 'endDate',
+    label: 'submission.sections.upload.form.until-label',
+    labelTooltip: null,
+    name: 'endDate',
+    placeholder: 'Until',
+    prefix: null,
+    relations: [],
+    required: true,
+    suffix: null,
+    tabIndex: null,
+    updateOn: null,
+    validators: { required: null },
+  }),
+  type: 'change',
 };
 
 
 export const checkboxChangeEvent = {
-    $event: {
-        bubbles: true,
-        cancelBubble: false,
-        cancelable: false,
-        composed: false,
-        currentTarget: null,
-        defaultPrevented: false,
-        eventPhase: 0,
-        isTrusted: true,
-        returnValue: true,
-        timeStamp: 143042.8999999999,
-        type: 'change',
-    },
-    context: null,
-    control: new UntypedFormControl({
-        errors: null,
-        pristine: false,
-        status: 'VALID',
-        statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        touched: true,
-        value: { year: 2021, month: 12, day: 30 },
-        valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        _updateOn: 'change',
-    }),
-    group: new UntypedFormGroup({}),
-    model: new DynamicCheckboxModel({
-        additional: null,
-        asyncValidators: null,
-        controlTooltip: null,
-        errorMessages: null,
-        hidden: false,
-        hint: null,
-        id: 'discoverable',
-        indeterminate: false,
-        label: 'Discoverable',
-        labelPosition: null,
-        labelTooltip: null,
-        name: 'discoverable',
-        relations: [],
-        required: false,
-        tabIndex: null,
-        updateOn: null,
-        validators: { required: null },
-    }),
-    type: 'change'
+  $event: {
+    bubbles: true,
+    cancelBubble: false,
+    cancelable: false,
+    composed: false,
+    currentTarget: null,
+    defaultPrevented: false,
+    eventPhase: 0,
+    isTrusted: true,
+    returnValue: true,
+    timeStamp: 143042.8999999999,
+    type: 'change',
+  },
+  context: null,
+  control: new UntypedFormControl({
+    errors: null,
+    pristine: false,
+    status: 'VALID',
+    statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    touched: true,
+    value: { year: 2021, month: 12, day: 30 },
+    valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    _updateOn: 'change',
+  }),
+  group: new UntypedFormGroup({}),
+  model: new DynamicCheckboxModel({
+    additional: null,
+    asyncValidators: null,
+    controlTooltip: null,
+    errorMessages: null,
+    hidden: false,
+    hint: null,
+    id: 'discoverable',
+    indeterminate: false,
+    label: 'Discoverable',
+    labelPosition: null,
+    labelTooltip: null,
+    name: 'discoverable',
+    relations: [],
+    required: false,
+    tabIndex: null,
+    updateOn: null,
+    validators: { required: null },
+  }),
+  type: 'change',
 };
diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts
index 0d6f924c01..599afaa20d 100644
--- a/src/app/shared/testing/group-mock.ts
+++ b/src/app/shared/testing/group-mock.ts
@@ -1,44 +1,44 @@
 import { Group } from '../../core/eperson/models/group.model';
-import { EPersonMock } from './eperson.mock';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export const GroupMock2: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [],
-    epersons: [],
-    permanent: true,
-    selfRegistered: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/groups/testgroupid2',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/epersons' }
+  handle: null,
+  subgroups: [],
+  epersons: [],
+  permanent: true,
+  selfRegistered: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/groups/testgroupid2',
     },
-    _name: 'testgroupname2',
-    id: 'testgroupid2',
-    uuid: 'testgroupid2',
-    type: 'group',
-    object: createSuccessfulRemoteDataObject$({ name: 'testgroupid2objectName'})
+    subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/epersons' },
+  },
+  _name: 'testgroupname2',
+  id: 'testgroupid2',
+  uuid: 'testgroupid2',
+  type: 'group',
+  object: createSuccessfulRemoteDataObject$({ name: 'testgroupid2objectName' }),
 });
 
 export const GroupMock: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [GroupMock2],
-    epersons: [EPersonMock],
-    selfRegistered: false,
-    permanent: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/groups/testgroupid',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/epersons' }
+  handle: null,
+  subgroups: [GroupMock2],
+  epersons: [EPersonMock],
+  selfRegistered: false,
+  permanent: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/groups/testgroupid',
     },
-    _name: 'testgroupname',
-    id: 'testgroupid',
-    uuid: 'testgroupid',
-    type: 'group',
+    subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/epersons' },
+  },
+  _name: 'testgroupname',
+  id: 'testgroupid',
+  uuid: 'testgroupid',
+  type: 'group',
 });
diff --git a/src/app/shared/testing/hal-endpoint-service.stub.ts b/src/app/shared/testing/hal-endpoint-service.stub.ts
index 753efcdb5d..f53eecb0bb 100644
--- a/src/app/shared/testing/hal-endpoint-service.stub.ts
+++ b/src/app/shared/testing/hal-endpoint-service.stub.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { hasValue } from '../empty.util';
 
 export class HALEndpointServiceStub {
diff --git a/src/app/shared/testing/host-window-service.stub.ts b/src/app/shared/testing/host-window-service.stub.ts
index ecb8c26acb..af1b159026 100644
--- a/src/app/shared/testing/host-window-service.stub.ts
+++ b/src/app/shared/testing/host-window-service.stub.ts
@@ -1,4 +1,9 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { WidthCategory } from '../host-window.service';
 
 // declare a stub service
 export class HostWindowServiceStub {
@@ -20,4 +25,12 @@ export class HostWindowServiceStub {
   isXsOrSm(): Observable<boolean> {
     return this.isXs();
   }
+
+  isMobile(): Observable<boolean> {
+    return this.isXs();
+  }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.isXs();
+  }
 }
diff --git a/src/app/shared/testing/identifiable-data-service.stub.ts b/src/app/shared/testing/identifiable-data-service.stub.ts
index cb4957500e..e8928b568d 100644
--- a/src/app/shared/testing/identifiable-data-service.stub.ts
+++ b/src/app/shared/testing/identifiable-data-service.stub.ts
@@ -1,8 +1,12 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
-import { BaseDataServiceStub } from './base-data-service.stub';
-import { FollowLinkConfig } from '../utils/follow-link-config.model';
-import { Observable, EMPTY } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { BaseDataServiceStub } from './base-data-service.stub';
 
 /**
  * Stub class for {@link IdentifiableDataService}
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index 71ee777157..e2e1118021 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -1,26 +1,30 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { MenuID } from '../menu/menu-id.model';
 import { MenuSection } from '../menu/menu-section.model';
 import { MenuState } from '../menu/menu-state.model';
-import { MenuID } from '../menu/menu-id.model';
 
 export class MenuServiceStub {
   visibleSection1 = {
     id: 'section',
     visible: true,
-    active: false
+    active: false,
   } as any;
   visibleSection2 = {
     id: 'section_2',
-    visible: true
+    visible: true,
   } as any;
   hiddenSection3 = {
     id: 'section_3',
-    visible: false
+    visible: false,
   } as any;
   subSection4 = {
     id: 'section_4',
     visible: true,
-    parentID: 'section1'
+    parentID: 'section1',
   } as any;
 
   toggleMenu(): void { /***/
@@ -53,6 +57,9 @@ export class MenuServiceStub {
   deactivateSection(): void { /***/
   }
 
+  toggleSection(): void { /***/
+  }
+
   addSection(menuID: MenuID, section: MenuSection): void { /***/
   }
 
diff --git a/src/app/shared/testing/ng-component-outlet-directive.stub.ts b/src/app/shared/testing/ng-component-outlet-directive.stub.ts
index 7b413e7443..796f0fdd32 100644
--- a/src/app/shared/testing/ng-component-outlet-directive.stub.ts
+++ b/src/app/shared/testing/ng-component-outlet-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/object-cache-service.stub.ts b/src/app/shared/testing/object-cache-service.stub.ts
new file mode 100644
index 0000000000..d6b21b3922
--- /dev/null
+++ b/src/app/shared/testing/object-cache-service.stub.ts
@@ -0,0 +1,35 @@
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { ObjectCacheEntry } from '../../core/cache/object-cache.reducer';
+
+/* eslint-disable @typescript-eslint/no-empty-function */
+/**
+ * Stub class of {@link ObjectCacheService}
+ */
+export class ObjectCacheServiceStub {
+
+  add(_object: CacheableObject, _msToLive: number, _requestUUID: string, _alternativeLink?: string): void {
+  }
+
+  remove(_href: string): void {
+  }
+
+  getByHref(_href: string): Observable<ObjectCacheEntry> {
+    return observableOf(undefined);
+  }
+
+  hasByHref$(_href: string): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  addDependency(_href$: string | Observable<string>, _dependsOnHref$: string | Observable<string>): void {
+  }
+
+  removeDependents(_href: string): void {
+  }
+
+}
diff --git a/src/app/shared/testing/object-select-service.stub.ts b/src/app/shared/testing/object-select-service.stub.ts
index 4841463913..05f5a509c0 100644
--- a/src/app/shared/testing/object-select-service.stub.ts
+++ b/src/app/shared/testing/object-select-service.stub.ts
@@ -1,4 +1,7 @@
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
 export class ObjectSelectServiceStub {
 
diff --git a/src/app/shared/testing/pagination-service.stub.ts b/src/app/shared/testing/pagination-service.stub.ts
index 3ea8e732c8..8755adc759 100644
--- a/src/app/shared/testing/pagination-service.stub.ts
+++ b/src/app/shared/testing/pagination-service.stub.ts
@@ -1,14 +1,18 @@
 import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 export class PaginationServiceStub {
 
   constructor(
-    public pagination = Object.assign(new PaginationComponentOptions(), {currentPage: 1, pageSize: 20}),
+    public pagination = Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
     public sort = new SortOptions('score', SortDirection.DESC),
-    public findlistOptions = Object.assign(new FindListOptions(), {currentPage: 1, elementsPerPage: 20}),
+    public findlistOptions = Object.assign(new FindListOptions(), { currentPage: 1, elementsPerPage: 20 }),
   ) {
   }
 
diff --git a/src/app/shared/testing/query-params-directive.stub.ts b/src/app/shared/testing/query-params-directive.stub.ts
index 60f76786c7..7c9d1e28d7 100644
--- a/src/app/shared/testing/query-params-directive.stub.ts
+++ b/src/app/shared/testing/query-params-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/related-relationships.mock.ts b/src/app/shared/testing/related-relationships.mock.ts
index 7ea90d5935..fad782f6c1 100644
--- a/src/app/shared/testing/related-relationships.mock.ts
+++ b/src/app/shared/testing/related-relationships.mock.ts
@@ -1,72 +1,72 @@
 export const relatedRelationships = {
-    'type': {
-        'value': 'paginated-list'
-    },
-    'pageInfo': {
-        'elementsPerPage': 5,
-        'totalElements': 2,
-        'totalPages': 1,
-        'currentPage': 1
-    },
-    '_links': {
-        'self': {
-            'href': 'http://localhost:8080/server/api/core/relationships/search/byItemsAndType?typeId=1&focusItem=b1b2c768-bda1-448a-a073-fc541e8b24d9&relationshipLabel=isPublicationOfAuthor&size=5&relatedItem=72635f7f-37b5-4875-b4f2-5ff45d97a09b&relatedItem=674f695e-8001-4150-8f9c-095c536a6bcb&relatedItem=a64719f8-ba7b-41d1-8eb6-f8feb0c000b7&relatedItem=75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63&relatedItem=10bc6f8b-0796-486f-94d8-4d2e1814586f'
-        },
-        'page': [
-            {
-                'href': 'http://localhost:8080/server/api/core/relationships/1408'
-            },
-            {
-                'href': 'http://localhost:8080/server/api/core/relationships/1409'
-            }
-        ]
+  'type': {
+    'value': 'paginated-list',
+  },
+  'pageInfo': {
+    'elementsPerPage': 5,
+    'totalElements': 2,
+    'totalPages': 1,
+    'currentPage': 1,
+  },
+  '_links': {
+    'self': {
+      'href': 'http://localhost:8080/server/api/core/relationships/search/byItemsAndType?typeId=1&focusItem=b1b2c768-bda1-448a-a073-fc541e8b24d9&relationshipLabel=isPublicationOfAuthor&size=5&relatedItem=72635f7f-37b5-4875-b4f2-5ff45d97a09b&relatedItem=674f695e-8001-4150-8f9c-095c536a6bcb&relatedItem=a64719f8-ba7b-41d1-8eb6-f8feb0c000b7&relatedItem=75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63&relatedItem=10bc6f8b-0796-486f-94d8-4d2e1814586f',
     },
     'page': [
-        {
-            'type': 'relationship',
-            'uuid': 'relationship-1408',
-            'id': 1408,
-            'leftPlace': 0,
-            'rightPlace': 0,
-            'leftwardValue': null,
-            'rightwardValue': null,
-            '_links': {
-                'relationshipType': {
-                    'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-                },
-                'self': {
-                    'href': 'http://localhost:8080/server/api/core/relationships/1408'
-                },
-                'leftItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63'
-                },
-                'rightItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9'
-                }
-            }
+      {
+        'href': 'http://localhost:8080/server/api/core/relationships/1408',
+      },
+      {
+        'href': 'http://localhost:8080/server/api/core/relationships/1409',
+      },
+    ],
+  },
+  'page': [
+    {
+      'type': 'relationship',
+      'uuid': 'relationship-1408',
+      'id': 1408,
+      'leftPlace': 0,
+      'rightPlace': 0,
+      'leftwardValue': null,
+      'rightwardValue': null,
+      '_links': {
+        'relationshipType': {
+          'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
         },
-        {
-            'type': 'relationship',
-            'uuid': 'relationship-1409',
-            'id': 1409,
-            'leftPlace': 0,
-            'rightPlace': 1,
-            'leftwardValue': null,
-            'rightwardValue': null,
-            '_links': {
-                'relationshipType': {
-                    'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-                },
-                'self': {
-                    'href': 'http://localhost:8080/server/api/core/relationships/1409'
-                },
-                'leftItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/10bc6f8b-0796-486f-94d8-4d2e1814586f'
-                },
-                'rightItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9'
-                }
-            }
-        }
-    ]
+        'self': {
+          'href': 'http://localhost:8080/server/api/core/relationships/1408',
+        },
+        'leftItem': {
+          'href': 'http://localhost:8080/server/api/core/items/75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63',
+        },
+        'rightItem': {
+          'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9',
+        },
+      },
+    },
+    {
+      'type': 'relationship',
+      'uuid': 'relationship-1409',
+      'id': 1409,
+      'leftPlace': 0,
+      'rightPlace': 1,
+      'leftwardValue': null,
+      'rightwardValue': null,
+      '_links': {
+        'relationshipType': {
+          'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
+        },
+        'self': {
+          'href': 'http://localhost:8080/server/api/core/relationships/1409',
+        },
+        'leftItem': {
+          'href': 'http://localhost:8080/server/api/core/items/10bc6f8b-0796-486f-94d8-4d2e1814586f',
+        },
+        'rightItem': {
+          'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9',
+        },
+      },
+    },
+  ],
 };
diff --git a/src/app/shared/testing/relationship-types.mock.ts b/src/app/shared/testing/relationship-types.mock.ts
index 2c1f210820..1f2ee0fb25 100644
--- a/src/app/shared/testing/relationship-types.mock.ts
+++ b/src/app/shared/testing/relationship-types.mock.ts
@@ -1,71 +1,71 @@
 export const relationshipTypes = [
-    {
-        'id': 1,
-        'leftwardType': 'isAuthorOfPublication',
-        'rightwardType': 'isPublicationOfAuthor',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/1'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-            }
-        }
+  {
+    'id': 1,
+    'leftwardType': 'isAuthorOfPublication',
+    'rightwardType': 'isPublicationOfAuthor',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/1',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
+      },
     },
-    {
-        'id': 4,
-        'leftwardType': 'isProjectOfPerson',
-        'rightwardType': 'isPersonOfProject',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/3'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/4'
-            }
-        }
+  },
+  {
+    'id': 4,
+    'leftwardType': 'isProjectOfPerson',
+    'rightwardType': 'isPersonOfProject',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/3',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/4',
+      },
     },
-    {
-        'id': 5,
-        'leftwardType': 'isOrgUnitOfPerson',
-        'rightwardType': 'isPersonOfOrgUnit',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/4'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/5'
-            }
-        }
-    }
+  },
+  {
+    'id': 5,
+    'leftwardType': 'isOrgUnitOfPerson',
+    'rightwardType': 'isPersonOfOrgUnit',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/4',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/5',
+      },
+    },
+  },
 ];
diff --git a/src/app/shared/testing/request-service.stub.ts b/src/app/shared/testing/request-service.stub.ts
index 9add8898df..a0f05f4b50 100644
--- a/src/app/shared/testing/request-service.stub.ts
+++ b/src/app/shared/testing/request-service.stub.ts
@@ -1,4 +1,7 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 /**
  * Stub service for {@link RequestService}.
diff --git a/src/app/shared/testing/route-service.stub.ts b/src/app/shared/testing/route-service.stub.ts
index 8384c3efbc..97d6a65adb 100644
--- a/src/app/shared/testing/route-service.stub.ts
+++ b/src/app/shared/testing/route-service.stub.ts
@@ -1,4 +1,7 @@
-import { EMPTY, of as observableOf } from 'rxjs';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
 
 export const routeServiceStub: any = {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -37,6 +40,6 @@ export const routeServiceStub: any = {
   },
   getPreviousUrl: () => {
     return observableOf('/home');
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
diff --git a/src/app/shared/testing/router-link-directive.stub.ts b/src/app/shared/testing/router-link-directive.stub.ts
index 2357c89225..31132d4cf2 100644
--- a/src/app/shared/testing/router-link-directive.stub.ts
+++ b/src/app/shared/testing/router-link-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/router.stub.ts b/src/app/shared/testing/router.stub.ts
index 31bee0b6fe..4e7b0e460b 100644
--- a/src/app/shared/testing/router.stub.ts
+++ b/src/app/shared/testing/router.stub.ts
@@ -1,7 +1,8 @@
 import { of as observableOf } from 'rxjs';
+
 export class RouterStub {
   url: string;
-  routeReuseStrategy = {shouldReuseRoute: {}};
+  routeReuseStrategy = { shouldReuseRoute: {} };
   //noinspection TypeScriptUnresolvedFunction
   navigate = jasmine.createSpy('navigate');
   parseUrl = jasmine.createSpy('parseUrl');
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index 78b358f0d4..57587b1718 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -1,6 +1,13 @@
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 
 export class SearchConfigurationServiceStub {
 
@@ -30,7 +37,7 @@ export class SearchConfigurationServiceStub {
   }
 
   getAvailableConfigurationOptions() {
-    return observableOf([{value: 'test', label: 'test'}]);
+    return observableOf([{ value: 'test', label: 'test' }]);
   }
 
   getConfigurationSearchConfigObservable() {
@@ -42,6 +49,6 @@ export class SearchConfigurationServiceStub {
   }
 
   initializeSortOptionsFromConfiguration() {
-   /* empty */
+    /* empty */
   }
 }
diff --git a/src/app/shared/testing/search-service.stub.ts b/src/app/shared/testing/search-service.stub.ts
index b64fdd1330..18638ff73a 100644
--- a/src/app/shared/testing/search-service.stub.ts
+++ b/src/app/shared/testing/search-service.stub.ts
@@ -1,4 +1,9 @@
-import {of as observableOf,  Observable ,  BehaviorSubject } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { ViewMode } from '../../core/shared/view-mode.model';
 
 export class SearchServiceStub {
diff --git a/src/app/shared/testing/sidebar-service.stub.ts b/src/app/shared/testing/sidebar-service.stub.ts
index 8a73532f42..d10eb71227 100644
--- a/src/app/shared/testing/sidebar-service.stub.ts
+++ b/src/app/shared/testing/sidebar-service.stub.ts
@@ -1,4 +1,4 @@
-import {of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 
 export class SidebarServiceStub {
   isCollapsed = observableOf(true);
diff --git a/src/app/shared/testing/special-group.mock.ts b/src/app/shared/testing/special-group.mock.ts
index f1102e0584..6d5f123ffe 100644
--- a/src/app/shared/testing/special-group.mock.ts
+++ b/src/app/shared/testing/special-group.mock.ts
@@ -1,51 +1,57 @@
 import { Observable } from 'rxjs';
 
-import { EPersonMock } from './eperson.mock';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { Group } from '../../core/eperson/models/group.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { Group } from '../../core/eperson/models/group.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export const SpecialGroupMock2: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [],
-    epersons: [],
-    permanent: true,
-    selfRegistered: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/epersons' }
+  handle: null,
+  subgroups: [],
+  epersons: [],
+  permanent: true,
+  selfRegistered: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2',
     },
-    _name: 'testgroupname2',
-    id: 'testgroupid2',
-    uuid: 'testgroupid2',
-    type: 'specialGroups',
-   // object: createSuccessfulRemoteDataObject$({ name: 'testspecialGroupsid2objectName'})
+    subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/epersons' },
+  },
+  _name: 'testgroupname2',
+  id: 'testgroupid2',
+  uuid: 'testgroupid2',
+  type: 'specialGroups',
+  // object: createSuccessfulRemoteDataObject$({ name: 'testspecialGroupsid2objectName'})
 });
 
 export const SpecialGroupMock: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [SpecialGroupMock2],
-    epersons: [EPersonMock],
-    selfRegistered: false,
-    permanent: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/epersons' }
+  handle: null,
+  subgroups: [SpecialGroupMock2],
+  epersons: [EPersonMock],
+  selfRegistered: false,
+  permanent: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid',
     },
-    _name: 'testgroupname',
-    id: 'testgroupid',
-    uuid: 'testgroupid',
-    type: 'specialGroups',
+    subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/epersons' },
+  },
+  _name: 'testgroupname',
+  id: 'testgroupid',
+  uuid: 'testgroupid',
+  type: 'specialGroups',
 });
 
 export const SpecialGroupDataMock: RemoteData<PaginatedList<Group>> = createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [SpecialGroupMock2,SpecialGroupMock]));
diff --git a/src/app/shared/testing/store.mock.ts b/src/app/shared/testing/store.mock.ts
index 7967e2678a..027200925b 100644
--- a/src/app/shared/testing/store.mock.ts
+++ b/src/app/shared/testing/store.mock.ts
@@ -1,5 +1,10 @@
 import { Injectable } from '@angular/core';
-import { ActionsSubject, ReducerManager, StateObservable, Store } from '@ngrx/store';
+import {
+  ActionsSubject,
+  ReducerManager,
+  StateObservable,
+  Store,
+} from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 
 @Injectable()
@@ -9,7 +14,7 @@ export class StoreMock<T> extends Store<T> {
   constructor(
     state$: StateObservable,
     actionsObserver: ActionsSubject,
-    reducerManager: ReducerManager
+    reducerManager: ReducerManager,
   ) {
     super(state$, actionsObserver, reducerManager);
     this.source = this.stateSubject.asObservable();
diff --git a/src/app/shared/testing/submission-oject-data-service.mock.ts b/src/app/shared/testing/submission-oject-data-service.mock.ts
index d0bd29c3e8..8acb97c3a5 100644
--- a/src/app/shared/testing/submission-oject-data-service.mock.ts
+++ b/src/app/shared/testing/submission-oject-data-service.mock.ts
@@ -1,4 +1,4 @@
 export const mockSubmissionObjectDataService = jasmine.createSpyObj('SubmissionObjectDataService', {
   getHrefByID: jasmine.createSpy('getHrefByID'),
-  findById: jasmine.createSpy('findById')
+  findById: jasmine.createSpy('findById'),
 });
diff --git a/src/app/shared/testing/submission-rest-service.stub.ts b/src/app/shared/testing/submission-rest-service.stub.ts
index b6ec9a86a2..677fb05026 100644
--- a/src/app/shared/testing/submission-rest-service.stub.ts
+++ b/src/app/shared/testing/submission-rest-service.stub.ts
@@ -1,9 +1,9 @@
-import { of as observableOf } from 'rxjs';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
 
+import { CoreState } from '../../core/core-state.model';
 import { RequestService } from '../../core/data/request.service';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { CoreState } from '../../core/core-state.model';
 
 export class SubmissionRestServiceStub {
   protected linkPath = 'workspaceitems';
diff --git a/src/app/shared/testing/subscriptions-data.mock.ts b/src/app/shared/testing/subscriptions-data.mock.ts
index 07108ad516..771f1e38fb 100644
--- a/src/app/shared/testing/subscriptions-data.mock.ts
+++ b/src/app/shared/testing/subscriptions-data.mock.ts
@@ -1,7 +1,7 @@
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { Item } from '../../core/shared/item.model';
 import { ITEM_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export const mockSubscriptionEperson = Object.assign(new EPerson(), {
   'id': 'fake-eperson-id',
@@ -14,8 +14,8 @@ export const mockSubscriptionEperson = Object.assign(new EPerson(), {
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }
+        'place': 0,
+      },
     ],
     'eperson.lastname': [
       {
@@ -23,9 +23,9 @@ export const mockSubscriptionEperson = Object.assign(new EPerson(), {
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }
-    ]
+        'place': 0,
+      },
+    ],
   },
   'netid': null,
   'lastActive': '2021-09-01T12:06:19.000+00:00',
@@ -36,12 +36,12 @@ export const mockSubscriptionEperson = Object.assign(new EPerson(), {
   'type': 'eperson',
   '_links': {
     'groups': {
-      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id/groups'
+      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id/groups',
     },
     'self': {
-      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id'
-    }
-  }
+      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id',
+    },
+  },
 });
 
 export const mockSubscriptionDSO = Object.assign(new Item(),
@@ -49,15 +49,15 @@ export const mockSubscriptionDSO = Object.assign(new Item(),
     id: 'fake-item-id',
     uuid: 'fake-item-id',
     metadata: {
-      'dc.title': [{ value: 'test item subscription' }]
+      'dc.title': [{ value: 'test item subscription' }],
     },
     type: ITEM_TYPE,
     _links: {
       self: {
-        href: 'https://dspace.org/server/api/core/items/fake-item-id'
-      }
-    }
-  }
+        href: 'https://dspace.org/server/api/core/items/fake-item-id',
+      },
+    },
+  },
 );
 
 export const mockSubscriptionDSO2 = Object.assign(new Item(),
@@ -65,40 +65,40 @@ export const mockSubscriptionDSO2 = Object.assign(new Item(),
     id: 'fake-item-id2',
     uuid: 'fake-item-id2',
     metadata: {
-      'dc.title': [{ value: 'test item subscription 2' }]
+      'dc.title': [{ value: 'test item subscription 2' }],
     },
     type: ITEM_TYPE,
     _links: {
       self: {
-        href: 'https://dspace.org/server/api/core/items/fake-item-id2'
-      }
-    }
-  }
+        href: 'https://dspace.org/server/api/core/items/fake-item-id2',
+      },
+    },
+  },
 );
 export const findByEPersonAndDsoResEmpty = {
   'type': {
-    'value': 'paginated-list'
+    'value': 'paginated-list',
   },
   'pageInfo': {
     'elementsPerPage': 0,
     'totalElements': 0,
     'totalPages': 1,
-    'currentPage': 1
+    'currentPage': 1,
   },
   '_links': {
     'self': {
-      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?resource=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda'
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?resource=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda',
     },
     'page': [
       {
-        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22'
+        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22',
       },
       {
-        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48'
-      }
-    ]
+        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48',
+      },
+    ],
   },
-  'page': []
+  'page': [],
 };
 
 export const subscriptionMock = {
@@ -108,28 +108,28 @@ export const subscriptionMock = {
     {
       'id': 77,
       'name': 'frequency',
-      'value': 'D'
+      'value': 'D',
     },
     {
       'id': 78,
       'name': 'frequency',
-      'value': 'M'
-    }
+      'value': 'M',
+    },
   ],
   'subscriptionType': 'test1',
   'ePerson': createSuccessfulRemoteDataObject$(mockSubscriptionEperson),
   'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO),
   '_links': {
     'dSpaceObject': {
-      'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject'
+      'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject',
     },
     'ePerson': {
-      'href': 'https://dspace/server/api/core/subscriptions/21/ePerson'
+      'href': 'https://dspace/server/api/core/subscriptions/21/ePerson',
     },
     'self': {
-      'href': 'https://dspace/server/api/core/subscriptions/21'
-    }
-  }
+      'href': 'https://dspace/server/api/core/subscriptions/21',
+    },
+  },
 };
 
 export const subscriptionMock2 = {
@@ -139,7 +139,7 @@ export const subscriptionMock2 = {
     {
       'id': 77,
       'name': 'frequency',
-      'value': 'D'
+      'value': 'D',
     },
   ],
   'subscriptionType': 'test2',
@@ -147,14 +147,14 @@ export const subscriptionMock2 = {
   'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO2),
   '_links': {
     'dSpaceObject': {
-      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject'
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject',
     },
     'ePerson': {
-      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson'
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson',
     },
     'self': {
-      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21'
-    }
-  }
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21',
+    },
+  },
 };
 
diff --git a/src/app/shared/testing/supervision-order.mock.ts b/src/app/shared/testing/supervision-order.mock.ts
index 850486016d..bc98de0dfb 100644
--- a/src/app/shared/testing/supervision-order.mock.ts
+++ b/src/app/shared/testing/supervision-order.mock.ts
@@ -1,93 +1,99 @@
-import { Item } from '../../core/shared/item.model';
-import { SupervisionOrder } from '../../core/supervision-order/models/supervision-order.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { GroupMock, GroupMock2 } from './group-mock';
 import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Item } from '../../core/shared/item.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { SupervisionOrder } from '../../core/supervision-order/models/supervision-order.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from './group-mock';
 
 const itemMock = Object.assign(new Item(), {
   metadata: {
     'dc.title': [
       {
-        value: 'Item one'
-      }
+        value: 'Item one',
+      },
     ],
     'dc.contributor.author': [
       {
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.publisher': [
       {
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.date.issued': [
       {
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
-        value: 'This is the abstract'
-      }
-    ]
-  }
+        value: 'This is the abstract',
+      },
+    ],
+  },
 });
 
 const anotherItemMock = Object.assign(new Item(), {
   metadata: {
     'dc.title': [
       {
-        value: 'Item two'
-      }
+        value: 'Item two',
+      },
     ],
     'dc.contributor.author': [
       {
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.publisher': [
       {
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.date.issued': [
       {
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
-        value: 'This is the abstract'
-      }
-    ]
-  }
+        value: 'This is the abstract',
+      },
+    ],
+  },
 });
 
 export const supervisionOrderMock: any = Object.assign(new SupervisionOrder(),{
   id: '1',
   item: createSuccessfulRemoteDataObject$(itemMock),
-  group: createSuccessfulRemoteDataObject$(GroupMock)
+  group: createSuccessfulRemoteDataObject$(GroupMock),
 });
 
 export const anotherSupervisionOrderMock: any = {
   id: '2',
   item: createSuccessfulRemoteDataObject$(anotherItemMock),
-  group: createSuccessfulRemoteDataObject$(GroupMock2)
+  group: createSuccessfulRemoteDataObject$(GroupMock2),
 };
 
 export const supervisionOrderListMock = [supervisionOrderMock, anotherSupervisionOrderMock];
 export const supervisionOrderEntryMock = {
   supervisionOrder: supervisionOrderMock,
-  group: GroupMock
+  group: GroupMock,
 };
 
 const pageInfo = new PageInfo({
   elementsPerPage: 10,
   totalElements: 2,
   totalPages: 1,
-  currentPage: 1
+  currentPage: 1,
 });
 const array = [supervisionOrderMock, anotherSupervisionOrderMock];
 const paginatedList = buildPaginatedList(pageInfo, array);
diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts
index 85fa295dc2..181cb34065 100644
--- a/src/app/shared/testing/test-module.ts
+++ b/src/app/shared/testing/test-module.ts
@@ -1,11 +1,15 @@
 import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  NgModule,
+} from '@angular/core';
+
 import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
 import { SharedModule } from '../shared.module';
+import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub';
 import { QueryParamsDirectiveStub } from './query-params-directive.stub';
 import { RouterLinkDirectiveStub } from './router-link-directive.stub';
-import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 
 /**
  * This module isn't used. It serves to prevent the AoT compiler
@@ -16,7 +20,7 @@ import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     QueryParamsDirectiveStub,
@@ -25,13 +29,13 @@ import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
     NgComponentOutletDirectiveStub,
     BrowserOnlyMockPipe,
   ],
-    exports: [
-        QueryParamsDirectiveStub,
-        RouterLinkDirectiveStub
-    ],
+  exports: [
+    QueryParamsDirectiveStub,
+    RouterLinkDirectiveStub,
+  ],
   schemas: [
-    CUSTOM_ELEMENTS_SCHEMA
-  ]
+    CUSTOM_ELEMENTS_SCHEMA,
+  ],
 })
 export class TestModule {
 }
diff --git a/src/app/shared/testing/translate-loader.mock.ts b/src/app/shared/testing/translate-loader.mock.ts
index 3251de9ea1..ea1ee7528e 100644
--- a/src/app/shared/testing/translate-loader.mock.ts
+++ b/src/app/shared/testing/translate-loader.mock.ts
@@ -1,5 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
 import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class TranslateLoaderMock implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
diff --git a/src/app/shared/testing/utils.test.ts b/src/app/shared/testing/utils.test.ts
index e5130d6182..850d50358c 100644
--- a/src/app/shared/testing/utils.test.ts
+++ b/src/app/shared/testing/utils.test.ts
@@ -1,11 +1,20 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Observable } from 'rxjs/internal/Observable';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { UnCacheableObject } from '../../core/shared/uncacheable-object.model';
-import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RequestEntry } from '../../core/data/request-entry.model';
+import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { UnCacheableObject } from '../../core/shared/uncacheable-object.model';
 
 /**
  * Returns true if a Native Element has a specified css class.
@@ -30,7 +39,7 @@ export const hasClass = (element: any, className: string): boolean => {
  */
 export const createTestComponent = <T>(html: string, type: new (...args: any[]) => T ): ComponentFixture<T> => {
   TestBed.overrideComponent(type, {
-    set: { template: html }
+    set: { template: html },
   });
   const fixture = TestBed.createComponent(type);
 
@@ -52,7 +61,7 @@ export function spyOnOperator(obj: any, prop: string): any {
     configurable: true,
     enumerable: true,
     value: oldProp,
-    writable: true
+    writable: true,
   });
 
   return spyOn(obj, prop);
@@ -91,9 +100,9 @@ export function createRequestEntry$(unCacheableObject?: UnCacheableObject, statu
       timeCompleted: new Date().getTime(),
       statusCode,
       errorMessage,
-      unCacheableObject
+      unCacheableObject,
     },
-    lastUpdated: new Date().getTime()
+    lastUpdated: new Date().getTime(),
   });
 }
 
diff --git a/src/app/shared/testing/vocabulary-service.stub.ts b/src/app/shared/testing/vocabulary-service.stub.ts
index f6a578dd3d..fd4483c5a2 100644
--- a/src/app/shared/testing/vocabulary-service.stub.ts
+++ b/src/app/shared/testing/vocabulary-service.stub.ts
@@ -1,12 +1,18 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { PageInfo } from '../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { Vocabulary } from '../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export class VocabularyServiceStub {
 
@@ -42,4 +48,8 @@ export class VocabularyServiceStub {
   findVocabularyById(id: string): Observable<RemoteData<Vocabulary>> {
     return;
   }
+
+  getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string): Observable<RemoteData<Vocabulary>> {
+    return createSuccessfulRemoteDataObject$(null);
+  }
 }
diff --git a/src/app/shared/testing/workflow-action-data-service.stub.ts b/src/app/shared/testing/workflow-action-data-service.stub.ts
index 38c764de5a..9cd61d7955 100644
--- a/src/app/shared/testing/workflow-action-data-service.stub.ts
+++ b/src/app/shared/testing/workflow-action-data-service.stub.ts
@@ -1,9 +1,13 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
 import { FindListOptions } from '../../core/data/find-list-options.model';
-import { FollowLinkConfig } from '../utils/follow-link-config.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { Observable, EMPTY } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
 import { IdentifiableDataServiceStub } from './identifiable-data-service.stub';
 
 /**
diff --git a/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts b/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
index 6df7fe52e6..7b9abefadb 100644
--- a/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
+++ b/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 // noinspection AngularMissingOrInvalidDeclarationInModule
 @Component({
   selector: 'ds-test-component',
-  template: ''
+  template: '',
 })
 export class TestComponent {
   type = 'themed';
diff --git a/src/app/shared/theme-support/test/test.component.spec.ts b/src/app/shared/theme-support/test/test.component.spec.ts
index 85e2e5aaa7..8f048aa2a7 100644
--- a/src/app/shared/theme-support/test/test.component.spec.ts
+++ b/src/app/shared/theme-support/test/test.component.spec.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 // noinspection AngularMissingOrInvalidDeclarationInModule
 @Component({
   selector: 'ds-test-component',
-  template: ''
+  template: '',
 })
 export class TestComponent {
   type = 'default';
diff --git a/src/app/shared/theme-support/theme.actions.ts b/src/app/shared/theme-support/theme.actions.ts
index dbc885772d..32ba431b1f 100644
--- a/src/app/shared/theme-support/theme.actions.ts
+++ b/src/app/shared/theme-support/theme.actions.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 
 export const ThemeActionTypes = {
diff --git a/src/app/shared/theme-support/theme.effects.spec.ts b/src/app/shared/theme-support/theme.effects.spec.ts
index 43727df8d6..96699498c9 100644
--- a/src/app/shared/theme-support/theme.effects.spec.ts
+++ b/src/app/shared/theme-support/theme.effects.spec.ts
@@ -1,11 +1,15 @@
-import { ThemeEffects } from './theme.effects';
 import { TestBed } from '@angular/core/testing';
-import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
 import { ROOT_EFFECTS_INIT } from '@ngrx/effects';
-import { SetThemeAction } from './theme.actions';
+import { provideMockActions } from '@ngrx/effects/testing';
 import { provideMockStore } from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+
+import { SetThemeAction } from './theme.actions';
 import { BASE_THEME_NAME } from './theme.constants';
+import { ThemeEffects } from './theme.effects';
 
 describe('ThemeEffects', () => {
   let themeEffects: ThemeEffects;
@@ -25,8 +29,8 @@ describe('ThemeEffects', () => {
       providers: [
         ThemeEffects,
         provideMockStore({ initialState }),
-        provideMockActions(() => mockActions)
-      ]
+        provideMockActions(() => mockActions),
+      ],
     });
 
     themeEffects = TestBed.inject(ThemeEffects);
@@ -37,15 +41,15 @@ describe('ThemeEffects', () => {
       setupEffectsWithActions(
         hot('--a-', {
           a: {
-            type: ROOT_EFFECTS_INIT
-          }
-        })
+            type: ROOT_EFFECTS_INIT,
+          },
+        }),
       );
     });
 
     it('should set the default theme', () => {
       const expected = cold('--b-', {
-        b: new SetThemeAction(BASE_THEME_NAME)
+        b: new SetThemeAction(BASE_THEME_NAME),
       });
 
       expect(themeEffects.initTheme$).toBeObservable(expected);
diff --git a/src/app/shared/theme-support/theme.effects.ts b/src/app/shared/theme-support/theme.effects.ts
index df74818fa8..f16c6cee70 100644
--- a/src/app/shared/theme-support/theme.effects.ts
+++ b/src/app/shared/theme-support/theme.effects.ts
@@ -1,10 +1,16 @@
 import { Injectable } from '@angular/core';
-import { createEffect, Actions, ofType, ROOT_EFFECTS_INIT } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+  ROOT_EFFECTS_INIT,
+} from '@ngrx/effects';
 import { map } from 'rxjs/operators';
-import { SetThemeAction } from './theme.actions';
-import { hasValue } from '../empty.util';
-import { BASE_THEME_NAME } from './theme.constants';
+
 import { getDefaultThemeConfig } from '../../../config/config.util';
+import { hasValue } from '../empty.util';
+import { SetThemeAction } from './theme.actions';
+import { BASE_THEME_NAME } from './theme.constants';
 
 @Injectable()
 export class ThemeEffects {
@@ -21,8 +27,8 @@ export class ThemeEffects {
         } else {
           return new SetThemeAction(BASE_THEME_NAME);
         }
-      })
-    )
+      }),
+    ),
   );
 
   constructor(
diff --git a/src/app/shared/theme-support/theme.model.ts b/src/app/shared/theme-support/theme.model.ts
new file mode 100644
index 0000000000..07c200ce06
--- /dev/null
+++ b/src/app/shared/theme-support/theme.model.ts
@@ -0,0 +1,108 @@
+/* eslint-disable max-classes-per-file */
+import { Injector } from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  HandleThemeConfig,
+  NamedThemeConfig,
+  RegExThemeConfig,
+  ThemeConfig,
+  UUIDThemeConfig,
+} from '../../../config/theme.config';
+import { getDSORoute } from '../../app-routing-paths';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { HandleObject } from '../../core/shared/handle-object.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { HandleService } from '../handle.service';
+
+export class Theme {
+  constructor(public config: NamedThemeConfig) {
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    return observableOf(true);
+  }
+}
+
+export class RegExTheme extends Theme {
+  regex: RegExp;
+
+  constructor(public config: RegExThemeConfig) {
+    super(config);
+    this.regex = new RegExp(this.config.regex);
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    let match: RegExpMatchArray;
+    const route = getDSORoute(dso);
+
+    if (isNotEmpty(route)) {
+      match = route.match(this.regex);
+    }
+
+    if (hasNoValue(match)) {
+      match = url.match(this.regex);
+    }
+
+    return observableOf(hasValue(match));
+  }
+}
+
+export class HandleTheme extends Theme {
+
+  constructor(public config: HandleThemeConfig,
+              protected handleService: HandleService,
+  ) {
+    super(config);
+  }
+
+  matches<T extends DSpaceObject & HandleObject>(url: string, dso: T): Observable<boolean> {
+    if (hasValue(dso?.handle)) {
+      return combineLatest([
+        this.handleService.normalizeHandle(dso?.handle),
+        this.handleService.normalizeHandle(this.config.handle),
+      ]).pipe(
+        map(([handle, normalizedHandle]: [string | null, string | null]) => {
+          return hasValue(dso) && hasValue(dso.handle) && handle === normalizedHandle;
+        }),
+        take(1),
+      );
+    } else {
+      return observableOf(false);
+    }
+  }
+}
+
+export class UUIDTheme extends Theme {
+  constructor(public config: UUIDThemeConfig) {
+    super(config);
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    return observableOf(hasValue(dso) && dso.uuid === this.config.uuid);
+  }
+}
+
+export const themeFactory = (config: ThemeConfig, injector: Injector): Theme => {
+  if (hasValue((config as RegExThemeConfig).regex)) {
+    return new RegExTheme(config as RegExThemeConfig);
+  } else if (hasValue((config as HandleThemeConfig).handle)) {
+    return new HandleTheme(config as HandleThemeConfig, injector.get(HandleService));
+  } else if (hasValue((config as UUIDThemeConfig).uuid)) {
+    return new UUIDTheme(config as UUIDThemeConfig);
+  } else {
+    return new Theme(config as NamedThemeConfig);
+  }
+};
diff --git a/src/app/shared/theme-support/theme.reducer.spec.ts b/src/app/shared/theme-support/theme.reducer.spec.ts
index 8733b88cda..16ad22c2cf 100644
--- a/src/app/shared/theme-support/theme.reducer.spec.ts
+++ b/src/app/shared/theme-support/theme.reducer.spec.ts
@@ -3,12 +3,12 @@ import { themeReducer } from './theme.reducer';
 
 describe('themeReducer', () => {
   const testState = {
-    currentTheme: 'test'
+    currentTheme: 'test',
   };
 
   it('should set the current theme in response to the SET action', () => {
     const expectedState = {
-      currentTheme: 'newTheme'
+      currentTheme: 'newTheme',
     };
     const action = new SetThemeAction('newTheme');
     const newState = themeReducer(testState, action);
diff --git a/src/app/shared/theme-support/theme.reducer.ts b/src/app/shared/theme-support/theme.reducer.ts
index 26083a0cef..aa963e4da4 100644
--- a/src/app/shared/theme-support/theme.reducer.ts
+++ b/src/app/shared/theme-support/theme.reducer.ts
@@ -1,18 +1,21 @@
-import { ThemeAction, ThemeActionTypes } from './theme.actions';
+import {
+  ThemeAction,
+  ThemeActionTypes,
+} from './theme.actions';
 
 export interface ThemeState {
   currentTheme: string;
 }
 
 const initialState: ThemeState = {
-  currentTheme: null
+  currentTheme: null,
 };
 
 export function themeReducer(state: ThemeState = initialState, action: ThemeAction): ThemeState {
   switch (action.type) {
     case ThemeActionTypes.SET: {
       return {
-        currentTheme: action.payload.name
+        currentTheme: action.payload.name,
       };
     }
     default: {
diff --git a/src/app/shared/theme-support/theme.service.spec.ts b/src/app/shared/theme-support/theme.service.spec.ts
index f56fb86cbc..c012932705 100644
--- a/src/app/shared/theme-support/theme.service.spec.ts
+++ b/src/app/shared/theme-support/theme.service.spec.ts
@@ -1,29 +1,39 @@
-import { of as observableOf } from 'rxjs';
+import {
+  CommonModule,
+  DOCUMENT,
+} from '@angular/common';
 import { TestBed } from '@angular/core/testing';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { LinkService } from '../../core/cache/builders/link.service';
-import { hot } from 'jasmine-marbles';
-import { SetThemeAction } from './theme.actions';
-import { Theme } from '../../../config/theme.model';
+import { ROUTER_NAVIGATED } from '@ngrx/router-store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { Community } from '../../core/shared/community.model';
-import { COMMUNITY } from '../../core/shared/community.resource-type';
-import { NoOpAction } from '../ngrx/no-op.action';
-import { ITEM } from '../../core/shared/item.resource-type';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { Item } from '../../core/shared/item.model';
+import { hot } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../core/cache/builders/link.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { COLLECTION } from '../../core/shared/collection.resource-type';
-import {
-  createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../remote-data.utils';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { ThemeService } from './theme.service';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { CommonModule, DOCUMENT } from '@angular/common';
+import { Community } from '../../core/shared/community.model';
+import { COMMUNITY } from '../../core/shared/community.resource-type';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ITEM } from '../../core/shared/item.resource-type';
 import { RouterMock } from '../mocks/router.mock';
+import { NoOpAction } from '../ngrx/no-op.action';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { ConfigurationDataServiceStub } from '../testing/configuration-data.service.stub';
+import { SetThemeAction } from './theme.actions';
+import { Theme } from './theme.model';
+import { ThemeService } from './theme.service';
 
 /**
  * LinkService able to mock recursively resolving DSO parent links
@@ -49,6 +59,7 @@ class MockLinkService {
 describe('ThemeService', () => {
   let themeService: ThemeService;
   let linkService: LinkService;
+  let configurationService: ConfigurationDataServiceStub;
   let initialState;
 
   let ancestorDSOs: DSpaceObject[];
@@ -63,12 +74,12 @@ describe('ThemeService', () => {
       Object.assign(new Collection(), {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
-        _links: { owningCommunity: { href: 'owning-community-link' } }
+        _links: { owningCommunity: { href: 'owning-community-link' } },
       }),
       Object.assign(new Community(), {
         type: COMMUNITY.value,
         uuid: 'sub-community-uuid',
-        _links: { parentCommunity: { href: 'parent-community-link' } }
+        _links: { parentCommunity: { href: 'parent-community-link' } },
       }),
       mockCommunity,
     ];
@@ -78,12 +89,13 @@ describe('ThemeService', () => {
         currentTheme: 'custom',
       },
     };
+    configurationService = new ConfigurationDataServiceStub();
   }
 
   function setupServiceWithActions(mockActions) {
     init();
     const mockDsoService = {
-      findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+      findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
     };
     TestBed.configureTestingModule({
       imports: [
@@ -96,7 +108,8 @@ describe('ThemeService', () => {
         provideMockActions(() => mockActions),
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: Router, useValue: new RouterMock() },
-      ]
+        { provide: ConfigurationDataService, useValue: configurationService },
+      ],
     });
 
     themeService = TestBed.inject(ThemeService);
@@ -112,7 +125,7 @@ describe('ThemeService', () => {
 
     function spyOnPrivateMethods() {
       spyOn((themeService as any), 'getAncestorDSOs').and.returnValue(() => observableOf([dso]));
-      spyOn((themeService as any), 'matchThemeToDSOs').and.returnValue(new Theme({ name: 'custom' }));
+      spyOn((themeService as any), 'matchThemeToDSOs').and.returnValue(observableOf(new Theme({ name: 'custom' })));
       spyOn((themeService as any), 'getActionForMatch').and.returnValue(new SetThemeAction('custom'));
     }
 
@@ -124,7 +137,7 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
       });
@@ -152,7 +165,7 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         (themeService as any).themes = [];
       });
@@ -182,13 +195,13 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
         snapshot = Object.assign({
           data: {
-            dso: createSuccessfulRemoteDataObject(dso)
-          }
+            dso: createSuccessfulRemoteDataObject(dso),
+          },
         });
       });
 
@@ -224,13 +237,13 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
         snapshot = Object.assign({
           queryParams: {
-            scope: mockCommunity.uuid
-          }
+            scope: mockCommunity.uuid,
+          },
         });
       });
 
@@ -283,13 +296,13 @@ describe('ThemeService', () => {
 
       beforeEach(() => {
         nonMatchingTheme = Object.assign(new Theme({ name: 'non-matching-theme' }), {
-          matches: () => false
+          matches: () => observableOf(false),
         });
         itemMatchingTheme = Object.assign(new Theme({ name: 'item-matching-theme' }), {
-          matches: (url, dso) => (dso as any).type === ITEM.value
+          matches: (url, dso) => observableOf((dso as any).type === ITEM.value),
         });
         communityMatchingTheme = Object.assign(new Theme({ name: 'community-matching-theme' }), {
-          matches: (url, dso) => (dso as any).type === COMMUNITY.value
+          matches: (url, dso) => observableOf((dso as any).type === COMMUNITY.value),
         });
         dsos = [
           Object.assign(new Item(), {
@@ -313,8 +326,11 @@ describe('ThemeService', () => {
           themeService.themes = themes;
         });
 
-        it('should return undefined', () => {
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toBeUndefined();
+        it('should return undefined', (done: DoneFn) => {
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBeUndefined();
+            done();
+          });
         });
       });
 
@@ -324,20 +340,31 @@ describe('ThemeService', () => {
           themeService.themes = themes;
         });
 
-        it('should return the matching theme', () => {
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme);
+        it('should return the matching theme', (done: DoneFn) => {
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(itemMatchingTheme);
+            done();
+          });
         });
       });
 
       describe('when multiple themes match some of the DSOs', () => {
-        it('should return the first matching theme', () => {
+        it('should return the first matching theme (itemMatchingTheme)', (done: DoneFn) => {
           themes = [ nonMatchingTheme, itemMatchingTheme, communityMatchingTheme ];
           themeService.themes = themes;
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme);
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(itemMatchingTheme);
+            done();
+          });
+        });
 
+        it('should return the first matching theme (communityMatchingTheme)', (done: DoneFn) => {
           themes = [ nonMatchingTheme, communityMatchingTheme, itemMatchingTheme ];
           themeService.themes = themes;
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(communityMatchingTheme);
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(communityMatchingTheme);
+            done();
+          });
         });
       });
     });
@@ -351,7 +378,7 @@ describe('ThemeService', () => {
         });
 
         observableOf(dso).pipe(
-          (themeService as any).getAncestorDSOs()
+          (themeService as any).getAncestorDSOs(),
         ).subscribe((result) => {
           expect(result).toEqual([dso, ...ancestorDSOs]);
           done();
@@ -365,7 +392,7 @@ describe('ThemeService', () => {
         };
 
         observableOf(dso).pipe(
-          (themeService as any).getAncestorDSOs()
+          (themeService as any).getAncestorDSOs(),
         ).subscribe((result) => {
           expect(result).toEqual([dso]);
           done();
@@ -380,8 +407,9 @@ describe('ThemeService', () => {
 
     beforeEach(() => {
       const mockDsoService = {
-        findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+        findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
       };
+      configurationService = new ConfigurationDataServiceStub();
 
       TestBed.configureTestingModule({
         imports: [
@@ -393,7 +421,8 @@ describe('ThemeService', () => {
           provideMockStore({ initialState }),
           { provide: DSpaceObjectDataService, useValue: mockDsoService },
           { provide: Router, useValue: new RouterMock() },
-        ]
+          { provide: ConfigurationDataService, useValue: configurationService },
+        ],
       });
 
       document = TestBed.inject(DOCUMENT);
diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index 6d2939a5f8..6d0ba38b5b 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -1,39 +1,85 @@
-import { Injectable, Inject, Injector } from '@angular/core';
-import { Store, createFeatureSelector, createSelector, select } from '@ngrx/store';
-import { BehaviorSubject, EMPTY, Observable, of as observableOf } from 'rxjs';
-import { ThemeState } from './theme.reducer';
-import { SetThemeAction, ThemeActionTypes } from './theme.actions';
-import { expand, filter, map, switchMap, take, toArray } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  ResolveEnd,
+  Router,
+} from '@angular/router';
+import {
+  createFeatureSelector,
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  BehaviorSubject,
+  concatMap,
+  EMPTY,
+  from,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  defaultIfEmpty,
+  expand,
+  filter,
+  map,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { getDefaultThemeConfig } from '../../../config/config.util';
+import {
+  HeadTagConfig,
+  ThemeConfig,
+} from '../../../config/theme.config';
+import { environment } from '../../../environments/environment';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { distinctNext } from '../../core/shared/distinct-next';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../core/shared/operators';
-import { HeadTagConfig, Theme, ThemeConfig, themeFactory } from '../../../config/theme.model';
-import { NO_OP_ACTION_TYPE, NoOpAction } from '../ngrx/no-op.action';
-import { followLink } from '../utils/follow-link-config.model';
-import { LinkService } from '../../core/cache/builders/link.service';
-import { environment } from '../../../environments/environment';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { ActivatedRouteSnapshot, ResolveEnd, Router } from '@angular/router';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import {
+  NO_OP_ACTION_TYPE,
+  NoOpAction,
+} from '../ngrx/no-op.action';
 import { GET_THEME_CONFIG_FOR_FACTORY } from '../object-collection/shared/listable-object/listable-object.decorator';
-import { distinctNext } from 'src/app/core/shared/distinct-next';
-import { DOCUMENT } from '@angular/common';
-import { getDefaultThemeConfig } from '../../../config/config.util';
+import { followLink } from '../utils/follow-link-config.model';
+import {
+  SetThemeAction,
+  ThemeActionTypes,
+} from './theme.actions';
 import { BASE_THEME_NAME } from './theme.constants';
+import {
+  Theme,
+  themeFactory,
+} from './theme.model';
+import { ThemeState } from './theme.reducer';
 
 export const themeStateSelector = createFeatureSelector<ThemeState>('theme');
 
 export const currentThemeSelector = createSelector(
   themeStateSelector,
-  (state: ThemeState): string => hasValue(state) ? state.currentTheme : undefined
+  (state: ThemeState): string => hasValue(state) ? state.currentTheme : BASE_THEME_NAME,
 );
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ThemeService {
   /**
@@ -63,7 +109,7 @@ export class ThemeService {
     this.hasDynamicTheme = environment.themes.some((themeConfig: any) =>
       hasValue(themeConfig.regex) ||
       hasValue(themeConfig.handle) ||
-      hasValue(themeConfig.uuid)
+      hasValue(themeConfig.uuid),
     );
   }
 
@@ -82,9 +128,9 @@ export class ThemeService {
     let currentTheme: string;
     this.store.pipe(
       select(currentThemeSelector),
-      take(1)
+      take(1),
     ).subscribe((name: string) =>
-      currentTheme = name
+      currentTheme = name,
     );
     return currentTheme;
   }
@@ -94,7 +140,7 @@ export class ThemeService {
    */
   getThemeName$(): Observable<string> {
     return this.store.pipe(
-      select(currentThemeSelector)
+      select(currentThemeSelector),
     );
   }
 
@@ -145,7 +191,7 @@ export class ThemeService {
         } else {
           return [false];
         }
-      })
+      }),
     ).subscribe((changed) => {
       distinctNext(this._isThemeLoading$, changed);
     });
@@ -219,7 +265,7 @@ export class ThemeService {
     // create new head tags (not yet added to DOM)
     const headTagFragment = this.document.createDocumentFragment();
     this.createHeadTags(themeName)
-        .forEach(newHeadTag => headTagFragment.appendChild(newHeadTag));
+      .forEach(newHeadTag => headTagFragment.appendChild(newHeadTag));
 
     // add new head tags to DOM
     head.appendChild(headTagFragment);
@@ -240,14 +286,7 @@ export class ThemeService {
       if (hasValue(parentThemeName)) {
         // inherit the head tags of the parent theme
         return this.createHeadTags(parentThemeName);
-      }
-      const defaultThemeConfig = getDefaultThemeConfig();
-      const defaultThemeName = defaultThemeConfig.name;
-      if (
-        hasNoValue(defaultThemeName) ||
-        themeName === defaultThemeName ||
-        themeName === BASE_THEME_NAME
-      ) {
+      } else {
         // last resort, use fallback favicon.ico
         return [
           this.createHeadTag({
@@ -256,13 +295,10 @@ export class ThemeService {
               'rel': 'icon',
               'href': 'assets/images/favicon.ico',
               'sizes': 'any',
-            }
-          })
+            },
+          }),
         ];
       }
-
-      // inherit the head tags of the default theme
-      return this.createHeadTags(defaultThemeConfig.name);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));
@@ -278,7 +314,7 @@ export class ThemeService {
 
     if (hasValue(headTagConfig.attributes)) {
       Object.entries(headTagConfig.attributes)
-            .forEach(([key, value]) => tag.setAttribute(key, value));
+        .forEach(([key, value]) => tag.setAttribute(key, value));
     }
 
     // 'class' attribute should always be 'theme-head-tag' for removal
@@ -302,7 +338,7 @@ export class ThemeService {
     // and the current theme from the store
     const currentTheme$: Observable<string> = this.store.pipe(select(currentThemeSelector));
 
-    const action$ = currentTheme$.pipe(
+    const action$: Observable<SetThemeAction | NoOpAction> = currentTheme$.pipe(
       switchMap((currentTheme: string) => {
         const snapshotWithData = this.findRouteData(activatedRouteSnapshot);
         if (this.hasDynamicTheme === true && isNotEmpty(this.themes)) {
@@ -312,10 +348,12 @@ export class ThemeService {
               // Start with the resolved dso and go recursively through its parents until you reach the top-level community
               return observableOf(dsoRD.payload).pipe(
                 this.getAncestorDSOs(),
-                map((dsos: DSpaceObject[]) => {
-                  const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl);
+                switchMap((dsos: DSpaceObject[]) => {
+                  return this.matchThemeToDSOs(dsos, currentRouteUrl);
+                }),
+                map((dsoMatch: Theme) => {
                   return this.getActionForMatch(dsoMatch, currentTheme);
-                })
+                }),
               );
             }
           }
@@ -326,33 +364,41 @@ export class ThemeService {
               getFirstSucceededRemoteData(),
               getRemoteDataPayload(),
               this.getAncestorDSOs(),
-              map((dsos: DSpaceObject[]) => {
-                const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl);
+              switchMap((dsos: DSpaceObject[]) => {
+                return this.matchThemeToDSOs(dsos, currentRouteUrl);
+              }),
+              map((dsoMatch: Theme) => {
                 return this.getActionForMatch(dsoMatch, currentTheme);
-              })
+              }),
             );
           }
 
           // check whether the route itself matches
-          const routeMatch = this.themes.find((theme: Theme) => theme.matches(currentRouteUrl, undefined));
-
-          return [this.getActionForMatch(routeMatch, currentTheme)];
+          return from(this.themes).pipe(
+            concatMap((theme: Theme) => theme.matches(currentRouteUrl, undefined).pipe(
+              filter((result: boolean) => result === true),
+              map(() => theme),
+              take(1),
+            )),
+            take(1),
+            map((theme: Theme) => this.getActionForMatch(theme, currentTheme)),
+          );
+        } else {
+          // If there are no themes configured, do nothing
+          return observableOf(new NoOpAction());
         }
-
-        // If there are no themes configured, do nothing
-        return [new NoOpAction()];
       }),
       take(1),
     );
 
     action$.pipe(
-      filter((action) => action.type !== NO_OP_ACTION_TYPE),
-    ).subscribe((action) => {
+      filter((action: SetThemeAction | NoOpAction) => action.type !== NO_OP_ACTION_TYPE),
+    ).subscribe((action: SetThemeAction | NoOpAction) => {
       this.store.dispatch(action);
     });
 
     return action$.pipe(
-      map((action) => action.type === ThemeActionTypes.SET),
+      map((action: SetThemeAction | NoOpAction) => action.type === ThemeActionTypes.SET),
     );
   }
 
@@ -413,7 +459,7 @@ export class ThemeService {
         // only allow through DSOs that have a value
         filter((dso: DSpaceObject) => hasValue(dso)),
         // Wait for recursion to complete, and emit all results at once, in an array
-        toArray()
+        toArray(),
       );
   }
 
@@ -425,9 +471,10 @@ export class ThemeService {
    * @private
    */
   private getActionForMatch(newTheme: Theme, currentThemeName: string): SetThemeAction | NoOpAction {
-    if (hasValue(newTheme) && newTheme.config.name !== currentThemeName) {
+    const newThemeName: string = newTheme?.config.name ?? BASE_THEME_NAME;
+    if (newThemeName !== currentThemeName) {
       // If we have a match, and it isn't already the active theme, set it as the new theme
-      return new SetThemeAction(newTheme.config.name);
+      return new SetThemeAction(newThemeName);
     } else {
       // Otherwise, do nothing
       return new NoOpAction();
@@ -442,14 +489,17 @@ export class ThemeService {
    * @param currentRouteUrl The url for the current route
    * @private
    */
-  private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Theme {
-    // iterate over the themes in order, and return the first one that matches
-    return this.themes.find((theme: Theme) => {
-      // iterate over the dsos's in order (most specific one first, so Item, Collection,
-      // Community), and return the first one that matches the current theme
-      const match = dsos.find((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso));
-      return hasValue(match);
-    });
+  private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Observable<Theme> {
+    return from(this.themes).pipe(
+      concatMap((theme: Theme) => from(dsos).pipe(
+        concatMap((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso)),
+        filter((result: boolean) => result === true),
+        map(() => theme),
+        take(1),
+      )),
+      take(1),
+      defaultIfEmpty(undefined),
+    );
   }
 
   /**
diff --git a/src/app/shared/theme-support/themed.component.spec.ts b/src/app/shared/theme-support/themed.component.spec.ts
index 7776e60379..d39024a7f5 100644
--- a/src/app/shared/theme-support/themed.component.spec.ts
+++ b/src/app/shared/theme-support/themed.component.spec.ts
@@ -1,16 +1,24 @@
 /* eslint-disable max-classes-per-file */
-import { ThemedComponent } from './themed.component';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../utils/var.directive';
-import { ThemeService } from './theme.service';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { ThemeConfig } from '../../../config/theme.config';
 import { getMockThemeService } from '../mocks/theme-service.mock';
+import { VarDirective } from '../utils/var.directive';
 import { TestComponent } from './test/test.component.spec';
-import { ThemeConfig } from '../../../config/theme.model';
+import { ThemeService } from './theme.service';
+import { ThemedComponent } from './themed.component';
 
 @Component({
   selector: 'ds-test-themed-component',
-  templateUrl: './themed.component.html'
+  templateUrl: './themed.component.html',
 })
 class TestThemedComponent extends ThemedComponent<TestComponent> {
   protected inAndOutputNames: (keyof TestComponent & keyof this)[] = ['testInput'];
@@ -41,7 +49,7 @@ describe('ThemedComponent', () => {
       providers: [
         { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }
 
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 6b0727ccdd..689b8189da 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -1,30 +1,46 @@
 import {
+  AfterViewInit,
+  ChangeDetectorRef,
   Component,
+  ComponentRef,
+  ElementRef,
+  HostBinding,
+  OnChanges,
+  OnDestroy,
+  SimpleChanges,
   ViewChild,
   ViewContainerRef,
-  ComponentRef,
-  SimpleChanges,
-  OnInit,
-  OnDestroy,
-  ComponentFactoryResolver,
-  ChangeDetectorRef,
-  OnChanges,
-  HostBinding,
-  ElementRef,
 } from '@angular/core';
-import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
-import { combineLatest, from as fromPromise, Observable, of as observableOf, Subscription, BehaviorSubject } from 'rxjs';
-import { ThemeService } from './theme.service';
-import { catchError, switchMap, map, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from as fromPromise,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
 import { BASE_THEME_NAME } from './theme.constants';
+import { ThemeService } from './theme.service';
 
 @Component({
   selector: 'ds-themed',
   styleUrls: ['./themed.component.scss'],
   templateUrl: './themed.component.html',
 })
-export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges {
+export abstract class ThemedComponent<T> implements AfterViewInit, OnDestroy, OnChanges {
   @ViewChild('vcr', { read: ViewContainerRef }) vcr: ViewContainerRef;
   @ViewChild('content') themedElementContent: ElementRef;
   protected compRef: ComponentRef<T>;
@@ -47,7 +63,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   @HostBinding('attr.data-used-theme') usedTheme: string;
 
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
     protected themeService: ThemeService,
   ) {
@@ -74,8 +89,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
   }
 
-  ngOnInit(): void {
-    this.destroyComponentInstance();
+  ngAfterViewInit(): void {
     this.initComponentInstance();
   }
 
@@ -96,8 +110,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     if (hasNoValue(this.lazyLoadObs)) {
-      this.destroyComponentInstance();
-
       this.lazyLoadObs = combineLatest([
         observableOf(changes),
         this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
@@ -109,10 +121,10 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
             } else {
               // otherwise import and return the default component
               return fromPromise(this.importUnthemedComponent()).pipe(
-            tap(() => this.usedTheme = BASE_THEME_NAME),
+                tap(() => this.usedTheme = BASE_THEME_NAME),
                 map((unthemedFile: any) => {
                   return unthemedFile[this.getComponentName()];
-                })
+                }),
               );
             }
           })),
@@ -120,8 +132,10 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     this.lazyLoadSub = this.lazyLoadObs.subscribe(([simpleChanges, constructor]: [SimpleChanges, GenericConstructor<T>]) => {
-      const factory = this.resolver.resolveComponentFactory(constructor);
-      this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.childNodes]);
+      this.destroyComponentInstance();
+      this.compRef = this.vcr.createComponent(constructor, {
+        projectableNodes: [this.themedElementContent.nativeElement.childNodes],
+      });
       if (hasValue(simpleChanges)) {
         this.ngOnChanges(simpleChanges);
       } else {
diff --git a/src/app/shared/trackable/abstract-trackable.component.spec.ts b/src/app/shared/trackable/abstract-trackable.component.spec.ts
index c538f074c5..3c2e25f6f6 100644
--- a/src/app/shared/trackable/abstract-trackable.component.spec.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.spec.ts
@@ -1,14 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AbstractTrackableComponent } from './abstract-trackable.component';
-import { INotification, Notification } from '../notifications/models/notification.model';
-import { NotificationType } from '../notifications/models/notification-type';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import {
+  INotification,
+  Notification,
+} from '../notifications/models/notification.model';
+import { NotificationType } from '../notifications/models/notification-type';
+import { NotificationsService } from '../notifications/notifications.service';
+import { AbstractTrackableComponent } from './abstract-trackable.component';
 
 describe('AbstractTrackableComponent', () => {
   let comp: AbstractTrackableComponent;
@@ -24,8 +32,8 @@ describe('AbstractTrackableComponent', () => {
     {
       info: infoNotification,
       warning: warningNotification,
-      success: successNotification
-    }
+      success: successNotification,
+    },
   );
 
   const url = 'http://test-url.com/test-url';
@@ -39,8 +47,8 @@ describe('AbstractTrackableComponent', () => {
         initialize: {},
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     scheduler = getTestScheduler();
@@ -52,8 +60,8 @@ describe('AbstractTrackableComponent', () => {
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
         { provide: NotificationsService, useValue: notificationsService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts
index e1a99d90b9..de1bb7a841 100644
--- a/src/app/shared/trackable/abstract-trackable.component.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.ts
@@ -1,15 +1,16 @@
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../notifications/notifications.service';
+import { Component } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component } from '@angular/core';
+
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import { NotificationsService } from '../notifications/notifications.service';
 
 /**
  * Abstract Component that is able to track changes made in the inheriting component using the ObjectUpdateService
  */
 @Component({
   selector: 'ds-abstract-trackable',
-  template: ''
+  template: '',
 })
 export class AbstractTrackableComponent {
 
@@ -34,7 +35,7 @@ export class AbstractTrackableComponent {
    * Shows a notification to remind the user that they can undo this
    */
   discard() {
-    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), {timeOut: this.discardTimeOut});
+    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), { timeOut: this.discardTimeOut });
     this.objectUpdatesService.discardFieldUpdates(this.url, undoNotification);
   }
 
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
index 71a1dc3620..0129e7971c 100644
--- a/src/app/shared/translate/missing-translation.helper.ts
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -1,4 +1,7 @@
-import { MissingTranslationHandler, MissingTranslationHandlerParams } from '@ngx-translate/core';
+import {
+  MissingTranslationHandler,
+  MissingTranslationHandlerParams,
+} from '@ngx-translate/core';
 
 /**
  * Class to handle missing translations for the ngx-translate library
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 08d3e18117..1d7d4fef14 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -1,15 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TruncatablePartComponent } from './truncatable-part.component';
-import { TruncatableService } from '../truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { mockTruncatableService } from '../../mocks/mock-trucatable.service';
 import { getMockTranslateService } from '../../mocks/translate.service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { mockTruncatableService } from '../../mocks/mock-trucatable.service';
-import { By } from '@angular/platform-browser';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+import { TruncatableService } from '../truncatable.service';
+import { TruncatablePartComponent } from './truncatable-part.component';
 
 describe('TruncatablePartComponent', () => {
   let comp: TruncatablePartComponent;
@@ -26,7 +41,7 @@ describe('TruncatablePartComponent', () => {
       } else {
         return observableOf(false);
       }
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     translateService = getMockTranslateService();
@@ -35,8 +50,8 @@ describe('TruncatablePartComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [TruncatablePartComponent],
@@ -44,9 +59,9 @@ describe('TruncatablePartComponent', () => {
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatablePartComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -118,8 +133,8 @@ describe('TruncatablePartComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [TruncatablePartComponent],
@@ -127,9 +142,9 @@ describe('TruncatablePartComponent', () => {
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         { provide: TruncatableService, useValue: mockTruncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatablePartComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 790bd5985d..f07fc9a601 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -1,11 +1,20 @@
-import { AfterViewChecked, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { TruncatableService } from '../truncatable.service';
+import {
+  AfterViewChecked,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+
 import { hasValue } from '../../empty.util';
+import { TruncatableService } from '../truncatable.service';
 
 @Component({
   selector: 'ds-truncatable-part',
   templateUrl: './truncatable-part.component.html',
-  styleUrls: ['./truncatable-part.component.scss']
+  styleUrls: ['./truncatable-part.component.scss'],
 })
 
 /**
@@ -49,7 +58,7 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
   /**
    * The view on the truncatable part
    */
-  @ViewChild('content', {static: true}) content: ElementRef;
+  @ViewChild('content', { static: true }) content: ElementRef;
 
   /**
    * Current amount of lines shown of this part
diff --git a/src/app/shared/truncatable/truncatable.actions.ts b/src/app/shared/truncatable/truncatable.actions.ts
index cd9a92f935..a6eb86cb0e 100644
--- a/src/app/shared/truncatable/truncatable.actions.ts
+++ b/src/app/shared/truncatable/truncatable.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 
 /**
diff --git a/src/app/shared/truncatable/truncatable.component.spec.ts b/src/app/shared/truncatable/truncatable.component.spec.ts
index 29100e50d2..518ba06309 100644
--- a/src/app/shared/truncatable/truncatable.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable.component.spec.ts
@@ -1,9 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
 import { mockTruncatableService } from '../mocks/mock-trucatable.service';
 import { TruncatableComponent } from './truncatable.component';
 import { TruncatableService } from './truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('TruncatableComponent', () => {
   let comp: TruncatableComponent;
@@ -17,9 +25,9 @@ describe('TruncatableComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatableComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/shared/truncatable/truncatable.component.ts b/src/app/shared/truncatable/truncatable.component.ts
index 8fca300cd4..a1a6bbb200 100644
--- a/src/app/shared/truncatable/truncatable.component.ts
+++ b/src/app/shared/truncatable/truncatable.component.ts
@@ -1,4 +1,11 @@
-import { AfterViewChecked, Component, ElementRef, Input, OnInit } from '@angular/core';
+import {
+  AfterViewChecked,
+  Component,
+  ElementRef,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { TruncatableService } from './truncatable.service';
 
 @Component({
@@ -33,7 +40,7 @@ export class TruncatableComponent implements OnInit, AfterViewChecked {
    */
   @Input() showToggle = true;
 
-  public constructor(private service: TruncatableService, private el: ElementRef,) {
+  public constructor(private service: TruncatableService, private el: ElementRef) {
   }
 
   /**
diff --git a/src/app/shared/truncatable/truncatable.reducer.spec.ts b/src/app/shared/truncatable/truncatable.reducer.spec.ts
index 9866f382f7..dca19d0225 100644
--- a/src/app/shared/truncatable/truncatable.reducer.spec.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.spec.ts
@@ -1,8 +1,12 @@
 // eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
+import {
+  TruncatableCollapseAction,
+  TruncatableExpandAction,
+  TruncatableToggleAction,
+} from './truncatable.actions';
 import { truncatableReducer } from './truncatable.reducer';
-import { TruncatableCollapseAction, TruncatableExpandAction, TruncatableToggleAction } from './truncatable.actions';
 
 const id1 = '123';
 const id2 = '456';
@@ -53,6 +57,7 @@ describe('truncatableReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to false in response to the EXPAND action', () => {
@@ -71,6 +76,10 @@ describe('truncatableReducer', () => {
 
     const action = new TruncatableExpandAction(id1);
     truncatableReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of filterCollapsed in response to the TOGGLE action', () => {
@@ -92,5 +101,9 @@ describe('truncatableReducer', () => {
 
     const action = new TruncatableToggleAction(id2);
     truncatableReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 });
diff --git a/src/app/shared/truncatable/truncatable.reducer.ts b/src/app/shared/truncatable/truncatable.reducer.ts
index 252a7f2c38..661e80d830 100644
--- a/src/app/shared/truncatable/truncatable.reducer.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.ts
@@ -1,4 +1,7 @@
-import { TruncatableAction, TruncatableActionTypes } from './truncatable.actions';
+import {
+  TruncatableAction,
+  TruncatableActionTypes,
+} from './truncatable.actions';
 
 /**
  * Interface that represents the state of a single truncatable
@@ -30,22 +33,22 @@ export function truncatableReducer(state = initialState, action: TruncatableActi
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: true,
-        }
+        },
       });
     } case TruncatableActionTypes.EXPAND: {
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: false,
-        }
+        },
       });
     } case TruncatableActionTypes.TOGGLE: {
       if (!state[action.id]) {
-        state[action.id] = {collapsed: false};
+        state[action.id] = { collapsed: false };
       }
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: !state[action.id].collapsed,
-        }
+        },
       });
     }
     default: {
diff --git a/src/app/shared/truncatable/truncatable.service.spec.ts b/src/app/shared/truncatable/truncatable.service.spec.ts
index 005e463052..9889b97883 100644
--- a/src/app/shared/truncatable/truncatable.service.spec.ts
+++ b/src/app/shared/truncatable/truncatable.service.spec.ts
@@ -1,10 +1,17 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { TruncatableService } from './truncatable.service';
-import { TruncatableCollapseAction, TruncatableExpandAction } from './truncatable.actions';
-import { TruncatablesState } from './truncatable.reducer';
 import { of as observableOf } from 'rxjs';
 
+import {
+  TruncatableCollapseAction,
+  TruncatableExpandAction,
+} from './truncatable.actions';
+import { TruncatablesState } from './truncatable.reducer';
+import { TruncatableService } from './truncatable.service';
+
 describe('TruncatableService', () => {
   const id1 = '123';
   const id2 = '456';
@@ -13,16 +20,16 @@ describe('TruncatableService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
 
       providers: [
         {
-          provide: Store, useValue: store
-        }
-      ]
+          provide: Store, useValue: store,
+        },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/truncatable/truncatable.service.ts b/src/app/shared/truncatable/truncatable.service.ts
index 60e8a7df41..e6acffb388 100644
--- a/src/app/shared/truncatable/truncatable.service.ts
+++ b/src/app/shared/truncatable/truncatable.service.ts
@@ -1,14 +1,23 @@
-import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { TruncatablesState, TruncatableState } from './truncatable.reducer';
 import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { hasValue } from '../empty.util';
+import {
+  TruncatableCollapseAction,
   TruncatableExpandAction,
   TruncatableToggleAction,
-  TruncatableCollapseAction
 } from './truncatable.actions';
-import { hasValue } from '../empty.util';
+import {
+  TruncatablesState,
+  TruncatableState,
+} from './truncatable.reducer';
 
 const truncatableStateSelector = (state: TruncatablesState) => state.truncatable;
 
@@ -35,7 +44,7 @@ export class TruncatableService {
         } else {
           return false;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 759f84ef45..3d1d2b3734 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -14,10 +14,10 @@
 </div>
 <div class="well ds-base-drop-zone mt-1 mb-3 text-muted p-2">
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
-     *ngIf="fileObject!=null">  {{ fileObject.name }} </p>
+     *ngIf="fileObject!==null">  {{ fileObject.name }} </p>
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
       <span><i class="fas fa-cloud-upload"
-               aria-hidden="true"></i> {{ (fileObject == null ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
+               aria-hidden="true"></i> {{ (fileObject === null ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ml-1">
       <input class="form-control-file d-none" requireFile #file="ngModel" type="file" name="file-upload"
              id="file-upload"
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
index 06636f4256..6b67ecd166 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
@@ -1,7 +1,18 @@
-import { Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import uniqueId from 'lodash/uniqueId';
 import { FileUploader } from 'ng2-file-upload';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { UploaderOptions } from '../uploader/uploader-options.model';
 
 /**
@@ -14,7 +25,7 @@ import { UploaderOptions } from '../uploader/uploader-options.model';
 @Component({
   selector: 'ds-file-dropzone-no-uploader',
   templateUrl: './file-dropzone-no-uploader.component.html',
-  styleUrls: ['./file-dropzone-no-uploader.scss']
+  styleUrls: ['./file-dropzone-no-uploader.scss'],
 })
 export class FileDropzoneNoUploaderComponent implements OnInit {
 
diff --git a/src/app/shared/upload/upload.module.ts b/src/app/shared/upload/upload.module.ts
index 9f2895d7ac..e453c7fea9 100644
--- a/src/app/shared/upload/upload.module.ts
+++ b/src/app/shared/upload/upload.module.ts
@@ -5,12 +5,13 @@
  *
  * http://www.dspace.org/license/
  */
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared.module';
+import { NgModule } from '@angular/core';
 import { FileUploadModule } from 'ng2-file-upload';
-import { UploaderComponent } from './uploader/uploader.component';
+
+import { SharedModule } from '../shared.module';
 import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
+import { UploaderComponent } from './uploader/uploader.component';
 
 const COMPONENTS = [
   UploaderComponent,
@@ -32,7 +33,7 @@ const COMPONENTS = [
   exports: [
     ...COMPONENTS,
     FileUploadModule,
-  ]
+  ],
 })
 export class UploadModule {
 }
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 88dc5926e4..b1fd8199d8 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -23,7 +23,7 @@
           <i class="fas fa-upload" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
-            <span role="button" [attr.aria-label]="'uploader.browse' | translate">{{'uploader.browse' | translate}}</span>
+            <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
           </label>
           <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
         </span>
diff --git a/src/app/shared/upload/uploader/uploader.component.spec.ts b/src/app/shared/upload/uploader/uploader.component.spec.ts
index 8ea23c8acb..a67bde4539 100644
--- a/src/app/shared/upload/uploader/uploader.component.spec.ts
+++ b/src/app/shared/upload/uploader/uploader.component.spec.ts
@@ -1,19 +1,27 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
-
+import { HttpXsrfTokenExtractor } from '@angular/common/http';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import { FileUploadModule } from 'ng2-file-upload';
 
 import { DragService } from '../../../core/drag.service';
-import { UploaderOptions } from './uploader-options.model';
-import { UploaderComponent } from './uploader.component';
-import { FileUploadModule } from 'ng2-file-upload';
-import { TranslateModule } from '@ngx-translate/core';
-import { createTestComponent } from '../../testing/utils.test';
-import { HttpXsrfTokenExtractor } from '@angular/common/http';
 import { CookieService } from '../../../core/services/cookie.service';
 import { CookieServiceMock } from '../../mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../mocks/http-xsrf-token-extractor.mock';
+import { createTestComponent } from '../../testing/utils.test';
+import { UploaderComponent } from './uploader.component';
+import { UploaderOptions } from './uploader-options.model';
 
 describe('Chips component', () => {
 
@@ -27,7 +35,7 @@ describe('Chips component', () => {
     TestBed.configureTestingModule({
       imports: [
         FileUploadModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         UploaderComponent,
@@ -41,7 +49,7 @@ describe('Chips component', () => {
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -67,14 +75,14 @@ describe('Chips component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   public uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
     url: 'http://test',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index ef4ce4ee45..a3fb50a5fc 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -1,24 +1,40 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostListener, Input, Output, ViewEncapsulation, } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
-import { FileUploader } from 'ng2-file-upload';
-import uniqueId from 'lodash/uniqueId';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-
-import { UploaderOptions } from './uploader-options.model';
-import { hasValue, isNotEmpty, isUndefined } from '../../empty.util';
-import { UploaderProperties } from './uploader-properties.model';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
-import { XSRF_COOKIE, XSRF_REQUEST_HEADER, XSRF_RESPONSE_HEADER } from '../../../core/xsrf/xsrf.constants';
-import { CookieService } from '../../../core/services/cookie.service';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import uniqueId from 'lodash/uniqueId';
+import { FileUploader } from 'ng2-file-upload';
+import { of as observableOf } from 'rxjs';
+
 import { DragService } from '../../../core/drag.service';
+import { CookieService } from '../../../core/services/cookie.service';
+import {
+  XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from '../../../core/xsrf/xsrf.constants';
+import {
+  hasValue,
+  isNotEmpty,
+  isUndefined,
+} from '../../empty.util';
+import { UploaderOptions } from './uploader-options.model';
+import { UploaderProperties } from './uploader-properties.model';
 
 @Component({
   selector: 'ds-uploader',
   templateUrl: 'uploader.component.html',
   styleUrls: ['uploader.component.scss'],
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 
 export class UploaderComponent {
@@ -53,6 +69,11 @@ export class UploaderComponent {
    */
   @Input() uploadProperties: UploaderProperties;
 
+  /**
+   * The aria label to describe what kind of files need to be uploaded
+   */
+  @Input() ariaLabel: string;
+
   /**
    * The function to call when upload is completed
    */
@@ -90,7 +111,7 @@ export class UploaderComponent {
     private scrollToService: ScrollToService,
     private dragService: DragService,
     private tokenExtractor: HttpXsrfTokenExtractor,
-    private cookieService: CookieService
+    private cookieService: CookieService,
   ) {
   }
 
diff --git a/src/app/shared/utils/auto-focus.directive.ts b/src/app/shared/utils/auto-focus.directive.ts
index a2d860a8e1..e48ec7e1df 100644
--- a/src/app/shared/utils/auto-focus.directive.ts
+++ b/src/app/shared/utils/auto-focus.directive.ts
@@ -1,11 +1,17 @@
-import { Directive, AfterViewInit, ElementRef, Input } from '@angular/core';
+import {
+  AfterViewInit,
+  Directive,
+  ElementRef,
+  Input,
+} from '@angular/core';
+
 import { isNotEmpty } from '../empty.util';
 
 /**
  * Directive to set focus on an element when it is rendered
  */
 @Directive({
-  selector: '[dsAutoFocus]'
+  selector: '[dsAutoFocus]',
 })
 export class AutoFocusDirective implements AfterViewInit {
 
diff --git a/src/app/shared/utils/browser-only.pipe.ts b/src/app/shared/utils/browser-only.pipe.ts
index e3ee3df69d..65e6653256 100644
--- a/src/app/shared/utils/browser-only.pipe.ts
+++ b/src/app/shared/utils/browser-only.pipe.ts
@@ -1,5 +1,10 @@
-import { Inject, Pipe, PipeTransform, PLATFORM_ID } from '@angular/core';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Inject,
+  Pipe,
+  PipeTransform,
+  PLATFORM_ID,
+} from '@angular/core';
 
 /**
  * A pipe that only returns its input when run in the browser.
@@ -17,7 +22,7 @@ import { isPlatformBrowser } from '@angular/common';
  * until such components are fully interactive before trying to interact with them.
  */
 @Pipe({
-  name: 'dsBrowserOnly'
+  name: 'dsBrowserOnly',
 })
 export class BrowserOnlyPipe implements PipeTransform {
   constructor(
diff --git a/src/app/shared/utils/capitalize.pipe.ts b/src/app/shared/utils/capitalize.pipe.ts
index 2842d1dc7e..562434d731 100644
--- a/src/app/shared/utils/capitalize.pipe.ts
+++ b/src/app/shared/utils/capitalize.pipe.ts
@@ -1,7 +1,10 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({
-  name: 'dsCapitalize'
+  name: 'dsCapitalize',
 })
 
 /**
diff --git a/src/app/shared/utils/click-outside.directive.ts b/src/app/shared/utils/click-outside.directive.ts
index b9397c65e5..70587becd8 100644
--- a/src/app/shared/utils/click-outside.directive.ts
+++ b/src/app/shared/utils/click-outside.directive.ts
@@ -1,7 +1,13 @@
-import { Directive, ElementRef, Output, EventEmitter, HostListener } from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Output,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsClickOutside]'
+  selector: '[dsClickOutside]',
 })
 /**
  * Directive to detect when the users clicks outside of the element the directive was put on
diff --git a/src/app/shared/utils/console.pipe.ts b/src/app/shared/utils/console.pipe.ts
index fc672a84ae..5d49eaea84 100644
--- a/src/app/shared/utils/console.pipe.ts
+++ b/src/app/shared/utils/console.pipe.ts
@@ -1,7 +1,10 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({
-  name: 'dsConsole'
+  name: 'dsConsole',
 })
 export class ConsolePipe implements PipeTransform {
   transform(value: any): string {
diff --git a/src/app/shared/utils/debounce.directive.ts b/src/app/shared/utils/debounce.directive.ts
index 8830679e2b..a509af7a07 100644
--- a/src/app/shared/utils/debounce.directive.ts
+++ b/src/app/shared/utils/debounce.directive.ts
@@ -1,8 +1,18 @@
-import {distinctUntilChanged, debounceTime, takeUntil} from 'rxjs/operators';
-import { Directive, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgControl } from '@angular/forms';
-
 import { Subject } from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  takeUntil,
+} from 'rxjs/operators';
 
 @Directive({
   selector: '[ngModel][dsDebounce]',
@@ -11,6 +21,7 @@ import { Subject } from 'rxjs';
  * Directive for setting a debounce time on an input field
  * It will emit the input field's value when no changes were made to this value in a given debounce time
  */
+// todo: this class is unused, consider removing it instead of fixing lint
 export class DebounceDirective implements OnInit, OnDestroy {
 
   /**
@@ -39,14 +50,14 @@ export class DebounceDirective implements OnInit, OnDestroy {
    */
   ngOnInit() {
     this.model.valueChanges.pipe(
-      takeUntil(this.subject),
       debounceTime(this.dsDebounce),
-      distinctUntilChanged())
-      .subscribe((modelValue) => {
-        if (this.model.dirty) {
-          this.onDebounce.emit(modelValue);
-        }
-      });
+      distinctUntilChanged(),
+      takeUntil(this.subject),  // todo: check if this is ok
+    ).subscribe((modelValue) => {
+      if (this.model.dirty) {
+        this.onDebounce.emit(modelValue);
+      }
+    });
   }
 
   /**
diff --git a/src/app/shared/utils/drag-click.directive.ts b/src/app/shared/utils/drag-click.directive.ts
index b7377b4c55..9d04c0527f 100644
--- a/src/app/shared/utils/drag-click.directive.ts
+++ b/src/app/shared/utils/drag-click.directive.ts
@@ -1,7 +1,12 @@
-import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
+import {
+  Directive,
+  EventEmitter,
+  HostListener,
+  Output,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsDragClick]'
+  selector: '[dsDragClick]',
 })
 
 /**
diff --git a/src/app/shared/utils/emphasize.pipe.ts b/src/app/shared/utils/emphasize.pipe.ts
index 613074a308..632a812617 100644
--- a/src/app/shared/utils/emphasize.pipe.ts
+++ b/src/app/shared/utils/emphasize.pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({ name: 'dsEmphasize' })
 /**
@@ -26,7 +29,7 @@ export class EmphasizePipe implements PipeTransform {
     , '\\'
     , '^'
     , '$'
-    , '|'
+    , '|',
   ];
   /**
    * Regular expression for escaping the string we're trying to find
@@ -50,7 +53,7 @@ export class EmphasizePipe implements PipeTransform {
    * @param str Escape special characters in the string we're looking for
    * @returns {any} The escaped version of the input string
    */
-   escapeRegExp(str) {
+  escapeRegExp(str) {
     return str.replace(this.regex, '\\$&');
   }
 }
diff --git a/src/app/shared/utils/enum-keys-pipe.ts b/src/app/shared/utils/enum-keys-pipe.ts
index 0a4a445c02..c07c42fb9c 100644
--- a/src/app/shared/utils/enum-keys-pipe.ts
+++ b/src/app/shared/utils/enum-keys-pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({ name: 'dsKeys' })
 /**
diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index 934f3ee67a..820840b115 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 // eslint-disable-next-line import/no-namespace
 import * as fileSize from 'filesize';
 
diff --git a/src/app/shared/utils/file-value-accessor.directive.ts b/src/app/shared/utils/file-value-accessor.directive.ts
index 82ce2e6ab0..95c76b2484 100644
--- a/src/app/shared/utils/file-value-accessor.directive.ts
+++ b/src/app/shared/utils/file-value-accessor.directive.ts
@@ -1,27 +1,30 @@
-import {Directive} from '@angular/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
+import { Directive } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+} from '@angular/forms';
 
 @Directive({
-    // eslint-disable-next-line @angular-eslint/directive-selector
-    selector: 'input[type=file]',
-    // eslint-disable-next-line @angular-eslint/no-host-metadata-property
-    host : {
-        '(change)' : 'onChange($event.target.files)',
-        '(blur)': 'onTouched()'
-    },
-    providers: [
-        { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true }
-    ]
+  // eslint-disable-next-line @angular-eslint/directive-selector
+  selector: 'input[type=file]',
+  // eslint-disable-next-line @angular-eslint/no-host-metadata-property
+  host : {
+    '(change)' : 'onChange($event.target.files)',
+    '(blur)': 'onTouched()',
+  },
+  providers: [
+    { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true },
+  ],
 })
 /**
  * Value accessor directive for inputs of type 'file'
  */
 export class FileValueAccessorDirective implements ControlValueAccessor {
-    value: any;
-    onChange = (_) => { /* empty */ };
-    onTouched = () => { /* empty */};
+  value: any;
+  onChange = (_) => { /* empty */ };
+  onTouched = () => { /* empty */};
 
-    writeValue(value) { /* empty */}
-    registerOnChange(fn: any) { this.onChange = fn; }
-    registerOnTouched(fn: any) { this.onTouched = fn; }
+  writeValue(value) { /* empty */}
+  registerOnChange(fn: any) { this.onChange = fn; }
+  registerOnTouched(fn: any) { this.onTouched = fn; }
 }
diff --git a/src/app/shared/utils/follow-link-config.model.ts b/src/app/shared/utils/follow-link-config.model.ts
index 8d785dbaaf..0eb1ad0cae 100644
--- a/src/app/shared/utils/follow-link-config.model.ts
+++ b/src/app/shared/utils/follow-link-config.model.ts
@@ -1,6 +1,6 @@
+import { FindListOptions } from '../../core/data/find-list-options.model';
 import { HALResource } from '../../core/shared/hal-resource.model';
 import { hasValue } from '../empty.util';
-import { FindListOptions } from '../../core/data/find-list-options.model';
 
 /**
  * A class to send the retrieval of a {@link HALLink}
@@ -75,7 +75,7 @@ export const followLink = <R extends HALResource>(
     shouldEmbed,
     useCachedVersionIfAvailable,
     reRequestOnStale,
-    isOptional
+    isOptional,
   }: {
     findListOptions?: FindListOptions,
     shouldEmbed?: boolean,
@@ -92,7 +92,7 @@ export const followLink = <R extends HALResource>(
     useCachedVersionIfAvailable: hasValue(useCachedVersionIfAvailable) ? useCachedVersionIfAvailable : true,
     reRequestOnStale: hasValue(reRequestOnStale) ? reRequestOnStale : true,
     isOptional: hasValue(isOptional) ? isOptional : false,
-    linksToFollow
+    linksToFollow,
   };
   return followLinkConfig;
 };
diff --git a/src/app/shared/utils/has-no-value.pipe.ts b/src/app/shared/utils/has-no-value.pipe.ts
new file mode 100644
index 0000000000..c5e23d01ef
--- /dev/null
+++ b/src/app/shared/utils/has-no-value.pipe.ts
@@ -0,0 +1,16 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+import { hasNoValue } from '../empty.util';
+
+/**
+ * Returns true if the passed value is null or undefined.
+ */
+@Pipe({ name: 'dsHasNoValue' })
+export class HasNoValuePipe implements PipeTransform {
+  transform(value: any): boolean {
+    return hasNoValue(value);
+  }
+}
diff --git a/src/app/shared/utils/has-value.pipe.ts b/src/app/shared/utils/has-value.pipe.ts
new file mode 100644
index 0000000000..a669a77093
--- /dev/null
+++ b/src/app/shared/utils/has-value.pipe.ts
@@ -0,0 +1,16 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+import { hasValue } from '../empty.util';
+
+/**
+ * Returns true if the passed value is not null or undefined.
+ */
+@Pipe({ name: 'dsHasValue' })
+export class HasValuePipe implements PipeTransform {
+  transform(value: any): boolean {
+    return hasValue(value);
+  }
+}
diff --git a/src/app/shared/utils/in-list-validator.directive.ts b/src/app/shared/utils/in-list-validator.directive.ts
index fef0c2f962..278efa2dc3 100644
--- a/src/app/shared/utils/in-list-validator.directive.ts
+++ b/src/app/shared/utils/in-list-validator.directive.ts
@@ -1,5 +1,14 @@
-import { Directive, Input } from '@angular/core';
-import { UntypedFormControl, NG_VALIDATORS, ValidationErrors, Validator } from '@angular/forms';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  ValidationErrors,
+  Validator,
+} from '@angular/forms';
+
 import { inListValidator } from './validator.functions';
 
 /**
@@ -9,15 +18,15 @@ import { inListValidator } from './validator.functions';
   selector: '[ngModel][dsInListValidator]',
   // We add our directive to the list of existing validators
   providers: [
-    { provide: NG_VALIDATORS, useExisting: InListValidator, multi: true }
-  ]
+    { provide: NG_VALIDATORS, useExisting: InListValidator, multi: true },
+  ],
 })
 export class InListValidator implements Validator {
   /**
    * The list to look in
    */
   @Input()
-  dsInListValidator: string[];
+    dsInListValidator: string[];
 
   /**
    * The function that checks if the form control's value is currently valid
diff --git a/src/app/shared/utils/ipV4.validator.spec.ts b/src/app/shared/utils/ipV4.validator.spec.ts
new file mode 100644
index 0000000000..2410722d61
--- /dev/null
+++ b/src/app/shared/utils/ipV4.validator.spec.ts
@@ -0,0 +1,39 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+
+import { IpV4Validator } from './ipV4.validator';
+
+describe('IpV4 validator', () => {
+
+  let ipV4Validator: IpV4Validator;
+  const validIp = '192.168.0.1';
+  const formGroup = new UntypedFormGroup({
+    ip: new UntypedFormControl(''),
+  });
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        IpV4Validator,
+      ],
+    }).compileComponents();
+
+    ipV4Validator = TestBed.inject(IpV4Validator);
+  });
+
+  it('should return null for valid ipV4',  () => {
+    formGroup.controls.ip.setValue(validIp);
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toBeNull();
+  });
+
+  it('should return {isValidIp: false} for invalid Ip',  () => {
+    formGroup.controls.ip.setValue('100.260.45.1');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+    formGroup.controls.ip.setValue('100');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+    formGroup.controls.ip.setValue('testString');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+  });
+});
diff --git a/src/app/shared/utils/ipV4.validator.ts b/src/app/shared/utils/ipV4.validator.ts
new file mode 100644
index 0000000000..04f2a4b022
--- /dev/null
+++ b/src/app/shared/utils/ipV4.validator.ts
@@ -0,0 +1,30 @@
+import { Directive } from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  Validator,
+} from '@angular/forms';
+
+@Directive({
+  // eslint-disable-next-line @angular-eslint/directive-selector
+  selector: '[ipV4format]',
+  providers: [
+    { provide: NG_VALIDATORS, useExisting: IpV4Validator, multi: true },
+  ],
+})
+/**
+ * Validator to validate if an Ip is in the right format
+ */
+export class IpV4Validator implements Validator {
+  validate(formControl: UntypedFormControl): {[key: string]: boolean} | null {
+    const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
+    const ipValue = formControl.value;
+    const ipParts = ipValue?.split('.');
+
+    if (ipv4Regex.test(ipValue) && ipParts.every(part => parseInt(part, 10) <= 255)) {
+      return null;
+    }
+
+    return { isValidIp: false };
+  }
+}
diff --git a/src/app/shared/utils/markdown.pipe.spec.ts b/src/app/shared/utils/markdown.pipe.spec.ts
index 50f772097d..cf644767e2 100644
--- a/src/app/shared/utils/markdown.pipe.spec.ts
+++ b/src/app/shared/utils/markdown.pipe.spec.ts
@@ -1,7 +1,8 @@
-import { MarkdownPipe } from './markdown.pipe';
 import { TestBed } from '@angular/core/testing';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { MarkdownPipe } from './markdown.pipe';
 
 describe('Markdown Pipe', () => {
 
@@ -17,8 +18,8 @@ describe('Markdown Pipe', () => {
             markdown: {
               enabled: true,
               mathjax: true,
-            }
-          })
+            },
+          }),
         },
       ],
     }).compileComponents();
@@ -29,36 +30,36 @@ describe('Markdown Pipe', () => {
   it('should render markdown', async () => {
     await testTransform(
       '# Header',
-      '<h1>Header</h1>'
+      '<h1>Header</h1>',
     );
   });
 
   it('should render mathjax', async () => {
     await testTransform(
       '$\\sqrt{2}^2$',
-      '<svg.*?>.*</svg>'
+      '<svg.*?>.*</svg>',
     );
   });
 
   it('should render regular links', async () => {
     await testTransform(
       '<a href="https://www.dspace.com">DSpace</a>',
-      '<a href="https://www.dspace.com">DSpace</a>'
+      '<a href="https://www.dspace.com">DSpace</a>',
     );
   });
 
   it('should not render javascript links', async () => {
     await testTransform(
       '<a href="javascript:window.alert(\'bingo!\');">exploit</a>',
-      '<a>exploit</a>'
+      '<a>exploit</a>',
     );
   });
 
   async function testTransform(input: string, output: string) {
     expect(
-      await markdownPipe.transform(input)
+      await markdownPipe.transform(input),
     ).toMatch(
-      new RegExp('.*' + output + '.*')
+      new RegExp('.*' + output + '.*'),
     );
   }
 });
diff --git a/src/app/shared/utils/markdown.pipe.ts b/src/app/shared/utils/markdown.pipe.ts
index e494a82613..d86a8d95ca 100644
--- a/src/app/shared/utils/markdown.pipe.ts
+++ b/src/app/shared/utils/markdown.pipe.ts
@@ -1,26 +1,36 @@
-import { Inject, InjectionToken, Pipe, PipeTransform, SecurityContext } from '@angular/core';
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+import {
+  Inject,
+  InjectionToken,
+  Pipe,
+  PipeTransform,
+  SecurityContext,
+} from '@angular/core';
+import {
+  DomSanitizer,
+  SafeHtml,
+} from '@angular/platform-browser';
+
 import { environment } from '../../../environments/environment';
 
 const markdownItLoader = async () => (await import('markdown-it')).default;
 type LazyMarkdownIt = ReturnType<typeof markdownItLoader>;
 const MARKDOWN_IT = new InjectionToken<LazyMarkdownIt>(
   'Lazily loaded MarkdownIt',
-  { providedIn: 'root', factory: markdownItLoader }
+  { providedIn: 'root', factory: markdownItLoader },
 );
 
 const mathjaxLoader = async () => (await import('markdown-it-mathjax3')).default;
 type Mathjax = ReturnType<typeof mathjaxLoader>;
 const MATHJAX = new InjectionToken<Mathjax>(
   'Lazily loaded mathjax',
-  { providedIn: 'root', factory: mathjaxLoader }
+  { providedIn: 'root', factory: mathjaxLoader },
 );
 
 const sanitizeHtmlLoader = async () => (await import('sanitize-html') as any).default;
 type SanitizeHtml = ReturnType<typeof sanitizeHtmlLoader>;
 const SANITIZE_HTML = new InjectionToken<SanitizeHtml>(
   'Lazily loaded sanitize-html',
-  { providedIn: 'root', factory: sanitizeHtmlLoader }
+  { providedIn: 'root', factory: sanitizeHtmlLoader },
 );
 
 /**
@@ -37,7 +47,7 @@ const SANITIZE_HTML = new InjectionToken<SanitizeHtml>(
  *   </span>
  */
 @Pipe({
-  name: 'dsMarkdown'
+  name: 'dsMarkdown',
 })
 export class MarkdownPipe implements PipeTransform {
 
@@ -67,28 +77,39 @@ export class MarkdownPipe implements PipeTransform {
         // sanitize-html doesn't let through SVG by default, so we extend its allowlists to cover MathJax SVG
         allowedTags: [
           ...sanitizeHtml.defaults.allowedTags,
-          'mjx-container', 'svg', 'g', 'path', 'rect', 'text'
+          'mjx-container', 'svg', 'g', 'path', 'rect', 'text',
+          // Also let the mjx-assistive-mml tag (and it's children) through (for screen readers)
+          'mjx-assistive-mml', 'math', 'mrow', 'mi',
         ],
         allowedAttributes: {
           ...sanitizeHtml.defaults.allowedAttributes,
           'mjx-container': [
-            'class', 'style', 'jax'
+            'class', 'style', 'jax',
           ],
           svg: [
-            'xmlns', 'viewBox', 'style', 'width', 'height', 'role', 'focusable', 'alt', 'aria-label'
+            'xmlns', 'viewBox', 'style', 'width', 'height', 'role', 'focusable', 'alt', 'aria-label',
           ],
           g: [
-            'data-mml-node', 'style', 'stroke', 'fill', 'stroke-width', 'transform'
+            'data-mml-node', 'style', 'stroke', 'fill', 'stroke-width', 'transform',
           ],
           path: [
-            'd', 'style', 'transform'
+            'd', 'style', 'transform',
           ],
           rect: [
-            'width', 'height', 'x', 'y', 'transform', 'style'
+            'width', 'height', 'x', 'y', 'transform', 'style',
           ],
           text: [
-            'transform', 'font-size'
-          ]
+            'transform', 'font-size',
+          ],
+          'mjx-assistive-mml': [
+            'unselectable', 'display', 'style',
+          ],
+          math: [
+            'xmlns',
+          ],
+          mrow: [
+            'data-mjx-texclass',
+          ],
         },
         parser: {
           lowerCaseAttributeNames: false,
diff --git a/src/app/shared/utils/metadatafield-validator.directive.ts b/src/app/shared/utils/metadatafield-validator.directive.ts
index 8725246eeb..badfad5b72 100644
--- a/src/app/shared/utils/metadatafield-validator.directive.ts
+++ b/src/app/shared/utils/metadatafield-validator.directive.ts
@@ -1,7 +1,24 @@
-import { Directive, Injectable } from '@angular/core';
-import { AbstractControl, AsyncValidator, NG_VALIDATORS, ValidationErrors } from '@angular/forms';
-import { map, switchMap, take } from 'rxjs/operators';
-import { of as observableOf, timer as observableTimer, Observable } from 'rxjs';
+import {
+  Directive,
+  Injectable,
+} from '@angular/core';
+import {
+  AbstractControl,
+  AsyncValidator,
+  NG_VALIDATORS,
+  ValidationErrors,
+} from '@angular/forms';
+import {
+  Observable,
+  of as observableOf,
+  timer as observableTimer,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { MetadataFieldDataService } from '../../core/data/metadata-field-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
@@ -15,8 +32,8 @@ import { getFirstSucceededRemoteData } from '../../core/shared/operators';
   selector: '[ngModel][dsMetadataFieldValidator]',
   // We add our directive to the list of existing validators
   providers: [
-    { provide: NG_VALIDATORS, useExisting: MetadataFieldValidator, multi: true }
-  ]
+    { provide: NG_VALIDATORS, useExisting: MetadataFieldValidator, multi: true },
+  ],
 })
 @Injectable({ providedIn: 'root' })
 export class MetadataFieldValidator implements AsyncValidator {
@@ -48,13 +65,13 @@ export class MetadataFieldValidator implements AsyncValidator {
               } else if (matchingFieldRD.payload.pageInfo.totalElements === 1) {
                 return null;
               }
-            })
+            }),
           );
 
         res.pipe(take(1)).subscribe();
 
         return res;
-      })
+      }),
     );
     resTimer.pipe(take(1)).subscribe();
     return resTimer;
diff --git a/src/app/shared/utils/object-keys-pipe.ts b/src/app/shared/utils/object-keys-pipe.ts
index 0d6a2c8222..095e076b8e 100644
--- a/src/app/shared/utils/object-keys-pipe.ts
+++ b/src/app/shared/utils/object-keys-pipe.ts
@@ -1,6 +1,9 @@
-import { PipeTransform, Pipe } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
-@Pipe({name: 'dsObjectKeys'})
+@Pipe({ name: 'dsObjectKeys' })
 /**
  * Pipe for parsing all keys of an object to an array of key-value pairs
  */
diff --git a/src/app/shared/utils/object-ngfor.pipe.ts b/src/app/shared/utils/object-ngfor.pipe.ts
index 982e3342e0..0e2d65b43e 100644
--- a/src/app/shared/utils/object-ngfor.pipe.ts
+++ b/src/app/shared/utils/object-ngfor.pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 /**
  * Pipe that allows to iterate over an object and to access to entry key and value :
@@ -9,10 +12,10 @@ import { Pipe, PipeTransform } from '@angular/core';
  *
  */
 @Pipe({
-  name: 'dsObjNgFor'
+  name: 'dsObjNgFor',
 })
 export class ObjNgFor implements PipeTransform {
   transform(value: any, args: any[] = null): any {
-    return Object.keys(value).map((key) => Object.assign({ key }, {value: value[key]}));
+    return Object.keys(value).map((key) => Object.assign({ key }, { value: value[key] }));
   }
 }
diff --git a/src/app/shared/utils/object-values-pipe.ts b/src/app/shared/utils/object-values-pipe.ts
index 5fab8bf841..a72d443b7e 100644
--- a/src/app/shared/utils/object-values-pipe.ts
+++ b/src/app/shared/utils/object-values-pipe.ts
@@ -1,9 +1,13 @@
-import { PipeTransform, Pipe } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
 import { isNotEmpty } from '../empty.util';
 
 @Pipe({
   name: 'dsObjectValues',
-  pure: true
+  pure: true,
 })
 /**
  * Pipe for parsing all values of an object to an array of values
diff --git a/src/app/shared/utils/relation-query.utils.spec.ts b/src/app/shared/utils/relation-query.utils.spec.ts
index f40c331497..1f2a725a9f 100644
--- a/src/app/shared/utils/relation-query.utils.spec.ts
+++ b/src/app/shared/utils/relation-query.utils.spec.ts
@@ -1,4 +1,7 @@
-import { getFilterByRelation, getQueryByRelations } from './relation-query.utils';
+import {
+  getFilterByRelation,
+  getQueryByRelations,
+} from './relation-query.utils';
 
 describe('Relation Query Utils', () => {
   const relationtype = 'isAuthorOfPublication';
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 62a69075fc..e2f3a0eb6c 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -1,5 +1,8 @@
-import { followLink, FollowLinkConfig } from './follow-link-config.model';
 import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from './follow-link-config.model';
 
 /**
  * Get the query for looking up items by relation type
@@ -30,7 +33,7 @@ export function itemLinksToFollow(showThumbnail: boolean):  FollowLinkConfig<Rel
   if (showThumbnail) {
     linksToFollow = [
       followLink('leftItem',{}, followLink('thumbnail')),
-      followLink('rightItem',{}, followLink('thumbnail'))
+      followLink('rightItem',{}, followLink('thumbnail')),
     ];
   } else {
     linksToFollow = [followLink('leftItem'), followLink('rightItem')];
diff --git a/src/app/shared/utils/require-file.validator.ts b/src/app/shared/utils/require-file.validator.ts
index ef41ad4309..c4ec59e160 100644
--- a/src/app/shared/utils/require-file.validator.ts
+++ b/src/app/shared/utils/require-file.validator.ts
@@ -1,22 +1,26 @@
-import {Directive} from '@angular/core';
-import {NG_VALIDATORS, Validator, UntypedFormControl} from '@angular/forms';
+import { Directive } from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  Validator,
+} from '@angular/forms';
 
 @Directive({
   // eslint-disable-next-line @angular-eslint/directive-selector
-    selector: '[requireFile]',
-    providers: [
-        { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
-    ]
+  selector: '[requireFile]',
+  providers: [
+    { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
+  ],
 })
 /**
  * Validator directive to validate if a file is selected
  */
 export class FileValidator implements Validator {
-    static validate(c: UntypedFormControl): {[key: string]: any} {
-      return c.value == null || c.value.length === 0 ? { required : true } : null;
-    }
+  static validate(c: UntypedFormControl): {[key: string]: any} {
+    return c.value == null || c.value.length === 0 ? { required : true } : null;
+  }
 
-    validate(c: UntypedFormControl): {[key: string]: any} {
-      return FileValidator.validate(c);
-    }
+  validate(c: UntypedFormControl): {[key: string]: any} {
+    return FileValidator.validate(c);
+  }
 }
diff --git a/src/app/shared/utils/route.utils.spec.ts b/src/app/shared/utils/route.utils.spec.ts
index 7ec6c879d8..aa91a886db 100644
--- a/src/app/shared/utils/route.utils.spec.ts
+++ b/src/app/shared/utils/route.utils.spec.ts
@@ -7,12 +7,12 @@ describe('Route Utils', () => {
         primary: {
           segments: [
             { path: 'test' },
-            { path: 'path' }
-          ]
-        }
+            { path: 'path' },
+          ],
+        },
 
-      }
-    }
+      },
+    },
   };
   const router = { parseUrl: () => urlTree } as any;
   it('Should return the correct current path based on the router', () => {
diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts
index 8f7bb9120d..9f45b7ec23 100644
--- a/src/app/shared/utils/route.utils.ts
+++ b/src/app/shared/utils/route.utils.ts
@@ -1,6 +1,10 @@
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { hasValue } from '../empty.util';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
+
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { hasValue } from '../empty.util';
 
 /**
  * Util function to retrieve the current path (without query parameters) the user is on
diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 3f35ed9262..1d04c7e08a 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 
 /**
diff --git a/src/app/shared/utils/short-number.pipe.spec.ts b/src/app/shared/utils/short-number.pipe.spec.ts
index 99fb246f54..9fda54f470 100644
--- a/src/app/shared/utils/short-number.pipe.spec.ts
+++ b/src/app/shared/utils/short-number.pipe.spec.ts
@@ -9,7 +9,7 @@ describe('ShortNumber Pipe', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
-        ShortNumberPipe
+        ShortNumberPipe,
       ],
     }).compileComponents();
 
@@ -19,78 +19,78 @@ describe('ShortNumber Pipe', () => {
   it('should not transform with an invalid number', async () => {
     await testTransform(
       'tre',
-      'tre'
+      'tre',
     );
   });
 
   it('should not transform with an empty string', async () => {
     await testTransform(
       '',
-      ''
+      '',
     );
   });
 
   it('should not transform with zero', async () => {
     await testTransform(
       0,
-      '0'
+      '0',
     );
   });
 
   it('should render 1K', async () => {
     await testTransform(
       '1000',
-      '1K'
+      '1K',
     );
   });
 
   it('should render 1K', async () => {
     await testTransform(
       1000,
-      '1K'
+      '1K',
     );
   });
 
   it('should render 19.3K', async () => {
     await testTransform(
       19300,
-      '19.3K'
+      '19.3K',
     );
   });
 
   it('should render 1M', async () => {
     await testTransform(
       1000000,
-      '1M'
+      '1M',
     );
   });
 
   it('should render 1B', async () => {
     await testTransform(
       1000000000,
-      '1B'
+      '1B',
     );
   });
 
   it('should render 1T', async () => {
     await testTransform(
       1000000000000,
-      '1T'
+      '1T',
     );
   });
 
   it('should render 1Q', async () => {
     await testTransform(
       1000000000000000,
-      '1Q'
+      '1Q',
     );
   });
 
   async function testTransform(input: any, output: string) {
     expect(
-      await shortNumberPipe.transform(input)
+      await shortNumberPipe.transform(input),
     ).toMatch(
-      output
+      output,
     );
   }
 });
diff --git a/src/app/shared/utils/short-number.pipe.ts b/src/app/shared/utils/short-number.pipe.ts
index e4d5cf8356..dc06e7f52a 100644
--- a/src/app/shared/utils/short-number.pipe.ts
+++ b/src/app/shared/utils/short-number.pipe.ts
@@ -1,9 +1,13 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
 import { isEmpty } from '../empty.util';
 
 
 @Pipe({
-  name: 'dsShortNumber'
+  name: 'dsShortNumber',
 })
 export class ShortNumberPipe implements PipeTransform {
 
@@ -19,11 +23,11 @@ export class ShortNumberPipe implements PipeTransform {
     let key = '';
 
     const powers = [
-      {key: 'Q', value: Math.pow(10, 15)},
-      {key: 'T', value: Math.pow(10, 12)},
-      {key: 'B', value: Math.pow(10, 9)},
-      {key: 'M', value: Math.pow(10, 6)},
-      {key: 'K', value: 1000}
+      { key: 'Q', value: Math.pow(10, 15) },
+      { key: 'T', value: Math.pow(10, 12) },
+      { key: 'B', value: Math.pow(10, 9) },
+      { key: 'M', value: Math.pow(10, 6) },
+      { key: 'K', value: 1000 },
     ];
 
     for (let i = 0; i < powers.length; i++) {
diff --git a/src/app/shared/utils/split.pipe.ts b/src/app/shared/utils/split.pipe.ts
new file mode 100644
index 0000000000..2f6290322a
--- /dev/null
+++ b/src/app/shared/utils/split.pipe.ts
@@ -0,0 +1,20 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+/**
+ * Custom pipe to split a string into an array of substrings based on a specified separator.
+ * @param value - The string to be split.
+ * @param separator - The separator used to split the string.
+ * @returns An array of substrings.
+ */
+@Pipe({
+  name: 'dsSplit',
+})
+export class SplitPipe implements PipeTransform {
+  transform(value: string, separator: string): string[] {
+    return value.split(separator);
+  }
+
+}
diff --git a/src/app/shared/utils/truncate.pipe.ts b/src/app/shared/utils/truncate.pipe.ts
index f841535bb8..35d94656ba 100644
--- a/src/app/shared/utils/truncate.pipe.ts
+++ b/src/app/shared/utils/truncate.pipe.ts
@@ -1,4 +1,8 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
 import { hasValue } from '../empty.util';
 
 /**
@@ -6,7 +10,7 @@ import { hasValue } from '../empty.util';
  * Default value: 10
  */
 @Pipe({
-  name: 'dsTruncate'
+  name: 'dsTruncate',
 })
 export class TruncatePipe implements PipeTransform {
 
diff --git a/src/app/shared/utils/validator.functions.ts b/src/app/shared/utils/validator.functions.ts
index 164ac7885e..da3b94d303 100644
--- a/src/app/shared/utils/validator.functions.ts
+++ b/src/app/shared/utils/validator.functions.ts
@@ -1,4 +1,8 @@
-import { AbstractControl, ValidatorFn } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidatorFn,
+} from '@angular/forms';
+
 import { isNotEmpty } from '../empty.util';
 
 /**
diff --git a/src/app/shared/utils/var.directive.ts b/src/app/shared/utils/var.directive.ts
index 497fc91a8b..a5f6818214 100644
--- a/src/app/shared/utils/var.directive.ts
+++ b/src/app/shared/utils/var.directive.ts
@@ -1,4 +1,9 @@
-import { Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core';
+import {
+  Directive,
+  Input,
+  TemplateRef,
+  ViewContainerRef,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-selector */
 @Directive({
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 45d219eb91..5d29562a76 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,5 +1,7 @@
 <div class="btn-group" data-toggle="buttons">
     <button *ngIf="isToShow(viewModeEnum.ListElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.ListElement"
+            [attr.aria-label]="'search.view-switch.show-list' | translate"
        routerLink="."
        [queryParams]="{view: 'list'}"
        queryParamsHandling="merge"
@@ -8,9 +10,11 @@
        [class.active]="currentMode === viewModeEnum.ListElement"
        class="btn btn-secondary"
        [attr.data-test]="'list-view' | dsBrowserOnly">
-       <span class="fas fa-list"></span><span class="sr-only">{{'search.view-switch.show-list' | translate}}</span>
+       <i class="fas fa-list"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.GridElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.GridElement"
+            [attr.aria-label]="'search.view-switch.show-grid' | translate"
        routerLink="."
        [queryParams]="{view: 'grid'}"
        queryParamsHandling="merge"
@@ -19,7 +23,7 @@
        [class.active]="currentMode === viewModeEnum.GridElement"
        class="btn btn-secondary"
        [attr.data-test]="'grid-view' | dsBrowserOnly">
-       <span class="fas fa-th-large"></span><span class="sr-only">{{'search.view-switch.show-grid' | translate}}</span>
+       <i class="fas fa-th-large"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
        routerLink="."
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
index 248a843316..90c5b64e72 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
@@ -1,15 +1,27 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { SearchService } from '../../core/shared/search/search.service';
-import { ViewModeSwitchComponent } from './view-mode-switch.component';
-import { SearchServiceStub } from '../testing/search-service.stub';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { SearchServiceStub } from '../testing/search-service.stub';
+import { ViewModeSwitchComponent } from './view-mode-switch.component';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -28,12 +40,12 @@ describe('ViewModeSwitchComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule.withRoutes([
           { path: 'search', component: DummyComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [
         ViewModeSwitchComponent,
@@ -44,7 +56,7 @@ describe('ViewModeSwitchComponent', () => {
         { provide: SearchService, useValue: searchService },
       ],
     }).overrideComponent(ViewModeSwitchComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index 95f35abf17..b4b50462a1 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -1,13 +1,22 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
 
 import { SearchService } from '../../core/shared/search/search.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { isEmpty, isNotEmpty } from '../empty.util';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import { currentPath } from '../utils/route.utils';
-import { Router } from '@angular/router';
-import { filter } from 'rxjs/operators';
 
 /**
  * Component to switch between list and grid views.
@@ -15,7 +24,7 @@ import { filter } from 'rxjs/operators';
 @Component({
   selector: 'ds-view-mode-switch',
   styleUrls: ['./view-mode-switch.component.scss'],
-  templateUrl: './view-mode-switch.component.html'
+  templateUrl: './view-mode-switch.component.html',
 })
 export class ViewModeSwitchComponent implements OnInit, OnDestroy {
 
@@ -62,7 +71,7 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
     }
 
     this.sub = this.searchService.getViewMode().pipe(
-      filter((viewMode: ViewMode) => isNotEmpty(viewMode))
+      filter((viewMode: ViewMode) => isNotEmpty(viewMode)),
     ).subscribe((viewMode: ViewMode) => {
       this.currentMode = viewMode;
     });
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
index d5bb80dfde..241ab66405 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Collection } from '../../core/shared/collection.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Collection } from '../../core/shared/collection.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
 
 describe('CollectionStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('CollectionStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Collection(), {
             id: 'collection_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('CollectionStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('CollectionStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
index 4875ce39cd..c8b51765e6 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute , Router} from '@angular/router';
-import { Collection } from '../../core/shared/collection.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../core/shared/collection.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for a collection.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-collection-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./collection-statistics-page.component.scss']
+  styleUrls: ['./collection-statistics-page.component.scss'],
 })
 export class CollectionStatisticsPageComponent extends StatisticsPageComponent<Collection> {
 
@@ -31,7 +35,7 @@ export class CollectionStatisticsPageComponent extends StatisticsPageComponent<C
     protected router: Router,
     protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
-    protected authService: AuthService
+    protected authService: AuthService,
   ) {
     super(
       route,
diff --git a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
index dab96aef04..90981363f1 100644
--- a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
 
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
index 2e63f83b8f..a51e201043 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../core/shared/community.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Community } from '../../core/shared/community.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
 
 describe('CommunityStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('CommunityStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Community(), {
             id: 'community_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('CommunityStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('CommunityStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
index de7a8bbf8c..f6f7e8c78c 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Community } from '../../core/shared/community.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../core/shared/community.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for a community.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-community-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./community-statistics-page.component.scss']
+  styleUrls: ['./community-statistics-page.component.scss'],
 })
 export class CommunityStatisticsPageComponent extends StatisticsPageComponent<Community> {
 
diff --git a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
index 17f185f786..a3309ff83b 100644
--- a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
 
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
index 88bbca3fba..e5ee114e39 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ItemStatisticsPageComponent } from './item-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Item } from '../../core/shared/item.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Item } from '../../core/shared/item.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 
 describe('ItemStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('ItemStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Item(), {
             id: 'item_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('ItemStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('ItemStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
index f5f107af74..f7ec8299fc 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Item } from '../../core/shared/item.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../core/shared/item.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for an item.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-item-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./item-statistics-page.component.scss']
+  styleUrls: ['./item-statistics-page.component.scss'],
 })
 export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
 
@@ -32,7 +36,7 @@ export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
     protected router: Router,
     protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
-    protected authService: AuthService
+    protected authService: AuthService,
   ) {
     super(
       route,
diff --git a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
index 50e26329a9..b9a46308a0 100644
--- a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
index 3c181c1816..60148bc55b 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SiteStatisticsPageComponent } from './site-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Site } from '../../core/shared/site.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { SiteDataService } from '../../core/data/site-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Site } from '../../core/shared/site.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 
 describe('SiteStatisticsPageComponent', () => {
 
@@ -36,7 +44,7 @@ describe('SiteStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `site_id-TotalVisits-report`,
             points: [],
-          }
+          },
         ),
       ]),
     };
@@ -53,12 +61,12 @@ describe('SiteStatisticsPageComponent', () => {
             href: 'test_site_link',
           },
         },
-      }))
+      })),
     };
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
index 5eb19bec56..4fa3e10d36 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -1,12 +1,16 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { SiteDataService } from '../../core/data/site-data.service';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Site } from '../../core/shared/site.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { switchMap } from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { SiteDataService } from '../../core/data/site-data.service';
+import { Site } from '../../core/shared/site.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the site-wide statistics page.
@@ -14,7 +18,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-site-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./site-statistics-page.component.scss']
+  styleUrls: ['./site-statistics-page.component.scss'],
 })
 export class SiteStatisticsPageComponent extends StatisticsPageComponent<Site> {
 
diff --git a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
index 3f841163ed..e38cfe8247 100644
--- a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
index ef6f68d557..a435948db9 100644
--- a/src/app/statistics-page/statistics-page-routing.module.ts
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -1,16 +1,17 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
-import { StatisticsPageModule } from './statistics-page.module';
+
 import { CollectionPageResolver } from '../collection-page/collection-page.resolver';
 import { CommunityPageResolver } from '../community-page/community-page.resolver';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { StatisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard';
+import { ItemResolver } from '../item-page/item.resolver';
 import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component';
 import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component';
 import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component';
 import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component';
-import { ItemResolver } from '../item-page/item.resolver';
-import { StatisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard';
+import { StatisticsPageModule } from './statistics-page.module';
 
 @NgModule({
   imports: [
@@ -19,11 +20,11 @@ import { StatisticsAdministratorGuard } from '../core/data/feature-authorization
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         children: [
           {
@@ -31,57 +32,57 @@ import { StatisticsAdministratorGuard } from '../core/data/feature-authorization
             component: ThemedSiteStatisticsPageComponent,
           },
         ],
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `items/:id`,
         resolve: {
           scope: ItemResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedItemStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `collections/:id`,
         resolve: {
           scope: CollectionPageResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedCollectionStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `communities/:id`,
         resolve: {
           scope: CommunityPageResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedCommunityStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
-    ]
-    )
+    ],
+    ),
   ],
   providers: [
     I18nBreadcrumbResolver,
     I18nBreadcrumbsService,
     CollectionPageResolver,
     CommunityPageResolver,
-    ItemResolver
-  ]
+    ItemResolver,
+  ],
 })
 export class StatisticsPageRoutingModule {
 }
diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts
index 75726de94c..b0d54341a5 100644
--- a/src/app/statistics-page/statistics-page.module.ts
+++ b/src/app/statistics-page/statistics-page.module.ts
@@ -1,19 +1,19 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../core/core.module';
+import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
 import { SharedModule } from '../shared/shared.module';
 import { StatisticsModule } from '../statistics/statistics.module';
-import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
-import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
-import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
-import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
 import { CollectionStatisticsPageComponent } from './collection-statistics-page/collection-statistics-page.component';
-import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
 import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component';
+import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
 import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component';
+import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
 import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component';
+import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
 import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component';
+import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
 
 const components = [
   StatisticsTableComponent,
@@ -24,7 +24,7 @@ const components = [
   ThemedCollectionStatisticsPageComponent,
   ThemedCommunityStatisticsPageComponent,
   ThemedItemStatisticsPageComponent,
-  ThemedSiteStatisticsPageComponent
+  ThemedSiteStatisticsPageComponent,
 ];
 
 @NgModule({
@@ -32,13 +32,13 @@ const components = [
     CommonModule,
     SharedModule,
     CoreModule.forRoot(),
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
   ],
   declarations: components,
   providers: [
     UsageReportDataService,
   ],
-  exports: components
+  exports: components,
 })
 
 /**
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index c6938c7582..5ee12b72d9 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -1,11 +1,11 @@
 <div class="container">
 
   <ng-container *ngVar="(scope$ | async) as scope">
-    <h2 *ngIf="scope"
+    <h1 *ngIf="scope"
         class="header"
         id="{{ scope.id }}">
       {{ 'statistics.header' | translate: { scope: getName(scope) } }}
-    </h2>
+    </h1>
   </ng-container>
 
   <ng-container *ngVar="reports$ | async as reports">
@@ -19,7 +19,7 @@
                            [report]="report"
                            class="m-2 {{ report.id }}">
       </ds-statistics-table>
-      <div *ngIf="!(hasData$ | async)">
+      <div *ngIf="(hasData$ | async) !== true">
         {{ 'statistics.page.no-data' | translate }}
       </div>
     </ng-container>
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts
index 8b91d54ae8..8f2b13a034 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.ts
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.ts
@@ -1,25 +1,38 @@
-import { Component, OnInit } from '@angular/core';
-import { combineLatest, Observable } from 'rxjs';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { map, switchMap } from 'rxjs/operators';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { RemoteData } from '../../core/data/remote-data';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData
-} from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 
 /**
  * Class representing an abstract statistics page component.
  */
 @Component({
   selector: 'ds-statistics-page',
-  template: ''
+  template: '',
 })
 export abstract class StatisticsPageComponent<T extends DSpaceObject> implements OnInit {
 
@@ -54,7 +67,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
     this.reports$ = this.getReports$();
     this.hasData$ = this.reports$.pipe(
       map((reports) => reports.some(
-        (report) => report.points.length > 0
+        (report) => report.points.length > 0,
       )),
     );
   }
@@ -78,7 +91,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
     return this.scope$.pipe(
       switchMap((scope) =>
         combineLatest(
-          this.types.map((type) => this.usageReportService.getStatistic(scope.id, type))
+          this.types.map((type) => this.usageReportService.getStatistic(scope.id, type)),
         ),
       ),
     );
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
index 5a333b9658..efa9ce43d9 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.html
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -1,9 +1,9 @@
 <div *ngIf="hasData"
      class="m-1">
 
-  <h3 class="m-1">
+  <h2 class="m-1">
     {{ 'statistics.table.title.' + report.reportType | translate }}
-  </h3>
+  </h2>
 
   <table class="table table-striped" [attr.data-test]="report.reportType">
 
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
index c7900cd278..3c1c69fc6a 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
@@ -1,12 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StatisticsTableComponent } from './statistics-table.component';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { StatisticsTableComponent } from './statistics-table.component';
 
 describe('StatisticsTableComponent', () => {
 
@@ -27,7 +31,7 @@ describe('StatisticsTableComponent', () => {
         { provide: DSONameService, useValue: {} },
       ],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
@@ -69,8 +73,8 @@ describe('StatisticsTableComponent', () => {
               views: 8,
               downloads: 8,
             },
-          }
-        ]
+          },
+        ],
       });
       component.ngOnInit();
       fixture.detectChanges();
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts
index 45924caa8d..8c972b3bea 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts
@@ -1,11 +1,25 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Point, UsageReport } from '../../core/statistics/models/usage-report.model';
-import { Observable, of } from 'rxjs';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { map } from 'rxjs/operators';
-import { getRemoteDataPayload, getFinishedRemoteData } from '../../core/shared/operators';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import {
+  getFinishedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import {
+  Point,
+  UsageReport,
+} from '../../core/statistics/models/usage-report.model';
 import { isEmpty } from '../../shared/empty.util';
 
 /**
@@ -14,7 +28,7 @@ import { isEmpty } from '../../shared/empty.util';
 @Component({
   selector: 'ds-statistics-table',
   templateUrl: './statistics-table.component.html',
-  styleUrls: ['./statistics-table.component.scss']
+  styleUrls: ['./statistics-table.component.scss'],
 })
 export class StatisticsTableComponent implements OnInit {
 
@@ -22,7 +36,7 @@ export class StatisticsTableComponent implements OnInit {
    * The usage report to display a statistics table for
    */
   @Input()
-  report: UsageReport;
+    report: UsageReport;
 
   /**
    * Boolean indicating whether the usage report has data
diff --git a/src/app/statistics/angulartics/dspace-provider.spec.ts b/src/app/statistics/angulartics/dspace-provider.spec.ts
index 1ec7a9f06b..80176c3e94 100644
--- a/src/app/statistics/angulartics/dspace-provider.spec.ts
+++ b/src/app/statistics/angulartics/dspace-provider.spec.ts
@@ -1,8 +1,9 @@
-import { Angulartics2DSpace } from './dspace-provider';
 import { Angulartics2 } from 'angulartics2';
-import { StatisticsService } from '../statistics.service';
-import { filter } from 'rxjs/operators';
 import { of as observableOf } from 'rxjs';
+import { filter } from 'rxjs/operators';
+
+import { StatisticsService } from '../statistics.service';
+import { Angulartics2DSpace } from './dspace-provider';
 
 describe('Angulartics2DSpace', () => {
   let provider: Angulartics2DSpace;
@@ -11,13 +12,13 @@ describe('Angulartics2DSpace', () => {
 
   beforeEach(() => {
     angulartics2 = {
-      eventTrack: observableOf({action: 'page_view', properties: {
+      eventTrack: observableOf({ action: 'page_view', properties: {
         object: 'mock-object',
-        referrer: 'https://www.referrer.com'
-      }}),
-      filterDeveloperMode: () => filter(() => true)
+        referrer: 'https://www.referrer.com',
+      } }),
+      filterDeveloperMode: () => filter(() => true),
     } as any;
-    statisticsService = jasmine.createSpyObj('statisticsService', {trackViewEvent: null});
+    statisticsService = jasmine.createSpyObj('statisticsService', { trackViewEvent: null });
     provider = new Angulartics2DSpace(angulartics2, statisticsService);
   });
 
diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
index 86c16b5c01..c4143bbf97 100644
--- a/src/app/statistics/angulartics/dspace-provider.ts
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -1,11 +1,15 @@
 import { Injectable } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
+import {
+  Angulartics2,
+  EventTrack,
+} from 'angulartics2';
+
 import { StatisticsService } from '../statistics.service';
 
 /**
  * Angulartics2DSpace is a angulartics2 plugin that provides DSpace with the events.
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class Angulartics2DSpace {
 
   constructor(
@@ -23,7 +27,7 @@ export class Angulartics2DSpace {
       .subscribe((event) => this.eventTrack(event));
   }
 
-  private eventTrack(event) {
+  private eventTrack(event: Partial<EventTrack>): void {
     if (event.action === 'page_view') {
       this.statisticsService.trackViewEvent(event.properties.object, event.properties.referrer);
     } else if (event.action === 'search') {
@@ -32,7 +36,7 @@ export class Angulartics2DSpace {
         event.properties.page,
         event.properties.sort,
         event.properties.filters,
-        event.properties.clickedObject,
+        event.properties.clickedObject?.split('?')[0],
       );
     }
   }
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.ts b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
index 805d311cfd..1820b03be6 100644
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.ts
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
@@ -1,10 +1,16 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Angulartics2 } from 'angulartics2';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Subscription } from 'rxjs/internal/Subscription';
+import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
+
 import { ReferrerService } from '../../../core/services/referrer.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component triggers a page view statistic
@@ -28,7 +34,7 @@ export class ViewTrackerComponent implements OnInit, OnDestroy {
 
   constructor(
     public angulartics2: Angulartics2,
-    public referrerService: ReferrerService
+    public referrerService: ReferrerService,
   ) {
   }
 
@@ -40,7 +46,7 @@ export class ViewTrackerComponent implements OnInit, OnDestroy {
           action: 'page_view',
           properties: {
             object: this.object,
-            referrer
+            referrer,
           },
         });
       });
diff --git a/src/app/statistics/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts
index 2465e4db0e..eb35750c4c 100644
--- a/src/app/statistics/google-analytics.service.spec.ts
+++ b/src/app/statistics/google-analytics.service.spec.ts
@@ -4,12 +4,15 @@ import {
 } from 'angulartics2';
 import { of } from 'rxjs';
 
-import { GoogleAnalyticsService } from './google-analytics.service';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { KlaroService } from '../shared/cookies/klaro.service';
 import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { GoogleAnalyticsService } from './google-analytics.service';
 
 describe('GoogleAnalyticsService', () => {
   const trackingIdProp = 'google.analytics.key';
@@ -45,7 +48,7 @@ describe('GoogleAnalyticsService', () => {
     ]);
 
     klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
-      'getSavedPreferences': jasmine.createSpy('getSavedPreferences')
+      'getSavedPreferences': jasmine.createSpy('getSavedPreferences'),
     });
 
     configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
@@ -54,7 +57,7 @@ describe('GoogleAnalyticsService', () => {
       set src(newVal) { /* noop */ },
       get src() { return innerHTMLTestValue; },
       set innerHTML(newVal) { /* noop */ },
-      get innerHTML() { return srcTestValue; }
+      get innerHTML() { return srcTestValue; },
     };
 
     innerHTMLSpy = spyOnProperty(scriptElementMock, 'innerHTML', 'set');
@@ -71,7 +74,7 @@ describe('GoogleAnalyticsService', () => {
     });
 
     klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-      GOOGLE_ANALYTICS_KLARO_KEY: true
+      GOOGLE_ANALYTICS_KLARO_KEY: true,
     }));
 
     service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy );
@@ -95,7 +98,7 @@ describe('GoogleAnalyticsService', () => {
         });
 
         klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-          GOOGLE_ANALYTICS_KLARO_KEY: true
+          GOOGLE_ANALYTICS_KLARO_KEY: true,
         }));
 
         service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
@@ -118,7 +121,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy();
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -159,7 +162,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: false
+            [GOOGLE_ANALYTICS_KLARO_KEY]: false,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -181,7 +184,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -218,7 +221,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV3TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts
index 9d32a61093..508297c3b9 100644
--- a/src/app/statistics/google-analytics.service.ts
+++ b/src/app/statistics/google-analytics.service.ts
@@ -1,6 +1,8 @@
 import { DOCUMENT } from '@angular/common';
-import { Inject, Injectable } from '@angular/core';
-
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import {
   Angulartics2GoogleAnalytics,
   Angulartics2GoogleGlobalSiteTag,
@@ -9,9 +11,9 @@ import { combineLatest } from 'rxjs';
 
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { isEmpty } from '../shared/empty.util';
 import { KlaroService } from '../shared/cookies/klaro.service';
 import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import { isEmpty } from '../shared/empty.util';
 
 /**
  * Set up Google Analytics on the client side.
diff --git a/src/app/statistics/statistics-endpoint.model.ts b/src/app/statistics/statistics-endpoint.model.ts
index 0a3671432e..e1152e4a50 100644
--- a/src/app/statistics/statistics-endpoint.model.ts
+++ b/src/app/statistics/statistics-endpoint.model.ts
@@ -1,10 +1,14 @@
-import { HALLink } from '../core/shared/hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../core/utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { ResourceType } from '../core/shared/resource-type';
-import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
 import { CacheableObject } from '../core/cache/cacheable-object.model';
+import { HALLink } from '../core/shared/hal-link.model';
+import { ResourceType } from '../core/shared/resource-type';
+import { excludeFromEquals } from '../core/utilities/equals.decorators';
+import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
 
 /**
  * Model class for the statistics endpoint
@@ -18,13 +22,13 @@ export class StatisticsEndpoint implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The {@link HALLink}s for the statistics endpoint
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     searchevents: HALLink;
     viewevents: HALLink;
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
index 4870e4fbf0..9e1c248da8 100644
--- a/src/app/statistics/statistics.module.ts
+++ b/src/app/statistics/statistics.module.ts
@@ -1,5 +1,9 @@
-import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import {
+  ModuleWithProviders,
+  NgModule,
+} from '@angular/core';
+
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
@@ -9,7 +13,7 @@ import { StatisticsEndpoint } from './statistics-endpoint.model';
  * Declaration needed to make sure all decorator functions are called in time
  */
 export const models = [
-  StatisticsEndpoint
+  StatisticsEndpoint,
 ];
 
 @NgModule({
@@ -23,7 +27,7 @@ export const models = [
   ],
   exports: [
     ViewTrackerComponent,
-  ]
+  ],
 })
 /**
  * This module handles the statistics
diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts
index 45e954c51c..ff57e31970 100644
--- a/src/app/statistics/statistics.service.spec.ts
+++ b/src/app/statistics/statistics.service.spec.ts
@@ -1,11 +1,12 @@
-import { StatisticsService } from './statistics.service';
-import { RequestService } from '../core/data/request.service';
-import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
-import { getMockRequestService } from '../shared/mocks/request.service.mock';
 import isEqual from 'lodash/isEqual';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { SearchOptions } from '../shared/search/models/search-options.model';
+
+import { RequestService } from '../core/data/request.service';
 import { RestRequest } from '../core/data/rest-request.model';
+import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { getMockRequestService } from '../shared/mocks/request.service.mock';
+import { SearchOptions } from '../shared/search/models/search-options.model';
+import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
+import { StatisticsService } from './statistics.service';
 
 describe('StatisticsService', () => {
   let service: StatisticsService;
@@ -25,7 +26,7 @@ describe('StatisticsService', () => {
     service = initTestService();
 
     it('should send a request to track an item view ', () => {
-      const mockItem: any = {uuid: 'mock-item-uuid', type: 'item'};
+      const mockItem: any = { uuid: 'mock-item-uuid', type: 'item' };
       service.trackViewEvent(mockItem, 'https://www.referrer.com');
       const request: RestRequest = requestService.send.calls.mostRecent().args[0];
       expect(request.body).toBeDefined('request.body');
@@ -48,9 +49,9 @@ describe('StatisticsService', () => {
       size: 10,
       totalElements: 248,
       totalPages: 25,
-      number: 4
+      number: 4,
     };
-    const sort = {by: 'search-field', order: 'ASC'};
+    const sort = { by: 'search-field', order: 'ASC' };
     service.trackSearchEvent(mockSearch, page, sort);
     const request: RestRequest = requestService.send.calls.mostRecent().args[0];
     const body = JSON.parse(request.body);
@@ -64,14 +65,14 @@ describe('StatisticsService', () => {
         size: 10,
         totalElements: 248,
         totalPages: 25,
-        number: 4
+        number: 4,
       });
     });
 
     it('should specify the sort options', () => {
       expect(body.sort).toEqual({
         by: 'search-field',
-        order: 'asc'
+        order: 'asc',
       });
     });
   });
@@ -84,29 +85,29 @@ describe('StatisticsService', () => {
       query: 'mock-query',
       configuration: 'mock-configuration',
       dsoTypes: [DSpaceObjectType.ITEM],
-      scope: 'mock-scope'
+      scope: 'mock-scope',
     });
 
     const page = {
       size: 10,
       totalElements: 248,
       totalPages: 25,
-      number: 4
+      number: 4,
     };
-    const sort = {by: 'search-field', order: 'ASC'};
+    const sort = { by: 'search-field', order: 'ASC' };
     const filters = [
       {
         filter: 'title',
         operator: 'notcontains',
         value: 'dolor sit',
-        label: 'dolor sit'
+        label: 'dolor sit',
       },
       {
         filter: 'author',
         operator: 'authority',
         value: '9zvxzdm4qru17or5a83wfgac',
-        label: 'Amet, Consectetur'
-      }
+        label: 'Amet, Consectetur',
+      },
     ];
     service.trackSearchEvent(mockSearch, page, sort, filters);
     const request: RestRequest = requestService.send.calls.mostRecent().args[0];
@@ -130,14 +131,14 @@ describe('StatisticsService', () => {
           filter: 'title',
           operator: 'notcontains',
           value: 'dolor sit',
-          label: 'dolor sit'
+          label: 'dolor sit',
         },
         {
           filter: 'author',
           operator: 'authority',
           value: '9zvxzdm4qru17or5a83wfgac',
-          label: 'Amet, Consectetur'
-        }
+          label: 'Amet, Consectetur',
+        },
       ])).toBe(true);
     });
   });
diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts
index 56181d233c..9c63b67be7 100644
--- a/src/app/statistics/statistics.service.ts
+++ b/src/app/statistics/statistics.service.ts
@@ -1,17 +1,24 @@
-import { RequestService } from '../core/data/request.service';
 import { Injectable } from '@angular/core';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { map, take } from 'rxjs/operators';
-import { TrackRequest } from './track-request.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { HALEndpointService } from '../core/shared/hal-endpoint.service';
-import { SearchOptions } from '../shared/search/models/search-options.model';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RequestService } from '../core/data/request.service';
 import { RestRequest } from '../core/data/rest-request.model';
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+import { HALEndpointService } from '../core/shared/hal-endpoint.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { SearchOptions } from '../shared/search/models/search-options.model';
+import { TrackRequest } from './track-request.model';
 
 /**
  * The statistics service
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class StatisticsService {
 
   constructor(
@@ -24,7 +31,7 @@ export class StatisticsService {
     const requestId = this.requestService.generateRequestId();
     this.halService.getEndpoint(linkPath).pipe(
       map((endpoint: string) => new TrackRequest(requestId, endpoint, JSON.stringify(body))),
-      take(1) // otherwise the previous events will fire again
+      take(1), // otherwise the previous events will fire again
     ).subscribe((request: RestRequest) => this.requestService.send(request));
   }
 
@@ -35,12 +42,12 @@ export class StatisticsService {
    */
   trackViewEvent(
     dso: DSpaceObject,
-    referrer: string
+    referrer: string,
   ) {
     this.sendEvent('/statistics/viewevents', {
       targetId: dso.uuid,
       targetType: (dso as any).type,
-      referrer
+      referrer,
     });
   }
 
@@ -65,11 +72,11 @@ export class StatisticsService {
         size: page.size,
         totalElements: page.totalElements,
         totalPages: page.totalPages,
-        number: page.number
+        number: page.number,
       },
       sort: {
         by: sort.by,
-        order: sort.order.toLowerCase()
+        order: sort.order.toLowerCase(),
       },
     };
     if (hasValue(searchOptions.configuration)) {
@@ -89,7 +96,7 @@ export class StatisticsService {
           filter: filter.filter,
           operator: filter.operator,
           value: filter.value,
-          label: filter.label
+          label: filter.label,
         });
       }
       Object.assign(body, { appliedFilters: bodyFilters });
diff --git a/src/app/store.actions.ts b/src/app/store.actions.ts
index 59ce00a243..5839778ac0 100644
--- a/src/app/store.actions.ts
+++ b/src/app/store.actions.ts
@@ -1,6 +1,7 @@
-import { type } from './shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
 import { AppState } from './app.reducer';
+import { type } from './shared/ngrx/type';
 
 export const StoreActionTypes = {
   REHYDRATE: type('dspace/ngrx/REHYDRATE'),
diff --git a/src/app/store.effects.ts b/src/app/store.effects.ts
index c7add76add..4efb940c3d 100644
--- a/src/app/store.effects.ts
+++ b/src/app/store.effects.ts
@@ -1,17 +1,24 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  Store,
+} from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
-import { Action, Store } from '@ngrx/store';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
 
 import { AppState } from './app.reducer';
-import { StoreActionTypes } from './store.actions';
 import { HostWindowResizeAction } from './shared/host-window.actions';
+import { StoreActionTypes } from './store.actions';
 
 @Injectable()
 export class StoreEffects {
 
-   replay = createEffect(() => this.actions.pipe(
+  replay = createEffect(() => this.actions.pipe(
     ofType(StoreActionTypes.REPLAY),
     map((replayAction: Action) => {
       // TODO: should be able to replay all actions before the browser attempts to
@@ -21,9 +28,9 @@ export class StoreEffects {
       return observableOf({});
     })), { dispatch: false });
 
-   resize = createEffect(() => this.actions.pipe(
+  resize = createEffect(() => this.actions.pipe(
     ofType(StoreActionTypes.REPLAY, StoreActionTypes.REHYDRATE),
-    map(() => new HostWindowResizeAction(window.innerWidth, window.innerHeight))
+    map(() => new HostWindowResizeAction(window.innerWidth, window.innerHeight)),
   ));
 
   constructor(private actions: Actions, private store: Store<AppState>) {
diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts
index 8013162d85..ac623e6c6a 100644
--- a/src/app/submission/edit/submission-edit.component.spec.ts
+++ b/src/app/submission/edit/submission-edit.component.spec.ts
@@ -1,25 +1,34 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
-import { SubmissionEditComponent } from './submission-edit.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-
-import { RouterStub } from '../../shared/testing/router.stub';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
+import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../submission.service';
+import { SubmissionEditComponent } from './submission-edit.component';
 
 describe('SubmissionEditComponent Component', () => {
 
@@ -43,7 +52,7 @@ describe('SubmissionEditComponent Component', () => {
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([
           { path: ':id/edit', component: SubmissionEditComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [SubmissionEditComponent],
       providers: [
@@ -56,7 +65,7 @@ describe('SubmissionEditComponent Component', () => {
         { provide: ActivatedRoute, useValue: route },
 
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,7 +87,7 @@ describe('SubmissionEditComponent Component', () => {
 
     route.testParams = { id: submissionId };
     submissionServiceStub.retrieveSubmission.and.returnValue(
-      createSuccessfulRemoteDataObject$(submissionObject)
+      createSuccessfulRemoteDataObject$(submissionObject),
     );
 
     fixture.detectChanges();
@@ -94,7 +103,7 @@ describe('SubmissionEditComponent Component', () => {
   it('should redirect to mydspace when an empty SubmissionObject has been retrieved',() => {
 
     route.testParams = { id: submissionId };
-    submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$({})
+    submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$({}),
     );
 
     fixture.detectChanges();
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 93200e5e5c..153ed42588 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -1,24 +1,44 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { debounceTime, filter, switchMap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ParamMap,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  filter,
+  switchMap,
+} from 'rxjs/operators';
 
-import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { hasValue, isEmpty, isNotEmptyOperator, isNotNull } from '../../shared/empty.util';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import { SubmissionService } from '../submission.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { Collection } from '../../core/shared/collection.model';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
 import { Item } from '../../core/shared/item.model';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { ItemDataService } from '../../core/data/item-data.service';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import parseSectionErrors from '../utils/parseSectionErrors';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmptyOperator,
+  isNotNull,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionError } from '../objects/submission-error.model';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
 
 /**
  * This component allows to edit an existing workspaceitem/workflowitem.
@@ -26,7 +46,7 @@ import { SubmissionError } from '../objects/submission-error.model';
 @Component({
   selector: 'ds-submission-edit',
   styleUrls: ['./submission-edit.component.scss'],
-  templateUrl: './submission-edit.component.html'
+  templateUrl: './submission-edit.component.html',
 })
 export class SubmissionEditComponent implements OnDestroy, OnInit {
 
@@ -123,7 +143,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
       this.route.paramMap.pipe(
         switchMap((params: ParamMap) => this.submissionService.retrieveSubmission(params.get('id'))),
         // NOTE new submission is retrieved on the browser side only, so get null on server side rendering
-        filter((submissionObjectRD: RemoteData<SubmissionObject>) => isNotNull(submissionObjectRD))
+        filter((submissionObjectRD: RemoteData<SubmissionObject>) => isNotNull(submissionObjectRD)),
       ).subscribe((submissionObjectRD: RemoteData<SubmissionObject>) => {
         if (submissionObjectRD.hasSucceeded) {
           if (isEmpty(submissionObjectRD.payload)) {
@@ -151,7 +171,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
       this.itemLink$.pipe(
         isNotEmptyOperator(),
         switchMap((itemLink: string) =>
-          this.itemDataService.findByHref(itemLink)
+          this.itemDataService.findByHref(itemLink),
         ),
         getAllSucceededRemoteData(),
         // Multiple sources can update the item in quick succession.
diff --git a/src/app/submission/edit/themed-submission-edit.component.ts b/src/app/submission/edit/themed-submission-edit.component.ts
index bbaf432c13..62e4c1a4da 100644
--- a/src/app/submission/edit/themed-submission-edit.component.ts
+++ b/src/app/submission/edit/themed-submission-edit.component.ts
@@ -2,13 +2,14 @@
  * Themed wrapper for SubmissionEditComponent
  */
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionEditComponent } from './submission-edit.component';
 
 @Component({
   selector: 'ds-themed-submission-edit',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionEditComponent extends ThemedComponent<SubmissionEditComponent> {
   protected getComponentName(): string {
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index a78d737640..4e4200d16b 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,6 +1,6 @@
 <div>
   <div
-    *ngIf="!(available$ | async)"
+    *ngIf="(available$ | async) !== true"
     class="input-group mb-3">
     <div class="input-group-prepend">
       <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
@@ -25,14 +25,14 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
+            [disabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
-      <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
+      <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
       <ds-themed-collection-dropdown
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index c76de83b83..e2a90641e3 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -1,30 +1,47 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { CommunityDataService } from '../../../core/data/community-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { Collection } from '../../../core/shared/collection.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import {
+  mockSubmissionId,
+  mockSubmissionRestResponse,
+} from '../../../shared/mocks/submission.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionId, mockSubmissionRestResponse } from '../../../shared/mocks/submission.mock';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormCollectionComponent } from './submission-form-collection.component';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { SectionsService } from '../../sections/sections.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -46,11 +63,11 @@ describe('SubmissionFormCollectionComponent Component', () => {
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 1'
+        value: 'Community 1-Collection 1',
       }],
     _links: {
-      defaultAccessConditions: collectionId + '/defaultAccessConditions'
-    }
+      defaultAccessConditions: collectionId + '/defaultAccessConditions',
+    },
   });
 
   const mockCollectionList = [
@@ -58,71 +75,71 @@ describe('SubmissionFormCollectionComponent Component', () => {
       communities: [
         {
           id: '123456789-1',
-          name: 'Community 1'
-        }
+          name: 'Community 1',
+        },
       ],
       collection: {
         id: '1234567890-1',
-        name: 'Community 1-Collection 1'
-      }
+        name: 'Community 1-Collection 1',
+      },
     },
     {
       communities: [
         {
           id: '123456789-1',
-          name: 'Community 1'
-        }
+          name: 'Community 1',
+        },
       ],
       collection: {
         id: '1234567890-2',
-        name: 'Community 1-Collection 2'
-      }
+        name: 'Community 1-Collection 2',
+      },
     },
     {
       communities: [
         {
           id: '123456789-2',
-          name: 'Community 2'
-        }
+          name: 'Community 2',
+        },
       ],
       collection: {
         id: '1234567890-3',
-        name: 'Community 2-Collection 1'
-      }
+        name: 'Community 2-Collection 1',
+      },
     },
     {
       communities: [
         {
           id: '123456789-2',
-          name: 'Community 2'
-        }
+          name: 'Community 2',
+        },
       ],
       collection: {
         id: '1234567890-4',
-        name: 'Community 2-Collection 2'
-      }
-    }
+        name: 'Community 2-Collection 2',
+      },
+    },
   ];
 
   const communityDataService: any = jasmine.createSpyObj('communityDataService', {
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const collectionDataService: any = jasmine.createSpyObj('collectionDataService', {
     findById: jasmine.createSpy('findById'),
-    getAuthorizedCollectionByCommunity: jasmine.createSpy('getAuthorizedCollectionByCommunity')
+    getAuthorizedCollectionByCommunity: jasmine.createSpy('getAuthorizedCollectionByCommunity'),
   });
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
-    replace: jasmine.createSpy('replace')
+    replace: jasmine.createSpy('replace'),
   });
 
   const sectionsService: any = jasmine.createSpyObj('sectionsService', {
-    isSectionTypeAvailable: of(true)
+    isSectionTypeAvailable: of(true),
   });
 
   beforeEach(waitForAsync(() => {
@@ -131,11 +148,11 @@ describe('SubmissionFormCollectionComponent Component', () => {
         FormsModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormCollectionComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
@@ -147,9 +164,9 @@ describe('SubmissionFormCollectionComponent Component', () => {
         { provide: Store, useValue: store },
         { provide: SectionsService, useValue: sectionsService },
         ChangeDetectorRef,
-        SubmissionFormCollectionComponent
+        SubmissionFormCollectionComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -281,7 +298,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
         expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
         expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-          a: mockCollectionList[1].collection.name
+          a: mockCollectionList[1].collection.name,
         }));
       });
     });
@@ -292,7 +309,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 964f86577a..89d9112284 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -7,29 +7,37 @@ import {
   OnInit,
   Output,
   SimpleChanges,
-  ViewChild
+  ViewChild,
 } from '@angular/core';
-
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
 import {
   find,
-  map, mergeMap
+  map,
+  mergeMap,
 } from 'rxjs/operators';
 
-import { Collection } from '../../../core/shared/collection.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionService } from '../../submission.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { SectionsService } from '../../sections/sections.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SectionsType } from '../../sections/sections-type';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -37,7 +45,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-submission-form-collection',
   styleUrls: ['./submission-form-collection.component.scss'],
-  templateUrl: './submission-form-collection.component.html'
+  templateUrl: './submission-form-collection.component.html',
 })
 export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
 
@@ -137,7 +145,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
 
       this.selectedCollectionName$ = this.collectionDataService.findById(this.currentCollectionId).pipe(
         find((collectionRD: RemoteData<Collection>) => isNotEmpty(collectionRD.payload)),
-        map((collectionRD: RemoteData<Collection>) => this.dsoNameService.getName(collectionRD.payload))
+        map((collectionRD: RemoteData<Collection>) => this.dsoNameService.getName(collectionRD.payload)),
       );
     }
   }
@@ -171,20 +179,20 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
       this.submissionId,
       'sections',
       'collection').pipe(
-        mergeMap((submissionObject: SubmissionObject[]) => {
-          // retrieve the full submission object with embeds
-          return this.submissionService.retrieveSubmission(submissionObject[0].id).pipe(
-            getFirstSucceededRemoteDataPayload()
-          );
-        })
-      ).subscribe((submissionObject: SubmissionObject) => {
-        this.selectedCollectionId = event.collection.id;
-        this.selectedCollectionName$ = observableOf(event.collection.name);
-        this.collectionChange.emit(submissionObject);
-        this.submissionService.changeSubmissionCollection(this.submissionId, event.collection.id);
-        this.processingChange$.next(false);
-        this.cdr.detectChanges();
-      })
+      mergeMap((submissionObject: SubmissionObject[]) => {
+        // retrieve the full submission object with embeds
+        return this.submissionService.retrieveSubmission(submissionObject[0].id).pipe(
+          getFirstSucceededRemoteDataPayload(),
+        );
+      }),
+    ).subscribe((submissionObject: SubmissionObject) => {
+      this.selectedCollectionId = event.collection.id;
+      this.selectedCollectionName$ = observableOf(event.collection.name);
+      this.collectionChange.emit(submissionObject);
+      this.submissionService.changeSubmissionCollection(this.submissionId, event.collection.id);
+      this.processingChange$.next(false);
+      this.cdr.detectChanges();
+    }),
     );
   }
 
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index e898e1c220..f1162cea4d 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -11,10 +11,10 @@
     </button>
   </div>
   <div class="col text-right d-flex justify-content-end align-items-center">
-    <span *ngIf="!(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+    <span *ngIf="(hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
       <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
     </span>
-    <span *ngIf="(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+    <span *ngIf="(hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
       <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
     </span>
     <div *ngIf="(processingSaveStatus | async) || (processingDepositStatus | async)" class="col d-flex justify-content-end align-items-center">
@@ -28,12 +28,12 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
       <button type="button"
-              [class.btn-primary]="!(showDepositAndDiscard | async)"
+              [class.btn-primary]="(showDepositAndDiscard | async) !== true"
               [class.btn-secondary]="(showDepositAndDiscard | async)"
               class="btn"
               id="saveForLater"
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index dd28f9a10a..14270f2dea 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -1,21 +1,37 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
-import { SubmissionFormFooterComponent } from './submission-form-footer.component';
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
+import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionFormFooterComponent } from './submission-form-footer.component';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -33,7 +49,7 @@ describe('SubmissionFormFooterComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormFooterComponent,
@@ -45,9 +61,9 @@ describe('SubmissionFormFooterComponent', () => {
         { provide: SubmissionRestService, useClass: SubmissionRestServiceStub },
         ChangeDetectorRef,
         NgbModal,
-        SubmissionFormFooterComponent
+        SubmissionFormFooterComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -98,17 +114,17 @@ describe('SubmissionFormFooterComponent', () => {
       beforeEach(() => {
         submissionServiceStub.getSubmissionStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
 
         submissionServiceStub.getSubmissionSaveProcessingStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
 
         submissionServiceStub.getSubmissionDepositProcessingStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
       });
 
@@ -116,11 +132,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: true,
-          d: false
+          d: false,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -132,11 +148,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: false,
-          d: true
+          d: true,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -148,11 +164,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: false,
-          d: true
+          d: true,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -249,7 +265,7 @@ describe('SubmissionFormFooterComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 7a11537616..1db4b606d7 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -1,13 +1,20 @@
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
-import { Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { SubmissionService } from '../../submission.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
 import { isNotEmpty } from '../../../shared/empty.util';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component represents submission form footer bar.
@@ -15,7 +22,7 @@ import { isNotEmpty } from '../../../shared/empty.util';
 @Component({
   selector: 'ds-submission-form-footer',
   styleUrls: ['./submission-form-footer.component.scss'],
-  templateUrl: './submission-form-footer.component.html'
+  templateUrl: './submission-form-footer.component.html',
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
@@ -72,7 +79,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
   ngOnChanges(changes: SimpleChanges) {
     if (isNotEmpty(this.submissionId)) {
       this.submissionIsInvalid = this.submissionService.getSubmissionStatus(this.submissionId).pipe(
-        map((isValid: boolean) => isValid === false)
+        map((isValid: boolean) => isValid === false),
       );
 
       this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
@@ -112,7 +119,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
         if (result === 'ok') {
           this.submissionService.dispatchDiscard(this.submissionId);
         }
-      }
+      },
     );
   }
 }
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 939f23209a..0c7035c7f8 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -3,18 +3,20 @@
      placement="bottom-right"
      class="d-inline-block"
      [ngClass]="{'w-100': windowService.isXs()}">
+  <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [disabled]="!(hasSections$ | async)"
+          [disabled]="(hasSections$ | async) !== true"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
   </button>
+  </ng-container>
   <div ngbDropdownMenu
        class="sections-dropdown-menu"
        aria-labelledby="sectionControls"
        [ngClass]="{'w-100': (windowService.isXs() | async)}">
-    <button class="dropdown-item disabled" *ngIf="!(hasSections$ | async)">
+    <button class="dropdown-item disabled" *ngIf="(hasSections$ | async) !== true">
       {{ 'submission.sections.general.no-sections' | translate }}
     </button>
     <button class="dropdown-item" *ngFor="let listItem of (sectionList$ | async)" (click)="addSection(listItem.id)">
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts b/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
index a8ad7fbe49..fe59c06357 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
@@ -1,21 +1,35 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { HostWindowService } from '../../../shared/host-window.service';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormSectionAddComponent } from './submission-form-section-add.component';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SectionsService } from '../../sections/sections.service';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
 
 const mockAvailableSections: any = [
   {
@@ -25,7 +39,7 @@ const mockAvailableSections: any = [
     errors: [],
     header: 'submit.progressbar.describe.newsectionone',
     id: 'newsectionone',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/newsectiontwo',
@@ -34,8 +48,8 @@ const mockAvailableSections: any = [
     errors: [],
     header: 'submit.progressbar.describe.newsectiontwo',
     id: 'newsectiontwo',
-    sectionType: 'submission-form'
-  }
+    sectionType: 'submission-form',
+  },
 ];
 
 describe('SubmissionFormSectionAddComponent Component', () => {
@@ -50,7 +64,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
   const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const window = new HostWindowServiceStub(800);
@@ -59,11 +73,11 @@ describe('SubmissionFormSectionAddComponent Component', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormSectionAddComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: HostWindowService, useValue: window },
@@ -71,9 +85,9 @@ describe('SubmissionFormSectionAddComponent Component', () => {
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: Store, useValue: store },
         ChangeDetectorRef,
-        SubmissionFormSectionAddComponent
+        SubmissionFormSectionAddComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -208,7 +222,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index 1a758961d6..60452aa51b 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -1,12 +1,15 @@
-import { Component, Input, OnInit, } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { SectionsService } from '../../sections/sections.service';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { SubmissionService } from '../../submission.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
+import { SectionsService } from '../../sections/sections.service';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component allow to add any new section to submission form
@@ -14,7 +17,7 @@ import { SectionDataObject } from '../../sections/models/section-data.model';
 @Component({
   selector: 'ds-submission-form-section-add',
   styleUrls: [ './submission-form-section-add.component.scss' ],
-  templateUrl: './submission-form-section-add.component.html'
+  templateUrl: './submission-form-section-add.component.html',
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
@@ -60,7 +63,7 @@ export class SubmissionFormSectionAddComponent implements OnInit {
   ngOnInit() {
     this.sectionList$ = this.submissionService.getDisabledSectionsList(this.submissionId);
     this.hasSections$ = this.sectionList$.pipe(
-      map((list: SectionDataObject[]) => list.length > 0)
+      map((list: SectionDataObject[]) => list.length > 0),
     );
   }
 
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 4a916cfe23..84767c8c6f 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <div *ngIf="!(isLoading() | async)" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
+    <div *ngIf="(isLoading() | async) !== true" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
         <div *ngIf="(uploadEnabled$ | async)" class="w-100">
             <ds-submission-upload-files [submissionId]="submissionId"
                                         [collectionId]="collectionId"
@@ -9,7 +9,8 @@
 
         <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
           <ng-container *ngIf="!isSectionHidden">
-            <ds-submission-form-collection [currentCollectionId]="collectionId"
+            <ds-submission-form-collection
+            [currentCollectionId]="collectionId"
                                            [currentDefinition]="definitionId"
                                            [submissionId]="submissionId"
                                            [collectionModifiable]="collectionModifiable"
@@ -30,10 +31,12 @@
         <ng-container *ngFor="let object of (submissionSections | async)">
             <ds-submission-section-container [collectionId]="collectionId"
                                              [submissionId]="submissionId"
-                                             [sectionData]="object"></ds-submission-section-container>
+                                             [sectionData]="object">
+            </ds-submission-section-container>
         </ng-container>
     </div>
-    <div *ngIf="!(isLoading() | async)" class="submission-form-footer mt-3 mb-3 position-sticky">
+    <div *ngIf="(isLoading() | async) !== true" class="submission-form-footer mt-3 mb-3 position-sticky">
         <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
     </div>
 </div>
+
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index cc77c44afb..94001f14fa 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -1,10 +1,25 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
 import {
   mockSectionsData,
   mockSectionsList,
@@ -13,19 +28,16 @@ import {
   mockSubmissionId,
   mockSubmissionObjectNew,
   mockSubmissionSelfUrl,
-  mockSubmissionState
+  mockSubmissionState,
 } from '../../shared/mocks/submission.mock';
-import { SubmissionService } from '../submission.service';
-import { SubmissionFormComponent } from './submission-form.component';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../shared/testing/utils.test';
-import { Item } from '../../core/shared/item.model';
-import { TestScheduler } from 'rxjs/testing';
 import { SectionsService } from '../sections/sections.service';
 import { VisibilityType } from '../sections/visibility-type';
+import { SubmissionService } from '../submission.service';
+import { SubmissionFormComponent } from './submission-form.component';
 
 describe('SubmissionFormComponent Component', () => {
 
@@ -50,7 +62,7 @@ describe('SubmissionFormComponent Component', () => {
       imports: [],
       declarations: [
         SubmissionFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -58,9 +70,9 @@ describe('SubmissionFormComponent Component', () => {
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionsService, useValue: { isSectionTypeAvailable: () => observableOf(true) } },
         ChangeDetectorRef,
-        SubmissionFormComponent
+        SubmissionFormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -137,7 +149,7 @@ describe('SubmissionFormComponent Component', () => {
       scheduler.schedule(() => {
         comp.ngOnChanges({
           collectionId: new SimpleChange(null, collectionId, true),
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
         fixture.detectChanges();
       });
@@ -225,11 +237,11 @@ describe('SubmissionFormComponent Component', () => {
       scheduler.schedule(() => {
         comp.onCollectionChange({
           collection: {
-            id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb'
+            id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
           },
           submissionDefinition: {
-            name: 'traditional'
-          }
+            name: 'traditional',
+          },
         } as any);
         fixture.detectChanges();
       });
@@ -246,7 +258,7 @@ describe('SubmissionFormComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 216aefcfc3..d697b64f9d 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -1,27 +1,48 @@
-import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  SimpleChanges,
+} from '@angular/core';
+import isEqual from 'lodash/isEqual';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { Collection } from '../../core/shared/collection.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-
-import { hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
 import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { SubmissionError } from '../objects/submission-error.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SectionDataObject } from '../sections/models/section-data.model';
-import { SubmissionService } from '../submission.service';
-import { Item } from '../../core/shared/item.model';
-import { SectionsType } from '../sections/sections-type';
 import { SectionsService } from '../sections/sections.service';
-import { SubmissionError } from '../objects/submission-error.model';
-import { SubmissionSectionVisibility } from './../../core/config/models/config-submission-section.model';
-import { SubmissionSectionModel } from './../../core/config/models/config-submission-section.model';
+import { SectionsType } from '../sections/sections-type';
 import { VisibilityType } from '../sections/visibility-type';
-import isEqual from 'lodash/isEqual';
+import { SubmissionService } from '../submission.service';
+import {
+  SubmissionSectionModel,
+  SubmissionSectionVisibility,
+} from './../../core/config/models/config-submission-section.model';
 
 /**
  * This component represents the submission form.
@@ -184,7 +205,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
               this.item,
               this.submissionErrors);
             this.changeDetectorRef.detectChanges();
-          })
+          }),
       );
 
       // start auto save
@@ -198,10 +219,10 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
   private getCollectionVisibility(): SubmissionSectionVisibility {
     const submissionSectionModel: SubmissionSectionModel =
       this.submissionDefinition.sections.page.find(
-        (section) => isEqual(section.sectionType, SectionsType.Collection)
+        (section) => isEqual(section.sectionType, SectionsType.Collection),
       );
 
-   return isNotUndefined(submissionSectionModel.visibility) ? submissionSectionModel.visibility : null;
+    return isNotUndefined(submissionSectionModel.visibility) ? submissionSectionModel.visibility : null;
   }
 
   /**
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
index fa7ecebbff..28f6803c48 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
@@ -1,11 +1,26 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import {
   mockSectionsData,
   mockSubmissionCollectionId,
@@ -13,22 +28,20 @@ import {
   mockSubmissionObject,
   mockUploadResponse1ParsedErrors,
   mockUploadResponse2Errors,
-  mockUploadResponse2ParsedErrors
+  mockUploadResponse2ParsedErrors,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionService } from '../../submission.service';
-
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SectionsService } from '../../sections/sections.service';
-import { SubmissionUploadFilesComponent } from './submission-upload-files.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { cold, hot } from 'jasmine-marbles';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
+import { SectionsService } from '../../sections/sections.service';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionUploadFilesComponent } from './submission-upload-files.component';
 
 describe('SubmissionUploadFilesComponent Component', () => {
 
@@ -47,18 +60,18 @@ describe('SubmissionUploadFilesComponent Component', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionUploadFilesComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -68,9 +81,9 @@ describe('SubmissionUploadFilesComponent Component', () => {
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
         { provide: Store, useValue: store },
         ChangeDetectorRef,
-        SubmissionUploadFilesComponent
+        SubmissionUploadFilesComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -116,7 +129,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
         url: '',
         authToken: null,
         disableMultipart: false,
-        itemAlias: null
+        itemAlias: null,
       });
 
     });
@@ -134,12 +147,12 @@ describe('SubmissionUploadFilesComponent Component', () => {
     it('should init uploadEnabled properly', () => {
       sectionsServiceStub.isSectionTypeAvailable.and.returnValue(hot('-a-b', {
         a: false,
-        b: true
+        b: true,
       }));
 
       const expected = cold('-c-d', {
         c: false,
-        d: true
+        d: true,
       });
 
       comp.ngOnChanges();
@@ -165,8 +178,8 @@ describe('SubmissionUploadFilesComponent Component', () => {
             submissionId,
             sectionId,
             mockSectionsData[sectionId],
-          expectedErrors[sectionId],
-            expectedErrors[sectionId]
+            expectedErrors[sectionId],
+            expectedErrors[sectionId],
           );
         });
 
@@ -181,7 +194,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
 
         comp.onCompleteItem(Object.assign({}, uploadRestResponse, {
           sections: mockSectionsData,
-          errors: responseErrors.errors
+          errors: responseErrors.errors,
         }));
 
         Object.keys(mockSectionsData).forEach((sectionId) => {
@@ -189,8 +202,8 @@ describe('SubmissionUploadFilesComponent Component', () => {
             submissionId,
             sectionId,
             mockSectionsData[sectionId],
-          expectedErrors[sectionId],
-            expectedErrors[sectionId]
+            expectedErrors[sectionId],
+            expectedErrors[sectionId],
           );
         });
 
@@ -204,7 +217,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
@@ -214,7 +227,7 @@ class TestComponent {
     url: '',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
 }
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 721a6c108b..630356b1f8 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,19 +1,33 @@
-import { Component, Input, OnChanges } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { first, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  take,
+} from 'rxjs/operators';
 
-import { SectionsService } from '../../sections/sections.service';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { normalizeSectionData } from '../../../core/submission/submission-response-parsing.service';
-import { SubmissionService } from '../../submission.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
-import parseSectionErrors from '../../utils/parseSectionErrors';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { SectionsService } from '../../sections/sections.service';
 import { SectionsType } from '../../sections/sections-type';
+import { SubmissionService } from '../../submission.service';
+import parseSectionErrors from '../../utils/parseSectionErrors';
 
 /**
  * This component represents the drop zone that provides to add files to the submission.
@@ -132,23 +146,23 @@ export class SubmissionUploadFilesComponent implements OnChanges {
                   const sectionData = normalizeSectionData(sections[sectionId]);
                   const sectionErrors = errorsList[sectionId];
                   this.sectionService.isSectionType(this.submissionId, sectionId, SectionsType.Upload)
-                      .pipe(take(1))
-                      .subscribe((isUpload) => {
-                        if (isUpload) {
-                          // Look for errors on upload
-                          if ((isEmpty(sectionErrors))) {
-                            this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
-                          } else {
-                            this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
-                          }
+                    .pipe(take(1))
+                    .subscribe((isUpload) => {
+                      if (isUpload) {
+                        // Look for errors on upload
+                        if ((isEmpty(sectionErrors))) {
+                          this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
+                        } else {
+                          this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
                         }
-                      });
+                      }
+                    });
                   this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors, sectionErrors);
                 });
             }
 
           }
-        })
+        }),
     );
   }
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
index cd6d82c141..0ad28959ed 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
@@ -1,11 +1,21 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionImportExternalCollectionComponent } from './submission-import-external-collection.component';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
 
 describe('SubmissionImportExternalCollectionComponent test suite', () => {
   let comp: SubmissionImportExternalCollectionComponent;
@@ -23,9 +33,9 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       ],
       providers: [
         NgbActiveModal,
-        SubmissionImportExternalCollectionComponent
+        SubmissionImportExternalCollectionComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -70,11 +80,11 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       const entry = {
         communities: [
           { id: 'community1' },
-          { id: 'community2' }
+          { id: 'community2' },
         ],
         collection: {
-          id: 'collection'
-        }
+          id: 'collection',
+        },
       } as CollectionListEntry;
       comp.selectObject(entry);
 
@@ -134,7 +144,7 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index 22430196d4..0642d4156b 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -1,14 +1,19 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+
 /**
  * Wrap component for 'ds-collection-dropdown'.
  */
 @Component({
   selector: 'ds-submission-import-external-collection',
   styleUrls: ['./submission-import-external-collection.component.scss'],
-  templateUrl: './submission-import-external-collection.component.html'
+  templateUrl: './submission-import-external-collection.component.html',
 })
 export class SubmissionImportExternalCollectionComponent {
   /**
@@ -31,7 +36,7 @@ export class SubmissionImportExternalCollectionComponent {
    * @param {NgbActiveModal} activeModal
    */
   constructor(
-    private activeModal: NgbActiveModal
+    private activeModal: NgbActiveModal,
   ) { }
 
   /**
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
index f7ff88c3b1..210ae9cf27 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
@@ -1,24 +1,34 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
-
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { SubmissionService } from '../../submission.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
-import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
+import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component';
 
 const externalEntry = Object.assign(new ExternalSourceEntry(), {
   id: '0001-0001-0001-0001',
@@ -27,11 +37,11 @@ const externalEntry = Object.assign(new ExternalSourceEntry(), {
   metadata: {
     'dc.identifier.uri': [
       {
-        value: 'https://orcid.org/0001-0001-0001-0001'
-      }
-    ]
+        value: 'https://orcid.org/0001-0001-0001-0001',
+      },
+    ],
   },
-  _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } }
+  _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } },
 });
 
 describe('SubmissionImportExternalPreviewComponent test suite', () => {
@@ -48,11 +58,11 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     scheduler = getTestScheduler();
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionImportExternalPreviewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: Router, useValue: new RouterStub() },
@@ -60,9 +70,9 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: NgbModal, useValue: ngbModal },
         { provide: NgbActiveModal, useValue: ngbActiveModal },
-        SubmissionImportExternalPreviewComponent
+        SubmissionImportExternalPreviewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -105,7 +115,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     it('Should init component properly', () => {
       comp.externalSourceEntry = externalEntry;
       const expected = [
-        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') }
+        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
       ];
       fixture.detectChanges();
 
@@ -126,23 +136,23 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
             id: 'dummy',
             uuid: 'dummy',
             name: 'dummy',
-          }
+          },
         ],
         collection: {
           id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
           uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
           name: 'Collection 1',
-        }
+        },
       };
       const submissionObjects = [
-        { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' }
+        { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' },
       ];
       comp.externalSourceEntry = externalEntry;
       ngbModal.open.and.returnValue({
         componentInstance: { selectedEvent: observableOf(emittedEvent) },
         close: () => {
           return;
-        }
+        },
       });
       spyOn(comp, 'closeMetadataModal');
       submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects));
@@ -162,7 +172,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index ccc9ede142..279e087093 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -1,14 +1,23 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { mergeMap } from 'rxjs/operators';
+
 import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { Metadata } from '../../../core/shared/metadata.utils';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
-import { mergeMap } from 'rxjs/operators';
-import { SubmissionService } from '../../submission.service';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SubmissionService } from '../../submission.service';
 import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
 
 /**
@@ -17,7 +26,7 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external-
 @Component({
   selector: 'ds-submission-import-external-preview',
   styleUrls: ['./submission-import-external-preview.component.scss'],
-  templateUrl: './submission-import-external-preview.component.html'
+  templateUrl: './submission-import-external-preview.component.html',
 })
 export class SubmissionImportExternalPreviewComponent implements OnInit {
   /**
@@ -50,7 +59,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     private submissionService: SubmissionService,
     private modalService: NgbModal,
     private router: Router,
-    private notificationService: NotificationsService
+    private notificationService: NotificationsService,
   ) { }
 
   /**
@@ -62,7 +71,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     metadataKeys.forEach((key) => {
       this.metadataList.push({
         key: key,
-        value: Metadata.first(this.externalSourceEntry.metadata, key)
+        value: Metadata.first(this.externalSourceEntry.metadata, key),
       });
     });
   }
@@ -87,7 +96,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     this.modalRef.componentInstance.selectedEvent.pipe(
       mergeMap((collectionListEntry: CollectionListEntry) => {
         return this.submissionService.createSubmissionFromExternalSource(this.externalSourceEntry._links.self.href, collectionListEntry.collection.id);
-      })
+      }),
     ).subscribe((submissionObjects: SubmissionObject[]) => {
       let isValid = false;
       if (submissionObjects.length === 1) {
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 535395e534..7b5a2004d7 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,25 +1,28 @@
 <div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
-  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
+  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
 </div>
 <div class="input-group mb-5">
-  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
-  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group" aria-label="">
-    <button class="btn btn-outline-secondary w-fx" title="{{'submission.import-external.search.source.hint' |translate}}" ngbDropdownToggle>{{'submission.import-external.source.' + selectedElement?.name | translate}}</button>
-    <div ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
+  <input *ngIf="(isXsOrSm$ | async) !== true" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  <div [ngClass]="{'input-group-append': (isXsOrSm$ | async) !== true}" ngbDropdown role="group">
+    <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
+            class="btn btn-outline-secondary w-fx"
+            title="{{'submission.import-external.search.source.hint' |translate}}"
+            ngbDropdownToggle>
+      {{'submission.import-external.source.' + selectedElement?.name | translate}}
+    </button>
+    <ul ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
       aria-haspopup="true"
-      aria-expanded="false"
-      aria-labelledby="scrollableDropdownMenuButton">
-      <div class="scrollable-menu"
-        aria-labelledby="scrollableDropdownMenuButton"
+      aria-expanded="false">
+      <li class="scrollable-menu"
         infiniteScroll
         [infiniteScrollDistance]="2"
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-        <button ngbDropdownItem class="dropdown-item text-truncate" title="{{'submission.import-external.source.' + source?.name | translate}}" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
+        <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
-      </div>
-    </div>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+      </li>
+    </ul>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
index e1f59c3a5e..7715835c64 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
@@ -1,29 +1,42 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
 import {
-  SourceElement,
-  SubmissionImportExternalSearchbarComponent
-} from './submission-import-external-searchbar.component';
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
 import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { HostWindowService } from '../../../shared/host-window.service';
 import {
   externalSourceCiencia,
   externalSourceMyStaffDb,
   externalSourceOrcid,
-  getMockExternalSourceService
+  getMockExternalSourceService,
 } from '../../../shared/mocks/external-source.service.mock';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { ExternalSource } from '../../../core/shared/external-source.model';
-import { HostWindowService } from '../../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { RequestParam } from '../../../core/cache/models/request-param.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import {
+  SourceElement,
+  SubmissionImportExternalSearchbarComponent,
+} from './submission-import-external-searchbar.component';
 
 describe('SubmissionImportExternalSearchbarComponent test suite', () => {
   let comp: SubmissionImportExternalSearchbarComponent;
@@ -51,9 +64,9 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         ChangeDetectorRef,
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        SubmissionImportExternalSearchbarComponent
+        SubmissionImportExternalSearchbarComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -91,9 +104,9 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
       paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
       compAsAny.externalService.searchBy.and.returnValue(observableOf(paginatedListRD));
       sourceList = [
-        {id: 'orcid', name: 'orcid'},
-        {id: 'ciencia', name: 'ciencia'},
-        {id: 'my_staff_db', name: 'my_staff_db'},
+        { id: 'orcid', name: 'orcid' },
+        { id: 'ciencia', name: 'ciencia' },
+        { id: 'my_staff_db', name: 'my_staff_db' },
       ];
     });
 
@@ -124,7 +137,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
     });
 
     it('Variable \'selectedElement\' should be assigned', () => {
-      const selectedElement = {id: 'orcid', name: 'orcid'};
+      const selectedElement = { id: 'orcid', name: 'orcid' };
       comp.makeSourceSelection(selectedElement);
       expect(comp.selectedElement).toEqual(selectedElement);
     });
@@ -136,14 +149,14 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         elementsPerPage: 3,
         totalElements: 6,
         totalPages: 2,
-        currentPage: 0
+        currentPage: 0,
       });
       compAsAny.findListOptions = Object.assign({}, new FindListOptions(), {
         elementsPerPage: 3,
         currentPage: 0,
         searchParams: [
-          new RequestParam('entityType', 'Publication')
-        ]
+          new RequestParam('entityType', 'Publication'),
+        ],
       });
       comp.sourceList = sourceList;
       const expected = sourceList.concat(sourceList);
@@ -170,7 +183,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   initExternalSourceData = { entity: 'Publication', query: 'dummy', sourceId: 'ciencia' };
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index 522d71cc22..a3fd396dc2 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -1,19 +1,39 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  tap,
+} from 'rxjs/operators';
 
 import { RequestParam } from '../../../core/cache/models/request-param.model';
 import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
-import { ExternalSource } from '../../../core/shared/external-source.model';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { hasValue } from '../../../shared/empty.util';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import {
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { hasValue } from '../../../shared/empty.util';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 
 /**
  * Interface for the selected external source element.
@@ -38,7 +58,7 @@ export interface ExternalSourceData {
 @Component({
   selector: 'ds-submission-import-external-searchbar',
   styleUrls: ['./submission-import-external-searchbar.component.scss'],
-  templateUrl: './submission-import-external-searchbar.component.html'
+  templateUrl: './submission-import-external-searchbar.component.html',
 })
 export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDestroy {
   /**
@@ -93,7 +113,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
   constructor(
     private externalService: ExternalSourceDataService,
     private cdr: ChangeDetectorRef,
-    protected windowService: HostWindowService
+    protected windowService: HostWindowService,
   ) {
   }
 
@@ -103,7 +123,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
   ngOnInit() {
     this.selectedElement = {
       id: '',
-      name: 'loading'
+      name: 'loading',
     };
     this.searchString = '';
     this.sourceList = [];
@@ -111,8 +131,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
       elementsPerPage: 5,
       currentPage: 1,
       searchParams: [
-        new RequestParam('entityType', this.initExternalSourceData.entity)
-      ]
+        new RequestParam('entityType', this.initExternalSourceData.entity),
+      ],
     });
     this.externalService.searchBy('findByEntityType', this.findListOptions).pipe(
       catchError(() => {
@@ -156,8 +176,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
         elementsPerPage: 5,
         currentPage: this.findListOptions.currentPage + 1,
         searchParams: [
-          new RequestParam('entityType', this.initExternalSourceData.entity)
-        ]
+          new RequestParam('entityType', this.initExternalSourceData.entity),
+        ],
       });
       this.externalService.searchBy('findByEntityType', this.findListOptions).pipe(
         catchError(() => {
@@ -167,7 +187,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
           return observableOf(paginatedListRD);
         }),
         getFirstSucceededRemoteData(),
-        tap(() => this.sourceListLoading = false)
+        tap(() => this.sourceListLoading = false),
       ).subscribe((externalSource: RemoteData<PaginatedList<ExternalSource>>) => {
         externalSource.payload.page.forEach((element) => {
           this.sourceList.push({ id: element.id, name: element.name });
@@ -186,8 +206,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
       {
         entity: this.initExternalSourceData.entity,
         sourceId: this.selectedElement.id,
-        query: this.searchString
-      }
+        query: this.searchString,
+      },
     );
   }
 
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index dc46e6758f..55acb591d4 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12">
-      <h2 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h2>
+      <h1 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h1>
       <ds-submission-import-external-searchbar
         [initExternalSourceData]="reload$.value"
         (externalSourceData) = "getExternalSourceData($event)">
@@ -11,8 +11,8 @@
   <div class="row" *ngIf="reload$.value.entity">
     <div *ngIf="reload$.value.sourceId !== ''" class="col-md-12">
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <h3 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h3>
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !(isLoading$ | async) && entriesRD?.payload?.page?.length > 0" @fadeIn
+        <h2 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
+        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0" @fadeIn
                                 [objects]="entriesRD"
                                 [selectionConfig]="{ repeatable: repeatable, listId: listId }"
                                 [config]="initialPagination"
@@ -24,16 +24,16 @@
         </ds-viewable-collection>
         <ds-themed-loading *ngIf="(isLoading$ | async)"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
-        <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.empty' | translate }}</ds-alert>
+        <div *ngIf="(isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
         </div>
-        <div *ngIf="!(isLoading$ | async) && entriesRD.statusCode === 500" data-test="empty-external-error-500">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.response.500' | translate }}</ds-alert>
+        <div *ngIf="(isLoading$ | async) !== true && entriesRD.statusCode === 500" data-test="empty-external-error-500">
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
         </div>
       </ng-container>
     </div>
     <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
-      <ds-alert [type]="'alert-info'">
+      <ds-alert [type]="AlertType.Info">
         <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
       </ds-alert>
     </div>
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index 29b75bab44..a0955c9ea5 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -1,33 +1,43 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { getTestScheduler } from 'jasmine-marbles';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionImportExternalComponent } from './submission-import-external.component';
 import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
-import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { RouteService } from '../../core/services/route.service';
-import { createPaginatedList, createTestComponent } from '../../shared/testing/utils.test';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../shared/testing/utils.test';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
-import { By } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { SubmissionImportExternalComponent } from './submission-import-external.component';
 
 describe('SubmissionImportExternalComponent test suite', () => {
   let comp: SubmissionImportExternalComponent;
@@ -38,12 +48,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       pageSize: 10,
-      currentPage: 0
+      currentPage: 0,
     }),
-    query: 'test'
+    query: 'test',
   }));
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const mockExternalSourceService: any = getMockExternalSourceService();
 
@@ -51,12 +61,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        BrowserAnimationsModule
+        BrowserAnimationsModule,
       ],
       declarations: [
         SubmissionImportExternalComponent,
         TestComponent,
-        VarDirective
+        VarDirective,
       ],
       providers: [
         { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
@@ -64,9 +74,9 @@ describe('SubmissionImportExternalComponent test suite', () => {
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: new RouterStub() },
         { provide: NgbModal, useValue: ngbModal },
-        SubmissionImportExternalComponent
+        SubmissionImportExternalComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -109,17 +119,17 @@ describe('SubmissionImportExternalComponent test suite', () => {
 
     it('Should init component properly (without route data)', () => {
       const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([]));
-      comp.routeData = {entity: '', sourceId: '', query: '' };
+      comp.routeData = { entity: '', sourceId: '', query: '' };
       spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf(''));
       fixture.detectChanges();
 
-      expect(comp.routeData).toEqual({entity: '', sourceId: '', query: '' });
+      expect(comp.routeData).toEqual({ entity: '', sourceId: '', query: '' });
       expect(comp.isLoading$.value).toBe(false);
       expect(comp.entriesRD$.value).toEqual(expectedEntries);
     });
 
     it('Should init component properly (with route data)', () => {
-      comp.routeData = {entity: '', sourceId: '', query: '' };
+      comp.routeData = { entity: '', sourceId: '', query: '' };
       spyOn(compAsAny, 'retrieveExternalSources');
       spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValues(observableOf('entity'), observableOf('source'), observableOf('dummy'));
       fixture.detectChanges();
@@ -145,10 +155,10 @@ describe('SubmissionImportExternalComponent test suite', () => {
     });
 
     it('Should call \'router.navigate\'', () => {
-      comp.routeData = {entity: 'Person', sourceId: '', query: '' };
+      comp.routeData = { entity: 'Person', sourceId: '', query: '' };
       spyOn(compAsAny, 'retrieveExternalSources').and.callFake(() => null);
       compAsAny.router.navigate.and.returnValue( new Promise(() => {return;}));
-      const event = {entity: 'Person', sourceId: 'orcidV2', query: 'dummy' };
+      const event = { entity: 'Person', sourceId: 'orcidV2', query: 'dummy' };
 
       scheduler.schedule(() => comp.getExternalSourceData(event));
       scheduler.flush();
@@ -164,12 +174,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
         metadata: {
           'dc.identifier.uri': [
             {
-              value: 'https://orcid.org/0001-0001-0001-0001'
-            }
-          ]
-        }
+              value: 'https://orcid.org/0001-0001-0001-0001',
+            },
+          ],
+        },
       });
-      ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}});
+      ngbModal.open.and.returnValue({ componentInstance: { externalSourceEntry: null } });
       comp.import(entry);
 
       expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' });
@@ -193,32 +203,32 @@ describe('SubmissionImportExternalComponent test suite', () => {
       'errorMessage': null,
       'payload': {
         'type': {
-          'value': 'paginated-list'
+          'value': 'paginated-list',
         },
         'pageInfo': {
           'elementsPerPage': 10,
           'totalElements': 11971608,
           'totalPages': 1197161,
-          'currentPage': 1
+          'currentPage': 1,
         },
         '_links': {
           'first': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc',
           },
           'self': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test',
           },
           'next': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc',
           },
           'last': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc',
           },
           'page': [
             {
-              'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
-            }
-          ]
+              'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665',
+            },
+          ],
         },
         'page': [
           {
@@ -235,8 +245,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Silva I.M.M.',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.date.issued': [
                 {
@@ -245,8 +255,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '2024-01-01',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.description.abstract': [
                 {
@@ -255,8 +265,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'This systematic review integrates the data available in the literature regarding the biological activities of the extracts of endophytic fungi isolated from Annona muricata and their secondary metabolites. The search was performed using four electronic databases, and studies’ quality was evaluated using an adapted assessment tool. The initial database search yielded 436 results; ten studies were selected for inclusion. The leaf was the most studied part of the plant (in nine studies); Periconia sp. was the most tested fungus (n = 4); the most evaluated biological activity was anticancer (n = 6), followed by antiviral (n = 3). Antibacterial, antifungal, and antioxidant activities were also tested. Terpenoids or terpenoid hybrid compounds were the most abundant chemical metabolites. Phenolic compounds, esters, alkaloids, saturated and unsaturated fatty acids, aromatic compounds, and peptides were also reported. The selected studies highlighted the biotechnological potentiality of the endophytic fungi extracts from A. muricata. Consequently, it can be considered a promising source of biological compounds with antioxidant effects and active against different microorganisms and cancer cells. Further research is needed involving different plant tissues, other microorganisms, such as SARS-CoV-2, and different cancer cells.',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.doi': [
                 {
@@ -265,8 +275,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '10.1590/1519-6984.259525',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.pmid': [
                 {
@@ -275,8 +285,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '35588520',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.scopus': [
                 {
@@ -285,8 +295,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '2-s2.0-85130258665',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.grantno': [
                 {
@@ -295,8 +305,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'undefined',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.ispartof': [
                 {
@@ -305,8 +315,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Brazilian Journal of Biology',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.ispartofseries': [
                 {
@@ -315,8 +325,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Brazilian Journal of Biology',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.issn': [
                 {
@@ -325,8 +335,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '15196984',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.subject': [
                 {
@@ -335,8 +345,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'biological products | biotechnology | mycology | soursop',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.title': [
                 {
@@ -345,8 +355,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Biological activities of endophytic fungi isolated from Annona muricata Linnaeus: a systematic review',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.type': [
                 {
@@ -355,8 +365,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Journal',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oaire.citation.volume': [
                 {
@@ -365,8 +375,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '84',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oairecerif.affiliation.orgunit': [
                 {
@@ -375,8 +385,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Universidade Federal do Reconcavo da Bahia',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oairecerif.citation.number': [
                 {
@@ -385,8 +395,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'e259525',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'person.identifier.orcid': [
                 {
@@ -395,8 +405,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'person.identifier.scopus-author-id': [
                 {
@@ -405,19 +415,19 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '42561627000',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
-              ]
+                  'confidence': -1,
+                },
+              ],
             },
             '_links': {
               'self': {
-                'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
-              }
-            }
-          }
-        ]
+                'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665',
+              },
+            },
+          },
+        ],
       },
-      'statusCode': 200
+      'statusCode': 200,
     };
     const errorObj = {
       errorMessage: 'Http failure response for ' +
@@ -425,8 +435,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
       statusCode: 500,
       timeCompleted: 1656950434666,
       errors: [{
-        'message': 'Internal Server Error', 'paths': ['/server/api/integration/externalsources/pubmed/entries']
-      }]
+        'message': 'Internal Server Error', 'paths': ['/server/api/integration/externalsources/pubmed/entries'],
+      }],
     };
     beforeEach(() => {
       fixture = TestBed.createComponent(SubmissionImportExternalComponent);
@@ -483,7 +493,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
       mockExternalSourceService.getExternalSourceEntries.and.returnValue(createFailedRemoteDataObject$(
         errorObj.errorMessage,
         errorObj.statusCode,
-        errorObj.timeCompleted
+        errorObj.timeCompleted,
       ));
       spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
         if (param === 'entity') {
@@ -509,7 +519,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 25b1d5d1aa..73fd472e29 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -1,28 +1,49 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
-import { filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
-import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
-import { RemoteData } from '../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { Context } from '../../core/shared/context.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { RouteService } from '../../core/services/route.service';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import {
-  SubmissionImportExternalPreviewComponent
-} from './import-external-preview/submission-import-external-preview.component';
-import { fadeIn } from '../../shared/animations/fade';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { getFinishedRemoteData } from '../../core/shared/operators';
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
+import { Context } from '../../core/shared/context.model';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
 import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { getFinishedRemoteData } from '../../core/shared/operators';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { fadeIn } from '../../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
+import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
 
 /**
  * This component allows to submit a new workspaceitem importing the data from an external source.
@@ -31,7 +52,7 @@ import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type
   selector: 'ds-submission-import-external',
   styleUrls: ['./submission-import-external.component.scss'],
   templateUrl: './submission-import-external.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
@@ -51,7 +72,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   public reload$: BehaviorSubject<ExternalSourceData> = new BehaviorSubject<ExternalSourceData>({
     entity: '',
     query: '',
-    sourceId: ''
+    sourceId: '',
   });
   /**
    * Configuration to use for the import buttons
@@ -74,7 +95,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
    */
   public initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 10
+    pageSize: 10,
   });
   /**
    * The context to displaying lists for
@@ -92,6 +113,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
   private retrieveExternalSourcesSub: Subscription;
 
+  public readonly AlertType = AlertType;
+
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
@@ -116,9 +139,9 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
     this.listId = 'list-submission-external-sources';
     this.context = Context.EntitySearchModalWithNameVariants;
     this.repeatable = false;
-    this.routeData = {entity: '', sourceId: '', query: ''};
+    this.routeData = { entity: '', sourceId: '', query: '' };
     this.importConfig = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
     this.entriesRD$ = new BehaviorSubject(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [])));
     this.isLoading$ = new BehaviorSubject(false);
@@ -126,11 +149,11 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
       [
         this.routeService.getQueryParameterValue('entity'),
         this.routeService.getQueryParameterValue('sourceId'),
-        this.routeService.getQueryParameterValue('query')
+        this.routeService.getQueryParameterValue('query'),
       ]).pipe(
-      take(1)
+      take(1),
     ).subscribe(([entity, sourceId, query]: [string, string, string]) => {
-      this.reload$.next({entity: entity || NONE_ENTITY_TYPE, query: query, sourceId: sourceId});
+      this.reload$.next({ entity: entity || NONE_ENTITY_TYPE, query: query, sourceId: sourceId });
       this.selectLabel(entity);
       this.retrieveExternalSources();
     }));
@@ -144,8 +167,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
       [],
       {
         queryParams: event,
-        replaceUrl: true
-      }
+        replaceUrl: true,
+      },
     ).then(() => {
       this.reload$.next(event);
       this.retrieveExternalSources();
@@ -188,16 +211,16 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
     this.retrieveExternalSourcesSub = this.reload$.pipe(
       filter((sourceQueryObject: ExternalSourceData) => isNotEmpty(sourceQueryObject.sourceId) && isNotEmpty(sourceQueryObject.query)),
       switchMap((sourceQueryObject: ExternalSourceData) => {
-          const query = sourceQueryObject.query;
-          this.routeData = sourceQueryObject;
-          return this.searchConfigService.paginatedSearchOptions.pipe(
-            tap(() => this.isLoading$.next(true)),
-            filter((searchOptions) => searchOptions.query === query),
-            mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
-              getFinishedRemoteData(),
-            ))
-          );
-        }
+        const query = sourceQueryObject.query;
+        this.routeData = sourceQueryObject;
+        return this.searchConfigService.paginatedSearchOptions.pipe(
+          tap(() => this.isLoading$.next(true)),
+          filter((searchOptions) => searchOptions.query === query),
+          mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
+            getFinishedRemoteData(),
+          )),
+        );
+      },
       ),
     ).subscribe((rdData) => {
       this.entriesRD$.next(rdData);
@@ -213,7 +236,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   private selectLabel(entity: string): void {
     this.label = entity;
     this.importConfig = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
   }
 
diff --git a/src/app/submission/import-external/themed-submission-import-external.component.ts b/src/app/submission/import-external/themed-submission-import-external.component.ts
index 698a64842d..a452ad09a9 100644
--- a/src/app/submission/import-external/themed-submission-import-external.component.ts
+++ b/src/app/submission/import-external/themed-submission-import-external.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionImportExternalComponent } from './submission-import-external.component';
 
@@ -8,7 +9,7 @@ import { SubmissionImportExternalComponent } from './submission-import-external.
 @Component({
   selector: 'ds-themed-submission-import-external',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionImportExternalComponent extends ThemedComponent<SubmissionImportExternalComponent> {
   protected getComponentName(): string {
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 9182611e47..e075ce5e5b 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -1,16 +1,16 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 
-import { type } from '../../shared/ngrx/type';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { Item } from '../../core/shared/item.model';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../core/submission/models/workspaceitem-section-upload-file.model';
 import {
   WorkspaceitemSectionDataType,
-  WorkspaceitemSectionsObject
+  WorkspaceitemSectionsObject,
 } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { type } from '../../shared/ngrx/type';
 import { SectionsType } from '../sections/sections-type';
-import { Item } from '../../core/shared/item.model';
 import { SectionVisibility } from './section-visibility.model';
 import { SubmissionError } from './submission-error.model';
 import { SubmissionSectionError } from './submission-section-error.model';
@@ -56,9 +56,13 @@ export const SubmissionObjectActionTypes = {
   DISCARD_SUBMISSION_SUCCESS: type('dspace/submission/DISCARD_SUBMISSION_SUCCESS'),
   DISCARD_SUBMISSION_ERROR: type('dspace/submission/DISCARD_SUBMISSION_ERROR'),
 
+  // Clearing active section types
+  CLEAN_DUPLICATE_DETECTION: type('dspace/submission/CLEAN_DUPLICATE_DETECTION'),
+
   // Upload file types
   NEW_FILE: type('dspace/submission/NEW_FILE'),
   EDIT_FILE_DATA: type('dspace/submission/EDIT_FILE_DATA'),
+  EDIT_FILE_PRIMARY_BITSTREAM_DATA: type('dspace/submission/EDIT_FILE_PRIMARY_BITSTREAM_DATA'),
   DELETE_FILE: type('dspace/submission/DELETE_FILE'),
 
   // Errors
@@ -148,15 +152,15 @@ export class InitSectionAction implements Action {
    *    the section's errors
    */
   constructor(submissionId: string,
-              sectionId: string,
-              header: string,
-              config: string,
-              mandatory: boolean,
-              sectionType: SectionsType,
-              visibility: SectionVisibility,
-              enabled: boolean,
-              data: WorkspaceitemSectionDataType,
-              errors: SubmissionSectionError[]) {
+    sectionId: string,
+    header: string,
+    config: string,
+    mandatory: boolean,
+    sectionType: SectionsType,
+    visibility: SectionVisibility,
+    enabled: boolean,
+    data: WorkspaceitemSectionDataType,
+    errors: SubmissionSectionError[]) {
     this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
   }
 }
@@ -177,7 +181,7 @@ export class EnableSectionAction implements Action {
    *    the section's ID to add
    */
   constructor(submissionId: string,
-              sectionId: string) {
+    sectionId: string) {
     this.payload = { submissionId, sectionId };
   }
 }
@@ -230,15 +234,34 @@ export class UpdateSectionDataAction implements Action {
    *    the section's metadata
    */
   constructor(submissionId: string,
-              sectionId: string,
-              data: WorkspaceitemSectionDataType,
-              errorsToShow: SubmissionSectionError[],
-              serverValidationErrors: SubmissionSectionError[],
-              metadata?: string[]) {
+    sectionId: string,
+    data: WorkspaceitemSectionDataType,
+    errorsToShow: SubmissionSectionError[],
+    serverValidationErrors: SubmissionSectionError[],
+    metadata?: string[]) {
     this.payload = { submissionId, sectionId, data, errorsToShow, serverValidationErrors, metadata };
   }
 }
 
+/**
+ * Removes data and makes 'detect-duplicate' section not visible.
+ */
+export class CleanDuplicateDetectionAction implements Action {
+  type = SubmissionObjectActionTypes.CLEAN_DUPLICATE_DETECTION;
+  payload: {
+    submissionId: string;
+  };
+
+  /**
+   * creates a new CleanDetectDuplicateAction
+   *
+   * @param submissionId Id of the submission on which perform the action
+   */
+  constructor(submissionId: string ) {
+    this.payload = { submissionId };
+  }
+}
+
 export class UpdateSectionDataSuccessAction implements Action {
   type = SubmissionObjectActionTypes.UPDATE_SECTION_DATA_SUCCESS;
 }
@@ -334,12 +357,12 @@ export class InitSubmissionFormAction implements Action {
    *    the submission's sections errors
    */
   constructor(collectionId: string,
-              submissionId: string,
-              selfUrl: string,
-              submissionDefinition: SubmissionDefinitionsModel,
-              sections: WorkspaceitemSectionsObject,
-              item: Item,
-              errors: SubmissionError) {
+    submissionId: string,
+    selfUrl: string,
+    submissionDefinition: SubmissionDefinitionsModel,
+    sections: WorkspaceitemSectionsObject,
+    item: Item,
+    errors: SubmissionError) {
     this.payload = { collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors };
   }
 }
@@ -760,6 +783,29 @@ export class NewUploadedFileAction implements Action {
   }
 }
 
+export class EditFilePrimaryBitstreamAction implements Action {
+  type = SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA;
+  payload: {
+    submissionId: string;
+    sectionId: string;
+    fileId: string | null;
+  };
+
+  /**
+   * Edit a file data
+   *
+   * @param submissionId
+   *    the submission's ID
+   * @param sectionId
+   *    the section's ID
+   * @param fileId
+   *    the file's ID
+   */
+  constructor(submissionId: string, sectionId: string, fileId: string | null) {
+    this.payload = { submissionId, sectionId, fileId: fileId };
+  }
+}
+
 export class EditFileDataAction implements Action {
   type = SubmissionObjectActionTypes.EDIT_FILE_DATA;
   payload: {
@@ -821,6 +867,7 @@ export type SubmissionObjectAction = DisableSectionAction
   | InitSubmissionFormAction
   | ResetSubmissionFormAction
   | CancelSubmissionFormAction
+  | CleanDuplicateDetectionAction
   | CompleteInitSubmissionFormAction
   | ChangeSubmissionCollectionAction
   | SaveAndDepositSubmissionAction
@@ -833,6 +880,7 @@ export type SubmissionObjectAction = DisableSectionAction
   | SectionStatusChangeAction
   | NewUploadedFileAction
   | EditFileDataAction
+  | EditFilePrimaryBitstreamAction
   | DeleteUploadedFileAction
   | InertSectionErrorsAction
   | DeleteSectionErrorsAction
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index a1bb878aa5..66c6e8316e 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -1,12 +1,59 @@
 import { TestBed } from '@angular/core/testing';
-
-import { cold, hot } from 'jasmine-marbles';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
 
-import { SubmissionObjectEffects } from './submission-objects.effects';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
+import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
+import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import {
+  mockSectionsData,
+  mockSectionsDataTwo,
+  mockSectionsErrors,
+  mockSectionsErrorsTouchedField,
+  mockSubmissionCollectionId,
+  mockSubmissionDefinition,
+  mockSubmissionDefinitionResponse,
+  mockSubmissionId,
+  mockSubmissionRestResponse,
+  mockSubmissionSelfUrl,
+  mockSubmissionState,
+} from '../../shared/mocks/submission.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../shared/testing/sections-service.stub';
+import { StoreMock } from '../../shared/testing/store.mock';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
+import { mockSubmissionObjectDataService } from '../../shared/testing/submission-oject-data-service.mock';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SectionsService } from '../sections/sections.service';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
 import {
   CompleteInitSubmissionFormAction,
   DepositSubmissionAction,
@@ -22,40 +69,9 @@ import {
   SaveSubmissionSectionFormErrorAction,
   SaveSubmissionSectionFormSuccessAction,
   SubmissionObjectActionTypes,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import {
-  mockSectionsData,
-  mockSectionsDataTwo,
-  mockSectionsErrors,
-  mockSectionsErrorsTouchedField,
-  mockSubmissionCollectionId,
-  mockSubmissionDefinition,
-  mockSubmissionDefinitionResponse,
-  mockSubmissionId,
-  mockSubmissionRestResponse,
-  mockSubmissionSelfUrl,
-  mockSubmissionState
-} from '../../shared/mocks/submission.mock';
-import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import { SectionsService } from '../sections/sections.service';
-import { SectionsServiceStub } from '../../shared/testing/sections-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { StoreMock } from '../../shared/testing/store.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import parseSectionErrors from '../utils/parseSectionErrors';
-import { Item } from '../../core/shared/item.model';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
-import { mockSubmissionObjectDataService } from '../../shared/testing/submission-oject-data-service.mock';
+import { SubmissionObjectEffects } from './submission-objects.effects';
 
 describe('SubmissionObjectEffects test suite', () => {
   let submissionObjectEffects: SubmissionObjectEffects;
@@ -88,8 +104,8 @@ describe('SubmissionObjectEffects test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       providers: [
@@ -124,10 +140,10 @@ describe('SubmissionObjectEffects test suite', () => {
             selfUrl: selfUrl,
             submissionDefinition: submissionDefinition,
             sections: {},
-            item: {metadata: {}},
+            item: { metadata: {} },
             errors: [],
-          }
-        }
+          },
+        },
       });
 
       const mappedActions = [];
@@ -159,7 +175,7 @@ describe('SubmissionObjectEffects test suite', () => {
         e: mappedActions[3],
         f: mappedActions[4],
         g: mappedActions[5],
-        h: mappedActions[6]
+        h: mappedActions[6],
       });
 
       expect(submissionObjectEffects.loadForm$).toBeObservable(expected);
@@ -179,8 +195,8 @@ describe('SubmissionObjectEffects test suite', () => {
             sections: {},
             item: new Item(),
             errors: [],
-          }
-        }
+          },
+        },
       });
 
       const expected = cold('--b-', {
@@ -191,8 +207,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionDefinition,
           {},
           new Item(),
-          null
-        )
+          null,
+        ),
       });
 
       expect(submissionObjectEffects.resetForm$).toBeObservable(expected);
@@ -205,17 +221,17 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveSubmissionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -227,9 +243,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
             submissionId: submissionId,
-            isManual: true
-          }
-        }
+            isManual: true,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
@@ -238,8 +254,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           mockSubmissionRestResponse as any,
           true,
-          true
-        )
+          true,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -251,9 +267,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
             submissionId: submissionId,
-            isManual: false
-          }
-        }
+            isManual: false,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
@@ -262,8 +278,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           mockSubmissionRestResponse as any,
           false,
-          false
-        )
+          false,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -274,18 +290,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -298,17 +314,17 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveForLaterSubmissionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveForLaterSubmission$).toBeObservable(expected);
@@ -319,18 +335,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveForLaterSubmission$).toBeObservable(expected);
@@ -342,13 +358,13 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -356,9 +372,9 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-            notify: true
-          }
-        }
+            notify: true,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -368,21 +384,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -394,20 +410,20 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display errors when notification are disabled and field are not touched', () => {
       store.nextState({
         submission: {
-          objects: submissionState
+          objects: submissionState,
         },
         forms: {
           '2_traditionalpageone': {
             touched: {
-              'dc.title': true
-            }
-          }
-        }
+              'dc.title': true,
+            },
+          },
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -415,9 +431,9 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-            notify: false
-          }
-        }
+            notify: false,
+          },
+        },
       });
 
       const errorsToShowList = parseSectionErrors(mockSectionsErrorsTouchedField);
@@ -428,21 +444,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsToShowList.traditionalpageone,
-          serverValidationErrorsList.traditionalpageone
+          serverValidationErrorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsToShowList.license || [],
-          serverValidationErrorsList.license || []
+          serverValidationErrorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsToShowList.upload || [],
-          serverValidationErrorsList.upload || []
+          serverValidationErrorsList.upload || [],
         ),
       });
 
@@ -453,21 +469,21 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should display a success notification', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsData
+        sections: mockSectionsData,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const expected = cold('--(bcd)-', {
@@ -476,21 +492,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          []
+          [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           [],
-          []
+          [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           [],
-          []
+          [],
         ),
       });
 
@@ -501,22 +517,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should display a warning notification when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -526,21 +542,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -551,22 +567,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should detect and notify a new section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsDataTwo,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -576,28 +592,28 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
           errorsList.traditionalpagetwo || [],
-          errorsList.traditionalpagetwo || []
+          errorsList.traditionalpagetwo || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -612,22 +628,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -637,21 +653,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          errorsList.traditionalpageone
+          errorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -662,21 +678,21 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display a success notification', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsData
+        sections: mockSectionsData,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const expected = cold('--(bcd)-', {
@@ -685,21 +701,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          []
+          [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           [],
-          []
+          [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           [],
-          []
+          [],
         ),
       });
 
@@ -710,22 +726,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display a warning notification when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const serverValidationErrorsList = parseSectionErrors(mockSectionsErrors);
@@ -735,21 +751,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          serverValidationErrorsList.traditionalpageone
+          serverValidationErrorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           serverValidationErrorsList.license || [],
-          serverValidationErrorsList.license || []
+          serverValidationErrorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           serverValidationErrorsList.upload || [],
-          serverValidationErrorsList.upload || []
+          serverValidationErrorsList.upload || [],
         ),
       });
 
@@ -760,13 +776,13 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should detect new sections but not notify for it', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsDataTwo,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -774,8 +790,8 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-          }
-        }
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -785,28 +801,28 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
           [],
-          errorsList.traditionalpageone
+          errorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
           errorsList.traditionalpagetwo || [],
-          errorsList.traditionalpagetwo || []
+          errorsList.traditionalpagetwo || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -823,17 +839,17 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM,
           payload: {
             submissionId: submissionId,
-            sectionId: 'traditionalpageone'
-          }
-        }
+            sectionId: 'traditionalpageone',
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceID.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveSubmissionSectionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveSection$).toBeObservable(expected);
@@ -845,18 +861,18 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM,
           payload: {
             submissionId: submissionId,
-            sectionId: 'traditionalpageone'
-          }
-        }
+            sectionId: 'traditionalpageone',
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceID.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionSectionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveSection$).toBeObservable(expected);
@@ -869,20 +885,20 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsDataTwo
+        sections: mockSectionsDataTwo,
       })];
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(response));
       const expected = cold('--b-', {
         b: new DepositSubmissionAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -892,28 +908,28 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a SAVE_SUBMISSION_FORM_SUCCESS action when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(response));
 
       const expected = cold('--b-', {
-        b: new SaveSubmissionFormSuccessAction(submissionId, response as any[], false, true)
+        b: new SaveSubmissionFormSuccessAction(submissionId, response as any[], false, true),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -925,18 +941,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -947,24 +963,24 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DEPOSIT_SUBMISSION_SUCCESS action on success', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.depositSubmission.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new DepositSubmissionSuccessAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.depositSubmission$).toBeObservable(expected);
@@ -973,26 +989,26 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DEPOSIT_SUBMISSION_ERROR action on error', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.depositSubmission.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new DepositSubmissionErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.depositSubmission$).toBeObservable(expected);
@@ -1006,9 +1022,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: mockSubmissionRestResponse
-          }
-        }
+            submissionObject: mockSubmissionRestResponse,
+          },
+        },
       });
 
       submissionObjectEffects.saveForLaterSubmissionSuccess$.subscribe(() => {
@@ -1024,9 +1040,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_SUCCESS,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.depositSubmissionSuccess$.subscribe(() => {
@@ -1042,9 +1058,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.depositSubmissionError$.subscribe(() => {
@@ -1059,9 +1075,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.saveError$.subscribe(() => {
@@ -1074,9 +1090,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.saveError$.subscribe(() => {
@@ -1089,24 +1105,24 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DISCARD_SUBMISSION_SUCCESS action on success', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.discardSubmission.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new DiscardSubmissionSuccessAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.discardSubmission$).toBeObservable(expected);
@@ -1115,26 +1131,26 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DISCARD_SUBMISSION_ERROR action on error', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.discardSubmission.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new DiscardSubmissionErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.discardSubmission$).toBeObservable(expected);
@@ -1147,9 +1163,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION_SUCCESS,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.discardSubmissionSuccess$.subscribe(() => {
@@ -1165,9 +1181,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.discardSubmissionError$.subscribe(() => {
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 98646009d5..53dcd9a19e 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -1,27 +1,58 @@
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import findKey from 'lodash/findKey';
 import isEqual from 'lodash/isEqual';
 import union from 'lodash/union';
+import {
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
 
-import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
-import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
+import { environment } from '../../../environments/environment';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemSectionDuplicatesObject } from '../../core/submission/models/workspaceitem-section-duplicates.model';
 import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { FormState } from '../../shared/form/form.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SectionsType } from '../sections/sections-type';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { SectionsService } from '../sections/sections.service';
+import { SectionsType } from '../sections/sections-type';
 import { SubmissionState } from '../submission.reducers';
 import { SubmissionService } from '../submission.service';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import parseSectionErrors from '../utils/parseSectionErrors';
 import {
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DepositSubmissionAction,
   DepositSubmissionErrorAction,
@@ -43,18 +74,11 @@ import {
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
   UpdateSectionDataAction,
-  UpdateSectionDataSuccessAction
+  UpdateSectionDataSuccessAction,
 } from './submission-objects.actions';
 import { SubmissionObjectEntry } from './submission-objects.reducer';
-import { Item } from '../../core/shared/item.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { FormState } from '../../shared/form/form.reducer';
-import { SubmissionSectionObject } from './submission-section-object.model';
 import { SubmissionSectionError } from './submission-section-error.model';
+import { SubmissionSectionObject } from './submission-section-object.model';
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -71,7 +95,12 @@ export class SubmissionObjectEffects {
         const selfLink = sectionDefinition._links.self.href || sectionDefinition._links.self;
         const sectionId = selfLink.substr(selfLink.lastIndexOf('/') + 1);
         const config = sectionDefinition._links.config ? (sectionDefinition._links.config.href || sectionDefinition._links.config) : '';
-        const enabled = (sectionDefinition.mandatory) || (isNotEmpty(action.payload.sections) && action.payload.sections.hasOwnProperty(sectionId));
+        // A section is enabled if it is mandatory or contains data in its section payload
+        // except for detect duplicate steps which will be hidden with no data unless overridden in config, even if mandatory
+        const enabled = (sectionDefinition.mandatory && (sectionDefinition.sectionType !== SectionsType.Duplicates))
+          || (isNotEmpty(action.payload.sections) && action.payload.sections.hasOwnProperty(sectionId)
+            && (sectionDefinition.sectionType === SectionsType.Duplicates && (alwaysDisplayDuplicates() || isNotEmpty((action.payload.sections[sectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)))
+          );
         let sectionData;
         if (sectionDefinition.sectionType !== SectionsType.SubmissionForm) {
           sectionData = (isNotUndefined(action.payload.sections) && isNotUndefined(action.payload.sections[sectionId])) ? action.payload.sections[sectionId] : Object.create(null);
@@ -90,8 +119,8 @@ export class SubmissionObjectEffects {
             sectionDefinition.visibility,
             enabled,
             sectionData,
-            sectionErrors
-          )
+            sectionErrors,
+          ),
         );
       });
       return { action: action, definition: definition, mappedActions: mappedActions };
@@ -99,7 +128,7 @@ export class SubmissionObjectEffects {
     mergeMap((result) => {
       return observableFrom(
         result.mappedActions.concat(
-          new CompleteInitSubmissionFormAction(result.action.payload.submissionId)
+          new CompleteInitSubmissionFormAction(result.action.payload.submissionId),
         ));
     })));
 
@@ -116,7 +145,7 @@ export class SubmissionObjectEffects {
         action.payload.submissionDefinition,
         action.payload.sections,
         action.payload.item,
-        null
+        null,
       ))));
 
   /**
@@ -129,8 +158,8 @@ export class SubmissionObjectEffects {
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
         'sections').pipe(
-          map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, action.payload.isManual, action.payload.isManual)),
-          catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, action.payload.isManual, action.payload.isManual)),
+        catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -143,8 +172,8 @@ export class SubmissionObjectEffects {
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
         'sections').pipe(
-          map((response: SubmissionObject[]) => new SaveForLaterSubmissionFormSuccessAction(action.payload.submissionId, response)),
-          catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveForLaterSubmissionFormSuccessAction(action.payload.submissionId, response)),
+        catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -184,8 +213,8 @@ export class SubmissionObjectEffects {
         action.payload.submissionId,
         'sections',
         action.payload.sectionId).pipe(
-          map((response: SubmissionObject[]) => new SaveSubmissionSectionFormSuccessAction(action.payload.submissionId, response)),
-          catchError(() => observableOf(new SaveSubmissionSectionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveSubmissionSectionFormSuccessAction(action.payload.submissionId, response)),
+        catchError(() => observableOf(new SaveSubmissionSectionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -210,9 +239,9 @@ export class SubmissionObjectEffects {
           action.payload.submissionId,
           'sections') as Observable<SubmissionObject[]>;
       } else {
-        response$ = this.submissionObjectService.findById(action.payload.submissionId, false, true).pipe(
+        response$ = this.submissionObjectService.findById(action.payload.submissionId, false, true, followLink('item'), followLink('collection')).pipe(
           getFirstSucceededRemoteDataPayload(),
-          map((submissionObject: SubmissionObject) => [submissionObject])
+          map((submissionObject: SubmissionObject) => [submissionObject]),
         );
       }
       return response$.pipe(
@@ -224,7 +253,7 @@ export class SubmissionObjectEffects {
               null,
               this.translate.instant('submission.sections.general.cannot_deposit'),
               null,
-              true
+              true,
             );
             return new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, false, true);
           }
@@ -241,7 +270,7 @@ export class SubmissionObjectEffects {
     switchMap(([action, state]: [DepositSubmissionAction, any]) => {
       return this.submissionService.depositSubmission(state.submission.objects[action.payload.submissionId].selfUrl).pipe(
         map(() => new DepositSubmissionSuccessAction(action.payload.submissionId)),
-        catchError((error) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
+        catchError((error: unknown) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -292,7 +321,7 @@ export class SubmissionObjectEffects {
       if (section.sectionType === SectionsType.SubmissionForm) {
         const submissionObject$ = this.submissionObjectService
           .findById(action.payload.submissionId, true, false, followLink('item')).pipe(
-            getFirstSucceededRemoteDataPayload()
+            getFirstSucceededRemoteDataPayload(),
           );
 
         const item$ = submissionObject$.pipe(
@@ -303,7 +332,7 @@ export class SubmissionObjectEffects {
         return item$.pipe(
           map((item: Item) => item.metadata),
           filter((metadata) => !isEqual(action.payload.data, metadata)),
-          map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata))
+          map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata)),
         );
       } else {
         return observableOf(new UpdateSectionDataSuccessAction());
@@ -434,8 +463,16 @@ export class SubmissionObjectEffects {
           && isEmpty(sections[sherpaPoliciesSectionId])) {
           mappedActions.push(new UpdateSectionDataAction(submissionId, sherpaPoliciesSectionId, null, [], []));
         }
-      });
 
+        // When Duplicate Detection step is enabled, add it only if there are duplicates in the response section data
+        // or if configuration overrides this behaviour
+        if (!alwaysDisplayDuplicates()) {
+          const duplicatesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.Duplicates);
+          if (isNotUndefined(duplicatesSectionId) && sections.hasOwnProperty(duplicatesSectionId) && isEmpty((sections[duplicatesSectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)) {
+            mappedActions.push(new CleanDuplicateDetectionAction(submissionId));
+          }
+        }
+      });
     }
     return mappedActions;
   }
@@ -481,3 +518,7 @@ function filterErrors(sectionForm: FormState, sectionErrors: SubmissionSectionEr
   });
   return filteredErrors;
 }
+
+function alwaysDisplayDuplicates(): boolean {
+  return (environment.submission.duplicateDetection.alwaysShowSection);
+}
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 2a24afae19..2389a5600c 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -1,7 +1,16 @@
-import { submissionObjectReducer, SubmissionObjectState } from './submission-objects.reducer';
+import { Item } from '../../core/shared/item.model';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionDefinitionResponse,
+  mockSubmissionId,
+  mockSubmissionSelfUrl,
+  mockSubmissionState,
+} from '../../shared/mocks/submission.mock';
+import { SectionsType } from '../sections/sections-type';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DeleteSectionErrorsAction,
   DeleteUploadedFileAction,
@@ -30,17 +39,12 @@ import {
   SaveSubmissionSectionFormSuccessAction,
   SectionStatusChangeAction,
   SubmissionObjectAction,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import { SectionsType } from '../sections/sections-type';
 import {
-  mockSubmissionCollectionId,
-  mockSubmissionDefinitionResponse,
-  mockSubmissionId,
-  mockSubmissionSelfUrl,
-  mockSubmissionState
-} from '../../shared/mocks/submission.mock';
-import { Item } from '../../core/shared/item.model';
+  submissionObjectReducer,
+  SubmissionObjectState,
+} from './submission-objects.reducer';
 
 describe('submissionReducer test suite', () => {
 
@@ -66,7 +70,7 @@ describe('submissionReducer test suite', () => {
         isLoading: true,
         savePending: false,
         depositPending: false,
-      }
+      },
     };
 
     const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -78,8 +82,8 @@ describe('submissionReducer test suite', () => {
   it('should complete submission initialization', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
-        isLoading: true
-      })
+        isLoading: true,
+      }),
     });
 
     const action = new CompleteInitSubmissionFormAction(submissionId);
@@ -99,7 +103,7 @@ describe('submissionReducer test suite', () => {
         isLoading: true,
         savePending: false,
         depositPending: false,
-      }
+      },
     };
 
     const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item());
@@ -143,7 +147,7 @@ describe('submissionReducer test suite', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
         savePending: true,
-      })
+      }),
     });
 
     let action: any = new SaveSubmissionFormSuccessAction(submissionId, []);
@@ -191,7 +195,7 @@ describe('submissionReducer test suite', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
         depositPending: true,
-      })
+      }),
     });
 
     const action: any = new DepositSubmissionSuccessAction(submissionId);
@@ -241,7 +245,7 @@ describe('submissionReducer test suite', () => {
       errorsToShow: [],
       serverValidationErrors: [],
       isLoading: false,
-      isValid: true
+      isValid: true,
     } as any;
 
     let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -273,7 +277,7 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].sections.traditionalpagetwo.enabled).toBeTruthy();
   });
 
-  it('should enable submission section properly', () => {
+  it('should disable submission section properly', () => {
 
     let action: SubmissionObjectAction = new EnableSectionAction(submissionId, 'traditionalpagetwo');
     let newState = submissionObjectReducer(initState, action);
@@ -306,8 +310,8 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: 'Author, Test',
           confidence: -1,
-          place: 0
-        }
+          place: 0,
+        },
       ],
       'dc.title': [
         {
@@ -316,8 +320,8 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: 'Title Test',
           confidence: -1,
-          place: 0
-        }
+          place: 0,
+        },
       ],
       'dc.date.issued': [
         {
@@ -326,9 +330,9 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: '2015',
           confidence: -1,
-          place: 0
-        }
-      ]
+          place: 0,
+        },
+      ],
     } as any;
 
     const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], []);
@@ -352,8 +356,8 @@ describe('submissionReducer test suite', () => {
     const errors = [
       {
         path: '/sections/license',
-        message: 'error.validation.license.notgranted'
-      }
+        message: 'error.validation.license.notgranted',
+      },
     ];
 
     const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -374,7 +378,7 @@ describe('submissionReducer test suite', () => {
   it('should add submission section error properly', () => {
     const error = {
       path: '/sections/traditionalpageone/dc.title/0',
-      message: 'error.validation.traditionalpageone.required'
+      message: 'error.validation.traditionalpageone.required',
     };
 
     const action = new InertSectionErrorsAction(submissionId, 'traditionalpageone', error);
@@ -387,21 +391,21 @@ describe('submissionReducer test suite', () => {
     const errors = [
       {
         path: '/sections/traditionalpageone/dc.contributor.author',
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       },
       {
         path: '/sections/traditionalpageone/dc.date.issued',
-        message: 'error.validation.required'
-      }
+        message: 'error.validation.required',
+      },
     ];
     const error = {
       path: '/sections/traditionalpageone/dc.contributor.author',
-      message: 'error.validation.required'
+      message: 'error.validation.required',
     };
 
     const expectedErrors = [{
       path: '/sections/traditionalpageone/dc.date.issued',
-      message: 'error.validation.required'
+      message: 'error.validation.required',
     }];
 
     let action: any = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -433,9 +437,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: '28297_389341539060_6452876_n.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -446,17 +450,17 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const expectedState = {
-      files: [fileData]
+      files: [fileData],
     };
 
     const action = new NewUploadedFileAction(submissionId, 'upload', uuid, fileData);
@@ -478,9 +482,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -491,14 +495,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const fileData2: any = {
       uuid: uuid2,
@@ -510,9 +514,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -523,14 +527,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
     };
 
     const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -538,15 +542,15 @@ describe('submissionReducer test suite', () => {
         sections: Object.assign({}, initState[submissionId].sections, {
           upload: Object.assign({}, initState[submissionId].sections.upload, {
             data: {
-              files: [fileData, fileData2]
-            }
-          })
-        })
-      })
+              files: [fileData, fileData2],
+            },
+          }),
+        }),
+      }),
     });
 
     const expectedState = {
-      files: [fileData]
+      files: [fileData],
     };
 
     const action = new DeleteUploadedFileAction(submissionId, 'upload', uuid2);
@@ -567,9 +571,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -580,14 +584,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const fileData2: any = {
       uuid: uuid,
@@ -599,9 +603,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'New title',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -612,14 +616,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
     };
 
     const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -627,15 +631,15 @@ describe('submissionReducer test suite', () => {
         sections: Object.assign({}, initState[submissionId].sections, {
           upload: Object.assign({}, initState[submissionId].sections.upload, {
             data: {
-              files: [fileData]
-            }
-          })
-        })
-      })
+              files: [fileData],
+            },
+          }),
+        }),
+      }),
     });
 
     const expectedState = {
-      files: [fileData2]
+      files: [fileData2],
     };
 
     const action = new EditFileDataAction(submissionId, 'upload', uuid, fileData2);
@@ -644,4 +648,20 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].sections.upload.data).toEqual(expectedState);
   });
 
+  it('should enable duplicates section properly', () => {
+
+    let action: SubmissionObjectAction = new EnableSectionAction(submissionId, 'duplicates');
+    let newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].sections.duplicates.enabled).toBeTruthy();
+  });
+
+  it('should clean duplicates section properly', () => {
+
+    let action = new CleanDuplicateDetectionAction(submissionId);
+    let newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].sections.duplicates.enabled).toBeFalsy();
+  });
+
 });
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index a05bf05f52..82e33062cd 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,11 +1,20 @@
-import { hasValue, isEmpty, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
 import differenceWith from 'lodash/differenceWith';
 import findKey from 'lodash/findKey';
 import isEqual from 'lodash/isEqual';
 import uniqWith from 'lodash/uniqWith';
 
+import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+  isNull,
+  isUndefined,
+} from '../../shared/empty.util';
 import {
   ChangeSubmissionCollectionAction,
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DeleteSectionErrorsAction,
   DeleteUploadedFileAction,
@@ -14,6 +23,7 @@ import {
   DepositSubmissionSuccessAction,
   DisableSectionAction,
   EditFileDataAction,
+  EditFilePrimaryBitstreamAction,
   EnableSectionAction,
   InertSectionErrorsAction,
   InitSectionAction,
@@ -36,9 +46,8 @@ import {
   SetSectionFormId,
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
 import { SubmissionSectionObject } from './submission-section-object.model';
 
 /**
@@ -203,6 +212,10 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return newFile(state, action as NewUploadedFileAction);
     }
 
+    case SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA: {
+      return editPrimaryBitstream(state, action as EditFilePrimaryBitstreamAction);
+    }
+
     case SubmissionObjectActionTypes.EDIT_FILE_DATA: {
       return editFileData(state, action as EditFileDataAction);
     }
@@ -224,6 +237,10 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return removeSectionErrors(state, action as RemoveSectionErrorsAction);
     }
 
+    case SubmissionObjectActionTypes.CLEAN_DUPLICATE_DETECTION: {
+      return cleanDuplicateDetectionSection(state, action as CleanDuplicateDetectionAction);
+    }
+
     default: {
       return state;
     }
@@ -249,10 +266,10 @@ const removeError = (state: SubmissionObjectState, action: DeleteSectionErrorsAc
       [ submissionId ]: Object.assign({}, state[ submissionId ], {
         sections: Object.assign({}, state[ submissionId ].sections, {
           [ sectionId ]: Object.assign({}, state[ submissionId ].sections [ sectionId ], {
-            errorsToShow: filteredErrors
-          })
-        })
-      })
+            errorsToShow: filteredErrors,
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -269,10 +286,10 @@ const addError = (state: SubmissionObjectState, action: InertSectionErrorsAction
       [ submissionId ]: Object.assign({}, state[ submissionId ], {
         activeSection: state[ action.payload.submissionId ].activeSection,        sections: Object.assign({}, state[ submissionId ].sections, {
           [ sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            errorsToShow
-          })
+            errorsToShow,
+          }),
         }),
-      })
+      }),
     });
   } else {
     return state;
@@ -296,10 +313,10 @@ function removeSectionErrors(state: SubmissionObjectState, action: RemoveSection
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            errorsToShow: []
-          })
-        })
-      })
+            errorsToShow: [],
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -349,8 +366,8 @@ function resetSubmission(state: SubmissionObjectState, action: ResetSubmissionFo
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.create(null),
-        isLoading: true
-      })
+        isLoading: true,
+      }),
     });
   } else {
     return state;
@@ -371,8 +388,8 @@ function completeInit(state: SubmissionObjectState, action: CompleteInitSubmissi
   if (hasValue(state[ action.payload.submissionId ])) {
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
-        isLoading: false
-      })
+        isLoading: false,
+      }),
     });
   } else {
     return state;
@@ -391,7 +408,7 @@ function completeInit(state: SubmissionObjectState, action: CompleteInitSubmissi
  *    the new state, with the flag set to true.
  */
 function saveSubmission(state: SubmissionObjectState,
-                        action: SaveSubmissionFormAction
+  action: SaveSubmissionFormAction
                           | SaveSubmissionSectionFormAction
                           | SaveForLaterSubmissionFormAction
                           | SaveAndDepositSubmissionAction): SubmissionObjectState {
@@ -402,7 +419,7 @@ function saveSubmission(state: SubmissionObjectState,
         sections: state[ action.payload.submissionId ].sections,
         isLoading: state[ action.payload.submissionId ].isLoading,
         savePending: true,
-      })
+      }),
     });
   } else {
     return state;
@@ -422,7 +439,7 @@ function saveSubmission(state: SubmissionObjectState,
  *    the new state, with the flag set to false.
  */
 function completeSave(state: SubmissionObjectState,
-                      action: SaveSubmissionFormSuccessAction
+  action: SaveSubmissionFormSuccessAction
                         | SaveForLaterSubmissionFormSuccessAction
                         | SaveSubmissionSectionFormSuccessAction
                         | SaveSubmissionFormErrorAction
@@ -432,7 +449,7 @@ function completeSave(state: SubmissionObjectState,
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         savePending: false,
-      })
+      }),
     });
   } else {
     return state;
@@ -455,7 +472,7 @@ function startDeposit(state: SubmissionObjectState, action: DepositSubmissionAct
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         savePending: false,
         depositPending: true,
-      })
+      }),
     });
   } else {
     return state;
@@ -477,7 +494,7 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         depositPending: false,
-      })
+      }),
     });
   } else {
     return state;
@@ -497,8 +514,8 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
 function changeCollection(state: SubmissionObjectState, action: ChangeSubmissionCollectionAction): SubmissionObjectState {
   return Object.assign({}, state, {
     [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
-      collection: action.payload.collectionId
-    })
+      collection: action.payload.collectionId,
+    }),
   });
 }
 
@@ -522,7 +539,7 @@ function setActiveSection(state: SubmissionObjectState, action: SetActiveSection
         sections: state[ action.payload.submissionId ].sections,
         isLoading: state[ action.payload.submissionId ].isLoading,
         savePending: state[ action.payload.submissionId ].savePending,
-      })
+      }),
     });
   } else {
     return state;
@@ -556,10 +573,10 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             errorsToShow: [],
             serverValidationErrors: action.payload.errors || [],
             isLoading: false,
-            isValid: isEmpty(action.payload.errors)
-          }
-        })
-      })
+            isValid: isEmpty(action.payload.errors),
+          },
+        }),
+      }),
     });
   } else {
     return state;
@@ -583,10 +600,10 @@ function setSectionFormId(state: SubmissionObjectState, action: SetSectionFormId
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: {
             ...state[ action.payload.submissionId ].sections [action.payload.sectionId],
-            formId: action.payload.formId
-          }
-        })
-      })
+            formId: action.payload.formId,
+          },
+        }),
+      }),
     });
   } else {
     return state;
@@ -614,10 +631,10 @@ function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDa
             data: action.payload.data,
             errorsToShow: action.payload.errorsToShow,
             serverValidationErrors: action.payload.serverValidationErrors,
-            metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata)
-          })
-        })
-      })
+            metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata),
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -661,10 +678,10 @@ function changeSectionState(state: SubmissionObjectState, action: EnableSectionA
         // sections: deleteProperty(state[ action.payload.submissionId ].sections, action.payload.sectionId),
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            enabled
-          })
-        })
-      })
+            enabled,
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -688,11 +705,11 @@ function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAct
         sections: Object.assign({}, state[ action.payload.submissionId ].sections,
           Object.assign({}, {
             [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-              isValid: action.payload.status
-            })
-          })
-        )
-      })
+              isValid: action.payload.status,
+            }),
+          }),
+        ),
+      }),
     });
   } else {
     return state;
@@ -716,7 +733,7 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
   let newData;
   if (isUndefined(filesData.files)) {
     newData = {
-      files: [action.payload.data]
+      files: [action.payload.data],
     };
   } else {
     newData = filesData;
@@ -728,13 +745,53 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
       sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
         [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
           enabled: true,
-          data: newData
-        })
-      })
-    })
+          data: newData,
+        }),
+      }),
+    }),
   });
 }
 
+/**
+ * Edit primary bitstream.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an EditFilePrimaryBitstreamAction action
+ * @return SubmissionObjectState
+ *    the new state, with the edited file.
+ */
+function editPrimaryBitstream(state: SubmissionObjectState, action: EditFilePrimaryBitstreamAction): SubmissionObjectState {
+  const filesData = state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data as WorkspaceitemSectionUploadObject;
+  const { submissionId, sectionId, fileId } = action.payload;
+
+  const fileIndex = findKey(filesData.files, { uuid: fileId });
+  if (isNull(fileIndex)) {
+    return state;
+  }
+
+  const submission = state[submissionId];
+  return {
+    ...state,
+    [submissionId]: {
+      ...submission,
+      sections: {
+        ...submission.sections,
+        [sectionId]: {
+          ...submission.sections[sectionId],
+          data: {
+            ...submission.sections[sectionId].data as WorkspaceitemSectionUploadObject,
+            primary: fileId,
+          },
+        },
+      },
+      isLoading: submission.isLoading,
+      savePending: submission.savePending,
+    },
+  };
+}
+
 /**
  * Edit a file.
  *
@@ -761,14 +818,14 @@ function editFileData(state: SubmissionObjectState, action: EditFileDataAction):
             Object.assign({}, {
               [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
                 data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
-                  files: newData
-                })
-              })
-            })
+                  files: newData,
+                }),
+              }),
+            }),
           ),
           isLoading: state[ action.payload.submissionId ].isLoading,
           savePending: state[ action.payload.submissionId ].savePending,
-        })
+        }),
       });
     }
   }
@@ -790,7 +847,7 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
   if (hasValue(filesData.files)) {
     const fileIndex: any = findKey(
       filesData.files,
-      {uuid: action.payload.fileId});
+      { uuid: action.payload.fileId });
     if (isNotNull(fileIndex)) {
       const newData = Array.from(filesData.files);
       newData.splice(fileIndex, 1);
@@ -800,14 +857,31 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
             Object.assign({}, {
               [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ], {
                 data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
-                  files: newData
-                })
-              })
-            })
-          )
-        })
+                  files: newData,
+                }),
+              }),
+            }),
+          ),
+        }),
       });
     }
   }
   return state;
 }
+
+function cleanDuplicateDetectionSection(state: SubmissionObjectState, action: CleanDuplicateDetectionAction): SubmissionObjectState {
+  if (isNotEmpty(state[ action.payload.submissionId ]) && state[action.payload.submissionId].sections.hasOwnProperty('duplicates')) {
+    return Object.assign({}, state, {
+      [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
+        sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
+          [ 'duplicates' ]: Object.assign({}, state[ action.payload.submissionId ].sections.duplicates, {
+            enabled: false,
+            data: { potentialDuplicates: [] },
+          }),
+        }),
+      }),
+    });
+  } else {
+    return state;
+  }
+}
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
index 16e437da80..7338539607 100644
--- a/src/app/submission/objects/submission-section-object.model.ts
+++ b/src/app/submission/objects/submission-section-object.model.ts
@@ -1,6 +1,6 @@
+import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '../sections/sections-type';
 import { SectionVisibility } from './section-visibility.model';
-import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index c70758a4df..92fc7eefd7 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -1,45 +1,49 @@
-import { FormService } from '../../../shared/form/form.service';
-import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
-
-import { SubmissionSectionAccessesComponent } from './section-accesses.component';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import {
-  getSubmissionAccessesConfigNotChangeDiscoverableService,
-  getSubmissionAccessesConfigService
-} from '../../../shared/mocks/section-accesses-config.service.mock';
-import { SectionAccessesService } from './section-accesses.service';
-import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../core/submission/submission-json-patch-operations.service';
-import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock';
-import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import {
-  SubmissionJsonPatchOperationsServiceStub
-} from '../../../shared/testing/submission-json-patch-operations-service.stub';
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { FormComponent } from '../../../shared/form/form.component';
 import {
   DynamicCheckboxModel,
   DynamicDatePickerModel,
   DynamicFormArrayModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { Store } from '@ngrx/store';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AppState } from '../../../app.reducer';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock';
+import {
+  getSubmissionAccessesConfigNotChangeDiscoverableService,
+  getSubmissionAccessesConfigService,
+} from '../../../shared/mocks/section-accesses-config.service.mock';
 import { mockAccessesFormData } from '../../../shared/mocks/submission.mock';
-import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import {
+  accessConditionChangeEvent,
+  checkboxChangeEvent,
+} from '../../../shared/testing/form-event.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionsService } from '../sections.service';
+import { SubmissionSectionAccessesComponent } from './section-accesses.component';
+import { SectionAccessesService } from './section-accesses.service';
 
 describe('SubmissionSectionAccessesComponent', () => {
   let component: SubmissionSectionAccessesComponent;
@@ -70,12 +74,12 @@ describe('SubmissionSectionAccessesComponent', () => {
     enabled: true,
     data: {
       discoverable: true,
-      accessConditions: []
+      accessConditions: [],
     },
     errorsToShow: [],
     serverValidationErrors: [],
     isLoading: false,
-    isValid: true
+    isValid: true,
   };
 
   describe('First with canChangeDiscoverable true', () => {
@@ -84,7 +88,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       await TestBed.configureTestingModule({
         imports: [
           BrowserModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
@@ -99,8 +103,8 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-          FormBuilderService
-        ]
+          FormBuilderService,
+        ],
       })
         .compileComponents();
     });
@@ -144,8 +148,8 @@ describe('SubmissionSectionAccessesComponent', () => {
     });
 
     it('should have set maxStartDate and maxEndDate properly', () => {
-      const maxStartDate = {year: 2024, month: 12, day: 20};
-      const maxEndDate = {year: 2022, month: 6, day: 20};
+      const maxStartDate = { year: 2024, month: 12, day: 20 };
+      const maxEndDate = { year: 2022, month: 6, day: 20 };
 
       const startDateModel = formbuilderService.findById('startDate', component.formModel);
       expect(startDateModel.max).toEqual(maxStartDate);
@@ -175,7 +179,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       await TestBed.configureTestingModule({
         imports: [
           BrowserModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
@@ -191,7 +195,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-        ]
+        ],
       })
         .compileComponents();
     });
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index 451fc73670..5c8d7afb14 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -1,16 +1,9 @@
-import { SectionAccessesService } from './section-accesses.service';
-import { Component, Inject, ViewChild } from '@angular/core';
+import {
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-
-import { filter, map, mergeMap, take } from 'rxjs/operators';
-import { combineLatest, Observable, of, Subscription } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
-
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsService } from '../sections.service';
-import { SectionModelComponent } from '../models/section.model';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
   DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
@@ -22,10 +15,46 @@ import {
   DynamicFormGroupModel,
   DynamicSelectModel,
   MATCH_ENABLED,
-  OR_OPERATOR
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 import {
   ACCESS_CONDITION_GROUP_CONFIG,
   ACCESS_CONDITION_GROUP_LAYOUT,
@@ -38,26 +67,9 @@ import {
   FORM_ACCESS_CONDITION_START_DATE_CONFIG,
   FORM_ACCESS_CONDITION_START_DATE_LAYOUT,
   FORM_ACCESS_CONDITION_TYPE_CONFIG,
-  FORM_ACCESS_CONDITION_TYPE_LAYOUT
+  FORM_ACCESS_CONDITION_TYPE_LAYOUT,
 } from './section-accesses.model';
-import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
-import {
-  WorkspaceitemSectionAccessesObject
-} from '../../../core/submission/models/workspaceitem-section-accesses.model';
-import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { FormComponent } from '../../../shared/form/form.component';
-import { FormService } from '../../../shared/form/form.service';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../core/submission/submission-json-patch-operations.service';
-import { dateToISOFormat } from '../../../shared/date.util';
-import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
-import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { SectionAccessesService } from './section-accesses.service';
 
 /**
  * This component represents a section for managing item's access conditions.
@@ -65,7 +77,7 @@ import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynami
 @Component({
   selector: 'ds-section-accesses',
   templateUrl: './section-accesses.component.html',
-  styleUrls: ['./section-accesses.component.scss']
+  styleUrls: ['./section-accesses.component.scss'],
 })
 @renderSectionFor(SectionsType.AccessesCondition)
 export class SubmissionSectionAccessesComponent extends SectionModelComponent {
@@ -163,7 +175,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
               metadataModel.value = {
                 year: date.getUTCFullYear(),
                 month: date.getUTCMonth() + 1,
-                day: date.getUTCDate()
+                day: date.getUTCDate(),
               };
             } else {
               metadataModel.value = accessCondition[key];
@@ -203,7 +215,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
         take(1),
         filter((isValid) => isValid),
         mergeMap(() => this.formService.getFormData(this.formId)),
-        take(1)
+        take(1),
       ).subscribe((formData: any) => {
         const accessConditionsToSave = [];
         formData.accessCondition
@@ -307,10 +319,10 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       const discoverableCheckboxConfig = Object.assign({}, ACCESS_FORM_CHECKBOX_CONFIG, {
         label: this.translate.instant('submission.sections.accesses.form.discoverable-label'),
         hint: this.translate.instant('submission.sections.accesses.form.discoverable-description'),
-        value: this.accessesData.discoverable
+        value: this.accessesData.discoverable,
       });
       formModel.push(
-        new DynamicCheckboxModel(discoverableCheckboxConfig, ACCESS_FORM_CHECKBOX_LAYOUT)
+        new DynamicCheckboxModel(discoverableCheckboxConfig, ACCESS_FORM_CHECKBOX_LAYOUT),
       );
     }
 
@@ -322,8 +334,8 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       accessConditionTypeOptions.push(
         {
           label: accessCondition.name,
-          value: accessCondition.name
-        }
+          value: accessCondition.name,
+        },
       );
     }
     accessConditionTypeModelConfig.options = accessConditionTypeOptions;
@@ -342,7 +354,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
           maxStartDate = {
             year: min.getUTCFullYear(),
             month: min.getUTCMonth() + 1,
-            day: min.getUTCDate()
+            day: min.getUTCDate(),
           };
         }
       }
@@ -353,7 +365,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
           maxEndDate = {
             year: max.getUTCFullYear(),
             month: max.getUTCMonth() + 1,
-            day: max.getUTCDate()
+            day: max.getUTCDate(),
           };
         }
       }
@@ -391,7 +403,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
     // Number of access conditions blocks in form
     accessConditionsArrayConfig.initialCount = isNotEmpty(this.accessesData.accessConditions) ? this.accessesData.accessConditions.length : 1;
     formModel.push(
-      new DynamicFormArrayModel(accessConditionsArrayConfig, ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT)
+      new DynamicFormArrayModel(accessConditionsArrayConfig, ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT),
     );
 
     this.initModelData(formModel);
diff --git a/src/app/submission/sections/accesses/section-accesses.model.ts b/src/app/submission/sections/accesses/section-accesses.model.ts
index 435c521175..6b4732b881 100644
--- a/src/app/submission/sections/accesses/section-accesses.model.ts
+++ b/src/app/submission/sections/accesses/section-accesses.model.ts
@@ -12,7 +12,7 @@ import { DynamicCheckboxModelConfig } from '@ng-dynamic-forms/core/lib/model/che
 
 export const ACCESS_FORM_CHECKBOX_CONFIG: DynamicCheckboxModelConfig = {
   id: 'discoverable',
-  name: 'discoverable'
+  name: 'discoverable',
 };
 
 export const ACCESS_FORM_CHECKBOX_LAYOUT = {
@@ -20,21 +20,21 @@ export const ACCESS_FORM_CHECKBOX_LAYOUT = {
   element: {
     container: 'custom-control custom-checkbox pl-1',
     control: 'custom-control-input',
-    label: 'custom-control-label pt-1'
-  }
+    label: 'custom-control-label pt-1',
+  },
 };
 
 export const ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'accessConditionGroup',
-  group: []
+  group: [],
 };
 
 export const ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'form-group access-condition-group col',
     container: 'pl-1 pr-1',
-    control: 'form-row '
-  }
+    control: 'form-row ',
+  },
 };
 
 export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig = {
@@ -44,20 +44,20 @@ export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig =
 export const ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
     group: 'form-row pt-4',
-  }
+  },
 };
 
 export const FORM_ACCESS_CONDITION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
   id: 'name',
   label: 'submission.sections.accesses.form.access-condition-label',
   hint: 'submission.sections.accesses.form.access-condition-hint',
-  options: []
+  options: [],
 };
 export const FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'col-12',
-    label: 'col-form-label name-label'
-  }
+    label: 'col-form-label name-label',
+  },
 };
 
 export const FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -71,24 +71,24 @@ export const FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConf
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.accesses.form.date-required-from'
-  }
+    required: 'submission.sections.accesses.form.date-required-from',
+  },
 };
 export const FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
 
 export const FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -102,22 +102,22 @@ export const FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.accesses.form.date-required-until'
-  }
+    required: 'submission.sections.accesses.form.date-required-until',
+  },
 };
 export const FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
diff --git a/src/app/submission/sections/accesses/section-accesses.service.ts b/src/app/submission/sections/accesses/section-accesses.service.ts
index f358582136..cb9b1e5ef3 100644
--- a/src/app/submission/sections/accesses/section-accesses.service.ts
+++ b/src/app/submission/sections/accesses/section-accesses.service.ts
@@ -1,13 +1,15 @@
 import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+} from 'rxjs/operators';
 
-import { SubmissionState } from '../../submission.reducers';
+import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
 import { isNotUndefined } from '../../../shared/empty.util';
 import { submissionSectionDataFromIdSelector } from '../../selectors';
-import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
+import { SubmissionState } from '../../submission.reducers';
 
 /**
  * A service that provides methods to handle submission item's accesses condition state.
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0796da5a64..7c6145a65e 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -20,7 +20,7 @@
     </ng-container>
 
     <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length == 0"
+      <button *ngIf="submissionCcLicenses?.length === 0"
               class="dropdown-item disabled">
         {{ 'submission.sections.ccLicense.none' | translate }}
       </button>
@@ -134,6 +134,7 @@
       <div class="m-2">
         <div (click)="setAccepted(!accepted)">
           <input type="checkbox"
+                 class="mr-2"
                  title="accepted"
                  [checked]="accepted">
           <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index bb83e48d21..9048a3d25e 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -1,23 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { SubmissionSectionCcLicensesComponent } from './submission-section-cc-licenses.component';
-import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type';
-import { of as observableOf } from 'rxjs';
-import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { SharedModule } from '../../../shared/shared.module';
-import { SectionsService } from '../sections.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
 import { TranslateModule } from '@ngx-translate/core';
-import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type';
+import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
+import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
-import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionCcLicensesComponent } from './submission-section-cc-licenses.component';
 
 describe('SubmissionSectionCcLicensesComponent', () => {
 
@@ -33,7 +38,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     serverValidationErrors: [],
     header: 'test header',
     id: 'test section id',
-    sectionType: SectionsType.SubmissionForm
+    sectionType: SectionsType.SubmissionForm,
   };
 
   const submissionCcLicenses: SubmissionCcLicence[] = [
@@ -96,12 +101,12 @@ describe('SubmissionSectionCcLicensesComponent', () => {
             {
               id: 'test enum id 2a I',
               label: 'test enum label 2a I',
-              description: 'test enum description 2a I'
+              description: 'test enum description 2a I',
             },
             {
               id: 'test enum id 2a II',
               label: 'test enum label 2a II',
-              description: 'test enum description 2a II'
+              description: 'test enum description 2a II',
             },
           ],
         },
@@ -113,12 +118,12 @@ describe('SubmissionSectionCcLicensesComponent', () => {
             {
               id: 'test enum id 2b I',
               label: 'test enum label 2b I',
-              description: 'test enum description 2b I'
+              description: 'test enum description 2b I',
             },
             {
               id: 'test enum id 2b II',
               label: 'test enum label 2b II',
-              description: 'test enum description 2b II'
+              description: 'test enum description 2b II',
             },
           ],
         },
@@ -139,7 +144,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     getCcLicenseLink: createSuccessfulRemoteDataObject$(
       {
         url: 'test cc license link',
-      }
+      },
     ),
   });
 
@@ -150,7 +155,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     setSectionStatus: () => undefined,
     updateSectionData: (submissionId, sectionId, updatedData) => {
       component.sectionData.data = updatedData;
-    }
+    },
   };
 
   const operationsBuilder = jasmine.createSpyObj('operationsBuilder', {
@@ -198,10 +203,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -216,7 +221,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
     it('should display the selected cc license', () => {
       expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText
+        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText,
       ).toContain('test license name 2');
     });
 
@@ -249,7 +254,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
           new Map([
             [ccLicence.fields[0], ccLicence.fields[0].enums[1]],
             [ccLicence.fields[1], ccLicence.fields[1].enums[0]],
-          ])
+          ]),
         );
       });
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index c8cd898f96..78feb16f11 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,25 +1,45 @@
-import { Component, Inject } from '@angular/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import {
+  Field,
+  Option,
+  SubmissionCcLicence,
+} from '../../../core/submission/models/submission-cc-license.model';
+import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
+import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { isNotEmpty } from '../../../shared/empty.util';
 import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
-import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
-import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 
 /**
  * This component represents the submission section to select the Creative Commons license.
@@ -27,7 +47,7 @@ import {ConfigurationDataService} from '../../../core/data/configuration-data.se
 @Component({
   selector: 'ds-submission-section-cc-licenses',
   templateUrl: './submission-section-cc-licenses.component.html',
-  styleUrls: ['./submission-section-cc-licenses.component.scss']
+  styleUrls: ['./submission-section-cc-licenses.component.scss'],
 })
 @renderSectionFor(SectionsType.CcLicense)
 export class SubmissionSectionCcLicensesComponent extends SectionModelComponent {
@@ -96,7 +116,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected configService: ConfigurationDataService,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
-    @Inject('submissionIdProvider') public injectedSubmissionId: string
+    @Inject('submissionIdProvider') public injectedSubmissionId: string,
   ) {
     super(
       injectedCollectionId,
@@ -154,7 +174,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
       ccLicense: {
         id: ccLicense.id,
         fields: Object.assign({}, this.data.ccLicense.fields, {
-          [field.id]: option
+          [field.id]: option,
         }),
       },
       accepted: false,
@@ -188,7 +208,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   getCcLicenseLink$(): Observable<string> {
 
-    if (!!this.storedCcLicenseLink) {
+    if (this.storedCcLicenseLink) {
       return observableOf(this.storedCcLicenseLink);
     }
     if (!this.getSelectedCcLicense() || this.getSelectedCcLicense().fields.some(
@@ -199,7 +219,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     return this.submissionCcLicenseUrlDataService.getCcLicenseLink(
       selectedCcLicense,
       new Map(selectedCcLicense.fields.map(
-        (field) => [field, this.getSelectedOption(selectedCcLicense, field)]
+        (field) => [field, this.getSelectedOption(selectedCcLicense, field)],
       )),
     );
   }
@@ -257,7 +277,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
             ).subscribe((link) => {
               this.operationsBuilder.add(path, link.toString(), false, true);
             });
-          } else if (!!this.data.uri) {
+          } else if (this.data.uri) {
             this.operationsBuilder.remove(path);
           }
         }
@@ -268,19 +288,19 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         getRemoteDataPayload(),
         map((list) => list.page),
       ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses
+        (licenses) => this.submissionCcLicenses = licenses,
       ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
-        getRemoteDataPayload()
+        getRemoteDataPayload(),
       ).subscribe((remoteData) => {
-          if (remoteData === undefined || remoteData.values.length === 0) {
-            // No value configured, use blank value (International jurisdiction)
-            this.defaultJurisdiction = '';
-          } else {
-            this.defaultJurisdiction = remoteData.values[0];
-          }
-      })
+        if (remoteData === undefined || remoteData.values.length === 0) {
+          // No value configured, use blank value (International jurisdiction)
+          this.defaultJurisdiction = '';
+        } else {
+          this.defaultJurisdiction = remoteData.values[0];
+        }
+      }),
     );
   }
 
@@ -290,7 +310,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   setAccepted(accepted: boolean) {
     this.updateSectionData({
-      accepted
+      accepted,
     });
     this.updateSectionStatus();
   }
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index e6ae9d1b9c..3f0050ea51 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -9,7 +9,7 @@
           'submission.sections.'+sectionData.header | translate
           }}</span>
         <div class="d-inline-block float-right">
-          <i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
+          <i *ngIf="(sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
             class="fas fa-exclamation-circle text-warning mr-3"
             title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
@@ -48,4 +48,4 @@
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/container/section-container.component.spec.ts b/src/app/submission/sections/container/section-container.component.spec.ts
index d3f4a93762..2bec3c0ac5 100644
--- a/src/app/submission/sections/container/section-container.component.spec.ts
+++ b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -1,35 +1,45 @@
 // Load the implementations that should be tested
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { SubmissionSectionContainerComponent } from './section-container.component';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SectionsType } from '../sections-type';
-import { SectionsDirective } from '../sections.directive';
-import { SubmissionService } from '../../submission.service';
-import { SectionsService } from '../sections.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
 import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
 import { SectionDataObject } from '../models/section-data.model';
-import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
+import { SectionsDirective } from '../sections.directive';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionContainerComponent } from './section-container.component';
 
 const sectionState = {
   header: 'submit.progressbar.describe.stepone',
-    config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
-    mandatory: true,
-    sectionType: SectionsType.SubmissionForm,
-    collapsed: false,
-    enabled: true,
-    data: {},
-    errorsToShow:	[],
-    serverValidationErrors:	[],
-    isLoading: false,
-    isValid: false
+  config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
+  mandatory: true,
+  sectionType: SectionsType.SubmissionForm,
+  collapsed: false,
+  enabled: true,
+  data: {},
+  errorsToShow:	[],
+  serverValidationErrors:	[],
+  isLoading: false,
+  isValid: false,
 } as any;
 
 const sectionObject: SectionDataObject = {
@@ -40,7 +50,7 @@ const sectionObject: SectionDataObject = {
   serverValidationErrors:		[],
   header:	'submit.progressbar.describe.stepone',
   id:	'traditionalpageone',
-  sectionType:	SectionsType.SubmissionForm
+  sectionType:	SectionsType.SubmissionForm,
 };
 
 describe('SubmissionSectionContainerComponent test suite', () => {
@@ -68,7 +78,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionSectionContainerComponent,
@@ -78,9 +88,9 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       providers: [
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
-        SubmissionSectionContainerComponent
+        SubmissionSectionContainerComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -226,7 +236,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: '',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 8f9ebfbfda..ed035ee6ff 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -1,9 +1,15 @@
-import { Component, Injector, Input, OnInit, ViewChild } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 
-import { SectionsDirective } from '../sections.directive';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { SectionDataObject } from '../models/section-data.model';
+import { SectionsDirective } from '../sections.directive';
 import { rendersSectionType } from '../sections-decorator';
-import { AlertType } from '../../../shared/alert/aletr-type';
 
 /**
  * This component represents a section that contains the submission license form.
@@ -11,7 +17,7 @@ import { AlertType } from '../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-submission-section-container',
   templateUrl: './section-container.component.html',
-  styleUrls: ['./section-container.component.scss']
+  styleUrls: ['./section-container.component.scss'],
 })
 export class SubmissionSectionContainerComponent implements OnInit {
 
@@ -68,7 +74,7 @@ export class SubmissionSectionContainerComponent implements OnInit {
         { provide: 'sectionDataProvider', useFactory: () => (this.sectionData), deps: [] },
         { provide: 'submissionIdProvider', useFactory: () => (this.submissionId), deps: [] },
       ],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html
new file mode 100644
index 0000000000..d9e33a70f7
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.html
@@ -0,0 +1,20 @@
+<!--
+Template for the detect duplicates submission section component
+@author Kim Shepherd
+-->
+<div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
+  <ng-container *ngIf="data?.potentialDuplicates.length === 0">
+    <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
+  </ng-container>
+    <ng-container *ngIf="data?.potentialDuplicates.length > 0">
+      <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
+      <div *ngFor="let dupe of data?.potentialDuplicates" class="ds-duplicate">
+        <a target="_blank" [href]="getItemLink(dupe.uuid)">{{dupe.title}}</a>
+        <div *ngFor="let metadatum of Metadata.toViewModelList(dupe.metadata)">
+          {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
+        </div>
+        <p *ngIf="dupe.workspaceItemId">{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
+        <p *ngIf="dupe.workflowItemId">{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+      </div>
+    </ng-container>
+</div>
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
new file mode 100644
index 0000000000..3128a775fd
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
@@ -0,0 +1,261 @@
+import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { of as observableOf } from 'rxjs';
+
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { License } from '../../../core/shared/license.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { defaultUUID } from '../../../shared/mocks/uuid.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model';
+import { DUPLICATE } from '../../../shared/object-list/duplicate-data/duplicate.resource-type';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { SubmissionService } from '../../submission.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionDuplicatesComponent } from './section-duplicates.component';
+
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
+  return jasmine.createSpyObj('FormOperationsService', {
+    getConfigAll: jasmine.createSpy('getConfigAll'),
+    getConfigByHref: jasmine.createSpy('getConfigByHref'),
+    getConfigByName: jasmine.createSpy('getConfigByName'),
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
+  });
+}
+
+function getMockCollectionDataService(): CollectionDataService {
+  return jasmine.createSpyObj('CollectionDataService', {
+    findById: jasmine.createSpy('findById'),
+    findByHref: jasmine.createSpy('findByHref'),
+  });
+}
+
+const duplicates: Duplicate[] = [{
+  title: 'Unique title',
+  uuid: defaultUUID,
+  workflowItemId: 1,
+  workspaceItemId: 2,
+  owningCollection: 'Test Collection',
+  metadata: {
+    'dc.title': [
+      Object.assign(new MetadataValue(), {
+        'value': 'Unique title',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0,
+      })],
+  },
+  type: DUPLICATE,
+  _links: {
+    self: {
+      href: 'http://localhost:8080/server/api/core/submission/duplicates/search?uuid=testid',
+    },
+  },
+}];
+
+const sectionObject = {
+  header: 'submission.sections.submit.progressbar.duplicates',
+  mandatory: true,
+  opened: true,
+  data: { potentialDuplicates: duplicates },
+  errorsToShow: [],
+  serverValidationErrors: [],
+  id: 'duplicates',
+  sectionType: SectionsType.Duplicates,
+  sectionVisibility: null,
+};
+
+describe('SubmissionSectionDuplicatesComponent test suite', () => {
+  let comp: SubmissionSectionDuplicatesComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionDuplicatesComponent>;
+  let submissionServiceStub: any = new SubmissionServiceStub();
+  const sectionsServiceStub: any = new SectionsServiceStub();
+  let formService: any;
+  let formOperationsService: any;
+  let formBuilderService: any;
+  let collectionDataService: any;
+
+  const submissionId = mockSubmissionId;
+  const collectionId = mockSubmissionCollectionId;
+  const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
+
+  const licenseText = 'License text';
+  const mockCollection = Object.assign(new Collection(), {
+    name: 'Community 1-Collection 1',
+    id: collectionId,
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1',
+      }],
+    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        NgxPaginationModule,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionSectionDuplicatesComponent,
+        TestComponent,
+        ObjNgFor,
+        VarDirective,
+      ],
+      providers: [
+        { provide: CollectionDataService, useValue: getMockCollectionDataService() },
+        { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: SectionsService, useClass: SectionsServiceStub },
+        { provide: SubmissionService, useClass: SubmissionServiceStub },
+        { provide: 'collectionIdProvider', useValue: collectionId },
+        { provide: 'sectionDataProvider', useValue: sectionObject },
+        { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: PaginationService, useValue: paginationService },
+        ChangeDetectorRef,
+        FormBuilderService,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionObject));
+      testFixture = TestBed.createComponent(SubmissionSectionDuplicatesComponent);
+      testComp = testFixture.componentInstance;
+
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionSectionDuplicatesComponent', () => {
+      expect(testComp).toBeTruthy();
+    });
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionSectionDuplicatesComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      submissionServiceStub = TestBed.inject(SubmissionService);
+      formService = TestBed.inject(FormService);
+      formBuilderService = TestBed.inject(FormBuilderService);
+      formOperationsService = TestBed.inject(SectionFormOperationsService);
+      collectionDataService = TestBed.inject(CollectionDataService);
+      compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    // Test initialisation of the submission section
+    it('Should init section properly', () => {
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+      spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
+      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
+      expect(comp.isLoading).toBeTruthy();
+      comp.onSectionInit();
+      fixture.detectChanges();
+      expect(comp.isLoading).toBeFalsy();
+    });
+
+    // The following tests look for proper logic in the getSectionStatus() implementation
+    // These are very simple as we don't really have a 'false' state unless we're still loading
+    it('Should return TRUE if the isLoading is FALSE', () => {
+      compAsAny.isLoading = false;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: true,
+      }));
+    });
+    it('Should return FALSE', () => {
+      compAsAny.isLoadin = true;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
new file mode 100644
index 0000000000..d4065153ae
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -0,0 +1,130 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { WorkspaceitemSectionDuplicatesObject } from '../../../core/submission/models/workspaceitem-section-duplicates.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths';
+import { AlertType } from '../../../shared/alert/alert-type';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+
+/**
+ * Detect duplicates step
+ *
+ * @author Kim Shepherd
+ */
+@Component({
+  selector: 'ds-submission-section-duplicates',
+  templateUrl: './section-duplicates.component.html',
+  changeDetection: ChangeDetectionStrategy.Default,
+})
+
+@renderSectionFor(SectionsType.Duplicates)
+export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
+  protected readonly Metadata = Metadata;
+  /**
+   * The Alert categories.
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * Variable to track if the section is loading.
+   * @type {boolean}
+   */
+  public isLoading = true;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables.
+   *
+   * @param {TranslateService} translate
+   * @param {SectionsService} sectionService
+   * @param {SubmissionService} submissionService
+   * @param {string} injectedCollectionId
+   * @param {SectionDataObject} injectedSectionData
+   * @param {string} injectedSubmissionId
+   */
+  constructor(protected translate: TranslateService,
+              protected sectionService: SectionsService,
+              protected submissionService: SubmissionService,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  /**
+   * Initialize all instance variables and retrieve configuration.
+   */
+  onSectionInit() {
+    this.isLoading = false;
+  }
+
+  /**
+   * Check if identifier section has read-only visibility
+   */
+  isReadOnly(): boolean {
+    return true;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions, if needed.
+   */
+  onSectionDestroy(): void {
+    return;
+  }
+
+  /**
+   * Get section status. Because this simple component never requires human interaction, this is basically
+   * always going to be the opposite of "is this section still loading". This is not the place for API response
+   * error checking but determining whether the step can 'proceed'.
+   *
+   * @return Observable<boolean>
+   *     the section status
+   */
+  public getSectionStatus(): Observable<boolean> {
+    return observableOf(!this.isLoading);
+  }
+
+  /**
+   * Get duplicate data as observable from the section data
+   */
+  public getDuplicateData(): Observable<WorkspaceitemSectionDuplicatesObject> {
+    return this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType) as
+      Observable<WorkspaceitemSectionDuplicatesObject>;
+  }
+
+  /**
+   * Construct and return an item link for use with a preview item stub
+   * @param uuid
+   */
+  public getItemLink(uuid: any) {
+    return new URLCombiner(getItemModuleRoute(), uuid).toString();
+  }
+
+
+}
diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index 65ddbe0cb0..2e0c5cccb5 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -1,20 +1,26 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DynamicFormControlEvent,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { SectionFormOperationsService } from './section-form-operations.service';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import {
   mockInputWithAuthorityValueModel,
   mockInputWithFormFieldValueModel,
@@ -25,11 +31,10 @@ import {
   mockQualdropInputModel,
   MockQualdropModel,
   MockRelationModel,
-  mockRowGroupModel
+  mockRowGroupModel,
 } from '../../../shared/mocks/form-models.mock';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { SectionFormOperationsService } from './section-form-operations.service';
 
 describe('SectionFormOperationsService test suite', () => {
   let formBuilderService: any;
@@ -37,10 +42,10 @@ describe('SectionFormOperationsService test suite', () => {
   let serviceAsAny: any;
 
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
-      add: jasmine.createSpy('add'),
-      replace: jasmine.createSpy('replace'),
-      remove: jasmine.createSpy('remove'),
-    });
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
   const pathCombiner = new JsonPatchOperationPathCombiner('sections', 'test');
 
   const dynamicFormControlChangeEvent: DynamicFormControlEvent = {
@@ -49,7 +54,7 @@ describe('SectionFormOperationsService test suite', () => {
     control: null,
     group: null,
     model: null,
-    type: 'change'
+    type: 'change',
   };
 
   const dynamicFormControlRemoveEvent: DynamicFormControlEvent = {
@@ -58,7 +63,7 @@ describe('SectionFormOperationsService test suite', () => {
     control: null,
     group: null,
     model: null,
-    type: 'remove'
+    type: 'remove',
   };
 
   beforeEach(waitForAsync(() => {
@@ -67,15 +72,15 @@ describe('SectionFormOperationsService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
-        SectionFormOperationsService
-      ]
+        SectionFormOperationsService,
+      ],
     }).compileComponents().then();
   }));
 
@@ -114,8 +119,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return the index of the array to which the element belongs', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         context: {
-          index: 1
-        }
+          index: 1,
+        },
       });
 
       expect(service.getArrayIndexFromEvent(event)).toBe(1);
@@ -126,10 +131,10 @@ describe('SectionFormOperationsService test suite', () => {
         model: {
           parent: {
             parent: {
-              index: 2
-            }
-          }
-        }
+              index: 2,
+            },
+          },
+        },
       });
       spyOn(serviceAsAny, 'isPartOfArrayOfGroup').and.returnValue(true);
 
@@ -157,10 +162,10 @@ describe('SectionFormOperationsService test suite', () => {
           type: DYNAMIC_FORM_CONTROL_TYPE_GROUP,
           parent: {
             context: {
-              type: DYNAMIC_FORM_CONTROL_TYPE_ARRAY
-            }
-          }
-        }
+              type: DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
+            },
+          },
+        },
       };
 
       expect(service.isPartOfArrayOfGroup(model as any)).toBeTruthy();
@@ -168,7 +173,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return false when parent element doesn\'t belong to an array group element', () => {
       const model = {
-        parent: null
+        parent: null,
       };
 
       expect(service.isPartOfArrayOfGroup(model as any)).toBeFalsy();
@@ -181,19 +186,19 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
           parent: {
-            context: context
-          }
-        }
+            context: context,
+          },
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectMap = new Map();
       expectMap.set(MockQualdropModel.qualdropId, [MockQualdropModel.value]);
@@ -207,17 +212,17 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
-          context: context
-        }
+          context: context,
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectMap = new Map();
       expectMap.set(MockQualdropModel.qualdropId, [MockQualdropModel.value]);
@@ -247,19 +252,19 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
           parent: {
-            context: context
-          }
-        }
+            context: context,
+          },
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectPath = 'dc.identifier.issn/0';
       spyOn(serviceAsAny, 'getArrayIndexFromEvent').and.returnValue(0);
@@ -273,17 +278,17 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
-          context: context
-        }
+          context: context,
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectPath = 'dc.identifier.issn/0';
       spyOn(serviceAsAny, 'getArrayIndexFromEvent').and.returnValue(0);
@@ -297,7 +302,7 @@ describe('SectionFormOperationsService test suite', () => {
   describe('getFieldPathSegmentedFromChangeEvent', () => {
     it('should return field segmented path properly', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockQualdropInputModel
+        model: mockQualdropInputModel,
       });
       formBuilderService.isQualdropGroup.and.returnValues(false, false);
 
@@ -306,7 +311,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field segmented path properly when model is DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: MockQualdropModel
+        model: MockQualdropModel,
       });
       formBuilderService.isQualdropGroup.and.returnValue(true);
 
@@ -316,8 +321,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return field segmented path properly when model belongs to a DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       formBuilderService.isQualdropGroup.and.returnValues(false, true);
 
@@ -330,8 +335,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return field value properly when model belongs to a DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(true);
       const expectedValue = 'test';
@@ -341,18 +346,18 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model is DynamicRelationGroupModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: MockRelationModel
+        model: MockRelationModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(true);
       const expectedValue = {
         journal: [
           'journal test 1',
-          'journal test 2'
+          'journal test 2',
         ],
         issue: [
           'issue test 1',
-          'issue test 2'
+          'issue test 2',
         ],
       };
 
@@ -361,7 +366,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model has language', () => {
       let event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageModel
+        model: mockInputWithLanguageModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(false);
@@ -370,19 +375,19 @@ describe('SectionFormOperationsService test suite', () => {
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageAndAuthorityModel
+        model: mockInputWithLanguageAndAuthorityModel,
       });
-      expectedValue = Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityModel.value, {language: mockInputWithLanguageAndAuthorityModel.language});
+      expectedValue = Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityModel.value, { language: mockInputWithLanguageAndAuthorityModel.language });
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageAndAuthorityArrayModel
+        model: mockInputWithLanguageAndAuthorityArrayModel,
       });
       expectedValue = [
         Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityArrayModel.value[0],
-        { language: mockInputWithLanguageAndAuthorityArrayModel.language }
-        )
+          { language: mockInputWithLanguageAndAuthorityArrayModel.language },
+        ),
       ];
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
@@ -390,7 +395,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model has an object as value', () => {
       let event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithFormFieldValueModel
+        model: mockInputWithFormFieldValueModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(false);
@@ -399,14 +404,14 @@ describe('SectionFormOperationsService test suite', () => {
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithAuthorityValueModel
+        model: mockInputWithAuthorityValueModel,
       });
       expectedValue = mockInputWithAuthorityValueModel.value;
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithObjectValueModel
+        model: mockInputWithObjectValueModel,
       });
       expectedValue = mockInputWithObjectValueModel.value;
 
@@ -461,8 +466,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -481,8 +486,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockRelationModel
-        }
+          parent: MockRelationModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -502,8 +507,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -523,8 +528,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -552,8 +557,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -577,8 +582,8 @@ describe('SectionFormOperationsService test suite', () => {
       let previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -607,8 +612,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -632,8 +637,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], null);
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -658,8 +663,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -693,8 +698,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/1');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -712,7 +717,7 @@ describe('SectionFormOperationsService test suite', () => {
       expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
         pathCombiner.getPath('path'),
         new FormFieldMetadataValueObject('test'),
-        true
+        true,
       );
     });
   });
@@ -808,7 +813,7 @@ describe('SectionFormOperationsService test suite', () => {
           isDraggable: true,
           groupFactory: () => {
             return [
-              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
             ];
           },
           required: false,
@@ -816,8 +821,8 @@ describe('SectionFormOperationsService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: []
-        }
+          typeBindRelations: [],
+        },
       );
       spyOn(serviceAsAny, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
       previousValue = new FormFieldPreviousValueObject(['path'], null);
@@ -831,7 +836,7 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
@@ -841,10 +846,10 @@ describe('SectionFormOperationsService test suite', () => {
     it('should dispatch a json-path add operation when a array value is not empty', () => {
       const pathValue = [
         new FormFieldMetadataValueObject('test'),
-        new FormFieldMetadataValueObject('test two')
+        new FormFieldMetadataValueObject('test two'),
       ];
       formBuilderService.getValueFromModel.and.returnValue({
-        path:pathValue
+        path:pathValue,
       });
       spyOn(previousValue, 'isPathEqual').and.returnValue(false);
 
@@ -852,13 +857,13 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
         pathCombiner.getPath('path'),
         pathValue,
-        false
+        false,
       );
       expect(jsonPatchOpBuilder.remove).not.toHaveBeenCalled();
     });
@@ -871,7 +876,7 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 778063dd31..f8c14cf96c 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -1,31 +1,40 @@
 import { Injectable } from '@angular/core';
-
-import isEqual from 'lodash/isEqual';
-import isObject from 'lodash/isObject';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DynamicFormArrayGroupModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
-  isDynamicFormControlEvent
+  isDynamicFormControlEvent,
 } from '@ng-dynamic-forms/core';
-
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined, isNull, isUndefined } from '../../../shared/empty.util';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
-import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { deepClone } from 'fast-json-patch';
-import { dateToString, isNgbDateStruct } from '../../../shared/date.util';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import {
+  dateToString,
+  isNgbDateStruct,
+} from '../../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+  isNull,
+  isUndefined,
+} from '../../../shared/empty.util';
+import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 
 /**
  * The service handling all form section operations
@@ -57,9 +66,9 @@ export class SectionFormOperationsService {
    *    representing if field value related to the specified operation has stored value
    */
   public dispatchOperationsFromEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                     event: DynamicFormControlEvent,
-                                     previousValue: FormFieldPreviousValueObject,
-                                     hasStoredValue: boolean): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject,
+    hasStoredValue: boolean): void {
     switch (event.type) {
       case 'remove':
         this.dispatchOperationsFromRemoveEvent(pathCombiner, event, previousValue);
@@ -296,8 +305,8 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   protected dispatchOperationsFromRemoveEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                              event: DynamicFormControlEvent,
-                                              previousValue: FormFieldPreviousValueObject): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject): void {
 
     const path = this.getFieldPathFromEvent(event);
     const value = this.getFieldValueFromChangeEvent(event);
@@ -321,7 +330,7 @@ export class SectionFormOperationsService {
    */
   protected dispatchOperationsFromAddEvent(
     pathCombiner: JsonPatchOperationPathCombiner,
-    event: DynamicFormControlEvent
+    event: DynamicFormControlEvent,
   ): void {
     const path = this.getFieldPathSegmentedFromChangeEvent(event);
     const value = deepClone(this.getFieldValueFromChangeEvent(event));
@@ -360,11 +369,11 @@ export class SectionFormOperationsService {
    *    representing if field value related to the specified operation has stored value
    */
   protected dispatchOperationsFromChangeEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                              event: DynamicFormControlEvent,
-                                              previousValue: FormFieldPreviousValueObject,
-                                              hasStoredValue: boolean): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject,
+    hasStoredValue: boolean): void {
 
-   if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
+    if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
       // Model is a DynamicRowArrayModel
       this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
       return;
@@ -399,7 +408,7 @@ export class SectionFormOperationsService {
           if (isNotEmpty(moveFrom.path) && isNotEmpty(moveTo.path) && moveFrom.path !== moveTo.path) {
             this.operationsBuilder.move(
               moveTo,
-              moveFrom.path
+              moveFrom.path,
             );
           }
         }
@@ -448,9 +457,9 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   protected dispatchOperationsFromMap(valueMap: Map<string, any>,
-                                      pathCombiner: JsonPatchOperationPathCombiner,
-                                      event: DynamicFormControlEvent,
-                                      previousValue: FormFieldPreviousValueObject): void {
+    pathCombiner: JsonPatchOperationPathCombiner,
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject): void {
     const currentValueMap = valueMap;
     if (event.type === 'remove') {
       const path = this.getQualdropItemPathFromEvent(event);
@@ -493,8 +502,8 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   private dispatchOperationsFromMoveEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                          event: DynamicFormControlEvent,
-                                          previousValue: FormFieldPreviousValueObject) {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject) {
 
     return this.handleArrayGroupPatch(pathCombiner, event.$event, (event as any).$event.arrayModel, previousValue);
   }
@@ -512,9 +521,9 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   private handleArrayGroupPatch(pathCombiner: JsonPatchOperationPathCombiner,
-                                event,
-                                model: DynamicRowArrayModel,
-                                previousValue: FormFieldPreviousValueObject) {
+    event,
+    model: DynamicRowArrayModel,
+    previousValue: FormFieldPreviousValueObject) {
 
     const arrayValue = this.formBuilder.getValueFromModel([model]);
     const segmentedPath = this.getFieldPathSegmentedFromChangeEvent(event);
@@ -522,7 +531,7 @@ export class SectionFormOperationsService {
       this.operationsBuilder.add(
         pathCombiner.getPath(segmentedPath),
         arrayValue[segmentedPath],
-        false
+        false,
       );
     } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model))) {
       this.operationsBuilder.remove(pathCombiner.getPath(segmentedPath));
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index 4fbf324edf..70639db07d 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -1,49 +1,68 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SubmissionSectionFormComponent } from './section-form.component';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
-import { SectionFormOperationsService } from './section-form-operations.service';
-import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
-import {
-  mockSubmissionCollectionId, mockSubmissionId, mockUploadResponse1ParsedErrors,
-} from '../../../shared/mocks/submission.mock';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { FormComponent } from '../../../shared/form/form.component';
-import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlEventType,
+} from '@ng-dynamic-forms/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
+import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+  mockUploadResponse1ParsedErrors,
+} from '../../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { cold } from 'jasmine-marbles';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SubmissionService } from '../../submission.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionFormComponent } from './section-form.component';
+import { SectionFormOperationsService } from './section-form-operations.service';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
@@ -63,7 +82,7 @@ const sectionObject: SectionDataObject = {
   serverValidationErrors: [],
   header: 'submit.progressbar.describe.stepone',
   id: 'traditionalpageone',
-  sectionType: SectionsType.SubmissionForm
+  sectionType: SectionsType.SubmissionForm,
 };
 
 const testFormConfiguration = {
@@ -73,7 +92,7 @@ const testFormConfiguration = {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Title',
           mandatory: 'true',
@@ -81,18 +100,18 @@ const testFormConfiguration = {
           hints: ' Enter Title.',
           selectableMetadata: [
             {
-              metadata: 'dc.title'
-            }
+              metadata: 'dc.title',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel,
     {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Author',
           mandatory: 'false',
@@ -100,20 +119,20 @@ const testFormConfiguration = {
           hints: ' Enter Author.',
           selectableMetadata: [
             {
-              metadata: 'dc.contributor'
-            }
+              metadata: 'dc.contributor',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel,
   ],
   type: 'submissionform',
   _links: {
     self: {
-      href: 'testFormConfiguration.url'
-    }
-  }
+      href: 'testFormConfiguration.url',
+    },
+  },
 } as any;
 
 const testFormModel = [
@@ -124,7 +143,7 @@ const testFormModel = [
   new DynamicRowGroupModel({
     id: 'df-row-group-config-2',
     group: [new DsDynamicInputModel({ id: 'dc.contributor', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false })],
-  })
+  }),
 ];
 
 const dynamicFormControlEvent: DynamicFormControlEvent = {
@@ -133,7 +152,7 @@ const dynamicFormControlEvent: DynamicFormControlEvent = {
   control: null,
   group: testFormModel[0] as any,
   model: testFormModel[0].group[0],
-  type: DynamicFormControlEventType.Change
+  type: DynamicFormControlEventType.Change,
 };
 
 describe('SubmissionSectionFormComponent test suite', () => {
@@ -162,12 +181,12 @@ describe('SubmissionSectionFormComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
@@ -185,9 +204,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
         { provide: 'submissionIdProvider', useValue: submissionId },
         { provide: SubmissionObjectDataService, useValue: { getHrefByID: () => observableOf('testUrl'), findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem()) } },
         ChangeDetectorRef,
-        SubmissionSectionFormComponent
+        SubmissionSectionFormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -281,7 +300,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       const sectionData = {};
       const sectionError: SubmissionSectionError = {
         message: 'test' + 'Error: test',
-        path: '/sections/' + sectionObject.id
+        path: '/sections/' + sectionObject.id,
       };
 
       comp.initForm(sectionData);
@@ -293,11 +312,11 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return true when has Metadata Enrichment', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = {};
       compAsAny.sectionData.data = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       spyOn(compAsAny, 'inCurrentSubmissionScope').and.callThrough();
 
@@ -307,11 +326,11 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return false when has not Metadata Enrichment', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = newSectionData;
       compAsAny.sectionData.data = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       spyOn(compAsAny, 'inCurrentSubmissionScope').and.callThrough();
 
@@ -321,7 +340,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return false when metadata has Metadata Enrichment but not belonging to sectionMetadata', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = newSectionData;
       compAsAny.sectionMetadata = [];
@@ -338,16 +357,16 @@ describe('SubmissionSectionFormComponent test suite', () => {
                 {
                   selectableMetadata: [{ metadata: 'scoped.workflow' }],
                   scope: 'WORKFLOW',
-                } as FormFieldModel
-              ]
+                } as FormFieldModel,
+              ],
             },
             {
               fields: [
                 {
                   selectableMetadata: [{ metadata: 'scoped.workspace' }],
                   scope: 'WORKSPACE',
-                } as FormFieldModel
-              ]
+                } as FormFieldModel,
+              ],
             },
             {
               fields: [
@@ -369,10 +388,10 @@ describe('SubmissionSectionFormComponent test suite', () => {
               fields: [
                 {
                   selectableMetadata: [{ metadata: 'dc.title' }],
-                } as FormFieldModel
-              ]
-            }
-          ]
+                } as FormFieldModel,
+              ],
+            },
+          ],
         };
       });
 
@@ -435,7 +454,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionError = [];
       comp.sectionData.data = {};
@@ -456,7 +475,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       comp.sectionData.data = {};
       comp.sectionData.errorsToShow = [];
@@ -495,7 +514,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         sectionObject.id,
         'test',
         parsedSectionErrors,
-        []
+        [],
       );
       expect(comp.sectionData.errorsToShow).toEqual(parsedSectionErrors);
     });
@@ -504,7 +523,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -514,7 +533,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf(parsedSectionErrors));
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -524,7 +543,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(false));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -533,14 +552,14 @@ describe('SubmissionSectionFormComponent test suite', () => {
     it('should subscribe to state properly', () => {
       spyOn(comp, 'updateForm');
       const formData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionState = {
         data: sectionData,
-        errorsToShow: parsedSectionErrors
+        errorsToShow: parsedSectionErrors,
       };
 
       formService.getFormData.and.returnValue(observableOf(formData));
@@ -617,7 +636,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should check if has stored value in the section state', () => {
       comp.sectionData.data = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       } as any;
 
       expect(comp.hasStoredValue('dc.title', 0)).toBeTruthy();
@@ -631,7 +650,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 2a07f7e3f1..defc78d611 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -1,45 +1,72 @@
-import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
-import { DynamicFormControlEvent, DynamicFormControlModel } from '@ng-dynamic-forms/core';
-
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, take, tap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import findIndex from 'lodash/findIndex';
 import isEqual from 'lodash/isEqual';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
+import { environment } from '../../../../environments/environment';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { ConfigObject } from '../../../core/config/models/config.model';
+import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
+import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isUndefined,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { difference } from '../../../shared/object.util';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
+import { SubmissionService } from '../../submission.service';
 import { SectionModelComponent } from '../models/section.model';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { hasValue, isEmpty, isNotEmpty, isUndefined } from '../../../shared/empty.util';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
-import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from './section-form-operations.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SectionsService } from '../sections.service';
-import { difference } from '../../../shared/object.util';
-import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
-import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { environment } from '../../../../environments/environment';
-import { ConfigObject } from '../../../core/config/models/config.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
-import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
-import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
 
 /**
  * This component represents a section that contains a Form.
@@ -183,7 +210,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.submissionObjectService.findById(this.submissionId, true, false, followLink('item')).pipe(
             getFirstSucceededRemoteData(),
             getRemoteDataPayload()),
-            this.sectionService.isSectionReadOnly(this.submissionId, this.sectionData.id, this.submissionService.getSubmissionScope())
+          this.sectionService.isSectionReadOnly(this.submissionId, this.sectionData.id, this.submissionService.getSubmissionScope()),
         ])),
       take(1))
       .subscribe(([sectionData, submissionObject, isSectionReadOnly]: [WorkspaceitemSectionFormObject, SubmissionObject, boolean]) => {
@@ -219,11 +246,11 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   protected getSectionStatus(): Observable<boolean> {
     const formStatus$ = this.formService.isValid(this.formId);
     const serverValidationStatus$ = this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
-      map((validationErrors) => isEmpty(validationErrors))
+      map((validationErrors) => isEmpty(validationErrors)),
     );
 
     return observableCombineLatest([formStatus$, serverValidationStatus$]).pipe(
-      map(([formValidation, serverSideValidation]: [boolean, boolean]) => formValidation && serverSideValidation)
+      map(([formValidation, serverSideValidation]: [boolean, boolean]) => formValidation && serverSideValidation),
     );
   }
 
@@ -304,7 +331,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.collectionId,
         sectionData,
         this.submissionService.getSubmissionScope(),
-        this.isSectionReadonly
+        this.isSectionReadonly,
       );
       const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
       this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors, sectionMetadata);
@@ -312,9 +339,11 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
         message: msg,
-        path: '/sections/' + this.sectionData.id
+        path: '/sections/' + this.sectionData.id,
       };
-      console.error(e.stack);
+      if (e instanceof Error) {
+        console.error(e.stack);
+      }
       this.sectionService.setSectionError(this.submissionId, this.sectionData.id, sectionError);
     }
   }
@@ -390,7 +419,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.fieldsOnTheirWayToBeRemoved = new Map();
           this.sectionMetadata = sectionState.metadata;
           this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
-        })
+        }),
     );
   }
 
@@ -416,7 +445,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   }
 
   private hasRelatedCustomError(medatata): boolean {
-    const index = findIndex(this.sectionData.errorsToShow, {path: this.pathCombiner.getPath(medatata).path});
+    const index = findIndex(this.sectionData.errorsToShow, { path: this.pathCombiner.getPath(medatata).path });
     if (index  !== -1) {
       const error = this.sectionData.errorsToShow[index];
       const validator = error.message.replace('error.validation.', '');
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
index 041e2af23a..3184010278 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -1,59 +1,73 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { NgxPaginationModule } from 'ngx-pagination';
-import { cold } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
+import { License } from '../../../core/shared/license.model';
+import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../shared/form/form.service';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
-import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionSectionIdentifiersComponent } from './section-identifiers.component';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
-import { License } from '../../../core/shared/license.model';
-import { Collection } from '../../../core/shared/collection.model';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
 import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
-import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
-import { Item } from '../../../core/shared/item.model';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { SubmissionService } from '../../submission.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionIdentifiersComponent } from './section-identifiers.component';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
-    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
   });
 }
 
 function getMockCollectionDataService(): CollectionDataService {
   return jasmine.createSpyObj('CollectionDataService', {
     findById: jasmine.createSpy('findById'),
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
@@ -64,9 +78,9 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'mockmatch'
-      }
-    ]
+        value: 'mockmatch',
+      },
+    ],
   },
 });
 
@@ -76,16 +90,16 @@ const identifierData: WorkspaceitemSectionIdentifiersObject = {
     value: 'https://doi.org/10.33515/dspace-61',
     identifierType: 'doi',
     identifierStatus: 'TO_BE_REGISTERED',
-    type: 'identifier'
+    type: 'identifier',
   },
   {
     value: '123456789/418',
     identifierType: 'handle',
     identifierStatus: null,
-    type: 'identifier'
-  }
+    type: 'identifier',
+  },
   ],
-  displayTypes: ['doi', 'handle']
+  displayTypes: ['doi', 'handle'],
 };
 
 // Mock section object to use with tests
@@ -99,7 +113,7 @@ const sectionObject: SectionDataObject = {
   header: 'submission.sections.submit.progressbar.identifiers',
   id: 'identifiers',
   sectionType: SectionsType.Identifiers,
-  sectionVisibility: null
+  sectionVisibility: null,
 };
 
 describe('SubmissionSectionIdentifiersComponent test suite', () => {
@@ -129,9 +143,9 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 1'
+        value: 'Community 1-Collection 1',
       }],
-    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
+    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
   });
   const paginationService = new PaginationServiceStub();
 
@@ -167,9 +181,9 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
         { provide: PaginationService, useValue: paginationService },
         ChangeDetectorRef,
         FormBuilderService,
-        SubmissionSectionIdentifiersComponent
+        SubmissionSectionIdentifiersComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -235,13 +249,13 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
     it('Should return TRUE if the isLoading is FALSE', () => {
       compAsAny.isLoading = false;
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
-        a: true
+        a: true,
       }));
     });
     it('Should return FALSE if the identifier data is missing handle', () => {
       compAsAny.isLoadin = true;
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
-        a: false
+        a: false,
       }));
     });
   });
@@ -251,7 +265,7 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index 2dc70f668e..b32458c757 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -1,15 +1,23 @@
-import {ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { SectionsType } from '../sections-type';
-import { SectionModelComponent } from '../models/section.model';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionDataObject } from '../models/section-data.model';
-import { SubmissionService } from '../../submission.service';
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { SectionsService } from '../sections.service';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
 import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+import { AlertType } from '../../../shared/alert/alert-type';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 
 /**
  * This simple component displays DOI, handle and other identifiers that are already minted for the item in
@@ -21,7 +29,7 @@ import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/
 @Component({
   selector: 'ds-submission-section-identifiers',
   templateUrl: './section-identifiers.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 
 @renderSectionFor(SectionsType.Identifiers)
@@ -72,7 +80,7 @@ export class SubmissionSectionIdentifiersComponent extends SectionModelComponent
   }
 
   ngOnInit() {
-      super.ngOnInit();
+    super.ngOnInit();
   }
 
   /**
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 35fea95b8d..b0e51985fe 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -1,43 +1,58 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  DynamicCheckboxModel,
+  DynamicFormControlEvent,
+  DynamicFormControlEventType,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { DynamicCheckboxModel, DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { Collection } from '../../../core/shared/collection.model';
+import { License } from '../../../core/shared/license.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
 import {
   mockLicenseParsedErrors,
   mockSubmissionCollectionId,
-  mockSubmissionId
+  mockSubmissionId,
 } from '../../../shared/mocks/submission.mock';
-import { FormComponent } from '../../../shared/form/form.component';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionSectionLicenseComponent } from './section-license.component';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { License } from '../../../core/shared/license.model';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { cold } from 'jasmine-marbles';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionLicenseComponent } from './section-license.component';
 
 const collectionId = mockSubmissionCollectionId;
 const licenseText = 'License text';
@@ -48,9 +63,9 @@ const mockCollection = Object.assign(new Collection(), {
     {
       key: 'dc.title',
       language: 'en_US',
-      value: 'Community 1-Collection 1'
+      value: 'Community 1-Collection 1',
     }],
-  license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
+  license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
 });
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
@@ -58,7 +73,7 @@ function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
-    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
   });
 }
 
@@ -68,13 +83,13 @@ const sectionObject: SectionDataObject = {
   data: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   errorsToShow: [],
   serverValidationErrors: [],
   header: 'submit.progressbar.describe.license',
   id: 'license',
-  sectionType: SectionsType.License
+  sectionType: SectionsType.License,
 };
 
 const dynamicFormControlEvent: DynamicFormControlEvent = {
@@ -83,7 +98,7 @@ const dynamicFormControlEvent: DynamicFormControlEvent = {
   control: null,
   group: null,
   model: null,
-  type: DynamicFormControlEventType.Change
+  type: DynamicFormControlEventType.Change,
 };
 
 describe('SubmissionSectionLicenseComponent test suite', () => {
@@ -108,7 +123,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
 
   const mockCollectionDataService = jasmine.createSpyObj('CollectionDataService', {
     findById: jasmine.createSpy('findById'),
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 
   beforeEach(waitForAsync(() => {
@@ -118,12 +133,12 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionLicenseComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: CollectionDataService, useValue: mockCollectionDataService },
@@ -139,9 +154,9 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: 'submissionIdProvider', useValue: submissionId },
         ChangeDetectorRef,
         FormBuilderService,
-        SubmissionSectionLicenseComponent
+        SubmissionSectionLicenseComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -213,7 +228,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         expect(model.value).toBeFalsy();
         expect(comp.licenseText$).toBeObservable(cold('(ab|)', {
           a: '',
-          b: licenseText
+          b: licenseText,
         }));
       });
 
@@ -221,7 +236,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         comp.sectionData.data = {
           url: 'url',
           acceptanceDate: Date.now(),
-          granted: true
+          granted: true,
         } as any;
 
         spyOn(compAsAny, 'getSectionStatus');
@@ -235,7 +250,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         expect(model.value).toBeTruthy();
         expect(comp.licenseText$).toBeObservable(cold('(ab|)', {
           a: '',
-          b: licenseText
+          b: licenseText,
         }));
       });
 
@@ -283,7 +298,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         comp.sectionData.data = {
           url: 'url',
           acceptanceDate: Date.now(),
-          granted: true
+          granted: true,
         } as any;
 
         comp.onSectionInit();
@@ -325,7 +340,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index e9a0cf1566..701bf75cb6 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -1,13 +1,30 @@
-import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
 import {
   DynamicCheckboxModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
-  DynamicFormLayout
+  DynamicFormLayout,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  startWith,
+  take,
+} from 'rxjs/operators';
 
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, startWith, take } from 'rxjs/operators';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
@@ -15,21 +32,27 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { License } from '../../../core/shared/license.model';
 import { WorkspaceitemSectionLicenseObject } from '../../../core/submission/models/workspaceitem-section-license.model';
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { SectionDataObject } from '../models/section-data.model';
-
 import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
-import { SectionsService } from '../sections.service';
-import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  SECTION_LICENSE_FORM_LAYOUT,
+  SECTION_LICENSE_FORM_MODEL,
+} from './section-license.model';
 
 /**
  * This component represents a section that contains the submission license form.
@@ -182,7 +205,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
             this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
           }
           this.changeDetectorRef.detectChanges();
-        })
+        }),
     );
   }
 
@@ -213,6 +236,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
     } else {
       this.operationsBuilder.remove(this.pathCombiner.getPath(path));
     }
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionData.id);
   }
 
   /**
diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
index 0f21ef98a4..33f7721ac3 100644
--- a/src/app/submission/sections/license/section-license.model.ts
+++ b/src/app/submission/sections/license/section-license.model.ts
@@ -5,9 +5,9 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
     element: {
       container: 'custom-control custom-checkbox pl-1',
       control: 'custom-control-input',
-      label: 'custom-control-label pt-1'
-    }
-  }
+      label: 'custom-control-label pt-1',
+    },
+  },
 };
 
 export const SECTION_LICENSE_FORM_MODEL = [
@@ -17,12 +17,12 @@ export const SECTION_LICENSE_FORM_MODEL = [
     required: true,
     value: false,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
       required: 'submission.sections.license.required',
-      notgranted: 'submission.sections.license.notgranted'
+      notgranted: 'submission.sections.license.notgranted',
     },
     type: 'CHECKBOX',
-  }
+  },
 ];
diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts
index 6f8126dffc..7ecb820db7 100644
--- a/src/app/submission/sections/models/section-data.model.ts
+++ b/src/app/submission/sections/models/section-data.model.ts
@@ -1,6 +1,6 @@
 import { WorkspaceitemSectionDataType } from '../../../core/submission/models/workspaceitem-sections.model';
-import { SectionsType } from '../sections-type';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SectionsType } from '../sections-type';
 
 /**
  * An interface to represent section model
diff --git a/src/app/submission/sections/models/section.model.ts b/src/app/submission/sections/models/section.model.ts
index c9be079213..4868f0c6c1 100644
--- a/src/app/submission/sections/models/section.model.ts
+++ b/src/app/submission/sections/models/section.model.ts
@@ -1,11 +1,24 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  startWith,
+} from 'rxjs/operators';
 
-import { Observable, Subscription } from 'rxjs';
-import { filter, startWith } from 'rxjs/operators';
-
-import { SectionDataObject } from './section-data.model';
+import {
+  hasValue,
+  isNotUndefined,
+} from '../../../shared/empty.util';
 import { SectionsService } from '../sections.service';
-import { hasValue, isNotUndefined } from '../../../shared/empty.util';
+import { SectionDataObject } from './section-data.model';
 
 export interface SectionDataModel {
   sectionData: SectionDataObject;
@@ -16,7 +29,7 @@ export interface SectionDataModel {
  */
 @Component({
   selector: 'ds-section-model',
-  template: ''
+  template: '',
 })
 export abstract class SectionModelComponent implements OnDestroy, OnInit, SectionDataModel {
   protected abstract sectionService: SectionsService;
diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts
new file mode 100644
index 0000000000..cfad518b85
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts
@@ -0,0 +1,96 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { CreateData } from '../../../core/data/base/create-data';
+import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec';
+import { DeleteData } from '../../../core/data/base/delete-data';
+import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { PatchData } from '../../../core/data/base/patch-data';
+import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+
+describe('CoarNotifyConfigDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: CoarNotifyConfigDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/coar-notify`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new CoarNotifyConfigDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initCreateService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as CreateData<any>;
+    const initFindAllService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as FindAllData<any>;
+    const initDeleteService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as DeleteData<any>;
+    const initPatchService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as PatchData<any>;
+    testCreateDataImplementation(initCreateService);
+    testFindAllDataImplementation(initFindAllService);
+    testPatchDataImplementation(initPatchService);
+    testDeleteDataImplementation(initDeleteService);
+  });
+
+});
diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts
new file mode 100644
index 0000000000..cb5155dd32
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts
@@ -0,0 +1,129 @@
+import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../core/data/base/create-data';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../core/data/base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../core/data/base/patch-data';
+import { ChangeAnalyzer } from '../../../core/data/change-analyzer';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { MultipartPostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type';
+import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
+
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the CoarNotifyConfig endpoint
+ */
+@Injectable()
+@dataService(SUBMISSION_COAR_NOTIFY_CONFIG)
+export class CoarNotifyConfigDataService extends IdentifiableDataService<SubmissionCoarNotifyConfig> implements FindAllData<SubmissionCoarNotifyConfig>, DeleteData<SubmissionCoarNotifyConfig>, PatchData<SubmissionCoarNotifyConfig>, CreateData<SubmissionCoarNotifyConfig> {
+  createData: CreateDataImpl<SubmissionCoarNotifyConfig>;
+  private findAllData: FindAllDataImpl<SubmissionCoarNotifyConfig>;
+  private deleteData: DeleteDataImpl<SubmissionCoarNotifyConfig>;
+  private patchData: PatchDataImpl<SubmissionCoarNotifyConfig>;
+  private comparator: ChangeAnalyzer<SubmissionCoarNotifyConfig>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('submissioncoarnotifyconfigs', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+  }
+
+
+  create(object: SubmissionCoarNotifyConfig, ...params: RequestParam[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.createData.create(object, ...params);
+  }
+
+  patch(object: SubmissionCoarNotifyConfig, operations: Operation[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: SubmissionCoarNotifyConfig): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.patchData.update(object);
+  }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    return this.patchData.commitUpdates(method);
+  }
+
+  createPatchFromCache(object: SubmissionCoarNotifyConfig): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SubmissionCoarNotifyConfig>[]): Observable<RemoteData<PaginatedList<SubmissionCoarNotifyConfig>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  public invoke(serviceName: string, serviceId: string, files: File[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    const requestId = this.requestService.generateRequestId();
+    this.getBrowseEndpoint().pipe(
+      take(1),
+      map((endpoint: string) => new URLCombiner(endpoint, serviceName, 'submissioncoarnotifyconfigmodel', serviceId).toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(files);
+        return new MultipartPostRequest(requestId, endpoint, body);
+      }),
+    ).subscribe((request: RestRequest) => this.requestService.send(request));
+
+    return this.rdbService.buildFromRequestUUID<SubmissionCoarNotifyConfig>(requestId);
+  }
+
+  private getInvocationFormData(files: File[]): FormData {
+    const form: FormData = new FormData();
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts
new file mode 100644
index 0000000000..53e41783ce
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts
@@ -0,0 +1,13 @@
+/**
+ * The resource type for Ldn-Services
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../../core/shared/resource-type';
+
+
+export const SUBMISSION_COAR_NOTIFY_CONFIG = new ResourceType('submissioncoarnotifyconfig');
+
+export const COAR_NOTIFY_WORKSPACEITEM = new ResourceType('workspaceitem');
+
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
new file mode 100644
index 0000000000..49742892ca
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -0,0 +1,149 @@
+<div class="container-fluid">
+  <ng-container *ngIf="patterns?.length > 0 ">
+    <div *ngFor="let ldnPattern of patterns; let i = index" class="col">
+      <div *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0">
+        <label class="row col-form-label">
+          {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
+        </label
+        >
+        <div *ngIf="ldnServiceByPattern[ldnPattern.pattern]?.services.length">
+          <div
+            *ngFor="
+            let service of ldnServiceByPattern[ldnPattern.pattern].services;
+            let serviceIndex = index
+          "
+          >
+            <div class="row">
+              <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
+                <div class="position-relative right-addon"
+                     [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
+                  <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+                     aria-hidden="true"></i>
+                  <input
+                    [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
+                    type="text"
+                    [readonly]="true"
+                    [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
+                    class="form-control w-100 scrollable-dropdown-input"
+                    [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
+                    (click)="myDropdown.open()"
+                  />
+                </div>
+                <div
+                  ngbDropdownMenu
+                  class="dropdown-menu scrollable-dropdown-menu w-100"
+                  aria-haspopup="true"
+                  aria-expanded="false"
+                >
+                  <div
+                    class="scrollable-menu"
+                    role="listbox"
+                    infiniteScroll
+                    [infiniteScrollDistance]="2"
+                    [infiniteScrollThrottle]="50"
+                    [scrollWindow]="false"
+                  >
+                    <button
+                      *ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
+                      class="dropdown-item collection-item text-truncate w-100"
+                    >
+                      {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
+                    </button>
+                    <button
+                      *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0"
+                      class="dropdown-item collection-item text-truncate w-100"
+                      (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
+                    >
+                      {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
+                    </button>
+                    <button
+                      *ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async"
+                      [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
+                      class="dropdown-item collection-item text-truncate w-100"
+                      (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
+                    >
+                      <b>
+                        {{ serviceOption.name }}
+                      </b>
+                      <br />
+                      {{ serviceOption.description }}
+                    </button>
+                  </div>
+                </div>
+              </div>
+              <button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
+                      type="button" [class.mt-2]="serviceIndex > 0"
+                      class="btn btn-secondary ml-2"
+                      role="button"
+                      title="{{'form.remove' | translate}}"
+                      [attr.aria-label]="'form.remove' | translate"
+                      (click)="removeService(ldnPattern, serviceIndex)"
+              >
+                <span><i class="fas fa-trash" aria-hidden="true"></i></span>
+              </button>
+            </div>
+
+            <small
+              class="row text-muted"
+              *ngIf="!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
+                    serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1"
+            >
+              {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
+            </small>
+            <ng-container *ngIf="(getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0">
+              <small class="row text-danger" *ngFor="let error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)">
+                {{ error.message | translate}}
+              </small>
+            </ng-container>
+            <div
+              class="row mt-1"
+              *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]"
+            >
+              <div
+                class="alert alert-info w-100 d-flex align-items-center flex-row"
+              >
+                <i class="fa-solid fa-circle-info fa-xl ml-2"></i>
+                <div class="ml-4">
+                  <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
+                  <div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
+                    {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
+                  </div>
+                  <ng-template #noDesc>
+                <span class="text-muted">
+                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
+                </span>
+                  </ng-template>
+                </div>
+              </div>
+            </div>
+            <div class="row" *ngIf="(getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0">
+              <div
+                class="alert alert-danger w-100 d-flex align-items-center flex-row"
+              >
+                <div class="ml-4">
+              <span>
+                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
+              </span>
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
+                   (click)="addNewService(ldnPattern)"
+                   class="btn btn-link mt-2 pl-0"
+              >
+                <i class="fas fa-plus"></i>
+                {{ 'submission.sections.general.add-more' | translate }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+    <ng-container *ngIf="!hasSectionData">
+    <p>
+      {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
+    </p>
+  </ng-container>
+</div>
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss
new file mode 100644
index 0000000000..4a3e7072a3
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss
@@ -0,0 +1,5 @@
+// Getting styles for NgbDropdown
+@import '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss';
+@import '../../../shared/form/form.component.scss';
+
+
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts
new file mode 100644
index 0000000000..f92ceff902
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts
@@ -0,0 +1,446 @@
+import { ChangeDetectorRef } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { NotifyServicePattern } from '../../../admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model';
+import {
+  LdnService,
+  LdnServiceByPattern,
+} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../sections.service';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+import { SubmissionSectionCoarNotifyComponent } from './section-coar-notify.component';
+import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
+
+describe('SubmissionSectionCoarNotifyComponent', () => {
+  let component: SubmissionSectionCoarNotifyComponent;
+  let componentAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionCoarNotifyComponent>;
+
+  let ldnServicesService: jasmine.SpyObj<LdnServicesService>;
+  let coarNotifyConfigDataService: jasmine.SpyObj<CoarNotifyConfigDataService>;
+  let operationsBuilder: jasmine.SpyObj<JsonPatchOperationsBuilder>;
+  let sectionService: jasmine.SpyObj<SectionsService>;
+  let cdRefStub: any;
+
+
+  const patterns: SubmissionCoarNotifyConfig[] = Object.assign(
+    [new SubmissionCoarNotifyConfig()],
+    {
+      patterns: [{ pattern: 'review', multipleRequest: false }, { pattern: 'endorsment', multipleRequest: false }],
+    },
+  );
+  const patternsPL = createPaginatedList(patterns);
+  const coarNotifyConfig = createSuccessfulRemoteDataObject$(patternsPL);
+
+  beforeEach(async () => {
+    ldnServicesService = jasmine.createSpyObj('LdnServicesService', [
+      'findByInboundPattern',
+    ]);
+    coarNotifyConfigDataService = jasmine.createSpyObj(
+      'CoarNotifyConfigDataService',
+      ['findAll'],
+    );
+    operationsBuilder = jasmine.createSpyObj('JsonPatchOperationsBuilder', [
+      'remove',
+      'replace',
+      'add',
+      'flushOperation',
+    ]);
+    sectionService = jasmine.createSpyObj('SectionsService', [
+      'dispatchRemoveSectionErrors',
+      'getSectionServerErrors',
+      'setSectionError',
+    ]);
+    cdRefStub = Object.assign({
+      detectChanges: () => fixture.detectChanges(),
+    });
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SubmissionSectionCoarNotifyComponent],
+      providers: [
+        { provide: LdnServicesService, useValue: ldnServicesService },
+        { provide: CoarNotifyConfigDataService, useValue: coarNotifyConfigDataService },
+        { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
+        { provide: SectionsService, useValue: sectionService },
+        { provide: ChangeDetectorRef, useValue: cdRefStub },
+        { provide: 'collectionIdProvider', useValue: 'collectionId' },
+        { provide: 'sectionDataProvider', useValue: { id: 'sectionId', data: {} } },
+        { provide: 'submissionIdProvider', useValue: 'submissionId' },
+        NgbDropdown,
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SubmissionSectionCoarNotifyComponent);
+    component = fixture.componentInstance;
+    componentAsAny = component;
+
+    component.patterns = patterns[0].patterns;
+    coarNotifyConfigDataService.findAll.and.returnValue(coarNotifyConfig);
+    sectionService.getSectionServerErrors.and.returnValue(
+      of(
+        Object.assign([], {
+          path: 'sections/sectionId/data/notifyCoar',
+          message: 'error',
+        }),
+      ),
+    );
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('onSectionInit', () => {
+    it('should call setCoarNotifyConfig and getSectionServerErrorsAndSetErrorsToDisplay', () => {
+      spyOn(component, 'setCoarNotifyConfig');
+      spyOn(componentAsAny, 'getSectionServerErrorsAndSetErrorsToDisplay');
+
+      component.onSectionInit();
+
+      expect(component.setCoarNotifyConfig).toHaveBeenCalled();
+      expect(componentAsAny.getSectionServerErrorsAndSetErrorsToDisplay).toHaveBeenCalled();
+    });
+  });
+
+  describe('onChange', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const index = 0;
+    const selectedService: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        {
+          pattern: 'review',
+        },
+      ],
+      description: '',
+    });
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.patterns = [];
+    });
+
+    it('should do nothing if the selected value is the same as the previous one', () => {
+
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = selectedService;
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.remove).not.toHaveBeenCalled();
+      expect(componentAsAny.operationsBuilder.replace).not.toHaveBeenCalled();
+      expect(componentAsAny.operationsBuilder.add).not.toHaveBeenCalled();
+    });
+
+    it('should remove the path when the selected value is null', () => {
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = selectedService;
+      component.onChange(ldnPattern.pattern, index, null);
+
+      expect(componentAsAny.operationsBuilder.flushOperation).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toBeNull();
+      expect(component.previousServices[ldnPattern.pattern].services[index]).toBeNull();
+    });
+
+    it('should replace the path when there is a previous value stored and it is different from the new one', () => {
+      const previousService: LdnService = Object.assign(new LdnService(), {
+        id: 2,
+        name: 'service2',
+        notifyServiceInboundPatterns: [
+          {
+            pattern: 'endorsement',
+          },
+        ],
+        description: 'test',
+      });
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = previousService;
+      component.previousServices[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [previousService],
+      } as LdnServiceByPattern;
+
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.add).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+        [selectedService.id],
+        false,
+        true,
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toEqual(
+        selectedService,
+      );
+      expect(component.previousServices[ldnPattern.pattern].services[index].id).toEqual(
+        selectedService.id,
+      );
+    });
+
+    it('should add the path when there is no previous value stored', () => {
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.add).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+        [selectedService.id],
+        false,
+        true,
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toEqual(
+        selectedService,
+      );
+      expect(component.previousServices[ldnPattern.pattern].services[index].id).toEqual(
+        selectedService.id,
+      );
+    });
+  });
+
+  describe('initSelectedServicesByPattern', () => {
+    const pattern1 = { pattern: 'review', multipleRequest: false };
+    const pattern2 = { pattern: 'endorsement', multipleRequest: false };
+    const service1: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      uuid: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern1,
+        }),
+      ],
+    });
+    const service2: LdnService = Object.assign(new LdnService(), {
+      id: 2,
+      uuid: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern2,
+        }),
+      ],
+    });
+    const service3: LdnService = Object.assign(new LdnService(), {
+      id: 3,
+      uuid: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern1,
+        }),
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern2,
+        }),
+      ],
+    });
+
+    const services = [service1, service2, service3];
+
+    beforeEach(() => {
+      ldnServicesService.findByInboundPattern.and.returnValue(
+        createSuccessfulRemoteDataObject$(createPaginatedList(services)),
+      );
+      component.ldnServiceByPattern[pattern1.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.ldnServiceByPattern[pattern2.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.patterns = [pattern1, pattern2];
+
+      spyOn(component, 'filterServices').and.callFake((pattern) => {
+        return of(services);
+      });
+    });
+
+    it('should initialize the selected services by pattern', () => {
+      component.initSelectedServicesByPattern();
+
+      expect(component.ldnServiceByPattern[pattern1.pattern].services).toEqual([null]);
+      expect(component.ldnServiceByPattern[pattern2.pattern].services).toEqual([null]);
+    });
+
+    it('should add the service to the selected services by pattern if the section data has a value for the pattern', () => {
+      component.sectionData.data[pattern1.pattern] = [service1.uuid, service3.uuid];
+      component.sectionData.data[pattern2.pattern] = [service2.uuid, service3.uuid];
+      component.initSelectedServicesByPattern();
+
+      expect(component.ldnServiceByPattern[pattern1.pattern].services).toEqual([
+        service1,
+        service3,
+      ]);
+      expect(component.ldnServiceByPattern[pattern2.pattern].services).toEqual([
+        service2,
+        service3,
+      ]);
+    });
+  });
+
+  describe('addService', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const service: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: ldnPattern.pattern }],
+    };
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+    });
+
+    it('should push the new service to the array corresponding to the pattern', () => {
+      component.addService(ldnPattern, service);
+
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services).toEqual([service]);
+    });
+  });
+
+  describe('removeService', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const service1: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+    const service2: LdnService = Object.assign(new LdnService(), {
+      id: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+    const service3: LdnService = Object.assign(new LdnService(), {
+      id: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+    });
+
+
+    it('should remove the service at the specified index from the array corresponding to the pattern', () => {
+      component.ldnServiceByPattern[ldnPattern.pattern].services = [service1, service2, service3];
+      component.removeService(ldnPattern, 1);
+
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services).toEqual([
+        service1,
+        service3,
+      ]);
+    });
+  });
+
+  describe('filterServices', () => {
+    const pattern = 'review';
+    const service1: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const service2: any = {
+      id: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const service3: any = {
+      id: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const services = [service1, service2, service3];
+
+    beforeEach(() => {
+      ldnServicesService.findByInboundPattern.and.returnValue(
+        createSuccessfulRemoteDataObject$(createPaginatedList(services)),
+      );
+    });
+
+    it('should return an observable of the services that match the given pattern', () => {
+      component.filterServices(pattern).subscribe((result) => {
+        expect(result).toEqual(services);
+      });
+    });
+  });
+
+  describe('hasInboundPattern', () => {
+    const pattern = 'review';
+    const service: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+
+    it('should return true if the service has the specified inbound pattern type', () => {
+      expect(component.hasInboundPattern(service, pattern)).toBeTrue();
+    });
+
+    it('should return false if the service does not have the specified inbound pattern type', () => {
+      expect(component.hasInboundPattern(service, 'endorsement')).toBeFalse();
+    });
+  });
+
+  describe('getSectionServerErrorsAndSetErrorsToDisplay', () => {
+    it('should set the validation errors for the current section to display', () => {
+      const validationErrors = [
+        { path: 'sections/sectionId/data/notifyCoar', message: 'error' },
+      ];
+      sectionService.getSectionServerErrors.and.returnValue(
+        of(validationErrors),
+      );
+
+      componentAsAny.getSectionServerErrorsAndSetErrorsToDisplay();
+
+      expect(sectionService.setSectionError).toHaveBeenCalledWith(
+        component.submissionId,
+        component.sectionData.id,
+        validationErrors[0],
+      );
+    });
+  });
+
+  describe('onSectionDestroy', () => {
+    it('should unsubscribe from all subscriptions', () => {
+      const sub1 = of(null).subscribe();
+      const sub2 = of(null).subscribe();
+      componentAsAny.subs = [sub1, sub2];
+      spyOn(sub1, 'unsubscribe');
+      spyOn(sub2, 'unsubscribe');
+      component.onSectionDestroy();
+      expect(sub1.unsubscribe).toHaveBeenCalled();
+      expect(sub2.unsubscribe).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
new file mode 100644
index 0000000000..6415e21f31
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -0,0 +1,359 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+} from '@angular/core';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import {
+  LdnService,
+  LdnServiceByPattern,
+} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+import { LdnPattern } from './submission-coar-notify.config';
+
+/**
+ * This component represents a section that contains the submission section-coar-notify form.
+ */
+@Component({
+  selector: 'ds-submission-section-coar-notify',
+  templateUrl: './section-coar-notify.component.html',
+  styleUrls: ['./section-coar-notify.component.scss'],
+  providers: [NgbDropdown],
+})
+@renderSectionFor(SectionsType.CoarNotify)
+export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent {
+
+  hasSectionData = false;
+  /**
+   * Contains an array of string patterns.
+   */
+  patterns: LdnPattern[] = [];
+  /**
+   * An object that maps string keys to arrays of LdnService objects.
+   * Used to store LdnService objects by pattern.
+   */
+  ldnServiceByPattern: { [key: string]: LdnServiceByPattern } = {};
+  /**
+   * A map representing all services for each pattern
+   * {
+   *  'pattern': {
+   *   'index': 'service.id'
+   *   }
+   * }
+   *
+   * @type {{ [key: string]: {[key: number]: number} }}
+   * @memberof SubmissionSectionCoarNotifyComponent
+   */
+  previousServices: { [key: string]: LdnServiceByPattern } = {};
+
+  /**
+   * The [[JsonPatchOperationPathCombiner]] object
+   * @type {JsonPatchOperationPathCombiner}
+   */
+  protected pathCombiner: JsonPatchOperationPathCombiner;
+  /**
+   * A map representing all field on their way to be removed
+   * @type {Map}
+   */
+  protected fieldsOnTheirWayToBeRemoved: Map<string, number[]> = new Map();
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  private filteredServicesByPattern = {};
+
+  constructor(protected ldnServicesService: LdnServicesService,
+              // protected formOperationsService: SectionFormOperationsService,
+              protected operationsBuilder: JsonPatchOperationsBuilder,
+              protected sectionService: SectionsService,
+              protected coarNotifyConfigDataService: CoarNotifyConfigDataService,
+              protected chd: ChangeDetectorRef,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  /**
+   * Initialize all instance variables
+   */
+  onSectionInit() {
+    this.setCoarNotifyConfig();
+    this.getSectionServerErrorsAndSetErrorsToDisplay();
+    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
+  }
+
+  /**
+   * Method called when section is initialized
+   * Retriev available NotifyConfigs
+   */
+  setCoarNotifyConfig() {
+    this.subs.push(
+      this.coarNotifyConfigDataService.findAll().pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((data) => {
+        if (data.hasSucceeded) {
+          this.patterns = data.payload.page[0].patterns;
+          this.initSelectedServicesByPattern();
+        }
+      }));
+  }
+
+  /**
+   * Handles the change event of a select element.
+   * @param pattern - The pattern of the select element.
+   * @param index - The index of the select element.
+   * @param selectedService - The selected LDN service.
+   */
+  onChange(pattern: string, index: number, selectedService: LdnService | null) {
+    // do nothing if the selected value is the same as the previous one
+    if (this.ldnServiceByPattern[pattern].services[index]?.id === selectedService?.id) {
+      return;
+    }
+
+    // initialize the previousServices object for the pattern if it does not exist
+    if (!this.previousServices[pattern]) {
+      this.previousServices[pattern] = {
+        services: [],
+        allowsMultipleRequests: this.patterns.find(ldnPattern => ldnPattern.pattern === pattern)?.multipleRequest,
+      };
+    }
+
+    // store the previous value
+    this.previousServices[pattern].services[index] = this.ldnServiceByPattern[pattern].services[index];
+    // set the new value
+    this.ldnServiceByPattern[pattern].services[index] = selectedService;
+
+    const hasPrevValueStored = hasValue(this.previousServices[pattern].services[index]) && this.previousServices[pattern].services[index].id !== selectedService?.id;
+    if (hasPrevValueStored) {
+      // when there is a previous value stored and it is different from the new one
+      this.operationsBuilder.flushOperation(this.pathCombiner.getPath([pattern, '-']));
+      if (this.filteredServicesByPattern[pattern]?.includes(this.previousServices[pattern].services[index])){
+        this.operationsBuilder.remove(this.pathCombiner.getPath([pattern, index.toString()]));
+      }
+    }
+
+    if (!hasPrevValueStored || (selectedService?.id && hasPrevValueStored)) {
+      // add the path when there is no previous value stored
+      this.operationsBuilder.add(this.pathCombiner.getPath([pattern, '-']), [selectedService.id], false, true);
+    }
+    // set the previous value to the new value
+    this.previousServices[pattern].services[index] = this.ldnServiceByPattern[pattern].services[index];
+    this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
+    this.chd.detectChanges();
+  }
+
+  /**
+   * Initializes the selected services by pattern.
+   * Loops through each pattern and filters the services based on the pattern.
+   * If the section data has a value for the pattern, it adds the service to the selected services by pattern.
+   * If the section data does not have a value for the pattern, it adds a null service to the selected services by pattern,
+   * so that the select element is initialized with a null value and to display the default select input.
+   */
+  initSelectedServicesByPattern(): void {
+    this.patterns.forEach((ldnPattern) => {
+      if (hasValue(this.sectionData.data[ldnPattern.pattern])) {
+        this.subs.push(
+          this.filterServices(ldnPattern.pattern)
+            .subscribe((services: LdnService[]) => {
+
+              if (!this.ldnServiceByPattern[ldnPattern.pattern]) {
+                this.ldnServiceByPattern[ldnPattern.pattern] = {
+                  services: [],
+                  allowsMultipleRequests: ldnPattern.multipleRequest,
+                };
+              }
+
+              this.ldnServiceByPattern[ldnPattern.pattern].services = services.filter((service) => {
+                const selection = (this.sectionData.data[ldnPattern.pattern] as LdnService[]).find((s: LdnService) => s.id === service.id);
+                this.addService(ldnPattern, selection);
+                return this.sectionData.data[ldnPattern.pattern].includes(service.uuid);
+              });
+            }),
+        );
+      } else {
+        this.ldnServiceByPattern[ldnPattern.pattern] = {
+          services: [],
+          allowsMultipleRequests: ldnPattern.multipleRequest,
+        };
+        this.addService(ldnPattern, null);
+      }
+    });
+  }
+
+  /**
+   * Adds a new service to the selected services for the given pattern.
+   * @param ldnPattern - The pattern to add the new service to.
+   * @param newService - The new service to add.
+   */
+  addService(ldnPattern: LdnPattern, newService: LdnService) {
+    // Your logic to add a new service to the selected services for the pattern
+    // Example: Push the newService to the array corresponding to the pattern
+    if (!this.ldnServiceByPattern[ldnPattern.pattern]) {
+      this.ldnServiceByPattern[ldnPattern.pattern] = {
+        services: [],
+        allowsMultipleRequests: ldnPattern.multipleRequest,
+      };
+    }
+    this.ldnServiceByPattern[ldnPattern.pattern].services.push(newService);
+  }
+
+  /**
+   * Removes the service at the specified index from the array corresponding to the pattern.
+   * @param ldnPattern - The LDN pattern from which to remove the service
+   * @param serviceIndex - the service index to remove
+   */
+  removeService(ldnPattern: LdnPattern, serviceIndex: number) {
+    if (this.ldnServiceByPattern[ldnPattern.pattern]) {
+      // Remove the service at the specified index from the array
+      this.ldnServiceByPattern[ldnPattern.pattern].services.splice(serviceIndex, 1);
+      this.previousServices[ldnPattern.pattern]?.services.splice(serviceIndex, 1);
+      this.operationsBuilder.flushOperation(this.pathCombiner.getPath([ldnPattern.pattern, '-']));
+      this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
+    }
+    if (!this.ldnServiceByPattern[ldnPattern.pattern].services.length) {
+      this.addNewService(ldnPattern);
+    }
+  }
+
+  /**
+   * Method called when dropdowns for the section are initialized
+   * Retrieve services with corresponding patterns to the dropdowns.
+   */
+  filterServices(pattern: string): Observable<LdnService[]> {
+    return this.ldnServicesService.findByInboundPattern(pattern).pipe(
+      getFirstCompletedRemoteData(),
+      tap((rd) => {
+        if (rd.hasFailed) {
+          throw new Error(`Failed to retrieve services for pattern ${pattern}`);
+        }
+      }),
+      filter((rd) => rd.hasSucceeded),
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+      tap(res => {
+        if (!this.filteredServicesByPattern[pattern]){
+          this.filteredServicesByPattern[pattern] = [];
+        }
+        if (this.filteredServicesByPattern[pattern].length === 0) {
+          this.filteredServicesByPattern[pattern].push(...res);
+        }
+      }),
+      map((res: LdnService[]) => res.filter((service) => {
+        if (!this.hasSectionData){
+          this.hasSectionData = this.hasInboundPattern(service, pattern);
+        }
+        return this.hasInboundPattern(service, pattern);
+      })),
+    );
+  }
+
+  /**
+   * Checks if the given service has the specified inbound pattern type.
+   * @param service - The service to check.
+   * @param patternType - The inbound pattern type to look for.
+   * @returns True if the service has the specified inbound pattern type, false otherwise.
+   */
+  hasInboundPattern(service: any, patternType: string): boolean {
+    return service.notifyServiceInboundPatterns.some((pattern: { pattern: string }) => {
+      return pattern.pattern === patternType;
+    });
+  }
+
+  /**
+   * Retrieves server errors for the current section and sets them to display.
+   * @returns An Observable that emits the validation errors for the current section.
+   */
+  private getSectionServerErrorsAndSetErrorsToDisplay() {
+    this.subs.push(
+      this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
+        take(1),
+        filter((validationErrors) => isNotEmpty(validationErrors)),
+      ).subscribe((validationErrors: SubmissionSectionError[]) => {
+        if (isNotEmpty(validationErrors)) {
+          validationErrors.forEach((error) => {
+            this.sectionService.setSectionError(this.submissionId, this.sectionData.id, error);
+          });
+        }
+      }));
+  }
+
+  /**
+   * Returns an observable of the errors for the current section that match the given pattern and index.
+   * @param pattern - The pattern to match against the error paths.
+   * @param index - The index to match against the error paths.
+   * @returns An observable of the errors for the current section that match the given pattern and index.
+   */
+  public getShownSectionErrors$(pattern: string, index: number): Observable<SubmissionSectionError[]> {
+    return this.sectionService.getShownSectionErrors(this.submissionId, this.sectionData.id, this.sectionData.sectionType)
+      .pipe(
+        take(1),
+        filter((validationErrors) => isNotEmpty(validationErrors)),
+        map((validationErrors: SubmissionSectionError[]) => {
+          return validationErrors.filter((error) => {
+            const path = `${pattern}/${index}`;
+            return error.path.includes(path);
+          });
+        }),
+      );
+  }
+
+  /**
+   * @returns An observable that emits a boolean indicating whether the section has any server errors or not.
+   */
+  protected getSectionStatus(): Observable<boolean> {
+    return this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
+      map((validationErrors) => isEmpty(validationErrors),
+      ));
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  onSectionDestroy() {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  /**
+   * Add new row to dropdown for multiple service selection
+   * @param ldnPattern - the related LDN pattern where the service is added
+   */
+  addNewService(ldnPattern: LdnPattern): void {
+    //idle new service for new selection
+    this.ldnServiceByPattern[ldnPattern.pattern].services.push(null);
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts
new file mode 100644
index 0000000000..3ca16a7f24
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts
@@ -0,0 +1,39 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { COAR_NOTIFY_WORKSPACEITEM } from './section-coar-notify-service.resource-type';
+
+/** An CoarNotify  and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class SubmissionCoarNotifyWorkspaceitemModel extends CacheableObject {
+  static type = COAR_NOTIFY_WORKSPACEITEM;
+
+  @excludeFromEquals
+  @autoserialize
+    endorsement?: number[];
+
+  @deserializeAs('id')
+    review?: number[];
+
+  @autoserialize
+    ingest?: number[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts
new file mode 100644
index 0000000000..59a9125fed
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts
@@ -0,0 +1,47 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type';
+
+export  interface LdnPattern {
+  pattern: string,
+  multipleRequest: boolean
+}
+/** A SubmissionCoarNotifyConfig and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class SubmissionCoarNotifyConfig extends CacheableObject {
+  static type = SUBMISSION_COAR_NOTIFY_CONFIG;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: string;
+
+  @deserializeAs('id')
+    uuid: string;
+
+  @autoserialize
+    patterns: LdnPattern[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/submission/sections/sections-type.ts b/src/app/submission/sections/sections-type.ts
index 6bca8a7252..50d15427d2 100644
--- a/src/app/submission/sections/sections-type.ts
+++ b/src/app/submission/sections/sections-type.ts
@@ -9,4 +9,6 @@ export enum SectionsType {
   SherpaPolicies = 'sherpaPolicy',
   Identifiers = 'identifiers',
   Collection = 'collection',
+  CoarNotify = 'coarnotify',
+  Duplicates = 'duplicates'
 }
diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts
index de6d43e1eb..9d32699770 100644
--- a/src/app/submission/sections/sections.directive.ts
+++ b/src/app/submission/sections/sections.directive.ts
@@ -1,22 +1,34 @@
-import { ChangeDetectorRef, Directive, Input, OnDestroy, OnInit } from '@angular/core';
-
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Directive,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import uniq from 'lodash/uniq';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { SectionsService } from './sections.service';
-import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { SubmissionService } from '../submission.service';
-import { SectionsType } from './sections-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
 import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
+import { SectionsService } from './sections.service';
+import { SectionsType } from './sections-type';
 
 /**
  * Directive for handling generic section functionality
  */
 @Directive({
   selector: '[dsSection]',
-  exportAs: 'sectionRef'
+  exportAs: 'sectionRef',
 })
 export class SectionsDirective implements OnDestroy, OnInit {
 
@@ -140,7 +152,7 @@ export class SectionsDirective implements OnDestroy, OnInit {
               this.submissionService.dispatchSave(this.submissionId);
             }
           }
-        })
+        }),
     );
 
     this.enabled = this.sectionService.isSectionEnabled(this.submissionId, this.sectionId);
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index 5aa47d1447..d8644a0db8 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -1,42 +1,54 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { submissionReducers } from '../submission.reducers';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionService } from '../submission.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { SectionsService } from './sections.service';
+import { storeModuleConfig } from '../../app.reducer';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
+import { FormService } from '../../shared/form/form.service';
+import { getMockFormService } from '../../shared/mocks/form-service.mock';
+import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
 import {
   mockSectionsData,
   mockSectionsErrors,
   mockSubmissionState,
-  mockSubmissionStateWithoutUpload
+  mockSubmissionStateWithoutUpload,
 } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
 import {
   DisableSectionAction,
   EnableSectionAction,
   InertSectionErrorsAction,
   RemoveSectionErrorsAction,
   SectionStatusChangeAction,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from '../objects/submission-objects.actions';
-import { FormClearErrorsAction } from '../../shared/form/form.actions';
-import parseSectionErrors from '../utils/parseSectionErrors';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
-import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
-import { storeModuleConfig } from '../../app.reducer';
-import { SectionsType } from './sections-type';
-import { FormService } from '../../shared/form/form.service';
-import { getMockFormService } from '../../shared/mocks/form-service.mock';
 import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { submissionReducers } from '../submission.reducers';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
+import { SectionsService } from './sections.service';
+import { SectionsType } from './sections-type';
 
 describe('SectionsService test suite', () => {
   let notificationsServiceStub: NotificationsServiceStub;
@@ -56,7 +68,7 @@ describe('SectionsService test suite', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const formService: any = getMockFormService();
@@ -68,9 +80,9 @@ describe('SectionsService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -79,8 +91,8 @@ describe('SectionsService test suite', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Store, useValue: store },
         { provide: FormService, useValue: formService },
-        SectionsService
-      ]
+        SectionsService,
+      ],
     }).compileComponents();
   }));
 
@@ -161,7 +173,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionData[sectionId]));
 
       const expected = cold('(b|)', {
-        b: sectionData[sectionId]
+        b: sectionData[sectionId],
       });
 
       expect(service.getSectionData(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
@@ -173,7 +185,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionErrors[sectionId]));
 
       const expected = cold('(b|)', {
-        b: sectionErrors[sectionId]
+        b: sectionErrors[sectionId],
       });
 
       expect(service.getSectionErrors(submissionId, sectionId)).toBeObservable(expected);
@@ -185,7 +197,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionState));
 
       const expected = cold('(b|)', {
-        b: sectionState
+        b: sectionState,
       });
 
       expect(service.getSectionState(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
@@ -197,7 +209,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ isValid: false }));
 
       let expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionValid(submissionId, sectionId)).toBeObservable(expected);
@@ -205,7 +217,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ isValid: true }));
 
       expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionValid(submissionId, sectionId)).toBeObservable(expected);
@@ -217,7 +229,7 @@ describe('SectionsService test suite', () => {
       submissionServiceStub.getActiveSectionId.and.returnValue(observableOf(sectionId));
 
       let expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionActive(submissionId, sectionId)).toBeObservable(expected);
@@ -225,7 +237,7 @@ describe('SectionsService test suite', () => {
       submissionServiceStub.getActiveSectionId.and.returnValue(observableOf('test'));
 
       expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionActive(submissionId, sectionId)).toBeObservable(expected);
@@ -237,7 +249,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ enabled: false }));
 
       let expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionEnabled(submissionId, sectionId)).toBeObservable(expected);
@@ -245,7 +257,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ enabled: true }));
 
       expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionEnabled(submissionId, sectionId)).toBeObservable(expected);
@@ -257,12 +269,12 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({
         visibility: {
           main: null,
-          other: 'READONLY'
-        }
+          other: 'READONLY',
+        },
       }));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
@@ -272,12 +284,12 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({
         visibility: {
           main: null,
-          other: 'READONLY'
-        }
+          other: 'READONLY',
+        },
       }));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
@@ -285,11 +297,11 @@ describe('SectionsService test suite', () => {
 
     it('should return an observable of false when it\'s not a readonly section', () => {
       store.select.and.returnValue(observableOf({
-        visibility: null
+        visibility: null,
       }));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
@@ -301,7 +313,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionAvailable(submissionId, sectionId)).toBeObservable(expected);
@@ -311,7 +323,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionAvailable(submissionId, 'test')).toBeObservable(expected);
@@ -323,7 +335,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionTypeAvailable(submissionId, SectionsType.Upload)).toBeObservable(expected);
@@ -333,7 +345,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionStateWithoutUpload));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionAvailable(submissionId, SectionsType.Upload)).toBeObservable(expected);
@@ -345,7 +357,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionType(submissionId, 'upload', SectionsType.Upload)).toBeObservable(expected);
@@ -355,7 +367,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionType(submissionId, sectionId, SectionsType.Upload)).toBeObservable(expected);
@@ -365,7 +377,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionType(submissionId, 'no-such-id', SectionsType.Upload)).toBeObservable(expected);
@@ -396,7 +408,7 @@ describe('SectionsService test suite', () => {
 
       const error: SubmissionSectionError = {
         path: 'test',
-        message: 'message test'
+        message: 'message test',
       };
       service.setSectionError(submissionId, sectionId, error);
 
@@ -446,10 +458,10 @@ describe('SectionsService test suite', () => {
         rows: [{
           fields: [{
             selectableMetadata: [{
-              metadata: 'dc.contributor.author'
-            }]
-          }]
-        }]
+              metadata: 'dc.contributor.author',
+            }],
+          }],
+        }],
       };
 
       const expectedConfiguredMetadata =  [ 'dc.contributor.author' ];
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 0ea6232237..58a4e90fbc 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -1,16 +1,41 @@
 import { Injectable } from '@angular/core';
-
-import { combineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, take } from 'rxjs/operators';
+import { parseReviver } from '@ng-dynamic-forms/core';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { ScrollToConfigOptions, ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import {
+  ScrollToConfigOptions,
+  ScrollToService,
+} from '@nicky-lenaers/ngx-scroll-to';
 import findIndex from 'lodash/findIndex';
 import findKey from 'lodash/findKey';
 import isEqual from 'lodash/isEqual';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { SubmissionState } from '../submission.reducers';
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
+import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
+import { FormError } from '../../shared/form/form.reducer';
+import { FormService } from '../../shared/form/form.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -18,33 +43,22 @@ import {
   RemoveSectionErrorsAction,
   SectionStatusChangeAction,
   SetSectionFormId,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from '../objects/submission-objects.actions';
-import {
-  SubmissionObjectEntry
-} from '../objects/submission-objects.reducer';
+import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
+import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { SubmissionSectionObject } from '../objects/submission-section-object.model';
 import {
   submissionObjectFromIdSelector,
   submissionSectionDataFromIdSelector,
   submissionSectionErrorsFromIdSelector,
   submissionSectionFromIdSelector,
-  submissionSectionServerErrorsFromIdSelector
+  submissionSectionServerErrorsFromIdSelector,
 } from '../selectors';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { FormClearErrorsAction } from '../../shared/form/form.actions';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SubmissionState } from '../submission.reducers';
 import { SubmissionService } from '../submission.service';
-import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import { SectionsType } from './sections-type';
-import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
-import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
-import { parseReviver } from '@ng-dynamic-forms/core';
-import { FormService } from '../../shared/form/form.service';
-import { JsonPatchOperationPathCombiner } from '../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { FormError } from '../../shared/form/form.reducer';
-import { SubmissionSectionObject } from '../objects/submission-section-object.model';
-import { SubmissionSectionError } from '../objects/submission-section-error.model';
 
 /**
  * A service that provides methods used in submission process.
@@ -197,12 +211,12 @@ export class SectionsService {
             const sectionErrors = formErrors
               .map((error) => ({
                 path: pathCombiner.getPath(error.fieldId.replace(/\_/g, '.')).path,
-                message: error.message
+                message: error.message,
               } as SubmissionSectionError))
               .filter((sectionError: SubmissionSectionError) => findIndex(state.errorsToShow, { path: sectionError.path }) === -1);
             return [...state.errorsToShow, ...sectionErrors];
-          })
-        ))
+          }),
+        )),
       );
     }
 
@@ -257,13 +271,13 @@ export class SectionsService {
       map((sectionState: SubmissionSectionObject) => {
         if (hasValue(sectionState.data) && sectionType === SectionsType.SubmissionForm) {
           return Object.assign({}, sectionState, {
-            data: normalizeSectionData(sectionState.data)
+            data: normalizeSectionData(sectionState.data),
           });
         } else {
           return sectionState;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -336,7 +350,7 @@ export class SectionsService {
         return isNotEmpty(sectionObj.visibility)
           && ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
               || (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
-             );
+          );
       }),
       distinctUntilChanged());
   }
@@ -407,7 +421,7 @@ export class SectionsService {
     this.store.dispatch(new EnableSectionAction(submissionId, sectionId));
     const config: ScrollToConfigOptions = {
       target: sectionId,
-      offset: -70
+      offset: -70,
     };
 
     this.scrollToService.scrollTo(config);
@@ -449,7 +463,7 @@ export class SectionsService {
     data: WorkspaceitemSectionDataType,
     errorsToShow: SubmissionSectionError[] = [],
     serverValidationErrors: SubmissionSectionError[] = [],
-    metadata?: string[]
+    metadata?: string[],
   ) {
     if (isNotEmpty(data)) {
       const isAvailable$ = this.isSectionAvailable(submissionId, sectionId);
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
index b65cb5e00f..45822c5898 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
@@ -1,13 +1,18 @@
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContentAccordionComponent } from './content-accordion.component';
-
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { ContentAccordionComponent } from './content-accordion.component';
 
 describe('ContentAccordionComponent', () => {
   let component: ContentAccordionComponent;
@@ -20,12 +25,12 @@ describe('ContentAccordionComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NgbCollapseModule
+        NgbCollapseModule,
       ],
-      declarations: [ContentAccordionComponent]
+      declarations: [ContentAccordionComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 0e7bc863ad..05fdad693e 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { PermittedVersions } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol
 @Component({
   selector: 'ds-content-accordion',
   templateUrl: './content-accordion.component.html',
-  styleUrls: ['./content-accordion.component.scss']
+  styleUrls: ['./content-accordion.component.scss'],
 })
 export class ContentAccordionComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
index 9a60a6d010..3255e7d5de 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
@@ -1,12 +1,17 @@
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MetadataInformationComponent } from './metadata-information.component';
-
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { MetadataInformationComponent } from './metadata-information.component';
 
 describe('MetadataInformationComponent', () => {
   let component: MetadataInformationComponent;
@@ -19,11 +24,11 @@ describe('MetadataInformationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [MetadataInformationComponent]
+      declarations: [MetadataInformationComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 307c18d8cc..f96479c70c 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det
 @Component({
   selector: 'ds-metadata-information',
   templateUrl: './metadata-information.component.html',
-  styleUrls: ['./metadata-information.component.scss']
+  styleUrls: ['./metadata-information.component.scss'],
 })
 export class MetadataInformationComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
index c5dc896858..0815fedf50 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
@@ -1,11 +1,17 @@
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PublicationInformationComponent } from './publication-information.component';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { PublicationInformationComponent } from './publication-information.component';
 
 describe('PublicationInformationComponent', () => {
   let component: PublicationInformationComponent;
@@ -19,11 +25,11 @@ describe('PublicationInformationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [PublicationInformationComponent]
+      declarations: [PublicationInformationComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index cfe42adf7b..bb62e57564 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Journal } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta
 @Component({
   selector: 'ds-publication-information',
   templateUrl: './publication-information.component.html',
-  styleUrls: ['./publication-information.component.scss']
+  styleUrls: ['./publication-information.component.scss'],
 })
 export class PublicationInformationComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
index 3e2c33481a..0780370d89 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PublisherPolicyComponent } from './publisher-policy.component';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { PublisherPolicyComponent } from './publisher-policy.component';
 
 describe('PublisherPolicyComponent', () => {
   let component: PublisherPolicyComponent;
@@ -18,8 +24,8 @@ describe('PublisherPolicyComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [PublisherPolicyComponent],
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index 96ada3904c..58ca300865 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Policy } from '../../../../core/submission/models/sherpa-policies-details.model';
-import { AlertType } from '../../../../shared/alert/aletr-type';
+import { AlertType } from '../../../../shared/alert/alert-type';
 
 /**
  * This component represents a section that contains the publisher policy informations.
@@ -9,7 +12,7 @@ import { AlertType } from '../../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-publisher-policy',
   templateUrl: './publisher-policy.component.html',
-  styleUrls: ['./publisher-policy.component.scss']
+  styleUrls: ['./publisher-policy.component.scss'],
 })
 export class PublisherPolicyComponent {
 
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
index 76a980ed3c..11c0fdb97f 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
@@ -1,23 +1,32 @@
-import { SharedModule } from '../../../shared/shared.module';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
-import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
-
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { BrowserModule, By } from '@angular/platform-browser';
-
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../app.reducer';
-import { SubmissionSectionSherpaPoliciesComponent } from './section-sherpa-policies.component';
-import { SubmissionService } from '../../submission.service';
 import { DebugElement } from '@angular/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import { Store } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AppState } from '../../../app.reducer';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { SharedModule } from '../../../shared/shared.module';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../../submission.service';
+import { SectionsService } from '../sections.service';
+import { SubmissionSectionSherpaPoliciesComponent } from './section-sherpa-policies.component';
 
 describe('SubmissionSectionSherpaPoliciesComponent', () => {
   let component: SubmissionSectionSherpaPoliciesComponent;
@@ -45,7 +54,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
     errorsToShow: [],
     serverValidationErrors: [],
     isLoading: false,
-    isValid: true
+    isValid: true,
   };
 
   describe('SubmissionSectionSherpaPoliciesComponent', () => {
@@ -58,11 +67,11 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
           NgbCollapseModule,
-          SharedModule
+          SharedModule,
         ],
         declarations: [SubmissionSectionSherpaPoliciesComponent],
         providers: [
@@ -72,7 +81,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
           { provide: Store, useValue: storeStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-        ]
+        ],
       })
         .compileComponents();
     });
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index e55b75146f..1f37c887bf 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -1,20 +1,28 @@
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { Component, Inject } from '@angular/core';
-
-import { BehaviorSubject, Observable, of, Subscription } from 'rxjs';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
 
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { WorkspaceitemSectionSherpaPoliciesObject } from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
+import { AlertType } from '../../../shared/alert/alert-type';
 import {
-  WorkspaceitemSectionSherpaPoliciesObject
-} from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
+  hasValue,
+  isEmpty,
+} from '../../../shared/empty.util';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
-import { SectionModelComponent } from '../models/section.model';
-import { SubmissionService } from '../../submission.service';
-import { hasValue, isEmpty } from '../../../shared/empty.util';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 
 /**
  * This component represents a section for the sherpa policy informations structure.
@@ -22,7 +30,7 @@ import { hasValue, isEmpty } from '../../../shared/empty.util';
 @Component({
   selector: 'ds-section-sherpa-policies',
   templateUrl: './section-sherpa-policies.component.html',
-  styleUrls: ['./section-sherpa-policies.component.scss']
+  styleUrls: ['./section-sherpa-policies.component.scss'],
 })
 @renderSectionFor(SectionsType.SherpaPolicies)
 export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent {
@@ -95,7 +103,7 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
       this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType)
         .subscribe((sherpaPolicies: WorkspaceitemSectionSherpaPoliciesObject) => {
           this.sherpaPoliciesData$.next(sherpaPolicies);
-        })
+        }),
     );
   }
 
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
index 7c5a979eed..f217abf88e 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
@@ -1,8 +1,8 @@
 <ng-container *ngFor="let accessCondition of accessConditionsList">
-  <span *ngIf="accessCondition.action == 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
+  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
     {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
   </span>
-  <span *ngIf="accessCondition.name == 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
-  <span *ngIf="accessCondition.name == 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+  <span *ngIf="accessCondition.name === 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
+  <span *ngIf="accessCondition.name === 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
   <br>
 </ng-container>
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
index 1a6a05e7b6..de614b45e3 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
@@ -1,13 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { find } from 'rxjs/operators';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { Group } from '../../../../core/eperson/models/group.model';
 import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model';
 import { isEmpty } from '../../../../shared/empty.util';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 /**
  * This component represents a badge that describe an access condition
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 2baa6c1555..0cb79e51cb 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -6,7 +6,6 @@
     </button>
   </div>
   <div class="modal-body">
-
     <ds-form *ngIf="formModel"
              #formRef="formComponent"
              [formId]="formId"
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index d008bf61f1..4e4f487fbf 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -1,20 +1,46 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormGroupModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
+import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../../../shared/date.util';
+import { DynamicCustomSwitchModel } from '../../../../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
-import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service.stub';
-import { SubmissionService } from '../../../../submission.service';
-import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
-import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
+import { FormFieldMetadataValueObject } from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { FormService } from '../../../../../shared/form/form.service';
+import { getMockFormService } from '../../../../../shared/mocks/form-service.mock';
+import { getMockSectionUploadService } from '../../../../../shared/mocks/section-upload.service.mock';
 import {
   mockFileFormData,
   mockSubmissionCollectionId,
@@ -24,29 +50,13 @@ import {
   mockUploadConfigResponseMetadata,
   mockUploadFiles,
 } from '../../../../../shared/mocks/submission.mock';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { FormService } from '../../../../../shared/form/form.service';
-import { getMockFormService } from '../../../../../shared/mocks/form-service.mock';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../../../shared/testing/utils.test';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import {
-  SubmissionJsonPatchOperationsServiceStub
-} from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../../../core/submission/submission-json-patch-operations.service';
+import { SubmissionService } from '../../../../submission.service';
+import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
 import { SectionUploadService } from '../../section-upload.service';
-import { getMockSectionUploadService } from '../../../../../shared/mocks/section-upload.service.mock';
-import {
-  FormFieldMetadataValueObject
-} from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
-import {
-  JsonPatchOperationPathCombiner
-} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { dateToISOFormat } from '../../../../../shared/date.util';
-import { of } from 'rxjs';
+import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
 
 const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
   add: jasmine.createSpy('add'),
@@ -78,7 +88,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   const fileIndex = '0';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
-  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
+
+  let noAccessConditionsMock = Object.assign({}, mockFileFormData);
+  delete noAccessConditionsMock.accessConditions;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -87,12 +100,12 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionUploadFileEditComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormService, useValue: getMockFormService() },
@@ -107,7 +120,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         NgbActiveModal,
         FormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -178,16 +191,20 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     it('should init form model properly', () => {
       comp.fileData = fileData;
       comp.formId = 'testFileForm';
-      const maxStartDate = {year: 2022, month: 1, day: 12};
-      const maxEndDate = {year: 2019, month: 7, day: 12};
+      const maxStartDate = { year: 2022, month: 1, day: 12 };
+      const maxEndDate = { year: 2019, month: 7, day: 12 };
 
       comp.ngOnInit();
 
+      const models = [DynamicCustomSwitchModel, DynamicFormGroupModel, DynamicFormArrayModel];
+
       expect(comp.formModel).toBeDefined();
-      expect(comp.formModel.length).toBe(2);
-      expect(comp.formModel[0] instanceof DynamicFormGroupModel).toBeTruthy();
-      expect(comp.formModel[1] instanceof DynamicFormArrayModel).toBeTruthy();
-      expect((comp.formModel[1] as DynamicFormArrayModel).groups.length).toBe(2);
+      expect(comp.formModel.length).toBe(models.length);
+      models.forEach((model, i) => {
+        expect(comp.formModel[i] instanceof model).toBeTruthy();
+      });
+
+      expect((comp.formModel[2] as DynamicFormArrayModel).groups.length).toBe(2);
       const startDateModel = formbuilderService.findById('startDate', comp.formModel);
       expect(startDateModel.max).toEqual(maxStartDate);
       const endDateModel = formbuilderService.findById('endDate', comp.formModel);
@@ -200,8 +217,8 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         context: null,
         control: null,
         group: null,
-        model: {id: 'name'} as any,
-        type: 'change'
+        model: { id: 'name' } as any,
+        type: 'change',
       };
       spyOn(comp, 'setOptions');
 
@@ -248,9 +265,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     });
 
     it('should save Bitstream File data properly when form is valid', fakeAsync(() => {
-      compAsAny.formRef = {formGroup: null};
+      compAsAny.formRef = { formGroup: null };
       compAsAny.fileData = fileData;
       compAsAny.pathCombiner = pathCombiner;
+      compAsAny.isPrimary = null;
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(of(true));
       formService.getFormData.and.returnValue(of(mockFileFormData));
@@ -259,10 +277,11 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         Object.assign(mockSubmissionObject, {
           sections: {
             upload: {
-              files: mockUploadFiles
-            }
-          }
-        })
+              primary: true,
+              files: mockUploadFiles,
+            },
+          },
+        }),
       ];
       operationsService.jsonPatchByResourceID.and.returnValue(of(response));
 
@@ -274,33 +293,60 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       comp.saveBitstreamData();
       tick();
 
-      let path = 'metadata/dc.title';
+      let path = 'primary';
+      expect(uploadService.updatePrimaryBitstreamOperation).toHaveBeenCalledWith(pathCombiner.getPath(path),  compAsAny.isPrimary,  mockFileFormData.primary[0], compAsAny.fileId);
+
+      const pathFragment = ['files', fileIndex];
+
+      path = 'metadata/dc.title';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.title'],
-        true
+        true,
       );
 
       path = 'metadata/dc.description';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.description'],
-        true
+        true,
       );
 
       path = 'accessConditions';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         accessConditionsToSave,
-        true
+        true,
       );
 
       expect(uploadService.updateFileData).toHaveBeenCalledWith(submissionId, sectionId, mockUploadFiles[0].uuid, mockUploadFiles[0]);
 
     }));
 
+    it('should update Bitstream data properly when access options are omitted', fakeAsync(() => {
+      compAsAny.formRef = { formGroup: null };
+      compAsAny.fileData = fileData;
+      compAsAny.pathCombiner = pathCombiner;
+      formService.validateAllFormFields.and.callFake(() => null);
+      formService.isValid.and.returnValue(of(true));
+      formService.getFormData.and.returnValue(of(noAccessConditionsMock));
+      const response = [
+        Object.assign(mockSubmissionObject, {
+          sections: {
+            upload: {
+              files: mockUploadFiles,
+            },
+          },
+        }),
+      ];
+      operationsService.jsonPatchByResourceID.and.returnValue(of(response));
+      comp.saveBitstreamData();
+      tick();
+      expect(uploadService.updateFileData).toHaveBeenCalled();
+    }));
+
     it('should not save Bitstream File data properly when form is not valid', fakeAsync(() => {
-      compAsAny.formRef = {formGroup: null};
+      compAsAny.formRef = { formGroup: null };
       compAsAny.pathCombiner = pathCombiner;
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(of(false));
@@ -317,7 +363,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 9ee4a7dda5..8d5779c12c 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -1,6 +1,12 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
   DynamicDatePickerModel,
@@ -10,13 +16,40 @@ import {
   DynamicFormGroupModel,
   DynamicSelectModel,
   MATCH_ENABLED,
-  OR_OPERATOR
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
-
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { Subscription } from 'rxjs';
 import {
-  WorkspaceitemSectionUploadFileObject
-} from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
+  filter,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+
+import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model';
+import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionUploadObject } from '../../../../../core/submission/models/workspaceitem-section-upload.model';
+import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../../../shared/date.util';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../shared/empty.util';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { FormService } from '../../../../../shared/form/form.service';
+import { SubmissionService } from '../../../../submission.service';
+import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
+import { SectionUploadService } from '../../section-upload.service';
 import {
   BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG,
   BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT,
@@ -28,35 +61,11 @@ import {
   BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
+  BITSTREAM_FORM_PRIMARY,
+  BITSTREAM_FORM_PRIMARY_LAYOUT,
   BITSTREAM_METADATA_FORM_GROUP_CONFIG,
-  BITSTREAM_METADATA_FORM_GROUP_LAYOUT
+  BITSTREAM_METADATA_FORM_GROUP_LAYOUT,
 } from './section-upload-file-edit.model';
-import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
-import { hasNoValue, hasValue, isNotEmpty, isNotNull } from '../../../../../shared/empty.util';
-import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
-import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
-import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model';
-import { SubmissionService } from '../../../../submission.service';
-import { FormService } from '../../../../../shared/form/form.service';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, mergeMap, take } from 'rxjs/operators';
-import { dateToISOFormat } from '../../../../../shared/date.util';
-import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import {
-  WorkspaceitemSectionUploadObject
-} from '../../../../../core/submission/models/workspaceitem-section-upload.model';
-import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../../../core/submission/submission-json-patch-operations.service';
-import {
-  JsonPatchOperationPathCombiner
-} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SectionUploadService } from '../../section-upload.service';
-import { Subscription } from 'rxjs';
-import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
-import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
 
 /**
  * This component represents the edit form for bitstream
@@ -67,13 +76,20 @@ import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynami
   templateUrl: './section-upload-file-edit.component.html',
 })
 export class SubmissionSectionUploadFileEditComponent
-    implements OnInit, OnDestroy {
+implements OnInit, OnDestroy {
 
   /**
    * The FormComponent reference
    */
   @ViewChild('formRef') public formRef: FormComponent;
 
+  /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+  isPrimary: boolean;
+
   /**
    * The list of available access condition
    * @type {Array}
@@ -191,6 +207,10 @@ export class SubmissionSectionUploadFileEditComponent
    *    The form model
    */
   public initModelData(formModel: DynamicFormControlModel[]) {
+
+    const primaryBitstreamModel: any = this.formBuilderService.findById('primary', formModel, this.fileIndex);
+    primaryBitstreamModel.value = this.isPrimary || false;
+
     this.fileData.accessConditions.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
         .filter((key) => accessCondition.hasOwnProperty(key) && isNotEmpty(accessCondition[key]))
@@ -202,7 +222,7 @@ export class SubmissionSectionUploadFileEditComponent
               metadataModel.value = {
                 year: date.getUTCFullYear(),
                 month: date.getUTCMonth() + 1,
-                day: date.getUTCDate()
+                day: date.getUTCDate(),
               };
             } else {
               metadataModel.value = accessCondition[key];
@@ -287,17 +307,20 @@ export class SubmissionSectionUploadFileEditComponent
     const configForm = Object.assign({}, this.configMetadataForm, {
       fields: Object.assign([], this.configMetadataForm.rows[0].fields[0], [
         this.configMetadataForm.rows[0].fields[0],
-        configDescr
-      ])
+        configDescr,
+      ]),
     });
     const formModel: DynamicFormControlModel[] = [];
+
+    formModel.push(new DynamicCustomSwitchModel(BITSTREAM_FORM_PRIMARY, BITSTREAM_FORM_PRIMARY_LAYOUT));
+
     const metadataGroupModelConfig = Object.assign({}, BITSTREAM_METADATA_FORM_GROUP_CONFIG);
     metadataGroupModelConfig.group = this.formBuilderService.modelFromConfiguration(
       this.submissionId,
       configForm,
       this.collectionId,
       this.fileData.metadata,
-      this.submissionService.getSubmissionScope()
+      this.submissionService.getSubmissionScope(),
     );
     formModel.push(new DynamicFormGroupModel(metadataGroupModelConfig, BITSTREAM_METADATA_FORM_GROUP_LAYOUT));
     const accessConditionTypeModelConfig = Object.assign({}, BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG);
@@ -309,8 +332,8 @@ export class SubmissionSectionUploadFileEditComponent
         accessConditionTypeOptions.push(
           {
             label: accessCondition.name,
-            value: accessCondition.name
-          }
+            value: accessCondition.name,
+          },
         );
       }
       accessConditionTypeModelConfig.options = accessConditionTypeOptions;
@@ -329,7 +352,7 @@ export class SubmissionSectionUploadFileEditComponent
             maxStartDate = {
               year: min.getUTCFullYear(),
               month: min.getUTCMonth() + 1,
-              day: min.getUTCDate()
+              day: min.getUTCDate(),
             };
           }
         }
@@ -340,7 +363,7 @@ export class SubmissionSectionUploadFileEditComponent
             maxEndDate = {
               year: max.getUTCFullYear(),
               month: max.getUTCMonth() + 1,
-              day: max.getUTCDate()
+              day: max.getUTCDate(),
             };
           }
         }
@@ -378,7 +401,7 @@ export class SubmissionSectionUploadFileEditComponent
       // Number of access conditions blocks in form
       accessConditionsArrayConfig.initialCount = isNotEmpty(this.fileData.accessConditions) ? this.fileData.accessConditions.length : 1;
       formModel.push(
-        new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT)
+        new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT),
       );
 
     }
@@ -386,10 +409,14 @@ export class SubmissionSectionUploadFileEditComponent
     return formModel;
   }
 
+
   /**
    * Save bitstream metadata
    */
   saveBitstreamData() {
+
+    const pathFragment = ['files', this.fileIndex];
+
     // validate form
     this.formService.validateAllFormFields(this.formRef.formGroup);
     const saveBitstreamDataSubscription = this.formService.isValid(this.formId).pipe(
@@ -398,13 +425,15 @@ export class SubmissionSectionUploadFileEditComponent
       mergeMap(() => this.formService.getFormData(this.formId)),
       take(1),
       mergeMap((formData: any) => {
+        this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, formData.primary[0], this.fileId);
+
         // collect bitstream metadata
         Object.keys((formData.metadata))
           .filter((key) => isNotEmpty(formData.metadata[key]))
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.add(this.pathCombiner.getPath(path), formData.metadata[key], true);
+            this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, path]), formData.metadata[key], true);
           });
         Object.keys((this.fileData.metadata))
           .filter((key) => isNotEmpty(this.fileData.metadata[key]))
@@ -413,79 +442,85 @@ export class SubmissionSectionUploadFileEditComponent
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.remove(this.pathCombiner.getPath(path));
+            this.operationsBuilder.remove(this.pathCombiner.getPath([...pathFragment, path]));
           });
         const accessConditionsToSave = [];
-        formData.accessConditions
-          .map((accessConditions) => accessConditions.accessConditionGroup)
-          .filter((accessCondition) => isNotEmpty(accessCondition))
-          .forEach((accessCondition) => {
-            let accessConditionOpt;
+        if (formData.hasOwnProperty('accessConditions')) {
+          formData.accessConditions
+            .filter((accessConditions) => isNotNull(accessConditions))
+            .map((accessConditions) => accessConditions.accessConditionGroup)
+            .filter((accessCondition) => isNotEmpty(accessCondition))
+            .forEach((accessCondition) => {
+              let accessConditionOpt;
 
-            this.availableAccessConditionOptions
-              .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
-              .forEach((element) => accessConditionOpt = element);
+              this.availableAccessConditionOptions
+                .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
+                .forEach((element) => accessConditionOpt = element);
 
-            if (accessConditionOpt) {
-              const currentAccessCondition = Object.assign({}, accessCondition);
-              currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
+              if (accessConditionOpt) {
+                const currentAccessCondition = Object.assign({}, accessCondition);
+                currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
 
-              /* When start and end date fields are deactivated, their values may be still present in formData,
+                /* When start and end date fields are deactivated, their values may be still present in formData,
               therefore it is necessary to delete them if they're not allowed by the current access condition option. */
-              if (!accessConditionOpt.hasStartDate) {
-                delete currentAccessCondition.startDate;
-              } else if (accessCondition.startDate) {
-                const startDate = this.retrieveValueFromField(accessCondition.startDate);
-                // Clamp the start date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let startDateDate = new Date(startDate);
-                if (accessConditionOpt.maxStartDate) {
+                if (!accessConditionOpt.hasStartDate) {
+                  delete currentAccessCondition.startDate;
+                } else if (accessCondition.startDate) {
+                  const startDate = this.retrieveValueFromField(accessCondition.startDate);
+                  // Clamp the start date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let startDateDate = new Date(startDate);
+                  if (accessConditionOpt.maxStartDate) {
                     const maxStartDateDate = new Date(accessConditionOpt.maxStartDate);
                     if (startDateDate > maxStartDateDate) {
-                        startDateDate = maxStartDateDate;
+                      startDateDate = maxStartDateDate;
                     }
+                  }
+                  currentAccessCondition.startDate = dateToISOFormat(startDateDate);
                 }
-                currentAccessCondition.startDate = dateToISOFormat(startDateDate);
-              }
-              if (!accessConditionOpt.hasEndDate) {
-                delete currentAccessCondition.endDate;
-              } else if (accessCondition.endDate) {
-                const endDate = this.retrieveValueFromField(accessCondition.endDate);
-                // Clamp the end date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let endDateDate = new Date(endDate);
-                if (accessConditionOpt.maxEndDate) {
+                if (!accessConditionOpt.hasEndDate) {
+                  delete currentAccessCondition.endDate;
+                } else if (accessCondition.endDate) {
+                  const endDate = this.retrieveValueFromField(accessCondition.endDate);
+                  // Clamp the end date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let endDateDate = new Date(endDate);
+                  if (accessConditionOpt.maxEndDate) {
                     const maxEndDateDate = new Date(accessConditionOpt.maxEndDate);
                     if (endDateDate > maxEndDateDate) {
-                        endDateDate = maxEndDateDate;
+                      endDateDate = maxEndDateDate;
                     }
+                  }
+                  currentAccessCondition.endDate = dateToISOFormat(endDateDate);
                 }
-                currentAccessCondition.endDate = dateToISOFormat(endDateDate);
+                accessConditionsToSave.push(currentAccessCondition);
               }
-              accessConditionsToSave.push(currentAccessCondition);
-            }
-          });
-
-        if (isNotEmpty(accessConditionsToSave)) {
-          this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true);
+            });
+        }
+        if (isNotEmpty(accessConditionsToSave)) {
+          this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, 'accessConditions']), accessConditionsToSave, true);
         }
-
         // dispatch a PATCH request to save metadata
         return this.operationsService.jsonPatchByResourceID(
           this.submissionService.getSubmissionObjectLinkName(),
           this.submissionId,
           this.pathCombiner.rootElement,
           this.pathCombiner.subRootElement);
-      })
+      }),
     ).subscribe((result: SubmissionObject[]) => {
-      if (result[0].sections[this.sectionId]) {
-        const uploadSection = (result[0].sections[this.sectionId] as WorkspaceitemSectionUploadObject);
-        Object.keys(uploadSection.files)
-          .filter((key) => uploadSection.files[key].uuid === this.fileId)
-          .forEach((key) => this.uploadService.updateFileData(
-            this.submissionId, this.sectionId, this.fileId, uploadSection.files[key])
-          );
+      const section = result[0].sections[this.sectionId];
+      if (!section) {
+        return;
       }
+      const uploadSection = (section as WorkspaceitemSectionUploadObject);
+
+      this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, uploadSection.primary);
+
+      Object.keys(uploadSection.files)
+        .filter((key) => uploadSection.files[key].uuid === this.fileId)
+        .forEach((key) => this.uploadService.updateFileData(
+          this.submissionId, this.sectionId, this.fileId, uploadSection.files[key]),
+        );
       this.isSaving = false;
       this.activeModal.close();
     });
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 7bd48559bf..4a39dfcfc8 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -4,34 +4,35 @@ import {
   DynamicFormControlLayout,
   DynamicFormGroupModelConfig,
   DynamicSelectModelConfig,
+  DynamicSwitchModelConfig,
   MATCH_ENABLED,
   OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
 
 export const BITSTREAM_METADATA_FORM_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'metadata',
-  group: []
+  group: [],
 };
 export const BITSTREAM_METADATA_FORM_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'form-group',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    label: 'col-sm-3'
-  }
+    label: 'col-sm-3',
+  },
 };
 export const BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'accessConditionGroup',
-  group: []
+  group: [],
 };
 
 export const BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'form-group access-condition-group col',
     container: 'pl-1 pr-1',
-    control: 'form-row '
-  }
+    control: 'form-row ',
+  },
 };
 
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig = {
@@ -41,21 +42,34 @@ export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayMode
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
     group: 'form-row pt-4',
-  }
+  },
 };
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
   id: 'name',
   label: 'submission.sections.upload.form.access-condition-label',
   hint: 'submission.sections.upload.form.access-condition-hint',
-  options: []
+  options: [],
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'col-12',
-    label: 'col-form-label name-label'
-  }
+    label: 'col-form-label name-label',
+  },
 };
+export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    host: 'col-12',
+    container: 'text-right',
+  },
+};
+
+export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
+  id: 'primary',
+  name: 'primary',
+  label: 'bitstream.edit.form.primaryBitstream.label',
+};
+
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
   id: 'startDate',
@@ -68,24 +82,24 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required-from'
-  }
+    required: 'submission.sections.upload.form.date-required-from',
+  },
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -99,22 +113,22 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required-until'
-  }
+    required: 'submission.sections.upload.form.date-required-until',
+  },
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 8999853d72..436c5a3323 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,8 +1,20 @@
 <ng-container *ngIf="fileData">
   <div class="row">
-    <div class="col-md-2">
-      <!--ds-themed-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-themed-thumbnail-->
-      <ds-themed-thumbnail [thumbnail]="fileData?.thumbnail"></ds-themed-thumbnail>
+    <!-- Default switch -->
+    <div class="col-md-2 d-flex justify-content-center align-items-center" >
+      <div class="custom-control custom-switch">
+        <input
+        type="checkbox"
+        class="custom-control-input"
+        id="primaryBitstream{{fileIndex}}"
+        [disabled]="processingSaveStatus$ | async"
+        [checked]="isPrimary"
+        (change)="togglePrimaryBitstream($event)">
+        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
+          <span class="sr-only" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          <span class="sr-only" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+        </label>
+      </div>
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
@@ -10,7 +22,8 @@
       </div>
       <div class="float-right w-15">
         <ng-container>
-          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true" [bitstream]="getBitstream()" [enableRequestACopy]="false">
+          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
+                                        [bitstream]="getBitstream()" [enableRequestACopy]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-themed-file-download-link>
           <button class="btn btn-link-focus"
@@ -25,7 +38,7 @@
                   [disabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
-            <i *ngIf="!(processingDelete$ | async)" class="fa fa-trash fa-2x text-danger"></i>
+            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
           </button>
         </ng-container>
       </div>
@@ -46,7 +59,9 @@
     <p>{{ 'submission.sections.upload.delete.confirm.info' | translate }}</p>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
-    <button type="button" class="btn btn-danger" (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
+    <button type="button" class="btn btn-secondary"
+            (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
+    <button type="button" class="btn btn-danger"
+            (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index 4f62ceef6c..83b3a33689 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -1,47 +1,63 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-
-import { of, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
+import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { FormService } from '../../../../shared/form/form.service';
 import { getMockFormService } from '../../../../shared/mocks/form-service.mock';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { HALEndpointServiceStub } from '../../../../shared/testing/hal-endpoint-service.stub';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
-import { SubmissionServiceStub } from '../../../../shared/testing/submission-service.stub';
+import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
 import {
   mockSubmissionCollectionId,
   mockSubmissionId,
   mockUploadConfigResponse,
-  mockUploadFiles
+  mockUploadFiles,
 } from '../../../../shared/mocks/submission.mock';
-
-import { SubmissionService } from '../../../submission.service';
-import { SectionUploadService } from '../section-upload.service';
+import { HALEndpointServiceStub } from '../../../../shared/testing/hal-endpoint-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../../shared/testing/utils.test';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { SubmissionService } from '../../../submission.service';
 import { POLICY_DEFAULT_WITH_LIST } from '../section-upload.component';
-import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
+import { SectionUploadService } from '../section-upload.service';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
 
 const configMetadataFormMock = {
   rows: [{
     fields: [{
       selectableMetadata: [
-        {metadata: 'dc.title', label: null, closed: false},
-        {metadata: 'dc.description', label: null, closed: false}
-      ]
-    }]
-  }]
+        { metadata: 'dc.title', label: null, closed: false },
+        { metadata: 'dc.description', label: null, closed: false },
+      ],
+    }],
+  }],
 };
 
 describe('SubmissionSectionUploadFileComponent test suite', () => {
@@ -66,7 +82,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   const fileName = '123456-test-upload.jpg';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
-  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
 
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
     add: jasmine.createSpy('add'),
@@ -80,12 +96,12 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         BrowserModule,
         CommonModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FileSizePipe,
         SubmissionSectionUploadFileComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormService, useValue: getMockFormService() },
@@ -98,9 +114,9 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         NgbModal,
         SubmissionSectionUploadFileComponent,
         SubmissionSectionUploadFileEditComponent,
-        FormBuilderService
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -180,7 +196,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
       expect(comp.fileData).toEqual(fileData);
     });
 
-    it('should call deleteFile on delete confirmation', () => {
+    it('should call deleteFile on delete confirmation', async () => {
       spyOn(compAsAny, 'deleteFile');
       comp.fileData = fileData;
 
@@ -196,9 +212,25 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
 
       fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        expect(compAsAny.deleteFile).toHaveBeenCalled();
-      });
+      await fixture.whenStable();
+      expect(compAsAny.deleteFile).toHaveBeenCalled();
+    });
+
+    it('should delete primary if file we delete is primary', () => {
+      compAsAny.isPrimary = true;
+      compAsAny.pathCombiner = pathCombiner;
+      operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+      compAsAny.deleteFile();
+      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath('primary'));
+      expect(uploadService.updateFilePrimaryBitstream).toHaveBeenCalledWith(submissionId, sectionId, null);
+    });
+
+    it('should NOT delete primary if file we delete is NOT primary', () => {
+      compAsAny.isPrimary = false;
+      compAsAny.pathCombiner = pathCombiner;
+      operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+      compAsAny.deleteFile();
+      expect(uploadService.updateFilePrimaryBitstream).not.toHaveBeenCalledTimes(1);
     });
 
     it('should delete file properly', () => {
@@ -209,7 +241,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
       compAsAny.deleteFile();
 
       expect(uploadService.removeUploadedFile).toHaveBeenCalledWith(submissionId, sectionId, fileId);
-      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath());
+      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath(['files', fileIndex]));
+
       expect(operationsService.jsonPatchByResourceID).toHaveBeenCalledWith(
         'workspaceitems',
         submissionId,
@@ -237,7 +270,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 26fb9445cb..8b86b1ec0f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,32 +1,36 @@
 import {
-    ChangeDetectorRef,
-    Component,
-    Input,
-    OnChanges,
-    OnDestroy,
-    OnInit,
-    SimpleChanges,
-    ViewChild
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
 } from '@angular/core';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
-import { DynamicFormControlModel, } from '@ng-dynamic-forms/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
-import { SectionUploadService } from '../section-upload.service';
-import { hasValue, isNotUndefined } from '../../../../shared/empty.util';
-import { FormService } from '../../../../shared/form/form.service';
-import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
-import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
-import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
-import { SubmissionService } from '../../../submission.service';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
+import { DynamicFormControlModel } from '@ng-dynamic-forms/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { filter } from 'rxjs/operators';
+
+import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import {
+  hasValue,
+  isNotUndefined,
+} from '../../../../shared/empty.util';
+import { FormService } from '../../../../shared/form/form.service';
+import { SubmissionService } from '../../../submission.service';
+import { SectionUploadService } from '../section-upload.service';
+import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -37,6 +41,12 @@ import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
   templateUrl: './section-upload-file.component.html',
 })
 export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy {
+  /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+  @Input() isPrimary: boolean | null;
 
   /**
    * The list of available access condition
@@ -100,6 +110,11 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   @ViewChild(SubmissionSectionUploadFileEditComponent) fileEditComp: SubmissionSectionUploadFileEditComponent;
 
+  /**
+   * A boolean representing if a submission save operation is pending
+   * @type {Observable<boolean>}
+   */
+  public processingSaveStatus$: Observable<boolean>;
 
   /**
    * The bitstream's metadata data
@@ -137,6 +152,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   protected pathCombiner: JsonPatchOperationPathCombiner;
 
+  /**
+   * The [JsonPatchOperationPathCombiner] object
+   * @type {JsonPatchOperationPathCombiner}
+   */
+  protected primaryBitstreamPathCombiner: JsonPatchOperationPathCombiner;
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -162,9 +183,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    * @param {SectionUploadService} uploadService
    */
   constructor(
-    private cdr: ChangeDetectorRef,
     private formService: FormService,
-    private halService: HALEndpointService,
     private modalService: NgbModal,
     private operationsBuilder: JsonPatchOperationsBuilder,
     private operationsService: SubmissionJsonPatchOperationsService,
@@ -185,9 +204,9 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
           .getFileData(this.submissionId, this.sectionId, this.fileId)
           .pipe(filter((bitstream) => isNotUndefined(bitstream)))
           .subscribe((bitstream) => {
-              this.fileData = bitstream;
-            }
-          )
+            this.fileData = bitstream;
+          },
+          ),
       );
     }
   }
@@ -197,7 +216,8 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   ngOnInit() {
     this.formId = this.formService.getUniqueId(this.fileId);
-    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId, 'files', this.fileIndex);
+    this.processingSaveStatus$ = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
+    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId);
     this.loadFormMetadata();
   }
 
@@ -211,7 +231,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
           this.processingDelete$.next(true);
           this.deleteFile();
         }
-      }
+      },
     );
   }
 
@@ -222,7 +242,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   public getBitstream(): Bitstream {
     return Object.assign(new Bitstream(), {
-      uuid: this.fileData.uuid
+      uuid: this.fileData.uuid,
     });
   }
 
@@ -247,7 +267,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     activeModal.componentInstance.formMetadata = this.formMetadata;
     activeModal.componentInstance.pathCombiner = this.pathCombiner;
     activeModal.componentInstance.submissionId = this.submissionId;
+    activeModal.componentInstance.isPrimary = this.isPrimary;
+  }
 
+  togglePrimaryBitstream(event) {
+    this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, event.target.checked, this.fileId);
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionId);
   }
 
   ngOnDestroy(): void {
@@ -265,7 +290,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
           this.formMetadata.push(metadatum.metadata);
         });
       });
-    }
+    },
     );
   }
 
@@ -273,13 +298,20 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    * Delete bitstream from submission
    */
   protected deleteFile() {
-    this.operationsBuilder.remove(this.pathCombiner.getPath());
+    this.operationsBuilder.remove(this.pathCombiner.getPath(['files', this.fileIndex]));
+    if (this.isPrimary) {
+      this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
+    }
+
     this.subscriptions.push(this.operationsService.jsonPatchByResourceID(
       this.submissionService.getSubmissionObjectLinkName(),
       this.submissionId,
       this.pathCombiner.rootElement,
       this.pathCombiner.subRootElement)
       .subscribe(() => {
+        if (this.isPrimary) {
+          this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, null);
+        }
         this.uploadService.removeUploadedFile(this.submissionId, this.sectionId, this.fileId);
         this.processingDelete$.next(false);
       }));
diff --git a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
index 9e0a265c3c..2280013147 100644
--- a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
@@ -1,15 +1,19 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { SubmissionFormsModel } from 'src/app/core/config/models/config-submission-forms.model';
 import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
 import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
 
 @Component({
-    selector: 'ds-themed-submission-upload-section-file',
-    styleUrls: [],
-    templateUrl: '../../../../shared/theme-support/themed.component.html'
+  selector: 'ds-themed-submission-upload-section-file',
+  styleUrls: [],
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionSectionUploadFileComponent
-    extends ThemedComponent<SubmissionSectionUploadFileComponent> {
+  extends ThemedComponent<SubmissionSectionUploadFileComponent> {
 
   /**
    * The list of available access condition
@@ -17,6 +21,13 @@ export class ThemedSubmissionSectionUploadFileComponent
    */
   @Input() availableAccessConditionOptions: any[];
 
+   /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+   @Input() isPrimary: boolean | null;
+
   /**
    * The submission id
    * @type {string}
@@ -69,6 +80,7 @@ export class ThemedSubmissionSectionUploadFileComponent
 
   protected inAndOutputNames: (keyof SubmissionSectionUploadFileComponent & keyof this)[] = [
     'availableAccessConditionOptions',
+    'isPrimary',
     'collectionId',
     'collectionPolicyType',
     'configMetadataForm',
@@ -76,8 +88,8 @@ export class ThemedSubmissionSectionUploadFileComponent
     'fileIndex',
     'fileName',
     'sectionId',
-    'submissionId'
-    ];
+    'submissionId',
+  ];
 
   protected getComponentName(): string {
     return 'SubmissionSectionUploadFileComponent';
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index b84ef6f6a8..cc12b5dea6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -15,15 +15,23 @@
     </ng-container>
     <ng-container *ngFor="let entry of getAllMetadataValue(fileDescrKey)">
       <ng-container *ngIf="entry.value !== ''">
-          {{entry.value | dsTruncate:['150']}}
+        {{entry.value | dsTruncate:['150']}}
       </ng-container>
       <ng-container *ngIf="entry.value === ''">
-        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0" class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
+        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0"
+              class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
       </ng-container>
       <span class="clearfix"></span>
     </ng-container>
   </ng-container>
 
+
+  <div class="mt-1" *ngIf="fileFormat">
+    {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
+  </div>
+  <div class="mt-1" *ngIf="fileCheckSum">
+    Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
+  </div>
   <span class="clearfix"></span>
   <ds-submission-section-upload-access-conditions [accessConditions]="fileData.accessConditions"></ds-submission-section-upload-access-conditions>
 </div>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
index dddc6cdc36..cfbeb4c5ae 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
@@ -1,14 +1,21 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { SubmissionSectionUploadFileViewComponent } from './section-upload-file-view.component';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock';
 import { createTestComponent } from '../../../../../shared/testing/utils.test';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { SubmissionSectionUploadFileViewComponent } from './section-upload-file-view.component';
 
 describe('SubmissionSectionUploadFileViewComponent test suite', () => {
 
@@ -21,18 +28,18 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         TruncatePipe,
         FormComponent,
         SubmissionSectionUploadFileViewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
-        SubmissionSectionUploadFileViewComponent
+        SubmissionSectionUploadFileViewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -92,7 +99,7 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index bb2fea20f8..5aa2af2e2f 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -1,9 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../../core/shared/metadata.models';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
-import { Metadata } from '../../../../../core/shared/metadata.utils';
-import { MetadataMap, MetadataValue } from '../../../../../core/shared/metadata.models';
 
 /**
  * This component allow to show bitstream's metadata
@@ -38,6 +45,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    */
   public fileDescrKey = 'Description';
 
+  public fileFormat!: string;
+
+  public fileCheckSum!: {
+    checkSumAlgorithm: string;
+    value: string;
+  };
+
   /**
    * Initialize instance variables
    */
@@ -46,6 +60,8 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
       this.metadata[this.fileTitleKey] = Metadata.all(this.fileData.metadata, 'dc.title');
       this.metadata[this.fileDescrKey] = Metadata.all(this.fileData.metadata, 'dc.description');
     }
+    this.fileCheckSum = this.fileData.checkSum;
+    this.fileFormat = this.fileData.format.shortDescription;
   }
 
   /**
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index b57b454288..41e912e613 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -2,15 +2,7 @@
           [dismissible]="true"
           [type]="AlertTypeEnum.Info"></ds-alert>
 
-<ng-container *ngIf="fileList.length == 0">
-  <div class="row">
-    <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
-    </div>
-  </div>
-</ng-container>
-
-<ng-container *ngIf="fileList.length > 0">
+<ng-container *ngIf="fileList.length > 0; else noFileUploaded">
 
   <div *ngIf="collectionDefaultAccessConditions.length > 0" class="row">
     <div class="col-sm-12" >
@@ -26,16 +18,26 @@
       </ds-alert>
     </div>
   </div>
-
-  <ng-container *ngFor="let fileEntry of fileList">
+  <div class="row">
+    <div class="col-md-2">
+      <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <hr/>
+    </div>
+  </div>
+  <ng-container *ngFor="let fileEntry of fileList; let i = index;">
     <ds-themed-submission-upload-section-file
+                                       [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
                                        [availableAccessConditionOptions]="availableAccessConditionOptions"
                                        [collectionId]="collectionId"
                                        [collectionPolicyType]="collectionPolicyType"
                                        [configMetadataForm]="(configMetadataForm$ | async)"
-                                       [fileId]="fileIndexes[fileList.indexOf(fileEntry)]"
-                                       [fileIndex]="fileList.indexOf(fileEntry)"
-                                       [fileName]="fileNames[fileList.indexOf(fileEntry)]"
+                                       [fileId]="fileEntry.uuid"
+                                       [fileIndex]="i"
+                                       [fileName]="fileNames[i]"
                                        [sectionId]="sectionData.id"
                                        [submissionId]="submissionId"></ds-themed-submission-upload-section-file>
     <div class="row">
@@ -45,3 +47,11 @@
     </div>
   </ng-container>
 </ng-container>
+
+<ng-template #noFileUploaded>
+  <div class="row">
+    <div class="col-md-12">
+      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 068fc5c766..59179166a3 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -1,22 +1,32 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
 import {
   mockGroup,
   mockSubmissionCollectionId,
@@ -25,20 +35,19 @@ import {
   mockUploadConfigResponse,
   mockUploadConfigResponseNotRequired,
   mockUploadFiles,
+  mockUploadFilesData,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
-import { SectionUploadService } from './section-upload.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
+import { SubmissionService } from '../../submission.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { Group } from '../../../core/eperson/models/group.model';
-import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
-import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { SectionUploadService } from './section-upload.service';
 
 function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
@@ -46,13 +55,13 @@ function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataServi
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
     getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
 function getMockCollectionDataService(): CollectionDataService {
   return jasmine.createSpyObj('CollectionDataService', {
-    findById: jasmine.createSpy('findById')
+    findById: jasmine.createSpy('findById'),
   });
 }
 
@@ -65,7 +74,7 @@ function getMockGroupEpersonService(): GroupDataService {
 
 function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('ResourcePolicyService', {
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
@@ -96,13 +105,13 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/upload',
       mandatory: true,
       data: {
-        files: []
+        files: [],
       },
       errorsToShow: [],
       serverValidationErrors: [],
       header: 'submit.progressbar.describe.upload',
       id: 'upload-id',
-      sectionType: SectionsType.Upload
+      sectionType: SectionsType.Upload,
     };
     submissionId = mockSubmissionId;
     collectionId = mockSubmissionCollectionId;
@@ -114,18 +123,18 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 1'
+          value: 'Community 1-Collection 1',
         }],
       _links: {
-        defaultAccessConditions: collectionId + '/defaultAccessConditions'
-      }
+        defaultAccessConditions: collectionId + '/defaultAccessConditions',
+      },
     });
 
     mockDefaultAccessCondition = Object.assign(new ResourcePolicy(), {
       name: null,
       groupUUID: '11cc35e5-a11d-4b64-b5b9-0052a5d15509',
       id: 20,
-      uuid: 'resource-policy-20'
+      uuid: 'resource-policy-20',
     });
     uploadsConfigService = getMockSubmissionUploadsConfigService();
 
@@ -145,32 +154,33 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
-        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
+        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition),
       })));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
       uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(
-        buildPaginatedList(new PageInfo(), [mockUploadConfigResponse as any]))
+        buildPaginatedList(new PageInfo(), [mockUploadConfigResponse as any])),
       );
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
     };
 
     TestBed.configureTestingModule({
       imports: [
         BrowserModule,
         CommonModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionSectionUploadComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: CollectionDataService, useValue: collectionDataService },
@@ -183,9 +193,9 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         { provide: 'sectionDataProvider', useValue: sectionObject },
         { provide: 'submissionIdProvider', useValue: submissionId },
         ChangeDetectorRef,
-        SubmissionSectionUploadComponent
+        SubmissionSectionUploadComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -230,11 +240,11 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should init component properly', () => {
-
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
-        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
+        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition),
       })));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
@@ -243,18 +253,11 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
-
       comp.onSectionInit();
 
-      const expectedGroupsMap = new Map([
-        [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
-        [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
-      ]);
-
       expect(comp.collectionId).toBe(collectionId);
       expect(comp.collectionName).toBe(mockCollection.name);
       expect(comp.availableAccessConditionOptions.length).toBe(4);
@@ -262,12 +265,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual([]);
-      expect(compAsAny.fileIndexes).toEqual([]);
       expect(compAsAny.fileNames).toEqual([]);
-
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
     });
 
     it('should init file list properly', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
@@ -279,10 +282,10 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf(mockUploadFilesData));
 
       comp.onSectionInit();
 
@@ -298,12 +301,14 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual(mockUploadFiles);
-      expect(compAsAny.fileIndexes).toEqual(['123456-test-upload']);
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
       expect(compAsAny.fileNames).toEqual(['123456-test-upload.jpg']);
 
     });
 
     it('should properly read the section status when required is true', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
+
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
@@ -314,12 +319,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(cold('-a-b', {
         a: [],
-        b: mockUploadFiles
+        b: mockUploadFiles,
       }));
 
       comp.onSectionInit();
@@ -328,13 +333,14 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
         c: false,
-        d: true
+        d: true,
       }));
     });
 
     it('should properly read the section status when required is false', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
@@ -343,12 +349,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(cold('-a-b', {
         a: [],
-        b: mockUploadFiles
+        b: mockUploadFiles,
       }));
 
       comp.onSectionInit();
@@ -357,7 +363,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
         c: true,
-        d: true
+        d: true,
       }));
     });
   });
@@ -366,7 +372,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index eefed8a36b..2afd059bfc 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -1,36 +1,53 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+} from '@angular/core';
 import {
   BehaviorSubject,
+  combineLatest,
   combineLatest as observableCombineLatest,
   Observable,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
-import { SectionModelComponent } from '../models/section.model';
-import { hasValue, isNotEmpty, isNotUndefined, isUndefined } from '../../../shared/empty.util';
-import { SectionUploadService } from './section-upload.service';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
-import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { SectionsType } from '../sections-type';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionDataObject } from '../models/section-data.model';
-import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer';
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Group } from '../../../core/eperson/models/group.model';
-import { SectionsService } from '../sections.service';
-import { SubmissionService } from '../../submission.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../../shared/empty.util';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+import { SectionUploadService } from './section-upload.service';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
@@ -58,10 +75,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
   public AlertTypeEnum = AlertType;
 
   /**
-   * The array containing the keys of file list array
+   * The uuid of primary bitstream file
    * @type {Array}
    */
-  public fileIndexes: string[] = [];
+  public primaryBitstreamUUID: string | null = null;
 
   /**
    * The file list
@@ -158,8 +175,8 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
       switchMap((config: SubmissionUploadsModel) =>
         config.metadata.pipe(
           getFirstSucceededRemoteData(),
-          map((remoteData: RemoteData<SubmissionFormsModel>) => remoteData.payload)
-        )
+          map((remoteData: RemoteData<SubmissionFormsModel>) => remoteData.payload),
+        ),
       ));
 
     this.subs.push(
@@ -171,7 +188,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
         filter((rd: RemoteData<Collection>) => isNotUndefined((rd.payload))),
         tap((collectionRemoteData: RemoteData<Collection>) => this.collectionName = this.dsoNameService.getName(collectionRemoteData.payload)),
         // TODO review this part when https://github.com/DSpace/dspace-angular/issues/575 is resolved
-/*        mergeMap((collectionRemoteData: RemoteData<Collection>) => {
+        /*        mergeMap((collectionRemoteData: RemoteData<Collection>) => {
           return this.resourcePolicyService.findByHref(
             (collectionRemoteData.payload as any)._links.defaultAccessConditions.href
           );
@@ -194,29 +211,20 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
         this.changeDetectorRef.detectChanges();
       }),
 
-      // retrieve submission's bitstreams from state
-      observableCombineLatest(this.configMetadataForm$,
-        this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe(
-        filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-          return isNotEmpty(configMetadataForm) && isNotUndefined(fileList);
+
+      // retrieve submission's bitstream data from state
+      combineLatest([this.configMetadataForm$,
+        this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id)]).pipe(
+        filter(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+          return isNotEmpty(configMetadataForm) && isNotEmpty(files);
         }),
         distinctUntilChanged())
-        .subscribe(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-            this.fileList = [];
-            this.fileIndexes = [];
-            this.fileNames = [];
-            this.changeDetectorRef.detectChanges();
-            if (isNotUndefined(fileList) && fileList.length > 0) {
-              fileList.forEach((file) => {
-                this.fileList.push(file);
-                this.fileIndexes.push(file.uuid);
-                this.fileNames.push(this.getFileName(configMetadataForm, file));
-              });
-            }
-
-            this.changeDetectorRef.detectChanges();
-          }
-        )
+        .subscribe(([configMetadataForm, { primary, files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+          this.primaryBitstreamUUID = primary;
+          this.fileList = files;
+          this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file));
+        },
+        ),
     );
   }
 
diff --git a/src/app/submission/sections/upload/section-upload.service.spec.ts b/src/app/submission/sections/upload/section-upload.service.spec.ts
new file mode 100644
index 0000000000..c57aac0ac9
--- /dev/null
+++ b/src/app/submission/sections/upload/section-upload.service.spec.ts
@@ -0,0 +1,70 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { JsonPatchOperationPathCombiner } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
+
+import { SectionUploadService } from './section-upload.service';
+
+const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+  add: jasmine.createSpy('add'),
+  replace: jasmine.createSpy('replace'),
+  remove: jasmine.createSpy('remove'),
+});
+
+describe('SectionUploadService test suite', () => {
+  let sectionUploadService: SectionUploadService;
+  let operationsBuilder: any;
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', 'upload');
+  const primaryPath = pathCombiner.getPath('primary');
+  const fileId = 'test';
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [StoreModule],
+      providers: [
+        { provide: Store, useValue: {} },
+        SectionUploadService,
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(() => {
+    sectionUploadService = TestBed.inject(SectionUploadService);
+    operationsBuilder = TestBed.inject(JsonPatchOperationsBuilder);
+  });
+
+  [
+    {
+      initialPrimary: null,
+      primary: true,
+      operationName: 'add',
+      expected: [primaryPath, fileId, false, true],
+    },
+    {
+      initialPrimary: true,
+      primary: false,
+      operationName: 'remove',
+      expected: [primaryPath],
+    },
+    {
+      initialPrimary: false,
+      primary: true,
+      operationName: 'replace',
+      expected: [primaryPath,  fileId, true],
+    },
+  ].forEach(({ initialPrimary, primary, operationName, expected }) => {
+    it(`updatePrimaryBitstreamOperation should add ${operationName} operation`, () => {
+      const path = pathCombiner.getPath('primary');
+      sectionUploadService.updatePrimaryBitstreamOperation(path, initialPrimary, primary, fileId);
+      expect(operationsBuilder[operationName]).toHaveBeenCalledWith(...expected);
+    });
+  });
+});
diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts
index a851fa9daf..152d4e174a 100644
--- a/src/app/submission/sections/upload/section-upload.service.ts
+++ b/src/app/submission/sections/upload/section-upload.service.ts
@@ -1,18 +1,29 @@
 import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
+import { JsonPatchOperationPathObject } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
-import { SubmissionState } from '../../submission.reducers';
+import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { isUndefined } from '../../../shared/empty.util';
 import {
   DeleteUploadedFileAction,
   EditFileDataAction,
-  NewUploadedFileAction
+  EditFilePrimaryBitstreamAction,
+  NewUploadedFileAction,
 } from '../../objects/submission-objects.actions';
-import { submissionUploadedFileFromUuidSelector, submissionUploadedFilesFromIdSelector } from '../../selectors';
-import { isUndefined } from '../../../shared/empty.util';
-import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
+import {
+  submissionSectionDataFromIdSelector,
+  submissionUploadedFileFromUuidSelector,
+  submissionUploadedFilesFromIdSelector,
+} from '../../selectors';
+import { SubmissionState } from '../../submission.reducers';
 
 /**
  * A service that provides methods to handle submission's bitstream state.
@@ -24,8 +35,53 @@ export class SectionUploadService {
    * Initialize service variables
    *
    * @param {Store<SubmissionState>} store
+   * @param {JsonPatchOperationsBuilder} operationsBuilder
    */
-  constructor(private store: Store<SubmissionState>) {}
+  constructor(private store: Store<SubmissionState>, private operationsBuilder: JsonPatchOperationsBuilder) {}
+
+  /**
+   * Define and add an operation based on a change
+   *
+   * @param path
+   *    The path to endpoint
+   * @param intitialPrimary
+   *    The initial primary indicator
+   * @param primary
+   *    the new primary indicator
+    * @param fileId
+   *    The file id
+   * @returns {void}
+   */
+  public updatePrimaryBitstreamOperation(path: JsonPatchOperationPathObject, intitialPrimary: boolean | null, primary: boolean | null, fileId: string): void {
+    if (intitialPrimary === null && primary) {
+      this.operationsBuilder.add(path, fileId, false, true);
+      return;
+    }
+
+    if (intitialPrimary !== primary) {
+      if (primary) {
+        this.operationsBuilder.replace(path, fileId, true);
+        return;
+      }
+      this.operationsBuilder.remove(path);
+    }
+  }
+
+  /**
+   * Return submission's bitstream data from state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @returns {WorkspaceitemSectionUploadObject}
+   *    Returns submission's bitstream data
+   */
+  public getUploadedFilesData(submissionId: string, sectionId: string): Observable<WorkspaceitemSectionUploadObject> {
+    return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
+      map((state) => state),
+      distinctUntilChanged());
+  }
 
   /**
    * Return submission's bitstream list from state
@@ -100,7 +156,23 @@ export class SectionUploadService {
    */
   public addUploadedFile(submissionId: string, sectionId: string, fileUUID: string, data: WorkspaceitemSectionUploadFileObject) {
     this.store.dispatch(
-      new NewUploadedFileAction(submissionId, sectionId, fileUUID, data)
+      new NewUploadedFileAction(submissionId, sectionId, fileUUID, data),
+    );
+  }
+
+  /**
+   * Update primary bitstream into the state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @param fileUUID
+   *    The bitstream UUID
+   */
+  public updateFilePrimaryBitstream(submissionId: string, sectionId: string, fileUUID: string | null) {
+    this.store.dispatch(
+      new EditFilePrimaryBitstreamAction(submissionId, sectionId, fileUUID),
     );
   }
 
@@ -118,7 +190,7 @@ export class SectionUploadService {
    */
   public updateFileData(submissionId: string, sectionId: string, fileUUID: string, data: WorkspaceitemSectionUploadFileObject) {
     this.store.dispatch(
-      new EditFileDataAction(submissionId, sectionId, fileUUID, data)
+      new EditFileDataAction(submissionId, sectionId, fileUUID, data),
     );
   }
 
@@ -134,7 +206,7 @@ export class SectionUploadService {
    */
   public removeUploadedFile(submissionId: string, sectionId: string, fileUUID: string) {
     this.store.dispatch(
-      new DeleteUploadedFileAction(submissionId, sectionId, fileUUID)
+      new DeleteUploadedFileAction(submissionId, sectionId, fileUUID),
     );
   }
 }
diff --git a/src/app/submission/selectors.ts b/src/app/submission/selectors.ts
index 6284aca892..432a5377a5 100644
--- a/src/app/submission/selectors.ts
+++ b/src/app/submission/selectors.ts
@@ -1,9 +1,16 @@
-import { createSelector, MemoizedSelector, Selector } from '@ngrx/store';
+import {
+  createSelector,
+  MemoizedSelector,
+  Selector,
+} from '@ngrx/store';
 
 import { hasValue } from '../shared/empty.util';
-import { submissionSelector, SubmissionState } from './submission.reducers';
-import { SubmissionObjectEntry} from './objects/submission-objects.reducer';
+import { SubmissionObjectEntry } from './objects/submission-objects.reducer';
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
+import {
+  submissionSelector,
+  SubmissionState,
+} from './submission.reducers';
 
 /**
  * Export a function to return a subset of the state by key
diff --git a/src/app/submission/server-submission.service.ts b/src/app/submission/server-submission.service.ts
index 3aa55a9d58..993e38cdaa 100644
--- a/src/app/submission/server-submission.service.ts
+++ b/src/app/submission/server-submission.service.ts
@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { Observable, of as observableOf } from 'rxjs';
-
-import { SubmissionService } from './submission.service';
-import { SubmissionObject } from '../core/submission/models/submission-object.model';
 import { RemoteData } from '../core/data/remote-data';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+import { SubmissionService } from './submission.service';
 
 /**
  * Instance of SubmissionService used on SSR.
diff --git a/src/app/submission/submission.effects.ts b/src/app/submission/submission.effects.ts
index 30e01451d1..5a4105e4ab 100644
--- a/src/app/submission/submission.effects.ts
+++ b/src/app/submission/submission.effects.ts
@@ -1,5 +1,5 @@
 import { SubmissionObjectEffects } from './objects/submission-objects.effects';
 
 export const submissionEffects = [
-  SubmissionObjectEffects
+  SubmissionObjectEffects,
 ];
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index cf0ab2b369..88c81bdee5 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -1,72 +1,74 @@
+import {
+  CommonModule,
+  NgOptimizedImage,
+} from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CoreModule } from '../core/core.module';
-import { SharedModule } from '../shared/shared.module';
-
-import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
-import { SectionsDirective } from './sections/sections.directive';
-import { SectionsService } from './sections/sections.service';
-import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
-import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
-import { SubmissionFormComponent } from './form/submission-form.component';
-import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
-import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
-import { CommonModule } from '@angular/common';
-import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import {
+  NgbAccordionModule,
+  NgbCollapseModule,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { EffectsModule } from '@ngrx/effects';
-import { submissionReducers, SubmissionState } from './submission.reducers';
-import { submissionEffects } from './submission.effects';
-import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
-import { SectionUploadService } from './sections/upload/section-upload.service';
-import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
-import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
-import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
-import { SubmissionEditComponent } from './edit/submission-edit.component';
-import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
 import {
-  SubmissionSectionUploadFileEditComponent
-} from './sections/upload/file/edit/section-upload-file-edit.component';
-import {
-  SubmissionSectionUploadFileViewComponent
-} from './sections/upload/file/view/section-upload-file-view.component';
-import {
-  SubmissionSectionUploadAccessConditionsComponent
-} from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
-import { SubmissionSubmitComponent } from './submit/submission-submit.component';
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
+
+import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
 import { storeModuleConfig } from '../app.reducer';
-import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
-import {
-  SubmissionImportExternalSearchbarComponent
-} from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
-import {
-  SubmissionImportExternalPreviewComponent
-} from './import-external/import-external-preview/submission-import-external-preview.component';
-import {
-  SubmissionImportExternalCollectionComponent
-} from './import-external/import-external-collection/submission-import-external-collection.component';
-import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
+import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
+import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
+import { CoreModule } from '../core/core.module';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
-import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
-import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
-import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
 import { FormModule } from '../shared/form/form.module';
-import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
-import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
-import { SectionAccessesService } from './sections/accesses/section-accesses.service';
-import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
-import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
-import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
-import {
-  PublicationInformationComponent
-} from './sections/sherpa-policies/publication-information/publication-information.component';
+import { SharedModule } from '../shared/shared.module';
 import { UploadModule } from '../shared/upload/upload.module';
-import {
-  MetadataInformationComponent
-} from './sections/sherpa-policies/metadata-information/metadata-information.component';
+import { SubmissionEditComponent } from './edit/submission-edit.component';
+import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
+import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
+import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
+import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
+import { SubmissionFormComponent } from './form/submission-form.component';
+import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
+import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
+import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
+import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
+import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
+import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
+import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
+import { SectionAccessesService } from './sections/accesses/section-accesses.service';
+import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
+import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
+import { SubmissionSectionDuplicatesComponent } from './sections/duplicates/section-duplicates.component';
+import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
 import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
-import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
+import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
+import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
+import { CoarNotifyConfigDataService } from './sections/section-coar-notify/coar-notify-config-data.service';
+import { SubmissionSectionCoarNotifyComponent } from './sections/section-coar-notify/section-coar-notify.component';
+import { SectionsDirective } from './sections/sections.directive';
+import { SectionsService } from './sections/sections.service';
+import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
+import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
+import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
+import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
+import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
+import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
+import { SubmissionSectionUploadFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
+import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
+import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
+import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
+import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
+import { SectionUploadService } from './sections/upload/section-upload.service';
+import { submissionEffects } from './submission.effects';
+import {
+  submissionReducers,
+  SubmissionState,
+} from './submission.reducers';
+import { SubmissionSubmitComponent } from './submit/submission-submit.component';
+import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -76,6 +78,8 @@ const ENTRY_COMPONENTS = [
   SubmissionSectionCcLicensesComponent,
   SubmissionSectionAccessesComponent,
   SubmissionSectionSherpaPoliciesComponent,
+  SubmissionSectionCoarNotifyComponent,
+  SubmissionSectionDuplicatesComponent,
 ];
 
 const DECLARATIONS = [
@@ -96,6 +100,7 @@ const DECLARATIONS = [
   SubmissionSectionUploadFileEditComponent,
   SubmissionSectionUploadFileViewComponent,
   SubmissionSectionIdentifiersComponent,
+  SubmissionSectionDuplicatesComponent,
   SubmissionImportExternalComponent,
   ThemedSubmissionImportExternalComponent,
   SubmissionImportExternalSearchbarComponent,
@@ -114,6 +119,7 @@ const DECLARATIONS = [
     CoreModule.forRoot(),
     SharedModule,
     StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
+    EffectsModule.forFeature(),
     EffectsModule.forFeature(submissionEffects),
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
@@ -122,6 +128,7 @@ const DECLARATIONS = [
     NgbCollapseModule,
     NgbAccordionModule,
     UploadModule,
+    NgOptimizedImage,
   ],
   declarations: DECLARATIONS,
   exports: [
@@ -135,7 +142,9 @@ const DECLARATIONS = [
     SubmissionAccessesConfigDataService,
     SectionAccessesService,
     SectionFormOperationsService,
-  ]
+    CoarNotifyConfigDataService,
+    LdnServicesService,
+  ],
 })
 
 /**
@@ -149,7 +158,7 @@ export class SubmissionModule {
   static withEntryComponents() {
     return {
       ngModule: SubmissionModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/submission/submission.reducers.ts b/src/app/submission/submission.reducers.ts
index 8d98a7d5c1..23cacbf13f 100644
--- a/src/app/submission/submission.reducers.ts
+++ b/src/app/submission/submission.reducers.ts
@@ -1,8 +1,11 @@
-import { ActionReducerMap, createFeatureSelector } from '@ngrx/store';
+import {
+  ActionReducerMap,
+  createFeatureSelector,
+} from '@ngrx/store';
 
 import {
   submissionObjectReducer,
-  SubmissionObjectState
+  SubmissionObjectState,
 } from './objects/submission-objects.reducer';
 
 /**
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index 1e2be5b612..0ba8e5d9a2 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -1,25 +1,57 @@
-import { StoreModule } from '@ngrx/store';
-import { fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
-
-import { of as observableOf, throwError as observableThrowError } from 'rxjs';
+import {
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import {
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot, } from 'jasmine-marbles';
 
-import { RouterMock } from '../shared/mocks/router.mock';
-import { SubmissionService } from './submission.service';
-import { submissionReducers } from './submission.reducers';
-import { SubmissionRestService } from '../core/submission/submission-rest.service';
-import { RouteService } from '../core/services/route.service';
-import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
-import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { environment } from '../../environments/environment';
+import { storeModuleConfig } from '../app.reducer';
+import { ErrorResponse } from '../core/cache/response.models';
+import { RequestService } from '../core/data/request.service';
+import { RequestError } from '../core/data/request-error.model';
 import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
+import { SubmissionRestService } from '../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../core/submission/submission-scope-type';
-import { mockSubmissionDefinition, mockSubmissionRestResponse } from '../shared/mocks/submission.mock';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { getMockRequestService } from '../shared/mocks/request.service.mock';
+import { RouterMock } from '../shared/mocks/router.mock';
+import { getMockSearchService } from '../shared/mocks/search-service.mock';
+import {
+  mockSubmissionDefinition,
+  mockSubmissionRestResponse,
+} from '../shared/mocks/submission.mock';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject } from '../shared/remote-data.utils';
+import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -30,18 +62,10 @@ import {
   SaveForLaterSubmissionFormAction,
   SaveSubmissionFormAction,
   SaveSubmissionSectionFormAction,
-  SetActiveSectionAction
+  SetActiveSectionAction,
 } from './objects/submission-objects.actions';
-import { createFailedRemoteDataObject, } from '../shared/remote-data.utils';
-import { getMockSearchService } from '../shared/mocks/search-service.mock';
-import { getMockRequestService } from '../shared/mocks/request.service.mock';
-import { RequestService } from '../core/data/request.service';
-import { SearchService } from '../core/shared/search/search.service';
-import { Item } from '../core/shared/item.model';
-import { storeModuleConfig } from '../app.reducer';
-import { environment } from '../../environments/environment';
-import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
+import { submissionReducers } from './submission.reducers';
+import { SubmissionService } from './submission.service';
 
 describe('SubmissionService test suite', () => {
   const collectionId = '43fe1f8c-09a6-4fcf-9c78-5d4fed8f2c8f';
@@ -61,7 +85,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -69,7 +93,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           collection: {
             config: '',
@@ -77,7 +101,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -85,7 +109,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           keyinformation: {
             header: 'submit.progressbar.describe.keyinformation',
@@ -98,7 +122,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           indexing: {
             header: 'submit.progressbar.describe.indexing',
@@ -111,7 +135,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           publicationchannel: {
             header: 'submit.progressbar.describe.publicationchannel',
@@ -124,7 +148,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           acknowledgement: {
             header: 'submit.progressbar.describe.acknowledgement',
@@ -137,7 +161,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           identifiers: {
             header: 'submit.progressbar.describe.identifiers',
@@ -150,7 +174,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           references: {
             header: 'submit.progressbar.describe.references',
@@ -163,7 +187,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           upload: {
             header: 'submit.progressbar.upload',
@@ -176,7 +200,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           license: {
             header: 'submit.progressbar.license',
@@ -185,7 +209,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             collapsed: false,
             enabled: true,
@@ -193,14 +217,14 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
-          }
+            isValid: false,
+          },
         },
         isLoading: false,
         savePending: false,
-        depositPending: false
-      }
-    }
+        depositPending: false,
+      },
+    },
   };
   const validSubState = {
     objects: {
@@ -216,7 +240,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -224,7 +248,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           collection: {
             config: '',
@@ -232,7 +256,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -240,7 +264,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           keyinformation: {
             header: 'submit.progressbar.describe.keyinformation',
@@ -253,7 +277,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           indexing: {
             header: 'submit.progressbar.describe.indexing',
@@ -266,7 +290,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           publicationchannel: {
             header: 'submit.progressbar.describe.publicationchannel',
@@ -279,7 +303,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           acknowledgement: {
             header: 'submit.progressbar.describe.acknowledgement',
@@ -292,7 +316,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           identifiers: {
             header: 'submit.progressbar.describe.identifiers',
@@ -305,7 +329,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           references: {
             header: 'submit.progressbar.describe.references',
@@ -318,7 +342,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           upload: {
             header: 'submit.progressbar.upload',
@@ -331,7 +355,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           license: {
             header: 'submit.progressbar.license',
@@ -340,7 +364,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             collapsed: false,
             enabled: true,
@@ -348,14 +372,14 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
-          }
+            isValid: true,
+          },
         },
         isLoading: false,
         savePending: false,
-        depositPending: false
-      }
-    }
+        depositPending: false,
+      },
+    },
   };
   const restService = new SubmissionRestServiceStub();
   const router = new RouterMock();
@@ -378,9 +402,9 @@ describe('SubmissionService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: Router, useValue: router },
@@ -392,8 +416,8 @@ describe('SubmissionService test suite', () => {
         NotificationsService,
         RouteService,
         SubmissionService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     }).compileComponents();
   }));
 
@@ -470,7 +494,7 @@ describe('SubmissionService test suite', () => {
         submissionDefinition,
         {},
         new Item(),
-        null
+        null,
       );
       const expected = new InitSubmissionFormAction(
         collectionId,
@@ -487,7 +511,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchDeposit', () => {
     it('should dispatch a new SaveAndDepositSubmissionAction', () => {
-      service.dispatchDeposit(submissionId,);
+      service.dispatchDeposit(submissionId);
       const expected = new SaveAndDepositSubmissionAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -496,7 +520,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchDiscard', () => {
     it('should dispatch a new DiscardSubmissionAction', () => {
-      service.dispatchDiscard(submissionId,);
+      service.dispatchDiscard(submissionId);
       const expected = new DiscardSubmissionAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -521,7 +545,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchSaveForLater', () => {
     it('should dispatch a new SaveForLaterSubmissionFormAction', () => {
-      service.dispatchSaveForLater(submissionId,);
+      service.dispatchSaveForLater(submissionId);
       const expected = new SaveForLaterSubmissionFormAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -540,7 +564,7 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionObject', () => {
     it('should return submission object state from the store', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionObject('826');
@@ -553,7 +577,7 @@ describe('SubmissionService test suite', () => {
   describe('getActiveSectionId', () => {
     it('should return current active submission form section', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getActiveSectionId('826');
@@ -567,7 +591,7 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionSections', () => {
     it('should return submission form sections', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a|', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionSections('826');
@@ -583,7 +607,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.indexing',
@@ -593,7 +617,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.publicationchannel',
@@ -603,7 +627,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.acknowledgement',
@@ -613,7 +637,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.identifiers',
@@ -623,7 +647,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.references',
@@ -633,7 +657,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.upload',
@@ -643,7 +667,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'upload',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.license',
@@ -653,9 +677,9 @@ describe('SubmissionService test suite', () => {
               sectionType: 'license',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
-            }
-          ]
+              serverValidationErrors: [],
+            },
+          ],
       });
 
       expect(result).toBeObservable(expected);
@@ -665,7 +689,7 @@ describe('SubmissionService test suite', () => {
   describe('getDisabledSectionsList', () => {
     it('should return list of submission disabled sections', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a|', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getDisabledSectionsList('826');
@@ -688,8 +712,8 @@ describe('SubmissionService test suite', () => {
             {
               header: 'submit.progressbar.describe.references',
               id: 'references',
-            }
-          ]
+            },
+          ],
       });
 
       expect(result).toBeObservable(expected);
@@ -737,12 +761,12 @@ describe('SubmissionService test suite', () => {
     it('should return properly submission status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a-b', {
         a: subState,
-        b: validSubState
+        b: validSubState,
       }));
       const result = service.getSubmissionStatus('826');
       const expected = cold('cc-d', {
         c: false,
-        d: true
+        d: true,
       });
 
       expect(result).toBeObservable(expected);
@@ -752,12 +776,12 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionSaveProcessingStatus', () => {
     it('should return submission save processing status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionSaveProcessingStatus('826');
       const expected = cold('bb', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
@@ -767,12 +791,12 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionDepositProcessingStatus', () => {
     it('should return submission deposit processing status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionDepositProcessingStatus('826');
       const expected = cold('bb', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
@@ -802,7 +826,7 @@ describe('SubmissionService test suite', () => {
         sectionType: 'collection' as any,
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -810,7 +834,7 @@ describe('SubmissionService test suite', () => {
         errorsToShow: [],
         serverValidationErrors: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       };
       expect(service.isSectionHidden(section)).toBeTruthy();
 
@@ -825,7 +849,7 @@ describe('SubmissionService test suite', () => {
         errorsToShow: [],
         serverValidationErrors: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       };
       expect(service.isSectionHidden(section)).toBeFalsy();
     });
@@ -836,7 +860,7 @@ describe('SubmissionService test suite', () => {
       const spy = spyOn(service, 'getSubmissionObject').and.returnValue(observableOf({ isLoading: true }));
 
       let expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSubmissionLoading(submissionId)).toBeObservable(expected);
@@ -844,7 +868,7 @@ describe('SubmissionService test suite', () => {
       spy.and.returnValue(observableOf({ isLoading: false }));
 
       expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSubmissionLoading(submissionId)).toBeObservable(expected);
@@ -906,7 +930,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         submissionDefinition,
         {},
-        new Item()
+        new Item(),
       )
       ;
       const expected = new ResetSubmissionFormAction(
@@ -915,7 +939,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         {},
         submissionDefinition,
-        new Item()
+        new Item(),
       );
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -925,23 +949,24 @@ describe('SubmissionService test suite', () => {
   describe('retrieveSubmission', () => {
     it('should retrieve submission from REST endpoint', () => {
       (service as any).restService.getDataById.and.returnValue(hot('a|', {
-        a: mockSubmissionRestResponse
+        a: mockSubmissionRestResponse,
       }));
 
       const result = service.retrieveSubmission('826');
       const expected = cold('(b|)', {
-        b: jasmine.objectContaining({ payload: mockSubmissionRestResponse[0] })
+        b: jasmine.objectContaining({ payload: mockSubmissionRestResponse[0] }),
       });
 
       expect(result).toBeObservable(expected);
     });
 
     it('should catch error from REST endpoint', () => {
+      const requestError = new RequestError('Internal Server Error');
+      requestError.statusCode = 500;
+      const errorResponse = new ErrorResponse(requestError);
+
       (service as any).restService.getDataById.and.callFake(
-        () => observableThrowError({
-          statusCode: 500,
-          errorMessage: 'Internal Server Error',
-        })
+        () => observableThrowError(errorResponse),
       );
 
       service.retrieveSubmission('826').subscribe((r) => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 9eb8cf110a..312d74bc8a 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -1,14 +1,51 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable, of as observableOf, Subscription, timer as observableTimer } from 'rxjs';
-import { catchError, concatMap, distinctUntilChanged, filter, find, map, startWith, take, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+  timer as observableTimer,
+} from 'rxjs';
+import {
+  catchError,
+  concatMap,
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  startWith,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { submissionSelector, SubmissionState } from './submission.reducers';
-import { hasValue, isEmpty, isNotUndefined } from '../shared/empty.util';
+import { environment } from '../../environments/environment';
+import { ErrorResponse } from '../core/cache/response.models';
+import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model';
+import { RemoteData } from '../core/data/remote-data';
+import { RequestService } from '../core/data/request.service';
+import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
+import { SubmissionRestService } from '../core/submission/submission-rest.service';
+import { SubmissionScopeType } from '../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotUndefined,
+} from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+} from '../shared/remote-data.utils';
+import { SubmissionError } from './objects/submission-error.model';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -19,33 +56,20 @@ import {
   SaveForLaterSubmissionFormAction,
   SaveSubmissionFormAction,
   SaveSubmissionSectionFormAction,
-  SetActiveSectionAction
+  SetActiveSectionAction,
 } from './objects/submission-objects.actions';
 import {
   SubmissionObjectEntry,
-  SubmissionSectionEntry
+  SubmissionSectionEntry,
 } from './objects/submission-objects.reducer';
-import { submissionObjectFromIdSelector } from './selectors';
-import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
-import { SubmissionRestService } from '../core/submission/submission-rest.service';
-import { SectionDataObject } from './sections/models/section-data.model';
-import { SubmissionScopeType } from '../core/submission/submission-scope-type';
-import { SubmissionObject } from '../core/submission/models/submission-object.model';
-import { RouteService } from '../core/services/route.service';
-import { SectionsType } from './sections/sections-type';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model';
-import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
-import { RemoteData } from '../core/data/remote-data';
-import { ErrorResponse } from '../core/cache/response.models';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
-import { RequestService } from '../core/data/request.service';
-import { SearchService } from '../core/shared/search/search.service';
-import { Item } from '../core/shared/item.model';
-import { environment } from '../../environments/environment';
-import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
-import { SubmissionError } from './objects/submission-error.model';
+import { SectionDataObject } from './sections/models/section-data.model';
+import { SectionsType } from './sections/sections-type';
+import { submissionObjectFromIdSelector } from './selectors';
+import {
+  submissionSelector,
+  SubmissionState,
+} from './submission.reducers';
 
 /**
  * A service that provides methods used in submission process.
@@ -217,7 +241,7 @@ export class SubmissionService {
    */
   dispatchSave(submissionId, manual?: boolean) {
     this.getSubmissionSaveProcessingStatus(submissionId).pipe(
-      find((isPending: boolean) => !isPending)
+      find((isPending: boolean) => !isPending),
     ).subscribe(() => {
       this.store.dispatch(new SaveSubmissionFormAction(submissionId, manual));
     });
@@ -505,7 +529,7 @@ export class SubmissionService {
             } else {
               this.router.navigateByUrl(previousUrl);
             }
-        })))
+          }))),
     ).subscribe();
   }
 
@@ -536,7 +560,7 @@ export class SubmissionService {
     selfUrl: string,
     submissionDefinition: SubmissionDefinitionsModel,
     sections: WorkspaceitemSectionsObject,
-    item: Item
+    item: Item,
   ) {
     this.store.dispatch(new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, sections, submissionDefinition, item));
   }
@@ -552,9 +576,11 @@ export class SubmissionService {
       find((submissionObjects: SubmissionObject[]) => isNotUndefined(submissionObjects)),
       map((submissionObjects: SubmissionObject[]) => createSuccessfulRemoteDataObject(
         submissionObjects[0])),
-      catchError((errorResponse: ErrorResponse) => {
-        return createFailedRemoteDataObject$<SubmissionObject>(errorResponse.errorMessage, errorResponse.statusCode);
-      })
+      catchError((errorResponse: unknown) => {
+        if (errorResponse instanceof ErrorResponse) {
+          return createFailedRemoteDataObject$<SubmissionObject>(errorResponse.errorMessage, errorResponse.statusCode);
+        }
+      }),
     );
   }
 
diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts
index da569e4e5d..6b44714ff8 100644
--- a/src/app/submission/submit/submission-submit.component.spec.ts
+++ b/src/app/submission/submit/submission-submit.component.spec.ts
@@ -1,22 +1,34 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
-
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
-import { SubmissionSubmitComponent } from './submission-submit.component';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../submission.service';
+import { SubmissionSubmitComponent } from './submission-submit.component';
 
 describe('SubmissionSubmitComponent Component', () => {
 
@@ -37,7 +49,7 @@ describe('SubmissionSubmitComponent Component', () => {
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([
           { path: '', component: SubmissionSubmitComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [SubmissionSubmitComponent],
       providers: [
@@ -47,9 +59,9 @@ describe('SubmissionSubmitComponent Component', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        ViewContainerRef
+        ViewContainerRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,11 +90,11 @@ describe('SubmissionSubmitComponent Component', () => {
 
   it('should redirect to workspaceitem edit when a not empty SubmissionObject has been retrieved',() => {
 
-    submissionServiceStub.createSubmission.and.returnValue(observableOf({ id: '1234'}));
+    submissionServiceStub.createSubmission.and.returnValue(observableOf({ id: '1234' }));
 
     fixture.detectChanges();
 
-    expect(router.navigate).toHaveBeenCalledWith(['/workspaceitems', '1234', 'edit'], { replaceUrl: true});
+    expect(router.navigate).toHaveBeenCalledWith(['/workspaceitems', '1234', 'edit'], { replaceUrl: true });
 
   });
 
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index a66d1e4656..c76d90a5bc 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -1,20 +1,39 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { debounceTime, switchMap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  switchMap,
+} from 'rxjs/operators';
 
-import { hasValue, isEmpty, isNotEmptyOperator, isNotNull } from '../../shared/empty.util';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmptyOperator,
+  isNotNull,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { Item } from '../../core/shared/item.model';
-import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { ItemDataService } from '../../core/data/item-data.service';
 
 /**
  * This component allows to submit a new workspaceitem.
@@ -22,7 +41,7 @@ import { ItemDataService } from '../../core/data/item-data.service';
 @Component({
   selector: 'ds-submission-submit',
   styleUrls: ['./submission-submit.component.scss'],
-  templateUrl: './submission-submit.component.html'
+  templateUrl: './submission-submit.component.html',
 })
 export class SubmissionSubmitComponent implements OnDestroy, OnInit {
 
@@ -120,14 +139,14 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
               this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
               this.router.navigate(['/mydspace']);
             } else {
-              this.router.navigate(['/workspaceitems', submissionObject.id, 'edit'], { replaceUrl: true});
+              this.router.navigate(['/workspaceitems', submissionObject.id, 'edit'], { replaceUrl: true });
             }
           }
         }),
       this.itemLink$.pipe(
         isNotEmptyOperator(),
         switchMap((itemLink: string) =>
-          this.itemDataService.findByHref(itemLink)
+          this.itemDataService.findByHref(itemLink),
         ),
         getAllSucceededRemoteData(),
         // Multiple sources can update the item in quick succession.
@@ -136,7 +155,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
       ).subscribe((itemRd: RemoteData<Item>) => {
         this.item = itemRd.payload;
         this.changeDetectorRef.detectChanges();
-      })
+      }),
     );
   }
 
diff --git a/src/app/submission/submit/themed-submission-submit.component.ts b/src/app/submission/submit/themed-submission-submit.component.ts
index 328113252f..6ea3eb9690 100644
--- a/src/app/submission/submit/themed-submission-submit.component.ts
+++ b/src/app/submission/submit/themed-submission-submit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionSubmitComponent } from './submission-submit.component';
 
@@ -8,7 +9,7 @@ import { SubmissionSubmitComponent } from './submission-submit.component';
 @Component({
   selector: 'ds-themed-submission-submit',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionSubmitComponent extends ThemedComponent<SubmissionSubmitComponent> {
   protected getComponentName(): string {
diff --git a/src/app/submission/utils/parseSectionErrorPaths.ts b/src/app/submission/utils/parseSectionErrorPaths.ts
index 4c973dedcf..b6c818f919 100644
--- a/src/app/submission/utils/parseSectionErrorPaths.ts
+++ b/src/app/submission/utils/parseSectionErrorPaths.ts
@@ -39,21 +39,21 @@ const parseSectionErrorPaths = (path: string | string[]): SectionErrorPath[] =>
   const paths = typeof path === 'string' ? [path] : path;
 
   return paths.map((item) => {
-      if (item.match(regex) && item.match(regex).length > 2) {
-        return {
-          sectionId: item.match(regex)[1],
-          fieldId: item.match(regex)[2],
-          fieldIndex: hasValue(item.match(regex)[3]) ? +item.match(regex)[3] : 0,
-          originalPath: item,
-        };
-      } else {
-        return {
-          sectionId: item.match(regexShort)[1],
-          originalPath: item,
-        };
-      }
-
+    if (item.match(regex) && item.match(regex).length > 2) {
+      return {
+        sectionId: item.match(regex)[1],
+        fieldId: item.match(regex)[2],
+        fieldIndex: hasValue(item.match(regex)[3]) ? +item.match(regex)[3] : 0,
+        originalPath: item,
+      };
+    } else {
+      return {
+        sectionId: item.match(regexShort)[1],
+        originalPath: item,
+      };
     }
+
+  },
   );
 };
 
diff --git a/src/app/submission/utils/parseSectionErrors.ts b/src/app/submission/utils/parseSectionErrors.ts
index 5f2867c8b8..e2e405915d 100644
--- a/src/app/submission/utils/parseSectionErrors.ts
+++ b/src/app/submission/utils/parseSectionErrors.ts
@@ -1,5 +1,8 @@
 import { SubmissionObjectError } from '../../core/submission/models/submission-object.model';
-import { default as parseSectionErrorPaths, SectionErrorPath } from './parseSectionErrorPaths';
+import {
+  default as parseSectionErrorPaths,
+  SectionErrorPath,
+} from './parseSectionErrorPaths';
 
 /**
  * the following method accept an array of SubmissionObjectError and return a section errors object
@@ -13,7 +16,7 @@ const parseSectionErrors = (errors: SubmissionObjectError[] = []): any => {
     const paths: SectionErrorPath[] = parseSectionErrorPaths(error.paths);
 
     paths.forEach((path: SectionErrorPath) => {
-      const sectionError = {path: path.originalPath, message: error.message};
+      const sectionError = { path: path.originalPath, message: error.message };
       if (!errorsList[path.sectionId]) {
         errorsList[path.sectionId] = [];
       }
diff --git a/src/app/submit-page/submit-page-routing.module.ts b/src/app/submit-page/submit-page-routing.module.ts
index 1572580b6a..b7e6d3e6f5 100644
--- a/src/app/submit-page/submit-page-routing.module.ts
+++ b/src/app/submit-page/submit-page-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component';
 
 @NgModule({
   imports: [
@@ -14,12 +14,12 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         pathMatch: 'full',
         component: ThemedSubmissionSubmitComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' }
-      }
-    ])
-  ]
+        data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' },
+      },
+    ]),
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the submit page path.
diff --git a/src/app/submit-page/submit-page.module.ts b/src/app/submit-page/submit-page.module.ts
index 6942628e9e..f6428e47e8 100644
--- a/src/app/submit-page/submit-page.module.ts
+++ b/src/app/submit-page/submit-page.module.ts
@@ -1,9 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
-import { SubmitPageRoutingModule } from './submit-page-routing.module';
-import { SubmissionModule } from '../submission/submission.module';
+
 import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { SubmitPageRoutingModule } from './submit-page-routing.module';
 
 @NgModule({
   imports: [
diff --git a/src/app/subscriptions-page/subscriptions-page-routing.module.ts b/src/app/subscriptions-page/subscriptions-page-routing.module.ts
index 149c9a415f..15600688e7 100644
--- a/src/app/subscriptions-page/subscriptions-page-routing.module.ts
+++ b/src/app/subscriptions-page/subscriptions-page-routing.module.ts
@@ -1,27 +1,28 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { SubscriptionsPageModule } from './subscriptions-page.module';
+
 import { SubscriptionsPageComponent } from './subscriptions-page.component';
+import { SubscriptionsPageModule } from './subscriptions-page.module';
 
 
 @NgModule({
   imports: [
     SubscriptionsPageModule,
     RouterModule.forChild([
-        {
-          path: '',
-          data: {
-            title: 'subscriptions.title',
-          },
-          children: [
-            {
-              path: '',
-              component: SubscriptionsPageComponent,
-            },
-          ]
+      {
+        path: '',
+        data: {
+          title: 'subscriptions.title',
         },
-    ])
-  ]
+        children: [
+          {
+            path: '',
+            component: SubscriptionsPageComponent,
+          },
+        ],
+      },
+    ]),
+  ],
 })
 export class SubscriptionsPageRoutingModule {
 }
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index ed31e16759..fcdaaaeace 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -1,13 +1,13 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12 m-40">
-      <h2>{{'subscriptions.title' | translate}}</h2>
+      <h1>{{'subscriptions.title' | translate}}</h1>
       <div class="row">
         <div class="col-md-12 m-40">
           <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
           <ng-container *ngVar="(subscriptions$ | async) as subscriptions">
 
-            <ds-pagination *ngIf="subscriptions?.pageInfo?.totalElements > 0 && !(loading$ | async)"
+            <ds-pagination *ngIf="subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true"
                            [paginationOptions]="config"
                            [collectionSize]="subscriptions?.pageInfo?.totalElements"
                            [hideGear]="true"
@@ -34,7 +34,7 @@
               </div>
             </ds-pagination>
 
-            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements == 0 && !(loading$ | async)" [type]="'alert-info'" data-test="empty-alert">
+            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true" [type]="AlertType.Info" data-test="empty-alert">
               {{ 'subscriptions.table.empty.message' | translate }}
             </ds-alert>
 
diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts
index 4f44392428..34b6e682d6 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts
@@ -1,31 +1,43 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { SubscriptionsPageComponent } from './subscriptions-page.component';
+import { AuthService } from '../core/auth/auth.service';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
 import { PaginationService } from '../core/pagination/pagination.service';
+import { PageInfo } from '../core/shared/page-info.model';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component';
 import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service';
 import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
-import { AuthService } from '../core/auth/auth.service';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import {
   mockSubscriptionEperson,
   subscriptionMock,
-  subscriptionMock2
+  subscriptionMock2,
 } from '../shared/testing/subscriptions-data.mock';
-import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
 import { VarDirective } from '../shared/utils/var.directive';
-import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component';
-import { PageInfo } from '../core/shared/page-info.model';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { buildPaginatedList } from '../core/data/paginated-list.model';
+import { SubscriptionsPageComponent } from './subscriptions-page.component';
 
 describe('SubscriptionsPageComponent', () => {
   let component: SubscriptionsPageComponent;
@@ -33,11 +45,11 @@ describe('SubscriptionsPageComponent', () => {
   let de: DebugElement;
 
   const authServiceStub = jasmine.createSpyObj('authorizationService', {
-    getAuthenticatedUserFromStore: observableOf(mockSubscriptionEperson)
+    getAuthenticatedUserFromStore: observableOf(mockSubscriptionEperson),
   });
 
   const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', {
-    findByEPerson: jasmine.createSpy('findByEPerson')
+    findByEPerson: jasmine.createSpy('findByEPerson'),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -45,11 +57,11 @@ describe('SubscriptionsPageComponent', () => {
   const mockSubscriptionList = [subscriptionMock, subscriptionMock2];
 
   const emptyPageInfo = Object.assign(new PageInfo(), {
-    totalElements: 0
+    totalElements: 0,
   });
 
   const pageInfo = Object.assign(new PageInfo(), {
-    totalElements: 2
+    totalElements: 2,
   });
 
   beforeEach(waitForAsync(() => {
@@ -61,19 +73,19 @@ describe('SubscriptionsPageComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [SubscriptionsPageComponent, SubscriptionViewComponent, VarDirective],
       providers: [
         { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: AuthService, useValue: authServiceStub },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
index 05c587ba12..e468a3918e 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -1,24 +1,42 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatestWith,
+  Observable,
+  shareReplay,
+  Subscription as rxjsSubscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatestWith, Observable, shareReplay, Subscription as rxjsSubscription } from 'rxjs';
-import { map, switchMap, take, tap } from 'rxjs/operators';
-
-import { Subscription } from '../shared/subscriptions/models/subscription.model';
-import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model';
-import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { PaginationService } from '../core/pagination/pagination.service';
-import { PageInfo } from '../core/shared/page-info.model';
 import { AuthService } from '../core/auth/auth.service';
-import { EPerson } from '../core/eperson/models/eperson.model';
-import { getAllCompletedRemoteData } from '../core/shared/operators';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { getAllCompletedRemoteData } from '../core/shared/operators';
+import { PageInfo } from '../core/shared/page-info.model';
+import { AlertType } from '../shared/alert/alert-type';
 import { hasValue } from '../shared/empty.util';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { Subscription } from '../shared/subscriptions/models/subscription.model';
+import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service';
 
 @Component({
   selector: 'ds-subscriptions-page',
   templateUrl: './subscriptions-page.component.html',
-  styleUrls: ['./subscriptions-page.component.scss']
+  styleUrls: ['./subscriptions-page.component.scss'],
 })
 /**
  * List and allow to manage all the active subscription for the current user
@@ -36,7 +54,7 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'elp',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -54,10 +72,12 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
    */
   sub: rxjsSubscription = null;
 
+  readonly AlertType = AlertType;
+
   constructor(
     private paginationService: PaginationService,
     private authService: AuthService,
-    private subscriptionService: SubscriptionsDataService
+    private subscriptionService: SubscriptionsDataService,
   ) {
 
   }
@@ -69,7 +89,7 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
     this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe(
       take(1),
       map((ePerson: EPerson) => ePerson.id),
-      shareReplay()
+      shareReplay({ refCount: false }),
     );
     this.retrieveSubscriptions();
   }
@@ -85,9 +105,9 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
       tap(() => this.loading$.next(true)),
       switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{
         currentPage: currentPagination.currentPage,
-        elementsPerPage: currentPagination.pageSize
+        elementsPerPage: currentPagination.pageSize,
       })),
-      getAllCompletedRemoteData()
+      getAllCompletedRemoteData(),
     ).subscribe((res: RemoteData<PaginatedList<Subscription>>) => {
       if (res.hasSucceeded) {
         this.subscriptions$.next(res.payload);
diff --git a/src/app/subscriptions-page/subscriptions-page.module.ts b/src/app/subscriptions-page/subscriptions-page.module.ts
index f7a4dc3344..1527c84e6e 100644
--- a/src/app/subscriptions-page/subscriptions-page.module.ts
+++ b/src/app/subscriptions-page/subscriptions-page.module.ts
@@ -1,8 +1,9 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SubscriptionsPageComponent } from './subscriptions-page.component';
+import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { SubscriptionsModule } from '../shared/subscriptions/subscriptions.module';
+import { SubscriptionsPageComponent } from './subscriptions-page.component';
 
 @NgModule({
   declarations: [SubscriptionsPageComponent],
@@ -10,6 +11,6 @@ import { SubscriptionsModule } from '../shared/subscriptions/subscriptions.modul
     CommonModule,
     SharedModule,
     SubscriptionsModule,
-  ]
+  ],
 })
 export class SubscriptionsPageModule { }
diff --git a/src/app/suggestion-notifications/selectors.ts b/src/app/suggestion-notifications/selectors.ts
new file mode 100644
index 0000000000..a8ec8c7def
--- /dev/null
+++ b/src/app/suggestion-notifications/selectors.ts
@@ -0,0 +1,105 @@
+import {
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import {
+  suggestionNotificationsSelector,
+  SuggestionNotificationsState,
+} from '../notifications/notifications.reducer';
+import { SuggestionTargetState } from '../notifications/suggestion-targets/suggestion-targets.reducer';
+import { subStateSelector } from '../submission/selectors';
+
+/**
+ * Returns the Reciter Suggestion Target state.
+ * @function _getSuggestionTargetState
+ * @param {AppState} state Top level state.
+ * @return {SuggestionNotificationsState}
+ */
+const _getSuggestionTargetState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
+
+// Reciter Suggestion Targets
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Suggestion Targets State.
+ * @function suggestionTargetStateSelector
+ * @return {SuggestionNotificationsState}
+ */
+export function suggestionTargetStateSelector(): MemoizedSelector<SuggestionNotificationsState, SuggestionTargetState> {
+  return subStateSelector<SuggestionNotificationsState, SuggestionTargetState>(suggestionNotificationsSelector, 'suggestionTarget');
+}
+
+/**
+ * Returns the Suggestion Targets list.
+ * @function suggestionTargetObjectSelector
+ * @return {SuggestionTarget[]}
+ */
+export function suggestionTargetObjectSelector(): MemoizedSelector<SuggestionNotificationsState, SuggestionTarget[]> {
+  return subStateSelector<SuggestionNotificationsState, SuggestionTarget[]>(suggestionTargetStateSelector(), 'targets');
+}
+
+/**
+ * Returns true if the Suggestion Targets are loaded.
+ * @function isSuggestionTargetLoadedSelector
+ * @return {boolean}
+ */
+export const isSuggestionTargetLoadedSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isReciterSuggestionTargetProcessingSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.processing,
+);
+
+/**
+ * Returns the total available pages of Reciter Suggestion Targets.
+ * @function getSuggestionTargetTotalPagesSelector
+ * @return {number}
+ */
+export const getSuggestionTargetTotalPagesSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.totalPages,
+);
+
+/**
+ * Returns the current page of Suggestion Targets.
+ * @function getSuggestionTargetCurrentPageSelector
+ * @return {number}
+ */
+export const getSuggestionTargetCurrentPageSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentPage,
+);
+
+/**
+ * Returns the total number of Suggestion Targets.
+ * @function getSuggestionTargetTotalsSelector
+ * @return {number}
+ */
+export const getSuggestionTargetTotalsSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.totalElements,
+);
+
+/**
+ * Returns Suggestion Targets for the current user.
+ * @function getCurrentUserSuggestionTargetSelector
+ * @return {SuggestionTarget[]}
+ */
+export const getCurrentUserSuggestionTargetsSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentUserTargets,
+);
+
+/**
+ * Returns whether or not the user has consulted their suggestions
+ * @function getCurrentUserSuggestionTargetSelector
+ * @return {boolean}
+ */
+export const getCurrentUserSuggestionTargetsVisitedSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentUserTargetsVisited,
+);
diff --git a/src/app/suggestions-page/suggestions-page-routing-paths.ts b/src/app/suggestions-page/suggestions-page-routing-paths.ts
new file mode 100644
index 0000000000..0f3aa782d2
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page-routing-paths.ts
@@ -0,0 +1,11 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const SUGGESTION_MODULE_PATH = 'suggestions';
+
+export function getSuggestionModuleRoute() {
+  return `/${SUGGESTION_MODULE_PATH}`;
+}
+
+export function getSuggestionPageRoute(SuggestionId: string) {
+  return new URLCombiner(getSuggestionModuleRoute(), SuggestionId).toString();
+}
diff --git a/src/app/suggestions-page/suggestions-page-routing.module.ts b/src/app/suggestions-page/suggestions-page-routing.module.ts
new file mode 100644
index 0000000000..0e5add0a7c
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page-routing.module.ts
@@ -0,0 +1,36 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+import { SuggestionsPageResolver } from './suggestions-page.resolver';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: ':targetId',
+        resolve: {
+          suggestionTargets: SuggestionsPageResolver,
+          breadcrumb: PublicationClaimBreadcrumbResolver,//I18nBreadcrumbResolver
+        },
+        data: {
+          title: 'admin.notifications.publicationclaim.page.title',
+          breadcrumbKey: 'admin.notifications.publicationclaim',
+          showBreadcrumbsFluid: false,
+        },
+        canActivate: [AuthenticatedGuard],
+        runGuardsAndResolvers: 'always',
+        component: SuggestionsPageComponent,
+      },
+    ]),
+  ],
+  providers: [
+    SuggestionsPageResolver,
+    PublicationClaimBreadcrumbResolver,
+  ],
+})
+export class SuggestionsPageRoutingModule {
+
+}
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
new file mode 100644
index 0000000000..75ba0315f3
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -0,0 +1,48 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+        <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
+          <div *ngIf="suggestionsRD?.pageInfo?.totalElements > 0">
+
+            <h1>
+              {{'suggestion.suggestionFor' | translate}}
+              <a target="_blank" [routerLink]="['/entities/person/', researcherUuid]">{{researcherName}}</a>
+              {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
+            </h1>
+
+            <div class="mb-3 mt-3">
+              <button class="btn mr-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
+              <em>({{ getSelectedSuggestionsCount() }})</em>
+              <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
+                                      class="m-2"
+                                     [isBulk]="true"
+                                     [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
+                                     (approveAndImport)="approveAndImportAllSelected($event)"
+                                     (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
+              <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
+            </div>
+            <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+            <ds-pagination *ngIf="(processing$ | async) !== true"
+                           [paginationOptions]="paginationOptions"
+                           [sortOptions]="paginationSortConfig"
+                           [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
+                           [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
+                           (paginationChange)="onPaginationChange()">
+              <ul class="list-unstyled">
+                <li *ngFor="let object of suggestionsRD?.page; let i = index; let last = last" class="mt-4 mb-4">
+                  <ds-suggestion-list-item
+                    [object]="object"
+                    [isSelected]="!!selectedSuggestions[object.id]"
+                    [isCollectionFixed]="isCollectionFixed([object])"
+                    (ignoreSuggestionClicked)="ignoreSuggestion($event)"
+                    (selected)="onSelected(object, $event)"
+                    (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
+                </li>
+              </ul>
+            </ds-pagination>
+          </div>
+          <div  *ngIf="suggestionsRD?.pageInfo?.totalElements === 0">{{ 'suggestion.count.missing' | translate }}</div>
+        </ng-container>
+    </div>
+  </div>
+</div>
diff --git a/src/app/suggestions-page/suggestions-page.component.scss b/src/app/suggestions-page/suggestions-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/suggestions-page/suggestions-page.component.spec.ts b/src/app/suggestions-page/suggestions-page.component.spec.ts
new file mode 100644
index 0000000000..9863f0012d
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.spec.ts
@@ -0,0 +1,231 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { AuthService } from '../core/auth/auth.service';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { SuggestionEvidencesComponent } from '../notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
+import {
+  SuggestionApproveAndImport,
+  SuggestionListElementComponent,
+} from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../notifications/suggestions.service';
+import {
+  mockSuggestionPublicationOne,
+  mockSuggestionPublicationTwo,
+} from '../shared/mocks/publication-claim.mock';
+import { mockSuggestionTargetsObjectOne } from '../shared/mocks/publication-claim-targets.mock';
+import {
+  getMockSuggestionNotificationsStateService,
+  getMockSuggestionsService,
+} from '../shared/mocks/suggestion.mock';
+import { getMockTranslateService } from '../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { ObjectKeysPipe } from '../shared/utils/object-keys-pipe';
+import { VarDirective } from '../shared/utils/var.directive';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+
+describe('SuggestionPageComponent', () => {
+  let component: SuggestionsPageComponent;
+  let fixture: ComponentFixture<SuggestionsPageComponent>;
+  let scheduler: TestScheduler;
+  const mockSuggestionsService = getMockSuggestionsService();
+  const mockSuggestionsTargetStateService = getMockSuggestionNotificationsStateService();
+  const router = new RouterStub();
+  const routeStub = {
+    data: observableOf({
+      suggestionTargets: createSuccessfulRemoteDataObject(mockSuggestionTargetsObjectOne),
+    }),
+    queryParams: observableOf({}),
+  };
+  const workspaceitemServiceMock = jasmine.createSpyObj('WorkspaceitemDataService', {
+    importExternalSourceEntry: jasmine.createSpy('importExternalSourceEntry'),
+  });
+
+  const authService = jasmine.createSpyObj('authService', {
+    isAuthenticated: observableOf(true),
+    setRedirectUrl: {},
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SuggestionEvidencesComponent,
+        SuggestionListElementComponent,
+        SuggestionsPageComponent,
+        ObjectKeysPipe,
+        VarDirective,
+      ],
+      providers: [
+        { provide: AuthService, useValue: authService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: WorkspaceitemDataService, useValue: workspaceitemServiceMock },
+        { provide: Router, useValue: router },
+        { provide: SuggestionsService, useValue: mockSuggestionsService },
+        { provide: SuggestionTargetsStateService, useValue: mockSuggestionsTargetStateService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: getMockTranslateService() },
+        { provide: PaginationService, useValue: paginationService },
+        SuggestionsPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents().then();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SuggestionsPageComponent);
+    component = fixture.componentInstance;
+    scheduler = getTestScheduler();
+  });
+
+  it('should create', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+
+    expect(component).toBeTruthy();
+    expect(component.suggestionId).toBe(mockSuggestionTargetsObjectOne.id);
+    expect(component.researcherName).toBe(mockSuggestionTargetsObjectOne.display);
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should update page on pagination change', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.onPaginationChange();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should update suggestion on page update', (done) => {
+    spyOn(component.processing$, 'next');
+    spyOn(component.suggestionsRD$, 'next');
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    paginationService.getFindListOptions().subscribe(() => {
+      expect(component.processing$.next).toHaveBeenCalled();
+      expect(mockSuggestionsService.getSuggestions).toHaveBeenCalled();
+      expect(component.suggestionsRD$.next).toHaveBeenCalled();
+      expect(mockSuggestionsService.clearSuggestionRequests).toHaveBeenCalled();
+      done();
+    });
+    component.updatePage();
+  });
+
+  it('should flag suggestion for deletion', fakeAsync(() => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.ignoreSuggestion('1');
+    expect(mockSuggestionsService.ignoreSuggestion).toHaveBeenCalledWith('1');
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    tick(201);
+    expect(component.updatePage).toHaveBeenCalled();
+  }));
+
+  it('should flag all suggestion for deletion', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.ignoreSuggestionAllSelected();
+    expect(mockSuggestionsService.ignoreSuggestionMultiple).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should approve and import', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.approveAndImport({ collectionId: '1234' } as unknown as SuggestionApproveAndImport);
+    expect(mockSuggestionsService.approveAndImport).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should approve and import multiple suggestions', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.approveAndImportAllSelected({ collectionId: '1234' } as unknown as SuggestionApproveAndImport);
+    expect(mockSuggestionsService.approveAndImportMultiple).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should select and deselect suggestion', () => {
+    component.selectedSuggestions = {};
+    component.onSelected(mockSuggestionPublicationOne, true);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toBe(mockSuggestionPublicationOne);
+    component.onSelected(mockSuggestionPublicationOne, false);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toBeUndefined();
+  });
+
+  it('should toggle all suggestions', () => {
+    component.selectedSuggestions = {};
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toEqual(mockSuggestionPublicationOne);
+    expect(component.selectedSuggestions[mockSuggestionPublicationTwo.id]).toEqual(mockSuggestionPublicationTwo);
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.selectedSuggestions).toEqual({});
+  });
+
+  it('should return all selected suggestions count', () => {
+    component.selectedSuggestions = {};
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.getSelectedSuggestionsCount()).toEqual(2);
+  });
+
+  it('should check if all collection is fixed', () => {
+    component.isCollectionFixed([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(mockSuggestionsService.isCollectionFixed).toHaveBeenCalled();
+  });
+
+  it('should translate suggestion source', () => {
+    component.translateSuggestionSource();
+    expect(mockSuggestionsService.translateSuggestionSource).toHaveBeenCalled();
+  });
+
+  it('should translate suggestion type', () => {
+    component.translateSuggestionType();
+    expect(mockSuggestionsService.translateSuggestionType).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts
new file mode 100644
index 0000000000..fefc655070
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.ts
@@ -0,0 +1,305 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { PaginatedList } from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Suggestion } from '../core/notifications/models/suggestion.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
+import {
+  SuggestionBulkResult,
+  SuggestionsService,
+} from '../notifications/suggestions.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+
+@Component({
+  selector: 'ds-suggestion-page',
+  templateUrl: './suggestions-page.component.html',
+  styleUrls: ['./suggestions-page.component.scss'],
+})
+
+/**
+ * Component used to visualize one of the suggestions from the publication claim page or from the notification pop up
+ */
+
+export class SuggestionsPageComponent implements OnInit {
+
+  /**
+   * The pagination configuration
+   */
+  paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'sp',
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+
+  /**
+   * The sorting configuration
+   */
+  paginationSortConfig: SortOptions = new SortOptions('trust', SortDirection.DESC);
+
+  /**
+   * The FindListOptions object
+   */
+  defaultConfig: FindListOptions = Object.assign(new FindListOptions(), { sort: this.paginationSortConfig });
+
+  /**
+   * A boolean representing if results are loading
+   */
+  public processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * A list of remote data objects of suggestions
+   */
+  suggestionsRD$: BehaviorSubject<PaginatedList<Suggestion>> = new BehaviorSubject<PaginatedList<Suggestion>>({} as any);
+
+  targetRD$: Observable<RemoteData<SuggestionTarget>>;
+  targetId$: Observable<string>;
+
+  suggestionTarget: SuggestionTarget;
+  suggestionId: any;
+  suggestionSource: any;
+  researcherName: any;
+  researcherUuid: any;
+
+  selectedSuggestions: { [id: string]: Suggestion } = {};
+  isBulkOperationPending = false;
+
+  constructor(
+    private authService: AuthService,
+    private notificationService: NotificationsService,
+    private paginationService: PaginationService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private suggestionService: SuggestionsService,
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private translateService: TranslateService,
+    private workspaceItemService: WorkspaceitemDataService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.targetRD$ = this.route.data.pipe(
+      map((data: Data) => data.suggestionTargets as RemoteData<SuggestionTarget>),
+      redirectOn4xx(this.router, this.authService),
+    );
+
+    this.targetId$ = this.targetRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((target: SuggestionTarget) => target.id),
+    );
+    this.targetRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe((suggestionTarget: SuggestionTarget) => {
+      this.suggestionTarget = suggestionTarget;
+      this.suggestionId = suggestionTarget.id;
+      this.researcherName = suggestionTarget.display;
+      this.suggestionSource = suggestionTarget.source;
+      this.researcherUuid = this.suggestionService.getTargetUuid(suggestionTarget);
+      this.updatePage();
+    });
+
+    this.suggestionTargetsStateService.dispatchMarkUserSuggestionsAsVisitedAction();
+  }
+
+  /**
+   * Called when one of the pagination settings is changed
+   */
+  onPaginationChange() {
+    this.updatePage();
+  }
+
+  /**
+   * Update the list of suggestions
+   */
+  updatePage() {
+    this.processing$.next(true);
+    const pageConfig$: Observable<FindListOptions> = this.paginationService.getFindListOptions(
+      this.paginationOptions.id,
+      this.defaultConfig,
+    ).pipe(
+      distinctUntilChanged(),
+    );
+    combineLatest([this.targetId$, pageConfig$]).pipe(
+      switchMap(([targetId, config]: [string, FindListOptions]) => {
+        return this.suggestionService.getSuggestions(
+          targetId,
+          config.elementsPerPage,
+          config.currentPage,
+          config.sort,
+        );
+      }),
+      take(1),
+    ).subscribe((results: PaginatedList<Suggestion>) => {
+      this.processing$.next(false);
+      this.suggestionsRD$.next(results);
+      this.suggestionService.clearSuggestionRequests();
+    });
+  }
+
+  /**
+   * Used to delete a suggestion.
+   * @suggestionId
+   */
+  ignoreSuggestion(suggestionId) {
+    this.suggestionService.ignoreSuggestion(suggestionId).subscribe(() => {
+      this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+      //We add a little delay in the page refresh so that we ensure the deletion has been propagated
+      setTimeout(() => this.updatePage(), 200);
+    });
+  }
+
+  /**
+   * Used to delete all selected suggestions.
+   */
+  ignoreSuggestionAllSelected() {
+    this.isBulkOperationPending = true;
+    this.suggestionService
+      .ignoreSuggestionMultiple(Object.values(this.selectedSuggestions))
+      .subscribe((results: SuggestionBulkResult) => {
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+        this.isBulkOperationPending = false;
+        this.selectedSuggestions = {};
+        if (results.success > 0) {
+          this.notificationService.success(
+            this.translateService.get('suggestion.ignoreSuggestion.bulk.success',
+              { count: results.success }));
+        }
+        if (results.fails > 0) {
+          this.notificationService.error(
+            this.translateService.get('suggestion.ignoreSuggestion.bulk.error',
+              { count: results.fails }));
+        }
+      });
+  }
+
+  /**
+   * Used to approve & import.
+   * @param event contains the suggestion and the target collection
+   */
+  approveAndImport(event: SuggestionApproveAndImport) {
+    this.suggestionService.approveAndImport(this.workspaceItemService, event.suggestion, event.collectionId)
+      .subscribe((workspaceitem: WorkspaceItem) => {
+        const content = this.translateService.instant('suggestion.approveAndImport.success', { url: getWorkspaceItemEditRoute(workspaceitem.id) });
+        this.notificationService.success('', content, { timeOut:0 }, true);
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+      });
+  }
+
+  /**
+   * Used to approve & import all selected suggestions.
+   * @param event contains the target collection
+   */
+  approveAndImportAllSelected(event: SuggestionApproveAndImport) {
+    this.isBulkOperationPending = true;
+    this.suggestionService
+      .approveAndImportMultiple(this.workspaceItemService, Object.values(this.selectedSuggestions), event.collectionId)
+      .subscribe((results: SuggestionBulkResult) => {
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+        this.isBulkOperationPending = false;
+        this.selectedSuggestions = {};
+        if (results.success > 0) {
+          this.notificationService.success(
+            this.translateService.get('suggestion.approveAndImport.bulk.success',
+              { count: results.success }));
+        }
+        if (results.fails > 0) {
+          this.notificationService.error(
+            this.translateService.get('suggestion.approveAndImport.bulk.error',
+              { count: results.fails }));
+        }
+      });
+  }
+
+  /**
+   * When a specific suggestion is selected.
+   * @param object the suggestions
+   * @param selected the new selected value for the suggestion
+   */
+  onSelected(object: Suggestion, selected: boolean) {
+    if (selected) {
+      this.selectedSuggestions[object.id] = object;
+    } else {
+      delete this.selectedSuggestions[object.id];
+    }
+  }
+
+  /**
+   * When Toggle Select All occurs.
+   * @param suggestions all the visible suggestions inside the page
+   */
+  onToggleSelectAll(suggestions: Suggestion[]) {
+    if ( this.getSelectedSuggestionsCount() > 0) {
+      this.selectedSuggestions = {};
+    } else {
+      suggestions.forEach((suggestion) => {
+        this.selectedSuggestions[suggestion.id] = suggestion;
+      });
+    }
+  }
+
+  /**
+   * The current number of selected suggestions.
+   */
+  getSelectedSuggestionsCount(): number {
+    return Object.keys(this.selectedSuggestions).length;
+  }
+
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection in the configuration.
+   * @param suggestions
+   */
+  isCollectionFixed(suggestions: Suggestion[]): boolean {
+    return this.suggestionService.isCollectionFixed(suggestions);
+  }
+
+  /**
+   * Label to be used to translate the suggestion source.
+   */
+  translateSuggestionSource() {
+    return this.suggestionService.translateSuggestionSource(this.suggestionSource);
+  }
+
+  /**
+   * Label to be used to translate the suggestion type.
+   */
+  translateSuggestionType() {
+    return this.suggestionService.translateSuggestionType(this.suggestionSource);
+  }
+
+}
diff --git a/src/app/suggestions-page/suggestions-page.module.ts b/src/app/suggestions-page/suggestions-page.module.ts
new file mode 100644
index 0000000000..8ba4f587f6
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.module.ts
@@ -0,0 +1,24 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SuggestionsService } from '../notifications/suggestions.service';
+import { SharedModule } from '../shared/shared.module';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+import { SuggestionsPageRoutingModule } from './suggestions-page-routing.module';
+
+@NgModule({
+  declarations: [SuggestionsPageComponent],
+  imports: [
+    CommonModule,
+    SharedModule,
+    SuggestionsPageRoutingModule,
+    NotificationsModule,
+  ],
+  providers: [
+    SuggestionsDataService,
+    SuggestionsService,
+  ],
+})
+export class SuggestionsPageModule { }
diff --git a/src/app/suggestions-page/suggestions-page.resolver.ts b/src/app/suggestions-page/suggestions-page.resolver.ts
new file mode 100644
index 0000000000..e066065c9a
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.resolver.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { find } from 'rxjs/operators';
+
+import { RemoteData } from '../core/data/remote-data';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { hasValue } from '../shared/empty.util';
+
+/**
+ * This class represents a resolver that requests a specific collection before the route is activated
+ */
+@Injectable()
+export class SuggestionsPageResolver implements Resolve<RemoteData<SuggestionTarget>> {
+  constructor(private suggestionsDataService: SuggestionTargetDataService) {
+  }
+
+  /**
+   * Method for resolving a suggestion target based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Collection>> Emits the found collection based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<SuggestionTarget>> {
+    return this.suggestionsDataService.getTargetById(route.params.targetId).pipe(
+      find((RD) => hasValue(RD.hasFailed) || RD.hasSucceeded),
+    );
+  }
+}
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index 5f741091f1..d97d3d5d70 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="(systemWideAlert$ |async)?.active">
-    <div class="rounded-0 alert alert-warning w100">
+    <div class="rounded-0 alert alert-warning w100 m-0 px-1">
         <div class="container">
             <span class="font-weight-bold">
         <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
index f767d0f196..155893f160 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, discardPeriodicTasks, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { SystemWideAlertBannerComponent } from './system-wide-alert-banner.component';
-import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
-import { SystemWideAlert } from '../system-wide-alert.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { utcToZonedTime } from 'date-fns-tz';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { TestScheduler } from 'rxjs/testing';
-import { getTestScheduler } from 'jasmine-marbles';
+import {
+  ComponentFixture,
+  discardPeriodicTasks,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
+import { utcToZonedTime } from 'date-fns-tz';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { SystemWideAlertBannerComponent } from './system-wide-alert-banner.component';
 
 
 describe('SystemWideAlertBannerComponent', () => {
@@ -33,7 +41,7 @@ describe('SystemWideAlertBannerComponent', () => {
       alertId: 1,
       message: 'Test alert message',
       active: true,
-      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString()
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString(),
     });
 
     systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
@@ -44,9 +52,9 @@ describe('SystemWideAlertBannerComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [SystemWideAlertBannerComponent],
       providers: [
-        {provide: SystemWideAlertDataService, useValue: systemWideAlertDataService},
-        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
-      ]
+        { provide: SystemWideAlertDataService, useValue: systemWideAlertDataService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
index 27bdb14f1d..a9550944d7 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -1,16 +1,33 @@
-import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
-import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
-import {
-  getAllSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { filter, map, switchMap } from 'rxjs/operators';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { SystemWideAlert } from '../system-wide-alert.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { BehaviorSubject, EMPTY, interval, Subscription } from 'rxjs';
-import { zonedTimeToUtc } from 'date-fns-tz';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { zonedTimeToUtc } from 'date-fns-tz';
+import {
+  BehaviorSubject,
+  EMPTY,
+  interval,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SystemWideAlert } from '../system-wide-alert.model';
 
 /**
  * Component responsible for rendering a banner and the countdown for an active system-wide alert
@@ -18,7 +35,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 @Component({
   selector: 'ds-system-wide-alert-banner',
   styleUrls: ['./system-wide-alert-banner.component.scss'],
-  templateUrl: './system-wide-alert-banner.component.html'
+  templateUrl: './system-wide-alert-banner.component.html',
 })
 export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
 
@@ -48,7 +65,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
   subscriptions: Subscription[] = [];
 
   constructor(
-    @Inject(PLATFORM_ID) protected platformId: Object,
+    @Inject(PLATFORM_ID) protected platformId: any,
     protected systemWideAlertDataService: SystemWideAlertDataService,
     protected notificationsService: NotificationsService,
   ) {
@@ -59,7 +76,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
       getAllSucceededRemoteDataPayload(),
       map((payload: PaginatedList<SystemWideAlert>) => payload.page),
       filter((page) => isNotEmpty(page)),
-      map((page) => page[0])
+      map((page) => page[0]),
     ).subscribe((alert: SystemWideAlert) => {
       this.systemWideAlert$.next(alert);
     }));
@@ -84,7 +101,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
         this.countDownHours.next(0);
         this.countDownMinutes.next(0);
         return EMPTY;
-      })
+      }),
     ).subscribe(() => {
       this.setTimeDifference(this.systemWideAlert$.getValue().countdownTo);
     }));
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 169081e277..95c7a69448 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h2 id="header">{{'system-wide-alert.form.header' | translate}}</h2>
+    <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
     <div [formGroup]="alertForm" [class]="'ng-invalid'">
         <div class="form-group">
             <div class="row mb-2">
@@ -30,6 +30,7 @@
     <div class="row">
         <div class="col mb-2 d-flex align-items-end">
             <ui-switch size="small"
+                       [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
                        [checked]="counterEnabled$ |async"
                        (change)="setCounterEnabled($event)"></ui-switch>
             <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
@@ -49,8 +50,9 @@
                             #d="ngbDatepicker"
                             (ngModelChange)="updatePreviewTime()"
                     />
-                    <button class="btn btn-outline-secondary fas fa-calendar" (click)="d.toggle()"
-                            type="button"></button>
+                    <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
+                            (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+                    </button>
                 </div>
             </div>
             <div class="col-12 d-md-none">
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 505990b445..c5beed4439 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -1,19 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
-import { SystemWideAlert } from '../system-wide-alert.model';
-import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { SystemWideAlertFormComponent } from './system-wide-alert-form.component';
+import {
+  utcToZonedTime,
+  zonedTimeToUtc,
+} from 'date-fns-tz';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
 import { RequestService } from '../../core/data/request.service';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
-import { FormsModule } from '@angular/forms';
-import { UiSwitchModule } from 'ngx-ui-switch';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { SystemWideAlert } from '../system-wide-alert.model';
 import { SystemWideAlertModule } from '../system-wide-alert.module';
+import { SystemWideAlertFormComponent } from './system-wide-alert-form.component';
 
 describe('SystemWideAlertFormComponent', () => {
   let comp: SystemWideAlertFormComponent;
@@ -37,13 +48,13 @@ describe('SystemWideAlertFormComponent', () => {
       alertId: 1,
       message: 'Test alert message',
       active: true,
-      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString()
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString(),
     });
 
     systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
       put: createSuccessfulRemoteDataObject$(systemWideAlert),
-      create: createSuccessfulRemoteDataObject$(systemWideAlert)
+      create: createSuccessfulRemoteDataObject$(systemWideAlert),
     });
 
     requestService = jasmine.createSpyObj('requestService', ['setStaleByHrefSubstring']);
@@ -55,11 +66,11 @@ describe('SystemWideAlertFormComponent', () => {
       imports: [FormsModule, SystemWideAlertModule, UiSwitchModule, TranslateModule.forRoot()],
       declarations: [SystemWideAlertFormComponent],
       providers: [
-        {provide: SystemWideAlertDataService, useValue: systemWideAlertDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: Router, useValue: router},
-        {provide: RequestService, useValue: requestService},
-      ]
+        { provide: SystemWideAlertDataService, useValue: systemWideAlertDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
+        { provide: RequestService, useValue: requestService },
+      ],
     }).compileComponents();
   }));
 
@@ -90,8 +101,8 @@ describe('SystemWideAlertFormComponent', () => {
       comp.createForm();
       expect(comp.formMessage.value).toEqual('');
       expect(comp.formActive.value).toEqual(false);
-      expect(comp.time).toEqual({hour: now.getHours(), minute: now.getMinutes()});
-      expect(comp.date).toEqual({year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate()});
+      expect(comp.time).toEqual({ hour: now.getHours(), minute: now.getMinutes() });
+      expect(comp.date).toEqual({ year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate() });
     });
   });
 
@@ -103,11 +114,11 @@ describe('SystemWideAlertFormComponent', () => {
 
       expect(comp.formMessage.value).toEqual(systemWideAlert.message);
       expect(comp.formActive.value).toEqual(true);
-      expect(comp.time).toEqual({hour: countDownTo.getHours(), minute: countDownTo.getMinutes()});
+      expect(comp.time).toEqual({ hour: countDownTo.getHours(), minute: countDownTo.getMinutes() });
       expect(comp.date).toEqual({
         year: countDownTo.getFullYear(),
         month: countDownTo.getMonth() + 1,
-        day: countDownTo.getDate()
+        day: countDownTo.getDate(),
       });
     });
   });
@@ -138,8 +149,8 @@ describe('SystemWideAlertFormComponent', () => {
       countDownDate.setHours(countDownDate.getHours() + 1);
       countDownDate.setMinutes(countDownDate.getMinutes() + 1);
 
-      comp.time = {hour: countDownDate.getHours(), minute: countDownDate.getMinutes()};
-      comp.date = {year: countDownDate.getFullYear(), month: countDownDate.getMonth() + 1, day: countDownDate.getDate()};
+      comp.time = { hour: countDownDate.getHours(), minute: countDownDate.getMinutes() };
+      comp.date = { year: countDownDate.getFullYear(), month: countDownDate.getMonth() + 1, day: countDownDate.getDate() };
 
       comp.updatePreviewTime();
 
@@ -167,8 +178,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
 
       const expectedAlert = new SystemWideAlert();
       expectedAlert.alertId = systemWideAlert.alertId;
@@ -190,8 +201,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
 
       const expectedAlert = new SystemWideAlert();
       expectedAlert.alertId = systemWideAlert.alertId;
@@ -213,8 +224,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
       comp.counterEnabled$.next(false);
 
       const expectedAlert = new SystemWideAlert();
@@ -237,8 +248,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
 
       const expectedAlert = new SystemWideAlert();
       expectedAlert.alertId = systemWideAlert.alertId;
@@ -260,8 +271,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
 
       const expectedAlert = new SystemWideAlert();
       expectedAlert.message = 'New message';
@@ -285,8 +296,8 @@ describe('SystemWideAlertFormComponent', () => {
 
       comp.formMessage.patchValue('New message');
       comp.formActive.patchValue(true);
-      comp.time = {hour: 4, minute: 26};
-      comp.date = {year: 2023, month: 1, day: 25};
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
 
       const expectedAlert = new SystemWideAlert();
       expectedAlert.message = 'New message';
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index eaff12c169..bfe5e39c5d 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -1,19 +1,40 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  utcToZonedTime,
+  zonedTimeToUtc,
+} from 'date-fns-tz';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { filter, map } from 'rxjs/operators';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { SystemWideAlert } from '../system-wide-alert.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
-import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
-import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
-import { RemoteData } from '../../core/data/remote-data';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
-import { RequestService } from '../../core/data/request.service';
-import { TranslateService } from '@ngx-translate/core';
+import { SystemWideAlert } from '../system-wide-alert.model';
 
 
 /**
@@ -22,7 +43,7 @@ import { TranslateService } from '@ngx-translate/core';
 @Component({
   selector: 'ds-system-wide-alert-form',
   styleUrls: ['./system-wide-alert-form.component.scss'],
-  templateUrl: './system-wide-alert-form.component.html'
+  templateUrl: './system-wide-alert-form.component.html',
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
@@ -82,7 +103,7 @@ export class SystemWideAlertFormComponent implements OnInit {
     protected notificationsService: NotificationsService,
     protected router: Router,
     protected requestService: RequestService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
   ) {
   }
 
@@ -98,12 +119,12 @@ export class SystemWideAlertFormComponent implements OnInit {
       }),
       map((payload: PaginatedList<SystemWideAlert>) => payload.page),
       filter((page) => isNotEmpty(page)),
-      map((page) => page[0])
+      map((page) => page[0]),
     );
     this.createForm();
 
     const currentDate = new Date();
-    this.minDate = {year: currentDate.getFullYear(), month: currentDate.getMonth() + 1, day: currentDate.getDate()};
+    this.minDate = { year: currentDate.getFullYear(), month: currentDate.getMonth() + 1, day: currentDate.getDate() };
 
 
     this.systemWideAlert$.subscribe((alert) => {
@@ -117,11 +138,11 @@ export class SystemWideAlertFormComponent implements OnInit {
    */
   createForm() {
     this.alertForm = new UntypedFormBuilder().group({
-        formMessage: new UntypedFormControl('', {
-          validators: [Validators.required],
-        }),
-        formActive: new UntypedFormControl(false),
-      }
+      formMessage: new UntypedFormControl('', {
+        validators: [Validators.required],
+      }),
+      formActive: new UntypedFormControl(false),
+    },
     );
     this.setDateTime(new Date());
   }
@@ -168,8 +189,8 @@ export class SystemWideAlertFormComponent implements OnInit {
 
 
   private setDateTime(dateToSet) {
-    this.time = {hour: dateToSet.getHours(), minute: dateToSet.getMinutes()};
-    this.date = {year: dateToSet.getFullYear(), month: dateToSet.getMonth() + 1, day: dateToSet.getDate()};
+    this.time = { hour: dateToSet.getHours(), minute: dateToSet.getMinutes() };
+    this.date = { year: dateToSet.getFullYear(), month: dateToSet.getMonth() + 1, day: dateToSet.getDate() };
 
     this.updatePreviewTime();
   }
@@ -229,7 +250,7 @@ export class SystemWideAlertFormComponent implements OnInit {
 
   private handleResponse(response$: Observable<RemoteData<SystemWideAlert>>, messagePrefix, navigateToHomePage: boolean) {
     response$.pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((response: RemoteData<SystemWideAlert>) => {
       if (response.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(`${messagePrefix}.success`));
diff --git a/src/app/system-wide-alert/system-wide-alert-routing.module.ts b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
index beb1b32187..f9c9664600 100644
--- a/src/app/system-wide-alert/system-wide-alert-routing.module.ts
+++ b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
@@ -1,8 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import {
-  SiteAdministratorGuard
-} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
 
 @NgModule({
@@ -14,8 +13,8 @@ import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-for
         component: SystemWideAlertFormComponent,
       },
 
-    ])
-  ]
+    ]),
+  ],
 })
 export class SystemWideAlertRoutingModule {
 
diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/system-wide-alert/system-wide-alert.model.ts
index 158deb2603..3c2b524c1f 100644
--- a/src/app/system-wide-alert/system-wide-alert.model.ts
+++ b/src/app/system-wide-alert/system-wide-alert.model.ts
@@ -1,4 +1,8 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../core/cache/builders/build-decorators';
 import { CacheableObject } from '../core/cache/cacheable-object.model';
 import { HALLink } from '../core/shared/hal-link.model';
@@ -18,38 +22,38 @@ export class SystemWideAlert implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier for this system-wide alert
    */
   @autoserialize
-  alertId: string;
+    alertId: string;
 
   /**
    * The message for this system-wide alert
    */
   @autoserialize
-  message: string;
+    message: string;
 
   /**
    * A string representation of the date to which this system-wide alert will count down when active
    */
   @autoserialize
-  countdownTo: string;
+    countdownTo: string;
 
   /**
    * Whether the system-wide alert is active
    */
   @autoserialize
-  active: boolean;
+    active: boolean;
 
 
   /**
    * The {@link HALLink}s for this system-wide alert
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 }
diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts
index ca200fa4f1..bad87363bc 100644
--- a/src/app/system-wide-alert/system-wide-alert.module.ts
+++ b/src/app/system-wide-alert/system-wide-alert.module.ts
@@ -1,12 +1,16 @@
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
+import {
+  NgbDatepickerModule,
+  NgbTimepickerModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service';
+import { SharedModule } from '../shared/shared.module';
 import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component';
 import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
-import { SharedModule } from '../shared/shared.module';
-import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service';
 import { SystemWideAlertRoutingModule } from './system-wide-alert-routing.module';
-import { UiSwitchModule } from 'ngx-ui-switch';
-import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   imports: [
@@ -18,15 +22,15 @@ import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-boots
     NgbDatepickerModule,
   ],
   exports: [
-    SystemWideAlertBannerComponent
+    SystemWideAlertBannerComponent,
   ],
   declarations: [
     SystemWideAlertBannerComponent,
-    SystemWideAlertFormComponent
+    SystemWideAlertFormComponent,
   ],
   providers: [
-    SystemWideAlertDataService
-  ]
+    SystemWideAlertDataService,
+  ],
 })
 export class SystemWideAlertModule {
 
diff --git a/src/app/thumbnail/themed-thumbnail.component.ts b/src/app/thumbnail/themed-thumbnail.component.ts
index 2a8d809104..2073ec1171 100644
--- a/src/app/thumbnail/themed-thumbnail.component.ts
+++ b/src/app/thumbnail/themed-thumbnail.component.ts
@@ -1,8 +1,12 @@
-import { ThemedComponent } from '../shared/theme-support/themed.component';
-import { Component, Input } from '@angular/core';
-import { ThumbnailComponent } from './thumbnail.component';
-import { Bitstream } from '../core/shared/bitstream.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { ThumbnailComponent } from './thumbnail.component';
 
 @Component({
   selector: 'ds-themed-thumbnail',
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index ebecb5e075..696427630e 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -1,17 +1,28 @@
-import { DebugElement, Pipe, PipeTransform } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
 import { of as observableOf } from 'rxjs';
 
-import { ThumbnailComponent } from './thumbnail.component';
-import { RemoteData } from '../core/data/remote-data';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
 import { AuthService } from '../core/auth/auth.service';
-import { FileService } from '../core/shared/file.service';
-import { VarDirective } from '../shared/utils/var.directive';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { FileService } from '../core/shared/file.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../shared/remote-data.utils';
+import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
+import { VarDirective } from '../shared/utils/var.directive';
+import { ThumbnailComponent } from './thumbnail.component';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -40,7 +51,7 @@ describe('ThumbnailComponent', () => {
       isAuthorized: observableOf(true),
     });
     fileService = jasmine.createSpyObj('FileService', {
-      retrieveFileDownloadLink: null
+      retrieveFileDownloadLink: null,
     });
     fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
@@ -49,8 +60,8 @@ describe('ThumbnailComponent', () => {
       providers: [
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService }
-      ]
+        { provide: FileService, useValue: fileService },
+      ],
     }).compileComponents();
   }));
 
@@ -290,7 +301,7 @@ describe('ThumbnailComponent', () => {
         bundle: { href: 'bundle.url' },
         format: { href: 'format.url' },
         content: { href: CONTENT },
-        thumbnail: undefined
+        thumbnail: undefined,
       };
     });
 
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 7f6531cc5e..765a81961f 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,13 +1,25 @@
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { hasNoValue, hasValue } from '../shared/empty.util';
-import { RemoteData } from '../core/data/remote-data';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+
 import { AuthService } from '../core/auth/auth.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
 import { FileService } from '../core/shared/file.service';
+import {
+  hasNoValue,
+  hasValue,
+} from '../shared/empty.util';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -134,7 +146,7 @@ export class ThumbnailComponent implements OnChanges {
           } else {
             return observableOf(null);
           }
-        })
+        }),
       ).subscribe((url: string) => {
         if (hasValue(url)) {
           // If we got a URL, try to load it
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts
index cbb85b6ad8..4ab935a4e9 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts
@@ -1,8 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action-page.component';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action-page.component';
+
 describe('AdvancedWorkflowActionPageComponent', () => {
   let component: AdvancedWorkflowActionPageComponent;
   let fixture: ComponentFixture<AdvancedWorkflowActionPageComponent>;
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts
index 91dce19a5e..a1e475e57f 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts
@@ -1,4 +1,7 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 /**
@@ -8,7 +11,7 @@ import { ActivatedRoute } from '@angular/router';
 @Component({
   selector: 'ds-advanced-workflow-action-page',
   templateUrl: './advanced-workflow-action-page.component.html',
-  styleUrls: ['./advanced-workflow-action-page.component.scss']
+  styleUrls: ['./advanced-workflow-action-page.component.scss'],
 })
 export class AdvancedWorkflowActionPageComponent implements OnInit {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
index d6d6f973c4..eb148a9f0f 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
@@ -1,35 +1,48 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
-import {
-  AdvancedWorkflowActionRatingComponent,
-  ADVANCED_WORKFLOW_TASK_OPTION_RATING
-} from './advanced-workflow-action-rating.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
-import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { Item } from '../../../core/shared/item.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { Item } from '../../../core/shared/item.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model';
-import { RequestService } from '../../../core/data/request.service';
-import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
 import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  ADVANCED_WORKFLOW_TASK_OPTION_RATING,
+  AdvancedWorkflowActionRatingComponent,
+} from './advanced-workflow-action-rating.component';
 
 const claimedTaskId = '2';
 const workflowId = '1';
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
index ebf1ead64a..d92ed73ff3 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
@@ -1,11 +1,17 @@
-import { Component, OnInit } from '@angular/core';
 import {
-  rendersAdvancedWorkflowTaskOption
-} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
-import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
-import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
-import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+
 import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
 
 export const ADVANCED_WORKFLOW_TASK_OPTION_RATING = 'submit_score';
 export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
index 71952ce9c7..ea6ef0706f 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
@@ -1,32 +1,45 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  AdvancedWorkflowActionSelectReviewerComponent,
-  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
-} from './advanced-workflow-action-select-reviewer.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
-import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
 import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
 import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { TranslateModule } from '@ngx-translate/core';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
-import { of as observableOf } from 'rxjs';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RequestService } from '../../../core/data/request.service';
-import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../shared/testing/eperson.mock';
 import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import {
+  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
+  AdvancedWorkflowActionSelectReviewerComponent,
+} from './advanced-workflow-action-select-reviewer.component';
 
 const claimedTaskId = '2';
 const workflowId = '1';
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
index 329af73351..9d4fd3ff30 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
@@ -1,27 +1,30 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Location } from '@angular/common';
 import {
-  rendersAdvancedWorkflowTaskOption
-} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
-import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
-import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import {
-  SelectReviewerAdvancedWorkflowInfo
-} from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model';
-import {
-  EPersonListActionConfig
-} from '../../../access-control/group-registry/group-form/members-list/members-list.component';
-import { Subscription } from 'rxjs';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../../core/services/route.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { Subscription } from 'rxjs';
+
+import { EPersonListActionConfig } from '../../../access-control/group-registry/group-form/members-list/members-list.component';
 import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { RouteService } from '../../../core/services/route.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { SelectReviewerAdvancedWorkflowInfo } from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { hasValue } from '../../../shared/empty.util';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
 
 export const ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer';
 export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction';
@@ -84,7 +87,7 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf
         remove: {
           css: 'btn-outline-danger',
           disabled: false,
-          icon: 'fas fa-minus'
+          icon: 'fas fa-minus',
         },
       };
     } else {
@@ -97,7 +100,7 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf
         remove: {
           css: 'btn-primary',
           disabled: true,
-          icon: 'fas fa-check'
+          icon: 'fas fa-check',
         },
       };
     }
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
index 7c8db782ce..7608d3751f 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
@@ -1,38 +1,72 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA, SimpleChange, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-import { ReviewersListComponent } from './reviewers-list.component';
-import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
-import {
-  createSuccessfulRemoteDataObject$,
-  createNoContentRemoteDataObject$
-} from '../../../../shared/remote-data.utils';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../../shared/testing/eperson.mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { ReviewersListComponent } from './reviewers-list.component';
 
+// todo: optimize imports
+
+// NOTE: Because ReviewersListComponent extends MembersListComponent, the below tests ONLY validate
+// features which are *unique* to ReviewersListComponent. All other features are tested in the
+// members-list.component.spec.ts file.
 describe('ReviewersListComponent', () => {
   let component: ReviewersListComponent;
   let fixture: ComponentFixture<ReviewersListComponent>;
@@ -40,31 +74,27 @@ describe('ReviewersListComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
-  let activeGroup;
-  let allEPersons;
-  let allGroups;
-  let epersonMembers;
-  let subgroupMembers;
+  let activeGroup: Group;
+  let epersonMembers: EPerson[];
+  let epersonNonMembers: EPerson[];
   let paginationService;
-  let ePersonDtoModel1: EpersonDtoModel;
-  let ePersonDtoModel2: EpersonDtoModel;
 
   beforeEach(waitForAsync(() => {
     activeGroup = GroupMock;
     epersonMembers = [EPersonMock2];
-    subgroupMembers = [GroupMock2];
-    allEPersons = [EPersonMock, EPersonMock2];
-    allGroups = [GroupMock, GroupMock2];
+    epersonNonMembers = [EPersonMock];
     ePersonDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
+      epersonNonMembers: epersonNonMembers,
+      // This method is used to get all the current members
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()));
       },
+      // This method is used to search across *non-members*
       searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), epersonNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
@@ -74,29 +104,26 @@ describe('ReviewersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
-      allGroups: allGroups,
+      epersonNonMembers: epersonNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(activeGroup);
       },
       getEPersonMembers() {
         return this.epersonMembers;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups));
-        }
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-      },
-      addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
-        this.epersonMembers = [...this.epersonMembers, eperson];
+      addMemberToGroup(parentGroup, epersonToAdd: EPerson): Observable<RestResponse> {
+        // Add eperson to list of members
+        this.epersonMembers = [...this.epersonMembers, epersonToAdd];
+        // Remove eperson from list of non-members
+        this.epersonNonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToAdd.id) {
+            this.epersonNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -109,39 +136,38 @@ describe('ReviewersListComponent', () => {
         return '/access-control/groups/' + group.id;
       },
       deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
-        this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => {
-          if (eperson.id !== epersonToDelete.id) {
-            return eperson;
+        // Remove eperson from list of members
+        this.epersonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToDelete.id) {
+            this.epersonMembers.splice(index, 1);
           }
         });
-        if (this.epersonMembers === undefined) {
-          this.epersonMembers = [];
-        }
+        // Add eperson to list of non-members
+        this.epersonNonMembers = [...this.epersonNonMembers, epersonToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
+      // Used to find the currently active group
       findById(id: string) {
-        for (const group of allGroups) {
-          if (group.id === id) {
-            return createSuccessfulRemoteDataObject$(group);
-          }
+        if (activeGroup.id === id) {
+          return createSuccessfulRemoteDataObject$(activeGroup);
         }
         return createNoContentRemoteDataObject$();
       },
       editGroup() {
         // empty
-      }
+      },
     };
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ReviewersListComponent],
@@ -153,7 +179,7 @@ describe('ReviewersListComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -169,17 +195,11 @@ describe('ReviewersListComponent', () => {
     fixture.debugElement.nativeElement.remove();
   }));
 
-  beforeEach(() => {
-    ePersonDtoModel1 = new EpersonDtoModel();
-    ePersonDtoModel1.eperson = EPersonMock;
-    ePersonDtoModel2 = new EpersonDtoModel();
-    ePersonDtoModel2.eperson = EPersonMock2;
-  });
 
   describe('when no group is selected', () => {
     beforeEach(() => {
       component.ngOnChanges({
-        groupId: new SimpleChange(undefined, null, true)
+        groupId: new SimpleChange(undefined, null, true),
       });
       fixture.detectChanges();
     });
@@ -198,7 +218,7 @@ describe('ReviewersListComponent', () => {
   describe('when a group is selected', () => {
     beforeEach(() => {
       component.ngOnChanges({
-        groupId: new SimpleChange(undefined, GroupMock.id, true)
+        groupId: new SimpleChange(undefined, GroupMock.id, true),
       });
       fixture.detectChanges();
     });
@@ -218,34 +238,32 @@ describe('ReviewersListComponent', () => {
   it('should replace the value when a new member is added when multipleReviewers is false', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
     component.multipleReviewers = false;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.addMemberToGroup(ePersonDtoModel2);
+    component.addMemberToGroup(EPersonMock2);
 
-    expect(component.selectedReviewers).toEqual([ePersonDtoModel2]);
-    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([ePersonDtoModel2.eperson]);
+    expect(component.selectedReviewers).toEqual([EPersonMock2]);
+    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([EPersonMock2]);
   });
 
   it('should add the value when a new member is added when multipleReviewers is true', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
     component.multipleReviewers = true;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.addMemberToGroup(ePersonDtoModel2);
+    component.addMemberToGroup(EPersonMock2);
 
-    expect(component.selectedReviewers).toEqual([ePersonDtoModel1, ePersonDtoModel2]);
-    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([ePersonDtoModel1.eperson, ePersonDtoModel2.eperson]);
+    expect(component.selectedReviewers).toEqual([EPersonMock, EPersonMock2]);
+    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([EPersonMock, EPersonMock2]);
   });
 
   it('should delete the member when present', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
-    ePersonDtoModel1.memberOfGroup = true;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.deleteMemberFromGroup(ePersonDtoModel1);
+    component.deleteMemberFromGroup(EPersonMock);
 
     expect(component.selectedReviewers).toEqual([]);
-    expect(ePersonDtoModel1.memberOfGroup).toBeFalse();
     expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([]);
   });
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 6984a1d86d..84841f2fc4 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -1,31 +1,38 @@
-import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { hasValue } from '../../../../shared/empty.util';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
+
 import {
-  MembersListComponent,
   EPersonListActionConfig,
+  MembersListComponent,
 } from '../../../../access-control/group-registry/group-form/members-list/members-list.component';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { Group } from '../../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 
 /**
  * Keys to keep track of specific subscriptions
  */
 enum SubKey {
   ActiveGroup,
-  MembersDTO,
-  SearchResultsDTO,
+  Members,
+  SearchResults,
 }
 
 /**
@@ -39,18 +46,18 @@ enum SubKey {
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
 
   @Input()
-  groupId: string | null;
+    groupId: string | null;
 
   @Input()
-  actionConfig: EPersonListActionConfig;
+    actionConfig: EPersonListActionConfig;
 
   @Input()
-  multipleReviewers: boolean;
+    multipleReviewers: boolean;
 
   @Output()
-  selectedReviewersUpdated: EventEmitter<EPerson[]> = new EventEmitter();
+    selectedReviewersUpdated: EventEmitter<EPerson[]> = new EventEmitter();
 
-  selectedReviewers: EpersonDtoModel[] = [];
+  selectedReviewers: EPerson[] = [];
 
   constructor(
     protected groupService: GroupDataService,
@@ -100,54 +107,40 @@ export class ReviewersListComponent extends MembersListComponent implements OnIn
   retrieveMembers(page: number): void {
     this.config.currentPage = page;
     if (this.groupId === null) {
-      this.unsubFrom(SubKey.MembersDTO);
-      const paginatedListOfDTOs: PaginatedList<EpersonDtoModel> = new PaginatedList();
-      paginatedListOfDTOs.page = this.selectedReviewers;
-      this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
+      this.unsubFrom(SubKey.Members);
+      const paginatedListOfEPersons: PaginatedList<EPerson> = new PaginatedList();
+      paginatedListOfEPersons.page = this.selectedReviewers;
+      this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
     } else {
       super.retrieveMembers(page);
     }
   }
 
   /**
-   * Checks whether the given {@link possibleMember} is part of the {@link selectedReviewers}.
+   * Removes the {@link eperson} from the {@link selectedReviewers}
    *
-   * @param possibleMember The {@link EPerson} that needs to be checked
+   * @param eperson The {@link EPerson} to remove
    */
-  isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return observableOf(hasValue(this.selectedReviewers.find((reviewer: EpersonDtoModel) => reviewer.eperson.id === possibleMember.id)));
-  }
-
-  /**
-   * Removes the {@link ePerson} from the {@link selectedReviewers}
-   *
-   * @param ePerson The {@link EpersonDtoModel} containg the {@link EPerson} to remove
-   */
-  deleteMemberFromGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = false;
-    const index = this.selectedReviewers.indexOf(ePerson);
+  deleteMemberFromGroup(eperson: EPerson) {
+    const index = this.selectedReviewers.indexOf(eperson);
     if (index !== -1) {
       this.selectedReviewers.splice(index, 1);
     }
-    this.selectedReviewersUpdated.emit(this.selectedReviewers.map((ePersonDtoModel: EpersonDtoModel) => ePersonDtoModel.eperson));
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
   }
 
   /**
-   * Adds the {@link ePerson} to the {@link selectedReviewers} (or replaces it when {@link multipleReviewers} is
+   * Adds the {@link eperson} to the {@link selectedReviewers} (or replaces it when {@link multipleReviewers} is
    * `false`). Afterwards it will emit the list.
    *
-   * @param ePerson The {@link EPerson} to add to the list
+   * @param eperson The {@link EPerson} to add to the list
    */
-  addMemberToGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = true;
+  addMemberToGroup(eperson: EPerson) {
     if (!this.multipleReviewers) {
-      for (const selectedReviewer of this.selectedReviewers) {
-        selectedReviewer.memberOfGroup = false;
-      }
       this.selectedReviewers = [];
     }
-    this.selectedReviewers.push(ePerson);
-    this.selectedReviewersUpdated.emit(this.selectedReviewers.map((epersonDtoModel: EpersonDtoModel) => epersonDtoModel.eperson));
+    this.selectedReviewers.push(eperson);
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
   }
 
 }
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts
index f1beb86b98..f63fb0e97e 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts
@@ -1,27 +1,31 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
-import { AdvancedWorkflowActionComponent } from './advanced-workflow-action.component';
 import { Component } from '@angular/core';
-import { MockComponent } from 'ng-mocks';
-import { DSOSelectorComponent } from '../../../shared/dso-selector/dso-selector/dso-selector.component';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { RouterTestingModule } from '@angular/router/testing';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { TranslateModule } from '@ngx-translate/core';
-import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
-import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
-import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import { MockComponent } from 'ng-mocks';
+import { of as observableOf } from 'rxjs';
+
 import { RequestService } from '../../../core/data/request.service';
-import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { DSOSelectorComponent } from '../../../shared/dso-selector/dso-selector/dso-selector.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
 import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import { AdvancedWorkflowActionComponent } from './advanced-workflow-action.component';
 
 const workflowId = '1';
 
@@ -117,7 +121,7 @@ describe('AdvancedWorkflowActionComponent', () => {
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: '',
-  template: ''
+  template: '',
 })
 class TestComponent extends AdvancedWorkflowActionComponent {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts
index 73fd6dc63e..7635020ebf 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts
@@ -1,19 +1,26 @@
-import { Component, OnInit } from '@angular/core';
-import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Observable } from 'rxjs';
-import { WorkflowItemActionPageComponent } from '../../workflow-item-action-page.component';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../../core/services/route.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { map } from 'rxjs/operators';
-import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
-import { RequestService } from '../../../core/data/request.service';
 import { Location } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../../workflow-item-action-page.component';
 
 /**
  * Abstract component for rendering an advanced claimed task's workflow page
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.html
deleted file mode 100644
index 0904d0fcde..0000000000
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-template dsAdvancedWorkflowActions></ng-template>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts
index 2c12b07589..df08d3e8ac 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts
@@ -1,14 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-actions-loader.component';
-import { Router } from '@angular/router';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { AdvancedWorkflowActionsDirective } from './advanced-workflow-actions.directive';
 import {
-  rendersAdvancedWorkflowTaskOption
-} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { getMockThemeService } from 'src/app/shared/mocks/theme-service.mock';
+import { ThemeService } from 'src/app/shared/theme-support/theme.service';
+
 import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths';
+import { DynamicComponentLoaderDirective } from '../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-actions-loader.component';
 
 const ADVANCED_WORKFLOW_ACTION_TEST = 'testaction';
 
@@ -17,17 +24,20 @@ describe('AdvancedWorkflowActionsLoaderComponent', () => {
   let fixture: ComponentFixture<AdvancedWorkflowActionsLoaderComponent>;
 
   let router: RouterStub;
+  let themeService: ThemeService;
 
   beforeEach(async () => {
     router = new RouterStub();
+    themeService = getMockThemeService();
 
     await TestBed.configureTestingModule({
       declarations: [
-        AdvancedWorkflowActionsDirective,
+        DynamicComponentLoaderDirective,
         AdvancedWorkflowActionsLoaderComponent,
       ],
       providers: [
         { provide: Router, useValue: router },
+        { provide: ThemeService, useValue: themeService },
       ],
     }).overrideComponent(AdvancedWorkflowActionsLoaderComponent, {
       set: {
@@ -50,24 +60,24 @@ describe('AdvancedWorkflowActionsLoaderComponent', () => {
 
   describe('When the component is rendered', () => {
     it('should display the AdvancedWorkflowActionTestComponent when the type has been defined in a rendersAdvancedWorkflowTaskOption', () => {
-      spyOn(component, 'getComponentByWorkflowTaskOption').and.returnValue(AdvancedWorkflowActionTestComponent);
+      spyOn(component, 'getComponent').and.returnValue(AdvancedWorkflowActionTestComponent);
 
       component.ngOnInit();
       fixture.detectChanges();
 
-      expect(component.getComponentByWorkflowTaskOption).toHaveBeenCalledWith(ADVANCED_WORKFLOW_ACTION_TEST);
+      expect(component.getComponent).toHaveBeenCalled();
       expect(fixture.debugElement.query(By.css('#AdvancedWorkflowActionsLoaderComponent'))).not.toBeNull();
       expect(router.navigate).not.toHaveBeenCalled();
     });
 
     it('should redirect to page not found when the type has not been defined in a rendersAdvancedWorkflowTaskOption', () => {
-      spyOn(component, 'getComponentByWorkflowTaskOption').and.returnValue(undefined);
+      spyOn(component, 'getComponent').and.returnValue(undefined);
       component.type = 'nonexistingaction';
 
       component.ngOnInit();
       fixture.detectChanges();
 
-      expect(component.getComponentByWorkflowTaskOption).toHaveBeenCalledWith('nonexistingaction');
+      expect(component.getComponent).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
     });
   });
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
index 32f14c015d..e196f1417c 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
@@ -1,21 +1,25 @@
-import { Component, Input, ViewChild, ComponentFactoryResolver, OnInit } from '@angular/core';
-import { hasValue } from '../../../shared/empty.util';
 import {
-  getAdvancedComponentByWorkflowTaskOption
-} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
-import { AdvancedWorkflowActionsDirective } from './advanced-workflow-actions.directive';
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import { AbstractComponentLoaderComponent } from 'src/app/shared/abstract-component-loader/abstract-component-loader.component';
+
 import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { hasValue } from '../../../shared/empty.util';
+import { getAdvancedComponentByWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
 
 /**
  * Component for loading a {@link AdvancedWorkflowActionComponent} depending on the "{@link type}" input
  */
 @Component({
   selector: 'ds-advanced-workflow-actions-loader',
-  templateUrl: './advanced-workflow-actions-loader.component.html',
-  styleUrls: ['./advanced-workflow-actions-loader.component.scss'],
+  templateUrl: '../../../shared/abstract-component-loader/abstract-component-loader.component.html',
 })
-export class AdvancedWorkflowActionsLoaderComponent implements OnInit {
+export class AdvancedWorkflowActionsLoaderComponent extends AbstractComponentLoaderComponent<Component> implements OnInit {
 
   /**
    * The name of the type to render
@@ -23,35 +27,28 @@ export class AdvancedWorkflowActionsLoaderComponent implements OnInit {
    */
   @Input() type: string;
 
-  /**
-   * Directive to determine where the dynamic child component is located
-   */
-  @ViewChild(AdvancedWorkflowActionsDirective, { static: true }) claimedTaskActionsDirective: AdvancedWorkflowActionsDirective;
+  protected inputNames: (keyof this & string)[] = [
+    ...this.inputNames,
+    'type',
+  ];
 
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
+    protected themeService: ThemeService,
     private router: Router,
   ) {
+    super(themeService);
   }
 
-  /**
-   * Fetch, create and initialize the relevant component
-   */
   ngOnInit(): void {
-    const comp = this.getComponentByWorkflowTaskOption(this.type);
-    if (hasValue(comp)) {
-      const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
-
-      const viewContainerRef = this.claimedTaskActionsDirective.viewContainerRef;
-      viewContainerRef.clear();
-      viewContainerRef.createComponent(componentFactory);
+    if (hasValue(this.getComponent())) {
+      super.ngOnInit();
     } else {
       void this.router.navigate([PAGE_NOT_FOUND_PATH]);
     }
   }
 
-  getComponentByWorkflowTaskOption(type: string): any {
-    return getAdvancedComponentByWorkflowTaskOption(type);
+  public getComponent(): GenericConstructor<Component> {
+    return getAdvancedComponentByWorkflowTaskOption(this.type);
   }
 
 }
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions.directive.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions.directive.ts
deleted file mode 100644
index e569f6cc6f..0000000000
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions.directive.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dsAdvancedWorkflowActions]',
-})
-/**
- * Directive used as a hook to know where to inject the dynamic Advanced Claimed Task Actions component
- */
-export class AdvancedWorkflowActionsDirective {
-
-  constructor(
-    public viewContainerRef: ViewContainerRef,
-  ) {
-  }
-
-}
diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
index 1ef87ad10f..5bf6aec2ff 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
@@ -1,4 +1,5 @@
 import { first } from 'rxjs/operators';
+
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
@@ -11,13 +12,13 @@ describe('ItemFromWorkflowResolver', () => {
     const itemUuid = '8888-8888-8888-8888';
     const wfi = {
       id: uuid,
-      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid }),
     };
 
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi),
       } as any;
       resolver = new ItemFromWorkflowResolver(wfiService, null);
     });
@@ -29,7 +30,7 @@ describe('ItemFromWorkflowResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(itemUuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
index bacf515656..237a6ad945 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
+import { Store } from '@ngrx/store';
+
 import { RemoteData } from '../core/data/remote-data';
 import { Item } from '../core/shared/item.model';
-import { Store } from '@ngrx/store';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -13,7 +14,7 @@ import { SubmissionObjectResolver } from '../core/submission/resolver/submission
 export class ItemFromWorkflowResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
   constructor(
     private workflowItemService: WorkflowItemDataService,
-    protected store: Store<any>
+    protected store: Store<any>,
   ) {
     super(workflowItemService, store);
   }
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
index c4dea0f30c..d775823746 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
@@ -1,25 +1,45 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { WorkflowItemActionPageComponent } from './workflow-item-action-page.component';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { RouteService } from '../core/services/route.service';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { VarDirective } from '../shared/utils/var.directive';
-import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { RouterStub } from '../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
-import { RequestService } from '../core/data/request.service';
-import { RequestServiceStub } from '../shared/testing/request-service.stub';
 import { Location } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { RequestService } from '../core/data/request.service';
+import { RouteService } from '../core/services/route.service';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { LocationStub } from '../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../shared/testing/request-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { VarDirective } from '../shared/utils/var.directive';
+import { WorkflowItemActionPageComponent } from './workflow-item-action-page.component';
 
 const type = 'testType';
 describe('WorkflowItemActionPageComponent', () => {
@@ -32,7 +52,7 @@ describe('WorkflowItemActionPageComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      sendBack: observableOf(true)
+      sendBack: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -46,8 +66,8 @@ describe('WorkflowItemActionPageComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [TestComponent, VarDirective],
       providers: [
@@ -59,7 +79,7 @@ describe('WorkflowItemActionPageComponent', () => {
         { provide: WorkflowItemDataService, useValue: wfiService },
         { provide: RequestService, useClass: RequestServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -106,9 +126,9 @@ describe('WorkflowItemActionPageComponent', () => {
 });
 
 @Component({
-    selector: 'ds-workflow-item-test-action-page',
-    templateUrl: 'workflow-item-action-page.component.html'
-  }
+  selector: 'ds-workflow-item-test-action-page',
+  templateUrl: 'workflow-item-action-page.component.html',
+},
 )
 class TestComponent extends WorkflowItemActionPageComponent {
   constructor(protected route: ActivatedRoute,
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
index 2ed5639c5a..d245fc3082 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
@@ -1,25 +1,44 @@
-import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Observable, combineLatest } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Params,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
-import { Item } from '../core/shared/item.model';
-import { ActivatedRoute, Data, Router, Params } from '@angular/router';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { RouteService } from '../core/services/route.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../core/data/remote-data';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../core/shared/operators';
-import { isEmpty } from '../shared/empty.util';
 import { RequestService } from '../core/data/request.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { isEmpty } from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
 
 /**
  * Abstract component representing a page to perform an action on a workflow item
  */
 @Component({
   selector: 'ds-workflowitem-action-page',
-  template: ''
+  template: '',
 })
 export abstract class WorkflowItemActionPageComponent implements OnInit {
   public type;
@@ -54,7 +73,7 @@ export abstract class WorkflowItemActionPageComponent implements OnInit {
   performAction() {
     combineLatest([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe(
       take(1),
-      switchMap(([wfi]) => this.sendRequest(wfi.id))
+      switchMap(([wfi]) => this.sendRequest(wfi.id)),
     ).subscribe((successful: boolean) => {
       if (successful) {
         const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title');
@@ -76,18 +95,18 @@ export abstract class WorkflowItemActionPageComponent implements OnInit {
   previousPage() {
     this.routeService.getPreviousUrl().pipe(take(1))
       .subscribe((url) => {
-          let params: Params = {};
-          if (isEmpty(url)) {
-            url = '/mydspace';
-            params = this.previousQueryParameters;
-          }
-          if (url.split('?').length > 1) {
-            for (const param of url.split('?')[1].split('&')) {
-              params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
-            }
-          }
-          void this.router.navigate([url.split('?')[0]], { queryParams: params });
+        let params: Params = {};
+        if (isEmpty(url)) {
+          url = '/mydspace';
+          params = this.previousQueryParameters;
         }
+        if (url.split('?').length > 1) {
+          for (const param of url.split('?')[1].split('&')) {
+            params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
+          }
+        }
+        void this.router.navigate([url.split('?')[0]], { queryParams: params });
+      },
       );
   }
 
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
index 358d26b482..c2f0abbde4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
@@ -1,7 +1,8 @@
-import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { Component } from '@angular/core';
 
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
+
 /**
  * Themed wrapper for WorkflowItemDeleteComponent
  */
@@ -9,7 +10,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-themed-workflow-item-delete',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedWorkflowItemDeleteComponent extends ThemedComponent<WorkflowItemDeleteComponent> {
   protected getComponentName(): string {
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
index 89a7029b4a..0b89452694 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
@@ -1,23 +1,37 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
-import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { RequestService } from '../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
 
 describe('WorkflowItemDeleteComponent', () => {
   let component: WorkflowItemDeleteComponent;
@@ -29,7 +43,7 @@ describe('WorkflowItemDeleteComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      delete: observableOf(true)
+      delete: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -43,8 +57,8 @@ describe('WorkflowItemDeleteComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [WorkflowItemDeleteComponent, VarDirective],
       providers: [
@@ -56,7 +70,7 @@ describe('WorkflowItemDeleteComponent', () => {
         { provide: WorkflowItemDataService, useValue: wfiService },
         { provide: RequestService, useValue: getMockRequestService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 011398369d..516d57e1a4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,21 +1,25 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
-import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { Location } from '@angular/common';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
 
 @Component({
   selector: 'ds-workflow-item-delete',
-  templateUrl: '../workflow-item-action-page.component.html'
+  templateUrl: '../workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to delete a workflow item
@@ -47,7 +51,7 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent
   sendRequest(id: string): Observable<boolean> {
     return this.workflowItemService.delete(id).pipe(
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
     );
   }
 }
diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
index 8f6a1f1de0..21f9e6e00a 100644
--- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
@@ -1,7 +1,8 @@
 import { first } from 'rxjs/operators';
-import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
+
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
 
 describe('WorkflowItemPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('WorkflowItemPageResolver', () => {
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       } as any;
       resolver = new WorkflowItemPageResolver(wfiService);
     });
@@ -23,7 +24,7 @@ describe('WorkflowItemPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
index 4bb3eac513..c5c2d4d717 100644
--- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
@@ -1,11 +1,16 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { RemoteData } from '../core/data/remote-data';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific workflow item before the route is activated
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
index 5a3e9ca476..2a6054f691 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
@@ -1,5 +1,6 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
 
 /**
@@ -9,7 +10,7 @@ import { WorkflowItemSendBackComponent } from './workflow-item-send-back.compone
 @Component({
   selector: 'ds-themed-workflow-item-send-back',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedWorkflowItemSendBackComponent extends ThemedComponent<WorkflowItemSendBackComponent> {
   protected getComponentName(): string {
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
index 1196e05593..95f90b34dd 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
@@ -1,23 +1,37 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
+
 import { RequestService } from '../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
 
 describe('WorkflowItemSendBackComponent', () => {
   let component: WorkflowItemSendBackComponent;
@@ -29,7 +43,7 @@ describe('WorkflowItemSendBackComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      sendBack: observableOf(true)
+      sendBack: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -43,8 +57,8 @@ describe('WorkflowItemSendBackComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [WorkflowItemSendBackComponent, VarDirective],
       providers: [
@@ -56,7 +70,7 @@ describe('WorkflowItemSendBackComponent', () => {
         { provide: WorkflowItemDataService, useValue: wfiService },
         { provide: RequestService, useValue: getMockRequestService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
index a3c03bcfb1..651924787f 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
@@ -1,17 +1,21 @@
-import { Component } from '@angular/core';
-import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
-import { Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
 import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
 
 @Component({
   selector: 'ds-workflow-item-send-back',
-  templateUrl: '../workflow-item-action-page.component.html'
+  templateUrl: '../workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to send back a workflow item to the submitter
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
index 326eebe4a7..1b21174c60 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
@@ -1,5 +1,8 @@
+import {
+  getWorkflowItemModuleRoute,
+  getWorkspaceItemModuleRoute,
+} from '../app-routing-paths';
 import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getWorkflowItemModuleRoute, getWorkspaceItemModuleRoute } from '../app-routing-paths';
 
 export function getWorkflowItemPageRoute(wfiId: string) {
   return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString();
@@ -28,9 +31,14 @@ export function getWorkspaceItemDeleteRoute(wsiId: string) {
   return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_DELETE_PATH).toString();
 }
 
+export function getWorkspaceItemEditRoute(wsiId: string) {
+  return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_EDIT_PATH).toString();
+}
+
 export const WORKFLOW_ITEM_EDIT_PATH = 'edit';
 export const WORKFLOW_ITEM_DELETE_PATH = 'delete';
 export const WORKFLOW_ITEM_VIEW_PATH = 'view';
 export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
 export const ADVANCED_WORKFLOW_PATH = 'advanced';
 export const WORKSPACE_ITEM_DELETE_PATH = 'delete';
+export const WORKSPACE_ITEM_EDIT_PATH = 'edit';
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index b093f20563..a5e0a261b0 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
@@ -2,23 +2,21 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
+import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
+import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
+import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
+import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
 import {
+  ADVANCED_WORKFLOW_PATH,
   WORKFLOW_ITEM_DELETE_PATH,
   WORKFLOW_ITEM_EDIT_PATH,
   WORKFLOW_ITEM_SEND_BACK_PATH,
   WORKFLOW_ITEM_VIEW_PATH,
-  ADVANCED_WORKFLOW_PATH,
 } from './workflowitems-edit-page-routing-paths';
-import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
-import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
-import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
-import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
-import {
-  AdvancedWorkflowActionPageComponent
-} from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
 
 @NgModule({
   imports: [
@@ -32,13 +30,13 @@ import {
             path: WORKFLOW_ITEM_EDIT_PATH,
             component: ThemedSubmissionEditComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
             data: {
               title: 'workflow-item.edit.title',
               breadcrumbKey: 'workflow-item.edit',
-              collectionModifiable: false
-            }
+              collectionModifiable: false,
+            },
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -46,42 +44,42 @@ import {
             component: ThemedFullItemPageComponent,
             resolve: {
               dso: ItemFromWorkflowResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' }
+            data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' },
           },
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_DELETE_PATH,
             component: ThemedWorkflowItemDeleteComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' }
+            data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' },
           },
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_SEND_BACK_PATH,
             component: ThemedWorkflowItemSendBackComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' }
+            data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' },
           },
           {
             canActivate: [AuthenticatedGuard],
             path: ADVANCED_WORKFLOW_PATH,
             component: AdvancedWorkflowActionPageComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.advanced.title', breadcrumbKey: 'workflow-item.edit' }
+            data: { title: 'workflow-item.advanced.title', breadcrumbKey: 'workflow-item.edit' },
           },
-        ]
-      }]
-    )
+        ],
+      }],
+    ),
   ],
-  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver]
+  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver],
 })
 /**
  * This module defines the default component to load when navigating to the workflowitems edit page path.
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
index cf998c5274..338e6c8a74 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
@@ -1,38 +1,24 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
-import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
-import { SubmissionModule } from '../submission/submission.module';
-import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component';
-import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
-import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
-import {
-  ThemedWorkflowItemSendBackComponent
-} from './workflow-item-send-back/themed-workflow-item-send-back.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { ItemPageModule } from '../item-page/item-page.module';
-import {
-  AdvancedWorkflowActionsLoaderComponent
-} from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component';
-import {
-  AdvancedWorkflowActionRatingComponent
-} from './advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
-import {
-  AdvancedWorkflowActionSelectReviewerComponent
-} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
-import {
-  AdvancedWorkflowActionPageComponent
-} from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
-import {
-  AdvancedWorkflowActionsDirective
-} from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions.directive';
-import { AccessControlModule } from '../access-control/access-control.module';
-import {
-  ReviewersListComponent
-} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component';
-import { FormModule } from '../shared/form/form.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
+import { AccessControlModule } from '../access-control/access-control.module';
+import { ItemPageModule } from '../item-page/item-page.module';
+import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
+import { AdvancedWorkflowActionRatingComponent } from './advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { AdvancedWorkflowActionSelectReviewerComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { ReviewersListComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component';
+import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component';
+import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component';
+import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
+import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
+import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
+
 @NgModule({
   imports: [
     WorkflowItemsEditPageRoutingModule,
@@ -54,9 +40,8 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     AdvancedWorkflowActionRatingComponent,
     AdvancedWorkflowActionSelectReviewerComponent,
     AdvancedWorkflowActionPageComponent,
-    AdvancedWorkflowActionsDirective,
     ReviewersListComponent,
-  ]
+  ],
 })
 /**
  * This module handles all modules that need to access the workflowitems edit page.
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
index c14344d70d..77232762c3 100644
--- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
@@ -1,4 +1,5 @@
 import { first } from 'rxjs/operators';
+
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
@@ -11,13 +12,13 @@ describe('ItemFromWorkspaceResolver', () => {
     const itemUuid = '8888-8888-8888-8888';
     const wfi = {
       id: uuid,
-      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid }),
     };
 
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi),
       } as any;
       resolver = new ItemFromWorkspaceResolver(wfiService, null);
     });
@@ -29,7 +30,7 @@ describe('ItemFromWorkspaceResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(itemUuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
index 60e1fe6a87..efbf28c61c 100644
--- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
+import { Store } from '@ngrx/store';
+
 import { RemoteData } from '../core/data/remote-data';
 import { Item } from '../core/shared/item.model';
-import { Store } from '@ngrx/store';
 import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 
@@ -11,11 +12,11 @@ import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.
  */
 @Injectable()
 export class ItemFromWorkspaceResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
-    constructor(
+  constructor(
         private workspaceItemService: WorkspaceitemDataService,
-        protected store: Store<any>
-    ) {
-        super(workspaceItemService, store);
-    }
+        protected store: Store<any>,
+  ) {
+    super(workspaceItemService, store);
+  }
 
 }
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
index bbd3360db4..0502da186b 100644
--- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
@@ -1,7 +1,8 @@
 import { first } from 'rxjs/operators';
-import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
+
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
 
 describe('WorkflowItemPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('WorkflowItemPageResolver', () => {
 
     beforeEach(() => {
       wsiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       } as any;
       resolver = new WorkspaceItemPageResolver(wsiService);
     });
@@ -23,7 +24,7 @@ describe('WorkflowItemPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
index 1b1aa25492..d10fb8a2b8 100644
--- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
@@ -1,11 +1,16 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { RemoteData } from '../core/data/remote-data';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific workflow item before the route is activated
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts
index 681cba21c8..5f30cc0d1c 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts
@@ -1,5 +1,6 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
 
 /**
@@ -9,7 +10,7 @@ import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.
 @Component({
   selector: 'ds-themed-workspace-items-delete',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedWorkspaceItemsDeletePageComponent extends ThemedComponent<WorkspaceItemsDeletePageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts
index ac2878e8bd..06fa6ddb80 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts
@@ -1,31 +1,43 @@
+import { Location } from '@angular/common';
+import {
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
-import { Location } from '@angular/common';
-import { of as observableOf } from 'rxjs';
-import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { LocationStub } from '../../shared/testing/location.stub';
-import { By } from '@angular/platform-browser';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
 
 describe('WorkspaceitemsDeletePageComponent', () => {
   let component: WorkspaceItemsDeletePageComponent;
   let fixture: ComponentFixture<WorkspaceItemsDeletePageComponent>;
 
   const workspaceitemDataServiceSpy = jasmine.createSpyObj('WorkspaceitemDataService', {
-    delete: observableOf(createSuccessfulRemoteDataObject({}))
+    delete: observableOf(createSuccessfulRemoteDataObject({})),
   });
 
   const wsi = new WorkspaceItem();
@@ -37,14 +49,14 @@ describe('WorkspaceitemsDeletePageComponent', () => {
     get: () => observableOf('test-message'),
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
-    onDefaultLangChange: new EventEmitter()
+    onDefaultLangChange: new EventEmitter(),
   };
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
         NgbModalModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [WorkspaceItemsDeletePageComponent],
       providers: [
@@ -55,7 +67,7 @@ describe('WorkspaceitemsDeletePageComponent', () => {
             {
               wsi: createSuccessfulRemoteDataObject(wsi),
               dso: createSuccessfulRemoteDataObject(dso),
-            }
+            },
           ),
         },
         { provide: Router, useValue: new RouterMock() },
@@ -92,7 +104,7 @@ describe('WorkspaceitemsDeletePageComponent', () => {
   });
 
   it('should delete the target workspace item', () => {
-    spyOn((component as any).modalService, 'open').and.returnValue({result: Promise.resolve('ok')});
+    spyOn((component as any).modalService, 'open').and.returnValue({ result: Promise.resolve('ok') });
     component.confirmDelete(By.css('#delete-modal'));
     fixture.detectChanges();
     expect((component as any).modalService.open).toHaveBeenCalled();
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
index 77ed0519d6..af1a12ed46 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -1,22 +1,39 @@
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { RouteService } from '../../core/services/route.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { Component, OnInit } from '@angular/core';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { map, Observable, switchMap, take } from 'rxjs';
-import { ActivatedRoute, Data, Params, Router } from '@angular/router';
 import { Location } from '@angular/common';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Params,
+  Router,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+  switchMap,
+  take,
+} from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-workspaceitems-delete-page',
   templateUrl: './workspaceitems-delete-page.component.html',
-  styleUrls: ['./workspaceitems-delete-page.component.scss']
+  styleUrls: ['./workspaceitems-delete-page.component.scss'],
 })
 export class WorkspaceItemsDeletePageComponent implements OnInit {
 
@@ -52,38 +69,38 @@ export class WorkspaceItemsDeletePageComponent implements OnInit {
     this.previousQueryParameters = (this.location.getState() as { [key: string]: any }).previousQueryParams;
   }
 
-    /**
+  /**
    * Navigates to the previous url
    * If there's not previous url, it continues to the mydspace page instead
    */
-    previousPage() {
-      this.routeService.getPreviousUrl().pipe(take(1))
-        .subscribe((url: string) => {
-            let params: Params = {};
-            if (!url) {
-              url = '/mydspace';
-              params = this.previousQueryParameters;
-            }
-            if (url.split('?').length > 1) {
-              for (const param of url.split('?')[1].split('&')) {
-                params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
-              }
-            }
-            void this.router.navigate([url.split('?')[0]], { queryParams: params });
+  previousPage() {
+    this.routeService.getPreviousUrl().pipe(take(1))
+      .subscribe((url: string) => {
+        let params: Params = {};
+        if (!url) {
+          url = '/mydspace';
+          params = this.previousQueryParameters;
+        }
+        if (url.split('?').length > 1) {
+          for (const param of url.split('?')[1].split('&')) {
+            params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
           }
-        );
-    }
+        }
+        void this.router.navigate([url.split('?')[0]], { queryParams: params });
+      },
+      );
+  }
 
   /**
    * Open the modal to confirm the deletion of the workspaceitem
    */
   public async confirmDelete(content) {
-   await this.modalService.open(content).result.then(
+    await this.modalService.open(content).result.then(
       (result) => {
         if (result === 'ok') {
-         this.sendDeleteRequest();
+          this.sendDeleteRequest();
         }
-      }
+      },
     );
   }
 
@@ -94,7 +111,7 @@ export class WorkspaceItemsDeletePageComponent implements OnInit {
     this.wsi$.pipe(
       switchMap((wsi: WorkspaceItem) => this.workspaceItemService.delete(wsi.id).pipe(
         getFirstCompletedRemoteData(),
-      ))
+      )),
     ).subscribe((response: RemoteData<NoContent>) => {
       if (response.hasSucceeded) {
         const title = this.translationService.get('workspace-item.delete.notification.success.title');
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
index 61393d9f64..712c1e9ece 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
@@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
+import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
-import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
 import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
 
 @NgModule({
   imports: [
@@ -23,9 +23,9 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
             path: 'edit',
             component: ThemedSubmissionEditComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }
+            data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' },
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -33,9 +33,9 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
             component: ThemedFullItemPageComponent,
             resolve: {
               dso: ItemFromWorkspaceResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }
+            data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' },
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -43,9 +43,9 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
             component: WorkspaceItemsDeletePageComponent,
             resolve: {
               dso: ItemFromWorkspaceResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' }
+            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -53,15 +53,15 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
             component: ThemedWorkspaceItemsDeletePageComponent,
             resolve: {
               dso: ItemFromWorkspaceResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' }
+            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
           },
-        ]
-      }
-    ])
+        ],
+      },
+    ]),
   ],
-  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver]
+  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver],
 })
 /**
  * This module defines the default component to load when navigating to the workspaceitems edit page path
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
index 77cb7a6e66..0ef3ea7e71 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
@@ -1,10 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
-import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
-import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
 import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
+import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 
 @NgModule({
   imports: [
@@ -16,7 +17,7 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
   declarations: [
     WorkspaceItemsDeletePageComponent,
     ThemedWorkspaceItemsDeletePageComponent,
-  ]
+  ],
 })
 /**
  * This module handles all modules that need to access the workspaceitems edit page.
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 70f5fdadb1..0b69b46b55 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -878,7 +878,408 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   // TODO New key - Add a translation
@@ -3878,6 +4279,20 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
@@ -3980,6 +4395,10 @@
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
@@ -4113,6 +4532,9 @@
   "menu.section.statistics_task": "Statistics Task",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
@@ -4276,25 +4698,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index cc05d12828..8c99662d4b 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -717,7 +717,408 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "পেছনে",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "প্রশাসনিক অনুসন্ধান",
@@ -3565,6 +3966,17 @@
   "menu.section.access_control_people": "ব্যাক্তি",
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "অ্যাডমিন অনুসন্ধান",
@@ -3645,6 +4057,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "অ্যাক্সেস কন্ট্রোল মেনু বিভাগ",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "অ্যাডমিন অনুসন্ধান মেনু বিভাগ",
 
@@ -3751,6 +4167,9 @@
   "menu.section.statistics_task": "পরিসংখ্যান টাস্ক",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "অ্যাক্সেস কন্ট্রোল বিভাগ টগল করুন",
@@ -3880,20 +4299,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "আপনার জমাগুলো",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "সংরক্ষণাগারভুক্ত",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "সংরক্ষণাগারভুক্ত",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "বৈধতা",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "বৈধতা",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "নিয়ামক জন্য অপেক্ষা করছে",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "নিয়ামক জন্য অপেক্ষা করছে",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "ওয়ার্কফ্লো",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "ওয়ার্কফ্লো",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "কর্মক্ষেত্র",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "কর্মক্ষেত্র",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "আমার ডিস্পেস",
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index 34279548bb..6fefff87dc 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -748,6 +748,409 @@
 
 
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Cerca administrativa",
 
@@ -3863,6 +4266,20 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Cerca d'administrador",
 
@@ -3944,6 +4361,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secció del menú de control d'accés",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Secció del menú de cerca d'administrador",
 
@@ -4057,6 +4478,10 @@
 
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secció de Control d'accés",
 
@@ -4190,20 +4615,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Els seus enviaments",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arxivat",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arxivat",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validació",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validació",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperant el controlador",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperant el controlador",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Flux de treball",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flux de treball",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espai de treball",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espai de treball",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "El meu DSpace",
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index f3155e9f57..651a3fd6b3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -858,7 +858,408 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   // TODO New key - Add a translation
@@ -3789,6 +4190,18 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
@@ -3891,6 +4304,10 @@
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
@@ -4024,6 +4441,9 @@
   "menu.section.statistics_task": "Statistics Task",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
@@ -4187,25 +4607,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index b03dc21e5a..b726f62b71 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -684,7 +684,408 @@
   // "admin.access-control.groups.form.return": "Return to groups",
   "admin.access-control.groups.form.return": "Zurück zu den Gruppen",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Admin-Suche",
@@ -731,9 +1132,6 @@
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "Workflows verwalten",
 
-  // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "Workflows",
-
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Löschen",
 
@@ -1382,7 +1780,7 @@
 
 
   // "community.create.head": "Create a Community",
-  "community.create.head": "Sammlung anlegen",
+  "community.create.head": "Bereich anlegen",
 
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "Bereich erfolgreich angelegt",
@@ -1712,7 +2110,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virenscan",
 
-
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "DOI registrieren",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Aufgabe:",
@@ -2192,6 +2591,44 @@
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Datenschutzerklärung",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Feedback",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Feedback",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Feedback",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Wir freuen uns auf Ihr Feedback. Sofern Sie eine Rückmeldung wünschen, werden wir uns in Kürze bei Ihnen melden.",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Sollten wir Rückfragen zu Ihrem Feedback haben, dann kontaktieren wir Sie unter dieser E-Mailadresse.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Feedback senden",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Ihr Kommentar",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Ihre E-Mailadresse",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Vielen Dank für Ihr Feedback! Ihr Feedback wurde erfolgreich versendet.",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Bitte geben Sie eine gültige E-Mailadresse ein!",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Bitte geben Sie einen Kommentar ein!",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "URL der Seite",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Dies ist die URL der Seite, auf die sich Ihr Feedback bezieht.",
 
 
   // "item.alerts.private": "This item is private",
@@ -3179,6 +3616,15 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Berichte",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Filtrierte Sammlungen",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Metadatenabfrage",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Admin-Suche",
 
@@ -3258,6 +3704,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Menübereich Zugriffskontrolle",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Menüabschnitt (Admin-Suche)",
 
@@ -3361,6 +3811,9 @@
   "menu.section.statistics_task": "Statistikaufgaben",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Bereich Zugriffskontrolle umschalten",
@@ -3484,20 +3937,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Ihre Veröffentlichungen",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archiviert",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviert",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validierung",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validierung",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Warten auf die Überprüfung",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Warten auf die Überprüfung",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Geschäftsgang",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Geschäftsgang",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Arbeitsbereich",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Arbeitsbereich",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mein DSpace",
@@ -4487,6 +4940,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Ja",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archiviert",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validierung",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for Controller",
+  "search.filters.namedresourcetype.Waiting for Controller": "Warten auf die Überprüfung",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Geschäftsgang",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Arbeitsbereich",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Ja",
 
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index af8a4fce49..018181c43f 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -151,6 +151,410 @@
   "admin.access-control.groups.title": "Ομάδες",
   "admin.access-control.groups.title.addGroup": "Νέα ομάδα",
   "admin.access-control.groups.title.singleGroup": "Επεξεργασία ομάδας",
+
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   "admin.curation-tasks.breadcrumbs": "Εργασίες επιμέλειας συστήματος",
   "admin.curation-tasks.header": "Εργασίες επιμέλειας συστήματος",
   "admin.curation-tasks.title": "Εργασίες επιμέλειας συστήματος",
@@ -1214,6 +1618,19 @@
   "menu.section.access_control_authorizations": "Εξουσιοδοτήσεις",
   "menu.section.access_control_groups": "Ομάδες",
   "menu.section.access_control_people": "Ανθρωποι",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   "menu.section.admin_search": "Αναζήτηση διαχειριστή",
   "menu.section.browse_community": "Αυτή η Κοινότητα",
   "menu.section.browse_community_by_author": "Από Συγγραφέα",
@@ -1238,6 +1655,11 @@
   "menu.section.export_metadata": "Μεταδεδομένα",
   "menu.section.health": "Υγεία",
   "menu.section.icon.access_control": "Ενότητα μενού ελέγχου πρόσβασης",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   "menu.section.icon.admin_search": "Ενότητα μενού αναζήτησης διαχειριστή",
   "menu.section.icon.control_panel": "Ενότητα μενού Πίνακας Ελέγχου",
   "menu.section.icon.curation_tasks": "Ενότητα μενού Εργασίας Επιμέλειας",
@@ -1270,6 +1692,11 @@
   "menu.section.statistics": "Στατιστικά",
   "menu.section.statistics_task": "Εργασία Στατιστικών",
   "menu.section.toggle.access_control": "Εναλλαγή ενότητας Ελέγχου πρόσβασης",
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   "menu.section.toggle.control_panel": "Εναλλαγή ενότητας Πίνακας Ελέγχου",
   "menu.section.toggle.curation_task": "Εναλλαγή ενότητας Εργασία Επιμέλειας",
   "menu.section.toggle.edit": "Εναλλαγή ενότητας Επεξεργασία",
@@ -1315,11 +1742,11 @@
   "mydspace.search-form.placeholder": "Αναζήτηση στο mydspace...",
   "mydspace.show.workflow": "Εργασίες ροής εργασιών",
   "mydspace.show.workspace": "Οι Υποβολές σας",
-  "mydspace.status.archived": "Αρχειοθετημένα",
-  "mydspace.status.validation": "Επικύρωση",
-  "mydspace.status.waiting-for-controller": "Αναμονή για τον ελεγκτή",
-  "mydspace.status.workflow": "Ροή εργασιών",
-  "mydspace.status.workspace": "Χώρος εργασίας",
+  "mydspace.status.mydspaceArchived": "Αρχειοθετημένα",
+  "mydspace.status.mydspaceValidation": "Επικύρωση",
+  "mydspace.status.mydspaceWaitingController": "Αναμονή για τον ελεγκτή",
+  "mydspace.status.mydspaceWorkflow": "Ροή εργασιών",
+  "mydspace.status.mydspaceWorkspace": "Χώρος εργασίας",
   "mydspace.title": "MyDSpace",
   "mydspace.upload.upload-failed": "Σφάλμα κατά τη δημιουργία νέου χώρου εργασίας. Επαληθεύστε το περιεχόμενο που ανεβάσατε πριν δοκιμάσετε ξανά.",
   "mydspace.upload.upload-failed-manyentries": "Μη επεξεργάσιμο αρχείο. Εντοπίστηκαν πάρα πολλές καταχωρίσεις, αλλά επιτρέπεται μόνο μία για αρχείο.",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..541bb4f39d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4,15 +4,15 @@
 
   "401.link.home-page": "Take me to the home page",
 
-  "401.unauthorized": "unauthorized",
+  "401.unauthorized": "Unauthorized",
 
   "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
 
   "403.link.home-page": "Take me to the home page",
 
-  "403.forbidden": "forbidden",
+  "403.forbidden": "Forbidden",
 
-  "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Service unavailable",
 
   "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
 
@@ -22,15 +22,15 @@
 
   "404.link.home-page": "Take me to the home page",
 
-  "404.page-not-found": "page not found",
+  "404.page-not-found": "Page not found",
 
-  "error-page.description.401": "unauthorized",
+  "error-page.description.401": "Unauthorized",
 
-  "error-page.description.403": "forbidden",
+  "error-page.description.403": "Forbidden",
 
-  "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Service unavailable",
 
-  "error-page.description.404": "page not found",
+  "error-page.description.404": "Page not found",
 
   "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
 
@@ -58,7 +58,7 @@
 
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
 
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Create bitstream format",
 
   "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
 
@@ -128,6 +128,8 @@
 
   "admin.registries.bitstream-formats.table.name": "Name",
 
+  "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+
   "admin.registries.bitstream-formats.table.id": "ID",
 
   "admin.registries.bitstream-formats.table.return": "Back",
@@ -142,6 +144,10 @@
 
   "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
 
+  "admin.registries.bitstream-formats.select": "Select",
+
+  "admin.registries.bitstream-formats.deselect": "Deselect",
+
   "admin.registries.metadata.breadcrumbs": "Metadata registry",
 
   "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
@@ -158,8 +164,14 @@
 
   "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
 
+  "admin.registries.metadata.schemas.select": "Select",
+
+  "admin.registries.metadata.schemas.deselect": "Deselect",
+
   "admin.registries.metadata.schemas.table.delete": "Delete selected",
 
+  "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+
   "admin.registries.metadata.schemas.table.id": "ID",
 
   "admin.registries.metadata.schemas.table.name": "Name",
@@ -172,6 +184,10 @@
 
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
 
+  "admin.registries.schema.fields.select": "Select",
+
+  "admin.registries.schema.fields.deselect": "Deselect",
+
   "admin.registries.schema.fields.head": "Schema metadata fields",
 
   "admin.registries.schema.fields.no-items": "No metadata fields to show.",
@@ -180,6 +196,8 @@
 
   "admin.registries.schema.fields.table.field": "Field",
 
+  "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+
   "admin.registries.schema.fields.table.id": "ID",
 
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -248,6 +266,14 @@
 
   "admin.access-control.epeople.title": "EPeople",
 
+  "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+
+  "admin.access-control.epeople.edit.title": "New EPerson",
+
+  "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+
+  "admin.access-control.epeople.add.title": "Add EPerson",
+
   "admin.access-control.epeople.head": "EPeople",
 
   "admin.access-control.epeople.search.head": "Search",
@@ -256,7 +282,7 @@
 
   "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Email (exact)",
 
   "admin.access-control.epeople.search.button": "Search",
 
@@ -268,7 +294,7 @@
 
   "admin.access-control.epeople.table.name": "Name",
 
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Email (exact)",
 
   "admin.access-control.epeople.table.edit": "Edit",
 
@@ -288,9 +314,9 @@
 
   "admin.access-control.epeople.form.lastName": "Last name",
 
-  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Email",
 
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
 
   "admin.access-control.epeople.form.canLogIn": "Can log in",
 
@@ -326,7 +352,7 @@
 
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
 
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
 
   "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
 
@@ -426,10 +452,6 @@
 
   "admin.access-control.groups.form.members-list.headMembers": "Current Members",
 
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-
   "admin.access-control.groups.form.members-list.search.button": "Search",
 
   "admin.access-control.groups.form.members-list.table.id": "ID",
@@ -486,8 +508,6 @@
 
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
 
   "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
@@ -506,11 +526,221 @@
 
   "admin.access-control.groups.form.return": "Back",
 
+  "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+
+  "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+
+  "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+
+  "admin.quality-assurance.page.title": "Quality Assurance",
+
+  "admin.notifications.source.breadcrumbs": "Quality Assurance",
+
   "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
 
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
 
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  "admin.reports.button.show-collections": "Show Collections",
+
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  "admin.reports.collections.item-results": "Item Results",
+
+  "admin.reports.collections.community": "Community",
+
+  "admin.reports.collections.collection": "Collection",
+
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  "admin.reports.items.head": "Metadata Query Report",
+
+  "admin.reports.items.run": "Run Item Query",
+
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  "admin.reports.items.limit": "Limit/",
+
+  "admin.reports.items.offset": "Offset",
+
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  "admin.reports.items.anyField": "Any field",
+
+  "admin.reports.items.predicate.exists": "exists",
+
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  "admin.reports.items.predicate.equals": "equals",
+
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  "admin.reports.items.predicate.like": "like",
+
+  "admin.reports.items.predicate.notLike": "not like",
+
+  "admin.reports.items.predicate.contains": "contains",
+
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  "admin.reports.items.predicate.matches": "matches",
+
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  "admin.reports.items.preset.new": "New Query",
+
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  "admin.reports.items.number": "No.",
+
+  "admin.reports.items.id": "UUID",
+
+  "admin.reports.items.collection": "Collection",
+
+  "admin.reports.items.handle": "URI",
+
+  "admin.reports.items.title": "Title",
+
+
+  "admin.reports.commons.filters": "Filters",
+
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  "admin.reports.commons.next-page": "Next Page",
+
+  "admin.reports.commons.page": "Page",
+
+  "admin.reports.commons.of": "of",
+
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   "admin.search.breadcrumbs": "Administrative Search",
 
@@ -586,9 +816,9 @@
 
   "admin.metadata-import.page.error.addFile": "Select file first!",
 
-  "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
 
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Select ZIP file first!",
 
   "admin.metadata-import.page.toggle.upload": "Upload",
 
@@ -624,10 +854,6 @@
 
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
 
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
 
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
@@ -700,7 +926,7 @@
 
   "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
 
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Primary File",
 
   "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
 
@@ -750,7 +976,7 @@
 
   "bitstream-request-a-copy.name.error": "The name is required",
 
-  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Your email address *",
 
   "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
 
@@ -782,6 +1008,8 @@
 
   "browse.comcol.by.srsc": "By Subject Category",
 
+  "browse.comcol.by.nsi": "By Norwegian Science Index",
+
   "browse.comcol.by.title": "By Title",
 
   "browse.comcol.head": "Browse",
@@ -796,6 +1024,8 @@
 
   "browse.metadata.title": "Title",
 
+  "browse.metadata.srsc": "Subject Category",
+
   "browse.metadata.author.breadcrumbs": "Browse by Author",
 
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
@@ -804,6 +1034,8 @@
 
   "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
 
+  "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+
   "browse.metadata.title.breadcrumbs": "Browse by Title",
 
   "pagination.next.button": "Next",
@@ -862,9 +1094,9 @@
 
   "browse.taxonomy.button": "Browse",
 
-  "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
 
-  "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Browsing by {{ field }} {{ value }}",
 
   "search.browse.item-back": "Back to Results",
 
@@ -876,6 +1108,8 @@
 
   "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
 
+  "collection.browse.logo": "Browse for a collection logo",
+
   "collection.create.head": "Create a Collection",
 
   "collection.create.notifications.success": "Successfully created the Collection",
@@ -1072,9 +1306,9 @@
 
   "collection.listelement.badge": "Collection",
 
-  "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.logo": "Collection logo",
 
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   "collection.page.edit": "Edit this collection",
 
@@ -1084,10 +1318,18 @@
 
   "collection.page.news": "News",
 
+  "collection.search.results.head": "Search Results",
+
   "collection.select.confirm": "Confirm selected",
 
   "collection.select.empty": "No collections to show",
 
+  "collection.select.table.selected": "Selected collections",
+
+  "collection.select.table.select": "Select collection",
+
+  "collection.select.table.deselect": "Deselect collection",
+
   "collection.select.table.title": "Title",
 
   "collection.source.controls.head": "Harvest Controls",
@@ -1148,6 +1390,14 @@
 
   "communityList.showMore": "Show More",
 
+  "communityList.expand": "Expand {{ name }}",
+
+  "communityList.collapse": "Collapse {{ name }}",
+
+  "community.browse.logo": "Browse for a community logo",
+
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
   "community.create.head": "Create a Community",
 
   "community.create.notifications.success": "Successfully created the Community",
@@ -1182,9 +1432,9 @@
 
   "community.edit.logo.label": "Community logo",
 
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
 
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Upload community logo successful.",
 
   "community.edit.logo.notifications.delete.success.title": "Logo deleted",
 
@@ -1192,13 +1442,13 @@
 
   "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
 
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Drop a community logo to upload",
 
   "community.edit.notifications.success": "Successfully edited the Community",
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "An error occured while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1224,6 +1474,8 @@
 
   "community.listelement.badge": "Community",
 
+  "community.logo": "Community logo",
+
   "comcol-role.edit.no-group": "None",
 
   "comcol-role.edit.create": "Create",
@@ -1256,7 +1508,7 @@
 
   "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
 
-  "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
 
   "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
 
@@ -1298,6 +1550,8 @@
 
   "community.all-lists.head": "Subcommunities and Collections",
 
+  "community.search.results.head": "Search Results",
+
   "community.sub-collection-list.head": "Collections in this Community",
 
   "community.sub-community-list.head": "Communities in this Community",
@@ -1392,7 +1646,7 @@
 
   "curation-task.task.vscan.label": "Virus Scan",
 
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Register DOI",
 
   "curation.form.task-select.label": "Task:",
 
@@ -1592,9 +1846,9 @@
 
   "error.validation.required": "This field is required",
 
-  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "This is not a valid email",
 
-  "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "This email is already taken",
 
   "error.validation.groupExists": "This group already exists",
 
@@ -1614,6 +1868,8 @@
 
   "feed.description": "Syndication feed",
 
+  "file-download-link.restricted": "Restricted bitstream",
+
   "file-section.error.header": "Error obtaining files for this item",
 
   "footer.copyright": "copyright © 2002-{{ year }}",
@@ -1668,7 +1924,7 @@
 
   "forgot-password.form.label.passwordrepeat": "Retype to confirm",
 
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
@@ -1746,6 +2002,10 @@
 
   "form.create": "Create",
 
+  "form.number-picker.decrement": "Decrement {{field}}",
+
+  "form.number-picker.increment": "Increment {{field}}",
+
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
   "grant-deny-request-copy.deny": "Don't send copy",
@@ -1888,12 +2148,16 @@
 
   "info.feedback.page-label": "Page",
 
-  "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "The page related to your feedback",
 
   "item.alerts.private": "This item is non-discoverable",
 
   "item.alerts.withdrawn": "This item has been withdrawn",
 
+  "item.alerts.reinstate-request": "Request reinstate",
+
+  "quality-assurance.event.table.person-who-requested": "Requested by",
+
   "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
 
   "item.edit.authorizations.title": "Edit item's Policies",
@@ -2088,6 +2352,12 @@
 
   "item.edit.metadata.discard-button": "Discard",
 
+  "item.edit.metadata.edit.language": "Edit language",
+
+  "item.edit.metadata.edit.value": "Edit value",
+
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2112,6 +2382,8 @@
 
   "item.edit.metadata.headers.value": "Value",
 
+  "item.edit.metadata.metadatafield": "Edit field",
+
   "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -2140,6 +2412,12 @@
 
   "item.edit.metadata.save-button": "Save",
 
+  "item.edit.metadata.authority.label": "Authority: ",
+
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+
   "item.edit.modify.overview.field": "Field",
 
   "item.edit.modify.overview.language": "Language",
@@ -2162,6 +2440,8 @@
 
   "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
 
+  "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+
   "item.edit.move.move": "Move",
 
   "item.edit.move.processing": "Moving...",
@@ -2356,6 +2636,14 @@
 
   "item.truncatable-part.show-less": "Collapse",
 
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  "item.qa-event-notification-info.check.button": "View",
+
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  "mydspace.qa-event-notification-info.check.button": "View",
+
   "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
 
   "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
@@ -2372,6 +2660,24 @@
 
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
 
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
+
   "item.page.abstract": "Abstract",
 
   "item.page.author": "Authors",
@@ -2432,6 +2738,8 @@
 
   "item.page.bitstreams.collapse": "Collapse",
 
+  "item.page.bitstreams.primary": "Primary",
+
   "item.page.filesection.original.bundle": "Original bundle",
 
   "item.page.filesection.license.bundle": "License bundle",
@@ -2440,12 +2748,18 @@
 
   "item.page.version.create": "Create new version",
 
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  "item.page.reinstate": "Request reinstatement",
+
   "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
 
   "item.page.claim.button": "Claim",
 
   "item.page.claim.tooltip": "Claim this item as profile",
 
+  "item.page.image.alt.ROR": "ROR logo",
+
   "item.preview.dc.identifier.uri": "Identifier:",
 
   "item.preview.dc.contributor.author": "Authors:",
@@ -2498,10 +2812,32 @@
 
   "item.preview.oaire.fundingStream": "Funding Stream:",
 
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  "item.preview.organization.address.addressCountry": "Country",
+
+  "item.preview.organization.foundingDate": "Founding Date",
+
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  "item.preview.organization.legalName": "Legal Name",
+
+  "item.preview.dspace.entity.type": "Entity Type:",
+
   "item.select.confirm": "Confirm selected",
 
   "item.select.empty": "No items to show",
 
+  "item.select.table.selected": "Selected items",
+
+  "item.select.table.select": "Select item",
+
+  "item.select.table.deselect": "Deselect item",
+
   "item.select.table.author": "Author",
 
   "item.select.table.collection": "Collection",
@@ -2552,6 +2888,12 @@
 
   "item.version.create.modal.header": "New version",
 
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
+
+  "item.qa.reinstate.modal.header": "Request reinstate",
+
+  "item.qa.reinstate.create.modal.header": "New version",
+
   "item.version.create.modal.text": "Create a new version for this item",
 
   "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
@@ -2560,16 +2902,44 @@
 
   "item.version.create.modal.button.confirm.tooltip": "Create new version",
 
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
   "item.version.create.modal.button.cancel": "Cancel",
 
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
   "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
 
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
   "item.version.create.modal.form.summary.label": "Summary",
 
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
   "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
 
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
   "item.version.create.modal.submitted.header": "Creating new version...",
 
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
   "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
 
   "item.version.create.notification.success": "New version has been created with version number {{version}}",
@@ -2602,6 +2972,10 @@
 
   "itemtemplate.edit.metadata.discard-button": "Discard",
 
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
+
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2624,6 +2998,8 @@
 
   "itemtemplate.edit.metadata.headers.value": "Value",
 
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
   "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -2690,6 +3066,8 @@
 
   "journalissue.page.titleprefix": "Journal Issue: ",
 
+  "journalissue.search.results.head": "Journal Issue Search Results",
+
   "journalvolume.listelement.badge": "Journal Volume",
 
   "journalvolume.page.description": "Description",
@@ -2702,6 +3080,8 @@
 
   "journalvolume.page.volume": "Volume",
 
+  "journalvolume.search.results.head": "Journal Volume Search Results",
+
   "iiifsearchable.listelement.badge": "Document Media",
 
   "iiifsearchable.page.titleprefix": "Document: ",
@@ -2768,8 +3148,6 @@
 
   "login.form.new-user": "New user? Click here to register.",
 
-  "login.form.or-divider": "or",
-
   "login.form.oidc": "Log in with OIDC",
 
   "login.form.orcid": "Log in with ORCID",
@@ -2790,6 +3168,8 @@
 
   "logout.title": "Logout",
 
+  "menu.header.nav.description": "Admin navigation bar",
+
   "menu.header.admin": "Management",
 
   "menu.header.image.logo": "Repository logo",
@@ -2806,6 +3186,12 @@
 
   "menu.section.access_control_people": "People",
 
+  "menu.section.reports": "Reports",
+
+  "menu.section.reports.collections": "Filtered Collections",
+
+  "menu.section.reports.queries": "Metadata Query",
+
   "menu.section.admin_search": "Admin Search",
 
   "menu.section.browse_community": "This Community",
@@ -2826,6 +3212,8 @@
 
   "menu.section.browse_global_by_srsc": "By Subject Category",
 
+  "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+
   "menu.section.browse_global_by_title": "By Title",
 
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
@@ -2856,6 +3244,8 @@
 
   "menu.section.icon.access_control": "Access Control menu section",
 
+  "menu.section.icon.reports": "Reports menu section",
+
   "menu.section.icon.admin_search": "Admin search menu section",
 
   "menu.section.icon.control_panel": "Control Panel menu section",
@@ -2886,6 +3276,8 @@
 
   "menu.section.icon.unpin": "Unpin sidebar",
 
+  "menu.section.icon.notifications": "Notifications menu section",
+
   "menu.section.import": "Import",
 
   "menu.section.import_batch": "Batch Import (ZIP)",
@@ -2904,6 +3296,12 @@
 
   "menu.section.new_process": "Process",
 
+  "menu.section.notifications": "Notifications",
+
+  "menu.section.quality-assurance": "Quality Assurance",
+
+  "menu.section.notifications_publication-claim": "Publication Claim",
+
   "menu.section.pin": "Pin sidebar",
 
   "menu.section.unpin": "Unpin sidebar",
@@ -2924,6 +3322,8 @@
 
   "menu.section.toggle.access_control": "Toggle Access Control section",
 
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   "menu.section.toggle.control_panel": "Toggle Control Panel section",
 
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
@@ -3002,13 +3402,13 @@
 
   "mydspace.results.no-title": "No title",
 
-  "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "No URI",
 
-  "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Search in MyDSpace...",
 
   "mydspace.show.workflow": "Workflow tasks",
 
-  "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Your submissions",
 
   "mydspace.show.supervisedWorkspace": "Supervised items",
 
@@ -3016,7 +3416,7 @@
 
   "mydspace.status.mydspaceValidation": "Validation",
 
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   "mydspace.status.mydspaceWorkflow": "Workflow",
 
@@ -3034,6 +3434,14 @@
 
   "mydspace.view-btn": "View",
 
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+
+  "notification.suggestion.review": "review the suggestions",
+
+  "notification.suggestion.please": "Please",
+
   "nav.browse.header": "All of DSpace",
 
   "nav.community-browse.header": "By Community",
@@ -3044,7 +3452,7 @@
 
   "nav.login": "Log In",
 
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "User profile menu and log out",
 
   "nav.logout": "Log Out",
 
@@ -3070,6 +3478,146 @@
 
   "none.listelement.badge": "Item",
 
+  "quality-assurance.title": "Quality Assurance",
+
+  "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+
+  "quality-assurance.source.description": "Below you can see all the notification's sources.",
+
+  "quality-assurance.topics": "Current Topics",
+
+  "quality-assurance.source": "Current Sources",
+
+  "quality-assurance.table.topic": "Topic",
+
+  "quality-assurance.table.source": "Source",
+
+  "quality-assurance.table.last-event": "Last Event",
+
+  "quality-assurance.table.actions": "Actions",
+
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  "quality-assurance.noTopics": "No topics found.",
+
+  "quality-assurance.noSource": "No sources found.",
+
+  "notifications.events.title": "Quality Assurance Suggestions",
+
+  "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+
+  "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+
+  "quality-assurance.loading": "Loading ...",
+
+  "quality-assurance.events.topic": "Topic:",
+
+  "quality-assurance.noEvents": "No suggestions found.",
+
+  "quality-assurance.event.table.trust": "Trust",
+
+  "quality-assurance.event.table.publication": "Publication",
+
+  "quality-assurance.event.table.details": "Details",
+
+  "quality-assurance.event.table.project-details": "Project details",
+
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  "quality-assurance.event.table.actions": "Actions",
+
+  "quality-assurance.event.action.accept": "Accept suggestion",
+
+  "quality-assurance.event.action.ignore": "Ignore suggestion",
+
+  "quality-assurance.event.action.undo": "DELETE",
+
+  "quality-assurance.event.action.reject": "Reject suggestion",
+
+  "quality-assurance.event.action.import": "Import project and accept suggestion",
+
+  "quality-assurance.event.table.pidtype": "PID Type:",
+
+  "quality-assurance.event.table.pidvalue": "PID Value:",
+
+  "quality-assurance.event.table.subjectValue": "Subject Value:",
+
+  "quality-assurance.event.table.abstract": "Abstract:",
+
+  "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+
+  "quality-assurance.event.table.project": "Project title:",
+
+  "quality-assurance.event.table.acronym": "Acronym:",
+
+  "quality-assurance.event.table.code": "Code:",
+
+  "quality-assurance.event.table.funder": "Funder:",
+
+  "quality-assurance.event.table.fundingProgram": "Funding program:",
+
+  "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+
+  "quality-assurance.events.back": "Back to topics",
+
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  "quality-assurance.event.table.less": "Show less",
+
+  "quality-assurance.event.table.more": "Show more",
+
+  "quality-assurance.event.project.found": "Bound to the local record:",
+
+  "quality-assurance.event.project.notFound": "No local record found",
+
+  "quality-assurance.event.sure": "Are you sure?",
+
+  "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+
+  "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+
+  "quality-assurance.event.action.cancel": "Cancel",
+
+  "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+
+  "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+
+  "quality-assurance.event.modal.project.title": "Choose a project to bound",
+
+  "quality-assurance.event.modal.project.publication": "Publication:",
+
+  "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+
+  "quality-assurance.event.modal.project.select": "Project search",
+
+  "quality-assurance.event.modal.project.search": "Search",
+
+  "quality-assurance.event.modal.project.clear": "Clear",
+
+  "quality-assurance.event.modal.project.cancel": "Cancel",
+
+  "quality-assurance.event.modal.project.bound": "Bound project",
+
+  "quality-assurance.event.modal.project.remove": "Remove",
+
+  "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+
+  "quality-assurance.event.modal.project.notFound": "No project found.",
+
+  "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+
+  "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+
+  "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+
+  "quality-assurance.event.reason": "Reason",
+
   "orgunit.listelement.badge": "Organizational Unit",
 
   "orgunit.listelement.no-title": "Untitled",
@@ -3088,6 +3636,8 @@
 
   "orgunit.page.titleprefix": "Organizational Unit: ",
 
+  "orgunit.page.ror": "ROR Identifier",
+
   "pagination.options.description": "Pagination options",
 
   "pagination.results-per-page": "Results Per Page",
@@ -3132,6 +3682,14 @@
 
   "process.new.select-parameters": "Parameters",
 
+  "process.new.select-parameter": "Select parameter",
+
+  "process.new.add-parameter": "Add a parameter...",
+
+  "process.new.delete-parameter": "Delete parameter",
+
+  "process.new.parameter.label": "Parameter value",
+
   "process.new.cancel": "Cancel",
 
   "process.new.submit": "Save",
@@ -3216,12 +3774,32 @@
 
   "process.detail.delete.error": "Something went wrong when deleting the process",
 
+  "process.detail.refreshing": "Auto-refreshing…",
+
+  "process.overview.table.completed.info": "Finish time (UTC)",
+
+  "process.overview.table.completed.title": "Succeeded processes",
+
+  "process.overview.table.empty": "No matching processes found.",
+
+  "process.overview.table.failed.info": "Finish time (UTC)",
+
+  "process.overview.table.failed.title": "Failed processes",
+
   "process.overview.table.finish": "Finish time (UTC)",
 
   "process.overview.table.id": "Process ID",
 
   "process.overview.table.name": "Name",
 
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  "process.overview.table.running.title": "Running processes",
+
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
   "process.overview.table.start": "Start time (UTC)",
 
   "process.overview.table.status": "Status",
@@ -3238,6 +3816,8 @@
 
   "process.overview.delete": "Delete {{count}} processes",
 
+  "process.overview.delete-process": "Delete process",
+
   "process.overview.delete.clear": "Clear delete selection",
 
   "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
@@ -3264,8 +3844,6 @@
 
   "profile.special.groups.head": "Authorization special groups you belong to",
 
-  "profile.head": "Update Profile",
-
   "profile.metadata.form.error.firstname.required": "First Name is required",
 
   "profile.metadata.form.error.lastname.required": "Last Name is required",
@@ -3366,6 +3944,72 @@
 
   "media-viewer.playlist": "Playlist",
 
+  "suggestion.loading": "Loading ...",
+
+  "suggestion.title": "Publication Claim",
+
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  "suggestion.targets": "Current Suggestions",
+
+  "suggestion.table.name": "Researcher Name",
+
+  "suggestion.table.actions": "Actions",
+
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  "suggestion.noTargets": "No target found.",
+
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  "suggestion.evidence.type": "Type",
+
+  "suggestion.evidence.score": "Score",
+
+  "suggestion.evidence.notes": "Notes",
+
+  "suggestion.approveAndImport": "Approve & import",
+
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  "suggestion.seeEvidence": "See evidence",
+
+  "suggestion.hideEvidence": "Hide evidence",
+
+  "suggestion.suggestionFor": "Suggestions for",
+
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  "suggestion.from.source": "from the ",
+
+  "suggestion.count.missing": "You have no publication claims left",
+
+  "suggestion.totalScore": "Total Score",
+
+  "suggestion.type.openaire": "OpenAIRE",
+
   "register-email.title": "New user registration",
 
   "register-page.create-profile.header": "Create Profile",
@@ -3462,10 +4106,14 @@
 
   "relationships.isIssueOf": "Journal Issues",
 
+  "relationships.isIssueOf.JournalIssue": "Journal Issue",
+
   "relationships.isJournalIssueOf": "Journal Issue",
 
   "relationships.isJournalOf": "Journals",
 
+  "relationships.isJournalVolumeOf": "Journal Volume",
+
   "relationships.isOrgUnitOf": "Organizational Units",
 
   "relationships.isPersonOf": "Authors",
@@ -3482,6 +4130,8 @@
 
   "relationships.isVolumeOf": "Journal Volumes",
 
+  "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+
   "relationships.isContributorOf": "Contributors",
 
   "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
@@ -3594,6 +4244,14 @@
 
   "resource-policies.table.headers.group": "Group",
 
+  "resource-policies.table.headers.select-all": "Select all",
+
+  "resource-policies.table.headers.deselect-all": "Deselect all",
+
+  "resource-policies.table.headers.select": "Select",
+
+  "resource-policies.table.headers.deselect": "Deselect",
+
   "resource-policies.table.headers.id": "ID",
 
   "resource-policies.table.headers.name": "Name",
@@ -3610,6 +4268,8 @@
 
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
 
+  "root.skip-to-content": "Skip to main content",
+
   "search.description": "",
 
   "search.switch-configuration.title": "Show",
@@ -3620,6 +4280,8 @@
 
   "search.search-form.placeholder": "Search the repository ...",
 
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
   "search.filters.applied.f.author": "Author",
 
   "search.filters.applied.f.dateIssued.max": "End date",
@@ -3792,6 +4454,10 @@
 
   "search.filters.filter.show-tree": "Browse {{ name }} tree",
 
+  "search.filters.filter.funding.head": "Funding",
+
+  "search.filters.filter.funding.placeholder": "Funding",
+
   "search.filters.filter.supervisedBy.head": "Supervised By",
 
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
@@ -3812,6 +4478,16 @@
 
   "search.filters.discoverable.false": "Yes",
 
+  "search.filters.namedresourcetype.Archived": "Archived",
+
+  "search.filters.namedresourcetype.Validation": "Validation",
+
+  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+
+  "search.filters.namedresourcetype.Workflow": "Workflow",
+
+  "search.filters.namedresourcetype.Workspace": "Workspace",
+
   "search.filters.withdrawn.true": "Yes",
 
   "search.filters.withdrawn.false": "No",
@@ -3864,6 +4540,10 @@
 
   "search.view-switch.show-list": "Show as list",
 
+  "selectable-list-item-control.deselect": "Deselect item",
+
+  "selectable-list-item-control.select": "Select item",
+
   "sorting.ASC": "Ascending",
 
   "sorting.DESC": "Descending",
@@ -3888,6 +4568,18 @@
 
   "sorting.lastModified.DESC": "Last modified Descending",
 
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
+
   "statistics.title": "Statistics",
 
   "statistics.header": "Statistics for {{ scope }}",
@@ -3932,6 +4624,8 @@
 
   "submission.general.discard.submit": "Discard",
 
+  "submission.general.back.submit": "Back",
+
   "submission.general.info.saved": "Saved",
 
   "submission.general.info.pending-changes": "Unsaved changes",
@@ -3982,6 +4676,8 @@
 
   "submission.import-external.source.datacite": "DataCite",
 
+  "submission.import-external.source.doi": "DOI",
+
   "submission.import-external.source.scielo": "SciELO",
 
   "submission.import-external.source.scopus": "Scopus",
@@ -4012,6 +4708,8 @@
 
   "submission.import-external.source.lcname": "Library of Congress Names",
 
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   "submission.import-external.preview.title": "Item Preview",
 
   "submission.import-external.preview.title.Publication": "Publication Preview",
@@ -4104,6 +4802,8 @@
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
@@ -4126,6 +4826,12 @@
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
 
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
@@ -4182,6 +4888,18 @@
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
@@ -4196,6 +4914,8 @@
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
@@ -4208,6 +4928,8 @@
 
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
 
+  "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
 
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
@@ -4242,6 +4964,8 @@
 
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
 
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
 
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
@@ -4304,6 +5028,8 @@
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
 
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
@@ -4346,6 +5072,8 @@
 
   "submission.sections.general.no-collection": "No collection found",
 
+  "submission.sections.general.no-entity": "No entity types found",
+
   "submission.sections.general.no-sections": "No options available",
 
   "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
@@ -4380,7 +5108,7 @@
 
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
 
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
 
   "submission.sections.submit.progressbar.identifiers": "Identifiers",
 
@@ -4418,6 +5146,10 @@
 
   "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
 
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+
   "submission.sections.upload.delete.confirm.cancel": "Cancel",
 
   "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
@@ -4508,6 +5240,14 @@
 
   "submission.sections.accesses.form.until-placeholder": "Until",
 
+  "submission.sections.duplicates.none": "No duplicates were detected.",
+
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
+
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
   "submission.sections.license.granted-label": "I confirm the license above",
 
   "submission.sections.license.required": "You must accept the license",
@@ -4634,6 +5374,8 @@
 
   "submission.workflow.tasks.pool.show-detail": "Show detail",
 
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+
   "submission.workspace.generic.view": "View",
 
   "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
@@ -4736,6 +5478,8 @@
 
   "vocabulary-treeview.search.form.search": "Search",
 
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+
   "vocabulary-treeview.search.no-result": "There were no items to show",
 
   "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
@@ -4772,6 +5516,8 @@
 
   "supervision.search.results.head": "Workflow and Workspace tasks",
 
+  "orgunit.search.results.head": "Organizational Unit Search Results",
+
   "workflow-item.edit.breadcrumbs": "Edit workflowitem",
 
   "workflow-item.edit.title": "Edit workflowitem",
@@ -5152,6 +5898,8 @@
 
   "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
 
+  "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+
   "system-wide-alert.form.label.preview": "System-wide alert preview",
 
   "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
@@ -5166,6 +5914,8 @@
 
   "admin.system-wide-alert.title": "System-wide Alerts",
 
+  "discover.filters.head": "Discover",
+
   "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
 
   "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
@@ -5174,8 +5924,16 @@
 
   "access-control-item-header-toggle": "Item's Metadata",
 
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
   "access-control-bitstream-header-toggle": "Bitstreams",
 
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
   "access-control-mode": "Mode",
 
   "access-control-access-conditions": "Access conditions",
@@ -5192,12 +5950,16 @@
 
   "access-control-bitstreams-selected": "bitstreams selected",
 
+  "access-control-bitstreams-select": "Select bitstreams",
+
   "access-control-cancel": "Cancel",
 
   "access-control-execute": "Execute",
 
   "access-control-add-more": "Add more",
 
+  "access-control-remove": "Remove access condition",
+
   "access-control-select-bitstreams-modal.title": "Select bitstreams",
 
   "access-control-select-bitstreams-modal.no-items": "No items to show.",
@@ -5216,4 +5978,667 @@
 
   "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
 
+  "vocabulary-treeview.search.form.add": "Add",
+
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  "filter.search.operator.placeholder": "Operator",
+
+  "search.filters.filter.entityType.text": "Item Type",
+
+  "search.filters.operator.equals.text": "Equals",
+
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  "search.filters.operator.contains.text": "Contains",
+
+  "search.filters.filter.title.text": "Title",
+
+  "search.filters.applied.f.title": "Title",
+
+  "search.filters.filter.author.text": "Author",
+
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  "service.overview.delete.header": "Delete Service",
+
+  "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-create-service.title": "Create service",
+  "service.overview.create.modal": "Create Service",
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  "ldn-service-status": "Status",
+  "service.confirm.create": "Create",
+  "service.refuse.create": "Cancel",
+  "ldn-register-new-service.title": "Register a new service",
+  "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.modal": "Edit Service",
+  "service.detail.update": "Confirm",
+  "service.detail.return": "Cancel",
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.reset-confirm": "Discard",
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.delete": "Delete service",
+  "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  "info.coar-notify-support.title": "Notify Support",
+
+  "info.coar-notify.breadcrumbs": "Notify Support",
+
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  "item.page.endorsement": "Endorsement",
+
+  "item.page.review": "Review",
+
+  "item.page.dataset": "Dataset",
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.services": "LDN Services",
+
+  "menu.section.services_new": "LDN Service",
+
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  "service.detail.delete.cancel": "Cancel",
+
+  "service.detail.delete.button": "Delete service",
+
+  "service.detail.delete.header": "Delete service",
+
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  "service.detail.delete.confirm": "Delete service",
+
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  "service.overview.table.id": "Services ID",
+
+  "service.overview.table.name": "Name",
+
+  "service.overview.table.start": "Start time (UTC)",
+
+  "service.overview.table.status": "Status",
+
+  "service.overview.table.user": "User",
+
+  "service.overview.title": "Services Overview",
+
+  "service.overview.breadcrumbs": "Services Overview",
+
+  "service.overview.table.actions": "Actions",
+
+  "service.overview.table.description": "Description",
+
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  "ldn-service-overview-close-modal": "Close modal",
+
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  "always_true_filter.label": "Always true",
+
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  "doi-filter.label": "DOI filter",
+
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  "is-archived_condition.label": "Is archived",
+
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  "item-is-public_condition.label": "Item is public",
+
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  "search.filters.filter.subject.text": "Subject",
+
+  "search.advanced.filters.head": "Advanced Search",
+
+  "filter.search.text.placeholder": "Search text",
+
+  "advancesearch.form.submit": "Add",
+
+  "ldn.no-filter.label": "None",
+
+  "admin.notify.dashboard": "Dashboard",
+
+  "menu.section.notify_dashboard": "Dashboard",
+
+  "menu.section.coar_notify": "COAR Notify",
+
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  "search.filters.applied.f.relateditem": "Related items",
+
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  "search.filters.filter.relateditem.head": "Related item",
+
+  "search.filters.filter.origin.head": "Origin",
+
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  "search.filters.filter.target.head": "Target",
+
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  "search.filters.filter.target.label": "Search target",
+
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  "search.filters.queue_status.1,authority": "Queued",
+
+  "search.filters.queue_status.2,authority": "Processing",
+
+  "search.filters.queue_status.3,authority": "Processed",
+
+  "search.filters.queue_status.4,authority": "Failed",
+
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  "search.filters.filter.target.placeholder": "Target",
+
+  "search.filters.filter.origin.label": "Search source",
+
+  "search.filters.filter.origin.placeholder": "Source",
+
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  "type.notify-detail-modal": "Type",
+
+  "id.notify-detail-modal": "Id",
+
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  "object.notify-detail-modal": "Repository Item",
+
+  "context.notify-detail-modal": "Repository Item",
+
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  "origin.notify-detail-modal": "LDN Service",
+
+  "target.notify-detail-modal": "LDN Service",
+
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  "notify-message-modal.title": "Message Detail",
+
+  "notify-message-modal.show-message": "Show message",
+
+  "notify-message-result.timestamp": "Timestamp",
+
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  "notify-message-result.ldnService": "LDN Service",
+
+  "notify-message-result.type": "Type",
+
+  "notify-message-result.status": "Status",
+
+  "notify-message-result.action": "Action",
+
+  "notify-message-result.detail": "Detail",
+
+  "notify-message-result.reprocess": "Reprocess",
+
+  "notify-queue-status.processed": "Processed",
+
+  "notify-queue-status.failed": "Failed",
+
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  "notify-queue-status.processing": "Processing",
+
+  "notify-queue-status.queued": "Queued",
+
+  "notify-queue-status.untrusted": "Untrusted",
+
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 7a2f2fa3db..298c0ff21f 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "no autorizado",
 
-
-
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
 
@@ -29,7 +27,6 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Llévame a la página de inicio",
 
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "No podemos encontrar la página que busca. La página puede haber sido movida o eliminada. Puede utilizar el botón de abajo para volver a la página de inicio. ",
 
@@ -52,7 +49,7 @@
   "error-page.description.404": "página no encontrada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
-  "error-page.orcid.generic-error": "Hubo un error en el login via ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
+  "error-page.orcid.generic-error": "Hubo un error en el login vía ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
 
   // "access-status.embargo.listelement.badge": "Embargo",
   "access-status.embargo.listelement.badge": "Embargo",
@@ -194,7 +191,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
-  // "admin.registries.bitstream-formats.table.id" : "ID",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -215,8 +213,6 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
-
-
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
@@ -256,8 +252,6 @@
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "Registro de metadatos",
 
-
-
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Esquema de metadatos",
 
@@ -275,7 +269,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
-  // "admin.registries.schema.fields.table.id" : "ID",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -335,7 +330,29 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registro de esquemas de metadatos",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestión de Acceso Masivo",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultados de la búsqueda",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestión de Acceso Masivo",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestión de Acceso Masivo",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Paso 1: Seleccione Objetos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Buscar",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selección actual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Paso 2: Operación a realizar",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Eliminar usuario",
@@ -347,7 +364,7 @@
   "admin.access-control.epeople.actions.reset": "Restablecer la contraseña",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Deja de hacerse pasar por usuario",
+  "admin.access-control.epeople.actions.stop-impersonating": "Dejar de hacerse pasar por usuario",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Usuarios",
@@ -478,8 +495,6 @@
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
 
-
-
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Grupos",
 
@@ -549,8 +564,6 @@
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
-
-
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Este grupo es permanente, por lo que no se puede editar ni eliminar. Sin embargo, puedes añadir y eliminar miembros del grupo utilizando esta página.",
 
@@ -719,6 +732,412 @@
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+  // "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Búsqueda administrativa",
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }}\"",
 
@@ -791,9 +1210,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Búsqueda administrativa",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Administrar flujo de trabajo",
 
@@ -818,8 +1234,6 @@
   // "admin.workflow.item.supervision": "Supervision",
   "admin.workflow.item.supervision": "Supervisión",
 
-
-
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar metadatos",
 
@@ -844,6 +1258,9 @@
   // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
   "admin.batch-import.page.help": "Seleccione la Colección a la que importar. Luego, suelte o busque el archivo zip en formato Simple Archive Format (SAF) que incluye los ítems a importar",
 
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Es posible realizar una importación tanto mediante una subida de fichero como a través de una URL. Use el selector de arriba para especificar la fuente de entrada.",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar",
 
@@ -863,14 +1280,26 @@
   "admin.metadata-import.page.button.proceed": "Continuar",
 
   // "admin.metadata-import.page.button.select-collection": "Select Collection",
-  "admin.metadata-import.page.button.select-collection": "Selecciona la Colleción",
+  "admin.metadata-import.page.button.select-collection": "Selecciona la Colección",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "¡Seleccione primero la URL del archivo!",
+
   // "admin.batch-import.page.error.addFile": "Select Zip file first!",
   "admin.batch-import.page.error.addFile": "¡Seleccione el archivo ZIP primero!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Subir",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "¡Seleccione primero la URL del archivo ZIP!",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Solo Validar",
 
@@ -895,14 +1324,12 @@
   // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
   "advanced-workflow-action.rating.description-requiredDescription": "Por favor, seleccione una evaluación y también agregue una revisión",
 
-
   // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
   "advanced-workflow-action.select-reviewer.description-single": "Por favor, seleccione un revisor antes de realizar el envío",
 
   // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
   "advanced-workflow-action.select-reviewer.description-multiple": "Por favor, seleccione uno o mas revisores antes de realizar el envío",
 
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Usuario",
 
@@ -987,15 +1414,12 @@
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "No se pudo actualizar el token de la sesión. Inicie sesión de nuevo.",
 
-
-
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Descargando {{ bitstream }}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Atrás" ,
 
-
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Editar las políticas del archivo",
 
@@ -1047,6 +1471,9 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Se produjo un error al guardar el formato del archivo.",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Se produjo un error al guardar el archivo primario",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -1071,7 +1498,6 @@
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "La altura del marco normalmente debería coincidir con la altura de la imagen",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Se guardaron sus cambios en este archivo.",
 
@@ -1095,6 +1521,7 @@
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Solicitando el siguiente fichero: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos los ficheros. ",
 
@@ -1137,8 +1564,6 @@
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "Hubo un fallo en el envío de la solicitud de ítem.",
 
-
-
   // "browse.back.all-results": "All browse results",
   "browse.back.all-results": "Todos los resultados de la búsqueda",
 
@@ -1151,8 +1576,11 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Por materia",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Por categoría",
+
   // "browse.comcol.by.title": "By Title",
-  "browse.comcol.by.title": "Por titulo",
+  "browse.comcol.by.title": "Por título",
 
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Examinar",
@@ -1181,6 +1609,9 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Examinar por materia",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Examinar por categoría",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar por título",
 
@@ -1262,21 +1693,24 @@
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "browse.startsWith.type_text": "Seleccione resultados tecleando las primeras letras",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Examinar",
+
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
   "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
-
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Volver a los resultados",
 
-
   // "chips.remove": "Remove chip",
   "chips.remove": "Quitar chip",
 
-
   // "claimed-approved-search-result-list-element.title": "Approved",
   "claimed-approved-search-result-list-element.title": "Aprobado",
 
@@ -1286,7 +1720,6 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, enviar de vuelta al Administrador de Revisión del flujo de trabajo",
 
-
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una colección",
 
@@ -1320,8 +1753,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }}\"?",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Eliminar esta colección",
 
@@ -1331,8 +1762,6 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Editar colección",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Mapeo de ítems",
 
@@ -1393,7 +1822,6 @@
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Asignar nuevos ítems",
 
-
   // "collection.edit.logo.delete.title": "Delete logo",
   "collection.edit.logo.delete.title": "Eliminar logo",
 
@@ -1421,21 +1849,23 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Suelta un logotipo de colección para cargarlo",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Editó con éxito la colección",
 
   // "collection.edit.return": "Back",
   "collection.edit.return": "Atrás",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Control de acceso",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Edición de colección: Control de acceso",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curar",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Edición de colección - Curar",
+  "collection.edit.tabs.curate.title": "Edición de colección: Curar",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Autorizaciones",
@@ -1518,8 +1948,6 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Edición de colección: fuente de contenido",
 
-
-
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Agregar",
 
@@ -1556,8 +1984,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Editar plantilla de ítem",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Breve descripción",
 
@@ -1585,13 +2011,9 @@
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "Tipo de entidad",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Colección",
 
-
-
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Envíos recientes",
 
@@ -1610,8 +2032,6 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
-
-
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
@@ -1621,63 +2041,81 @@
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
-
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Controles de recolección",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Hubo fallos al realizar las pruebas de comprobación de los ajustes",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "La prueba de los ajustes ha fallado",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "El script de prueba de los ajustes ha terminado correctamente",
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Probar la configuración",
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Probando la configuración...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "La importación ha comenzado correctamente",
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Hubo algún fallo al iniciar la importación",
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Importar ahora",
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importando...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "Ha ocurrido un error durante la importación",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "La importación finalizó",
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "La restauración y reimportación ha comenzado correctamente",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Ha ocurrido un error al iniciar la restauración y reimportación",
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Ha ocurrido un error en la restauración y reimportación",
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "Restauración y reimportación finalizadas",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Restauración y reimportación",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Restaurando y reimportando...",
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "Estado de la Recolección:",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Comienzo de la recolección:",
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Fecha de la última recolección:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Información de recolección:",
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/A",
 
-
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "La configuración proporcionada se ha probado y no funcionó.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Error del Servidor",
 
-
-
   // "communityList.breadcrumbs": "Community List",
   "communityList.breadcrumbs": "Lista de comunidades",
 
@@ -1690,8 +2128,6 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
@@ -1734,7 +2170,6 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Editar comunidad",
 
-
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
@@ -1762,8 +2197,6 @@
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Editó con éxito la comunidad",
 
@@ -1776,14 +2209,18 @@
   // "community.edit.return": "Back",
   "community.edit.return": "Atrás",
 
-
-
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Curar",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Edición de la comunidad - Curar",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Control de acceso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Edición de la comunidad: Control de acceso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadatos",
 
@@ -1802,13 +2239,9 @@
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Edición de la comunidad: autorizaciones",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidad",
 
-
-
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ninguno",
 
@@ -1827,28 +2260,24 @@
   // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
   "comcol-role.edit.delete.error.title": "Error al borrar el grupo del rol '{{ role }}'",
 
-
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Administradores",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Administradores",
 
-
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.community-admin.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar ítems a las subcolecciones, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones (sujeto a autorización).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
   "comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar ítems a la colección, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Remitentes",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
   "comcol-role.edit.submitters.description": "Los Usuarios y Grupos que tienen permiso para enviar nuevos ítems a esta colección.",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Acceso de lectura predeterminado del ítem",
 
@@ -1858,7 +2287,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los ítems entrantes está configurada actualmente como Anónimo.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Acceso de lectura predeterminado de archivos",
 
@@ -1868,28 +2296,24 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editores",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Los editores pueden editar los metadatos de los envíos entrantes y luego aceptarlos o rechazarlos.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Editores finales",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Los editores finales pueden editar los metadatos de los envíos entrantes, pero no podrán rechazarlos.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Revisores",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Los revisores pueden aceptar o rechazar envíos entrantes. Sin embargo, no pueden editar los metadatos del envío.",
 
-
   // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
   "comcol-role.edit.scorereviewers.name": "Revisores de puntuación",
 
@@ -1929,14 +2353,12 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Comunidades de esta comunidad",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Aceptar todo",
 
@@ -2015,38 +2437,30 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Requerido para iniciar sesión",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Preferencias",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Requerido para guardar sus preferencias",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Reconocimiento",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Requerido para guardar sus reconocimientos y consentimientos",
 
-
-
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Nos permite rastrear datos estadísticos",
 
-
-
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
   "cookies.consent.app.description.google-recaptcha": "Utilizamos el servicio google reCAPTCHA durante el registro y la recuperación de contraseña",
 
-
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
@@ -2059,10 +2473,10 @@
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Compartición",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Generar página de cita",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2080,10 +2494,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Búsqueda de virus",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
-  "curation-task.task.register-doi.label": "Registro DOI",
-
-
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registro DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarea:",
@@ -2112,10 +2524,8 @@
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
   "curation.form.handle.hint": "Sugerencia: Introduzca [su-prefijo-handle]/0 para ejecutar una tarea en toda su instalación (no todas las tareas permiten esta opción)",
 
-
-
   // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "deny-request-copy.email.message": "Estimado {{ recipientName }},\nEn respuesta a su solicitud, lamento informarle que no es posible enviarle una copia de los archivos que ha solicitado, en relación con el documento: \"{{ itemUrl }}\" ({{ itemName }}), del cual soy autor.\n\nSaludos cordiales,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "Estimado {{ recipientName }},\nEn respuesta a su solicitud, lamento informarle de que no es posible enviarle una copia de los archivos que ha solicitado, en relación con el documento: \"{{ itemUrl }}\" ({{ itemName }}), del cual soy autor.\n\nSaludos cordiales,\n{{ authorName }} <{{ authorEmail }}>",
 
   // "deny-request-copy.email.subject": "Request copy of document",
   "deny-request-copy.email.subject": "Solicitar una copia del documento",
@@ -2127,17 +2537,16 @@
   "deny-request-copy.header": "Denegar copia del documento",
 
   // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
-  "deny-request-copy.intro": "Éste es el texto que será enviado al solicitante.",
+  "deny-request-copy.intro": "Éste es el texto que será enviado al solicitante",
 
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
-
-
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sin título",
 
-
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sin nombre",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nueva colección",
@@ -2259,7 +2668,7 @@
   // "supervision-group-selector.notification.create.failure.title": "Error",
   "supervision-group-selector.notification.create.failure.title": "Error",
 
-  // "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group",
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
   "supervision-group-selector.notification.create.already-existing": "Ya existe una orden de supervisión para este ítem en el grupo selecionado",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
@@ -2374,7 +2783,7 @@
   "error.top-level-communities": "Error al recuperar las comunidades de primer nivel",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "Debe conceda esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
+  "error.validation.license.notgranted": "Debe conceder esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Esta entrada está restringida por este patrón: {{ pattern }}.",
@@ -2394,16 +2803,33 @@
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "Este grupo ya existe",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Este campo no puede contener puntos, comas o espacios. Use preferiblemente los campos Elemento y Cualificador",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Este campo no puede contener mas de 32 caracteres",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Este campo no puede contener mas de 256 caracteres",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Este campo no puede contener puntos, comas o espacios. Use preferiblemente el campo Cualificador",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Este campo no puede contener mas de 64 caracteres",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Este campo no puede contener mas de 64 caracteres",
 
   // "feed.description": "Syndication feed",
   "feed.description": "Hilo de sindicación",
 
-
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error al obtener archivos para este ítem",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
 
@@ -2419,14 +2845,12 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Política de privacidad",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Acuerdo de usuario final",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Sugerencias",
 
-
-
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
 
@@ -2460,8 +2884,6 @@
   // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
   "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
 
-
-
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Olvido de contraseña",
 
@@ -2504,7 +2926,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Enviar contraseña",
 
-
   // "form.add": "Add more",
   "form.add": "Añadir más",
 
@@ -2565,6 +2986,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No se introdujo ningún valor",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Correo electrónico",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nombre",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "en el índice Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institución",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Apellido",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Eliminar",
 
@@ -2589,16 +3028,14 @@
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
-
-
   // "grant-deny-request-copy.deny": "Don't send copy",
   "grant-deny-request-copy.deny": "No envíe copia",
 
   // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "Atrás",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  "grant-deny-request-copy.email.message": "Mensaje",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Mensaje adicional (opcional)",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
   "grant-deny-request-copy.email.message.empty": "Por favor, introduzca un mensaje",
@@ -2636,11 +3073,6 @@
   // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
   "grant-deny-request-copy.processed": "Esta solicitud ya fue procesada. Puede usar los botones inferiores para regresas a la página de inicio",
 
-
-
-  // "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "grant-request-copy.email.message": "Estimado {{ recipientName }},\nRespondiendo a su solicitud, le envío anexada una copia del fichero correspondiente al documento: \"{{ itemUrl }}\" ({{ itemName }}), del que soy autor.\n\nUn cordial saludo,\n{{ authorName }} <{{ authorEmail }}>",
-
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Solicitar copia de documento",
 
@@ -2650,23 +3082,22 @@
   // "grant-request-copy.header": "Grant document copy request",
   "grant-request-copy.header": "Conceder solicitud de copia de documento",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
   "grant-request-copy.intro": "Este mensaje se enviará al solicitante de la copia. Se le anexará una copia del documento.",
 
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Solicitud de ítem concedida exitosamente",
 
-
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Chequeos",
 
-  // "health-page.heading" : "Health",
+  // "health-page.heading": "Health",
   "health-page.heading": "Chequeos",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Información",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Estado",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2717,7 +3148,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No se detectaron problemas",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2736,8 +3166,6 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Seleccione una comunidad para explorar sus colecciones.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "He leído y acepto el Acuerdo de usuario final.",
 
@@ -2762,6 +3190,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Acuerdo de usuario final",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "los Estados Unidos de América",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Declaracion de privacidad",
 
@@ -2795,47 +3226,39 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Su correo electrónico",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Envío exitoso de sugerencia",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
+  // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "se requiere una dirección válida de correo electrónico",
 
-  // "info.feedback.error.message.required" : "A comment is required",
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "Se requiere un comentario",
 
-  // "info.feedback.page-label" : "Page",
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Página",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // "info.feedback.page_help": "Tha page related to your feedback",
   "info.feedback.page_help": "La página relacionada con su sugerencia",
 
-
-
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
-
-
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un ítem, además de modificar las políticas de los componentes individuales del ítem: paquetes y archivos. Brevemente, un ítem es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar las políticas del ítem",
 
-
-
   // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privado",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Retirado",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Bloque",
 
@@ -2869,8 +3292,6 @@
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Subir archivo",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Subir",
 
@@ -2961,8 +3382,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Subir",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancelar",
 
@@ -2990,7 +3409,6 @@
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "No tienes autorización para acceder a esta pestaña",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Mapeador de colecciones",
 
@@ -3114,8 +3532,6 @@
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Mapear nuevas colecciones",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Agregar",
 
@@ -3200,8 +3616,6 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
-
-
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3211,8 +3625,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Atrás",
 
@@ -3252,8 +3664,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Mover ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancelar",
 
@@ -3272,8 +3682,6 @@
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "El ítem ahora es privado",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Cancelar",
 
@@ -3292,8 +3700,6 @@
   // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "El ítem ahora es público",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Cancelar",
 
@@ -3312,8 +3718,6 @@
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "El ítem se reintegró correctamente",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Descartar",
 
@@ -3359,11 +3763,9 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este ítem",
 
-
   // "item.edit.return": "Back",
   "item.edit.return": "Atrás",
 
-
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Archivos",
 
@@ -3376,6 +3778,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Edición de ítem: Curar",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar ítem: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Control de acceso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Edición de ítem: Control de acceso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadatos",
 
@@ -3407,7 +3818,7 @@
   "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección diferente",
+  "item.edit.tabs.status.buttons.move.button": "Mover este ítem a una colección diferente",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover ítem a otra colección",
@@ -3434,7 +3845,7 @@
   "item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar este ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositorio",
@@ -3475,8 +3886,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Edición de ítem - Ver",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Cancelar",
 
@@ -3498,7 +3907,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Atrás",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3556,8 +3964,6 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Borrar grupo de supervisión",
 
-
-
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumen",
 
@@ -3600,6 +4006,18 @@
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamaño:",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Colecciones filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consulta de metadatos",
+
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Búsqueda de administrador",
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Ítems de esta revista",
 
@@ -3648,10 +4066,10 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraer",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bloque original",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Bloque de licencias",
 
   // "item.page.return": "Back",
@@ -3696,27 +4114,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volumen",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista o Serie",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editor:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Apellido:",
 
@@ -3744,8 +4165,6 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línea de financiación:",
 
-
-
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionado",
 
@@ -3761,7 +4180,6 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Título",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Aún no hay otras versiones para este ítem.",
 
@@ -3822,11 +4240,9 @@
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
   "item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
-
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Esta no es la última versión de este ítem. La última versión se puede encontrar <a href='{{ destination }}'>aquí</a>.",
 
-
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nueva versión",
 
@@ -3860,21 +4276,20 @@
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "Se está creando la nueva versión. Si el ítem tiene muchas relaciones, este proceso podría tardar.",
 
-  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "Se ha creado una nueva versión con número {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "No se ha creado una nueva versión",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
   "item.version.create.notification.inProgress": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
-
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Borrar versión",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-  "item.version.delete.modal.text": "Quiere borrar la versión {{version}}?",
+  "item.version.delete.modal.text": "¿Quiere borrar la versión {{version}}?",
 
   // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "Borrar",
@@ -3888,21 +4303,18 @@
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "No borrar esta versión",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "Se ha borrado la versión número {{version}}",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "No se ha borrado la versión número {{version}}",
 
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Se ha cambiado el resumen de la versión número {{version}}",
 
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
-  "item.version.edit.notification.success": "Ha cambiado el resumen de la versión número {{version}}",
-
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "No ha cambiado el resumen de la versión número {{version}}",
 
-
-
   // "itemtemplate.edit.metadata.add-button": "Add",
   "itemtemplate.edit.metadata.add-button": "Agregar",
 
@@ -3984,8 +4396,6 @@
   // "itemtemplate.edit.metadata.save-button": "Save",
   "itemtemplate.edit.metadata.save-button": "Guardar",
 
-
-
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
 
@@ -4016,8 +4426,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Búsqueda de revistas",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Número de la revista",
 
@@ -4045,8 +4453,6 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
-
-
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
 
@@ -4065,7 +4471,6 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
-
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -4099,7 +4504,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripción: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Cargando archivo...",
 
@@ -4154,8 +4558,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Cargando comunidades de primer nivel...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "Correo electrónico",
 
@@ -4192,8 +4594,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Acceso",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Cerrar sesión en DSpace",
 
@@ -4203,8 +4603,6 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
-
-
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -4214,27 +4612,24 @@
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Menú de gestión",
 
-
-
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Control de acceso",
 
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizaciones",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestión de Acceso Masivo",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuarios",
 
-
-
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Búsqueda de administrador",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Esta comunidad",
 
@@ -4259,22 +4654,21 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Por tema",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Por categoría",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por titulo",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Comunidades",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Panel de control",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Tareas de curación",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Editar",
 
@@ -4287,8 +4681,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Ítem",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
 
@@ -4307,10 +4699,13 @@
   // "menu.section.export_batch": "Batch Export (ZIP)",
   "menu.section.export_batch": "Exportación por lotes (ZIP)",
 
-
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Sección del menú de búsqueda de administrador",
 
@@ -4356,8 +4751,6 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
-
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4367,8 +4760,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadatos",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nuevo",
 
@@ -4387,24 +4778,18 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
 
-
-
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Anclar barra lateral",
 
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Desanclar la barra lateral",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Procesos",
 
   // "menu.section.health": "Health",
   "menu.section.health": "Chequeo",
 
-
-
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registros",
 
@@ -4414,15 +4799,15 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadatos",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Estadísticas",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarea de estadísticas",
 
-
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
@@ -4454,19 +4839,18 @@
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Alternar sección de Tarea de estadísticas",
 
-
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Administrar flujo de trabajo",
 
-
   // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "Exportar los resultados de búsqueda a CSV",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
   "metadata-export-search.submit.success": "La exportación ha comenzado satisfactoriamente",
+
   // "metadata-export-search.submit.error": "Starting the export has failed",
   "metadata-export-search.submit.error": "Ha fallado el comienzo de la exportación",
 
-
   // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "Mi DSpace",
 
@@ -4560,20 +4944,20 @@
   // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Ítems supervisados",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivado",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivado",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validación",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validación",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando al controlador",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperando al controlador",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Flujo de trabajo",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flujo de trabajo",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espacio de trabajo",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espacio de trabajo",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mi DSpace",
@@ -4593,8 +4977,6 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
-
-
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
 
@@ -4628,25 +5010,27 @@
   // "nav.search": "Search",
   "nav.search": "Buscar",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Buscar",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estadísticas",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Dejar de hacerse pasar por usuario",
+  "nav.stop-impersonating": "Dejar de impersonar al usuario",
 
-  // "nav.subscriptions" : "Subscriptions",
+  // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "Suscripciones",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegación",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil de usuario",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
-
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
@@ -4674,8 +5058,6 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unidad organizativa: ",
 
-
-
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
 
@@ -4691,8 +5073,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opciones de ordenación",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
 
@@ -4741,8 +5121,6 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Búsqueda de personas",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
@@ -4791,6 +5169,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Se produjo un error al crear este proceso.",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "El fichero sobrepasa el límte máximo de subida",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Crea un nuevo proceso",
 
@@ -4800,18 +5181,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Crea un nuevo proceso",
 
-
-
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Argumentos",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Este proceso no contiene ningún argumento",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Atrás",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Salida del proceso",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4823,28 +5202,29 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Este proceso no tiene salida",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Archivos de salida",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Este proceso no contiene ningún archivo de salida",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Secuencia de comandos",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+
   "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora de inicio",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de finalización",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Estado",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Crear un proceso similar",
 
   // "process.detail.actions": "Actions",
@@ -4871,24 +5251,22 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo falló eliminando el proceso",
 
-
-
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalización (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID de proceso",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nombre",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de inicio (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Estado",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuario",
 
   // "process.overview.title": "Processes Overview",
@@ -4927,8 +5305,6 @@
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
   "process.bulk.delete.success": "{{count}} proceso(s) se han eliminado correctamente",
 
-
-
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Actualización del perfil",
 
@@ -5058,8 +5434,6 @@
   // "project-relationships.search.results.head": "Project Search Results",
   "project-relationships.search.results.head": "Resultados de búsqueda de proyectos",
 
-
-
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publicación",
 
@@ -5093,7 +5467,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Búsqueda de publicaciones",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Siguiente",
 
@@ -5103,7 +5476,6 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Lista de reproducción",
 
-
   // "register-email.title": "New user registration",
   "register-email.title": "Registro de nuevo usuario",
 
@@ -5167,7 +5539,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registro completado",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Registro de nuevo usuario",
 
@@ -5209,6 +5580,7 @@
 
   // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para registrarse debe aceptar las cookies de <b>Registro y recuperación de contraseña</b> (Google reCaptcha).",
+
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
   "register-page.registration.error.maildomain": "Este correo electrónico no esta en la lista de dominios que pueden registrarse. Los dominios permitidos son {{ domains }}",
 
@@ -5223,6 +5595,7 @@
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
   "register-page.registration.google-recaptcha.notification.message.expired": "Verificación caducada. Verifique de nuevo.",
+
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "Las cuentas pueden registrarse para las direcciones de correo de los dominios",
 
@@ -5289,16 +5662,14 @@
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "Financiador",
 
-
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Logotipo del repositorio",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular :: ",
-
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositorio DSpace",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositorio DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Agregar",
@@ -5471,8 +5842,6 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
-
-
   // "search.description": "",
   "search.description": "",
 
@@ -5488,7 +5857,6 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Buscar en el repositorio ...",
 
-
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5537,8 +5905,6 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
-
-
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5758,8 +6124,6 @@
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
   "search.filters.filter.supervisedBy.label": "Búsqueda Supervisada Por",
 
-
-
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
 
@@ -5787,7 +6151,6 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "No",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtros",
 
@@ -5797,8 +6160,6 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
-
-
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -5808,8 +6169,6 @@
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "Todo DSpace",
 
-
-
   // "search.results.head": "Search Results",
   "search.results.head": "Resultados de la búsqueda",
 
@@ -5834,7 +6193,6 @@
   // "default-relationships.search.results.head": "Search Results",
   "default-relationships.search.results.head": "Resultados de la búsqueda",
 
-
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Volver a resultados",
 
@@ -5856,8 +6214,6 @@
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ajustes",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detalle",
 
@@ -5867,8 +6223,6 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
-
-
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -5905,7 +6259,6 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
-
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -5942,7 +6295,6 @@
   // "statistics.table.no-name": "(object name could not be loaded)",
   "statistics.table.no-name": "(el nombre del objeto no pudo ser cargado)",
 
-
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar envío",
 
@@ -5952,7 +6304,7 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "No tiene los permisos para realizar un nuevo envío.",
 
   // "submission.general.deposit": "Deposit",
@@ -5985,7 +6337,6 @@
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Guardar para más adelante",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importar metadatos desde una fuente externa",
 
@@ -6297,6 +6648,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Proyectos locales ({{ count }})",
 
@@ -6320,16 +6672,18 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de revista locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de revista locales  ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volúmenes de revista locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volúmenes de revista locales ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas Sherpa  ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas Sherpa ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editores Sherpa ({{ count }})",
@@ -6379,9 +6733,6 @@
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador del Proyecto",
 
-
-
-
   // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Buscar...",
 
@@ -6390,11 +6741,13 @@
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de revista",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volúmenes de la revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volúmenes de la revista",
 
@@ -6406,6 +6759,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agencia financiadora",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Proyectos",
 
@@ -6453,6 +6807,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumen de revista seleccionada",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Proyectos seleccionados",
 
@@ -6476,6 +6831,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número de revista seleccionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volúmenes de revista seleccionados",
 
@@ -6484,6 +6840,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamientos seleccionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número seleccionado",
 
@@ -6658,7 +7015,6 @@
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
   "submission.sections.submit.progressbar.sherpaPolicies": "Información sobre políticas editoriales de acceso abierto",
 
-
   // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
   "submission.sections.sherpa-policy.title-empty": "No se encuentra disponible la información sobre política editorial. Si tiene un ISSN asociado, introdúzcalo arriba para ver información sobre políticas editoriales de acceso abierto.",
 
@@ -6839,10 +7195,9 @@
   // "submission.sections.license.required": "You must accept the license",
   "submission.sections.license.required": "Debe aceptar la licencia",
 
-  // "submission.sections.license.notgranted":  "You must accept the license",
+  // "submission.sections.license.notgranted": "You must accept the license",
   "submission.sections.license.notgranted": "Debe aceptar la licencia",
 
-
   // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "Información de la Publicación",
 
@@ -6868,7 +7223,7 @@
   "submission.sections.sherpa.publisher.policy": "Política editorial",
 
   // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
-  "submission.sections.sherpa.publisher.policy.description": "La siguiente informacióm se encontró via Sherpa Romeo. En base a esas políticas, se proporcionan consejos sobre las necesidad de un embargo y de aquellos ficheros que puede utilizar.  Si tiene dudas, por favor, contacte con el administrador del repositorio mediante el formulario de sugerencias.",
+  "submission.sections.sherpa.publisher.policy.description": "La siguiente informacióm se encontró vía Sherpa Romeo. En base a esas políticas, se proporcionan consejos sobre las necesidad de un embargo y de aquellos ficheros que puede utilizar. Si tiene dudas, por favor, contacte con el administrador del repositorio mediante el formulario de sugerencias.",
 
   // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
   "submission.sections.sherpa.publisher.policy.openaccess": "Los caminos hacia el Acceso Abierto que esta revista permite se relacionan, por versión de artículo, abajo. Pulse en un camino para una visión mas detallada",
@@ -6921,16 +7276,12 @@
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
   "submission.sections.sherpa.error.message": "Hubo un error recuperando la información de Sherpa",
 
-
-
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nuevo envío",
 
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nuevo envío",
 
-
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Eliminar",
 
@@ -6949,21 +7300,18 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
 
-
   // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
   "submission.workflow.generic.submit_select_reviewer": "Seleccionar revisor",
 
   // "submission.workflow.generic.submit_select_reviewer-help": "",
   "submission.workflow.generic.submit_select_reviewer-help": "",
 
-
   // "submission.workflow.generic.submit_score": "Rate",
   "submission.workflow.generic.submit_score": "Evaluar",
 
   // "submission.workflow.generic.submit_score-help": "",
   "submission.workflow.generic.submit_score-help": "",
 
-
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprobar",
 
@@ -7006,8 +7354,6 @@
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Devuelva la tarea al pool para que otro usuario pueda realizarla.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Ocurrió un error durante la operación...",
 
@@ -7020,8 +7366,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operación exitosa",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Asumir tarea",
 
@@ -7034,13 +7378,14 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
-
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Ver",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/A",
 
   // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "Suscripciones",
@@ -7147,7 +7492,6 @@
   // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
   "subscriptions.table.empty.message": "Usted no tiene suscripciones. Para subscribirse a las actualizaciones por correo electrónico de una Comunidad o Colección, utilice el botón de suscripción en la página del objeto.",
 
-
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Miniatura",
 
@@ -7172,13 +7516,9 @@
   // "thumbnail.person.placeholder": "No Profile Picture Available",
   "thumbnail.person.placeholder": "No hay imagen de perfil disponible",
 
-
-
   // "title": "DSpace",
   "title": "DSpace",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Vista de árbol jerárquico",
 
@@ -7230,8 +7570,6 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Seleccione los ítems para los que desea guardar los metadatos virtuales como metadatos reales",
 
-
-
   // "supervisedWorkspace.search.results.head": "Supervised Items",
   "supervisedWorkspace.search.results.head": "Ítems supervisados",
 
@@ -7247,8 +7585,6 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Tareas del flujo de trabajo y del espacio de trabajo",
 
-
-
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
 
@@ -7279,7 +7615,6 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Borrar",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Devolver al remitente",
 
@@ -7313,11 +7648,33 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Vista del flujo de trabajo",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Borrar espacio de trabajo",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Borrar ítem del espacio de trabajo",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Borrar",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Cancelar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Borrado",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Este ítem del espacio de trabajo se eliminó correctamente",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Algo salió mal",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Este ítem del espacio de trabajo no pudo borrarse",
 
   // "workflow-item.advanced.title": "Advanced workflow",
   "workflow-item.advanced.title": "Flujo de trabajo avanzado",
 
-
   // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
   "workflow-item.selectrevieweraction.notification.success.title": "Revisor seleccionado",
 
@@ -7342,7 +7699,6 @@
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
   "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
 
-
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
   "workflow-item.scorereviewaction.notification.success.title": "Revisión de evaluación",
 
@@ -7379,7 +7735,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sesión",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Procesando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7412,10 +7768,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -7424,16 +7780,16 @@
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
   "researcherprofile.claim.not-authorized": "No está autorizado pare reclamar este ítem. Contacte con el administrador para mas detalles.",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "Hubo un error reclamando el perfil, por favor, inténtelo mas tarde",
 
-  // "researcherprofile.error.claim.title" : "Error",
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Perfil reclamado con éxito",
 
-  // "researcherprofile.success.claim.title" : "Success",
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Éxito",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7442,7 +7798,7 @@
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "Autorizaciones concedidas",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Conceder autorizaciones",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7458,7 +7814,7 @@
   "person.page.orcid.orcid-not-linked-message": "El ORCID iD de este perfil ({{ orcid }}) no se ha conectado aún con una cuenta en el registro ORCID o la conexión caducó.",
 
   // "person.page.orcid.unlink": "Disconnect from ORCID",
-  "person.page.orcid.unlink": "Desconectar de  ORCID",
+  "person.page.orcid.unlink": "Desconectar de ORCID",
 
   // "person.page.orcid.unlink.processing": "Processing...",
   "person.page.orcid.unlink.processing": "Procesando...",
@@ -7490,44 +7846,44 @@
   // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "Actualizar configuración",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliación",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Biografía",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Grados",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identificadores",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "Todas las financiaciones",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "Mi financiación",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Financiaciones seleccionadas",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Deshabilitado",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "Todas las publicaciones",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "Mis publicaciones",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicaciones seleccionadas",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Deshabilitado",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
-  "person.page.orcid.sync-queue.discard": "Deshechar el cambio y no sincronizar con ORCID",
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Deshechar el cambio y no sincronizar con el registro ORCID",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
   "person.page.orcid.sync-queue.discard.error": "Falló el borrado del registro ORCID en la cola",
@@ -7538,13 +7894,13 @@
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
   "person.page.orcid.sync-queue.empty-message": "La cola del registro de ORCID está vacía",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Descripción",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Acción",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -7610,7 +7966,7 @@
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL del investigador",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Sincronizar con el registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -7620,13 +7976,13 @@
   "person.page.orcid.sync-queue.send.unauthorized-error.content": "Pulse <a href='{{orcid}}'>aquí</a> para conceder de nuevo los permisos requeridos. Si el problema continuase, contacte con el administrador",
 
   // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
-  "person.page.orcid.sync-queue.send.bad-request-error": "El envío a  ORCID falló debido a que el recurso que se envión no era válido",
+  "person.page.orcid.sync-queue.send.bad-request-error": "El envío a ORCID falló debido a que el recurso que se envión no era válido",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
   "person.page.orcid.sync-queue.send.error": "Falló el envío a ORCID",
 
   // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
-  "person.page.orcid.sync-queue.send.conflict-error": "El envío a  ORCID falló debido a que el recurso ya existía en el registro ORCID",
+  "person.page.orcid.sync-queue.send.conflict-error": "El envío a ORCID falló debido a que el recurso ya existía en el registro ORCID",
 
   // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
   "person.page.orcid.sync-queue.send.not-found-warning": "El recurso no existe ya en el registro ORCID.",
@@ -7664,8 +8020,8 @@
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Se requiere el nombre de la organización",
 
-  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
-  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "la fecha de la publicación debe ser posterior a 1900",
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La fecha de publicación debe ser posterior a 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
   "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Se requiere la dirección de la organización",
@@ -7698,7 +8054,7 @@
   "person.page.orcid.synchronization-mode.label": "Modo sincronización",
 
   // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
-  "person.page.orcid.synchronization-mode-message": "Seleccione cómo prefiere realizar la sincronización con ORCID. Puede escoger \"Manual\" (usted envía los datos a ORCID manualmente), o \"Batch\" (el sistema enviará sus datos a ORCID via un programa planificado).",
+  "person.page.orcid.synchronization-mode-message": "Seleccione cómo prefiere realizar la sincronización con ORCID. Puede escoger \"Manual\" (usted envía los datos a ORCID manualmente), o \"Batch\" (el sistema enviará sus datos a ORCID vía un programa planificado).",
 
   // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
   "person.page.orcid.synchronization-mode-funding-message": "Seleccione si enviará información de sus entidades conectadas de tipo Proyecto a la información de financiación de ORCID.",
@@ -7744,13 +8100,13 @@
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorizaciones ORCID",
+
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Envíos recientes",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
   "listable-notification-object.default-message": "Este objeto no se pudo recuperar",
 
-
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Algo salió mal al recuperar el banner de alerta del sistema",
 
@@ -7766,8 +8122,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuto(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Alerta del Sistema",
 
@@ -7822,5 +8176,81 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas del sistema",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso a los metadatos o a los archivos del ítem.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso de todos los ítems de la colección. Puede realizar los cambios a los metadatos o a los archivos de todos los ítems.",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso de todos los ítems de todas las colecciones de esta comunidad. Puede realizar los cambios a los metadatos o a los archivos de todos los ítems.",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadatos del ítem",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Archivos",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condiciones de accceso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "No ha especificado condiciones de acceso. Si lo ejecuta, se sustituirán las condiciones actuales con las condiones heredadas de la colección de pertenencia.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Sustituir condiciones de accceso",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Añadir a las existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar los cambios a ficheros específicos",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Actualizar todos los archivos del ítem",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "archivos seleccionados",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Ejecutar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Añadir mas",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Seleccionar archivos",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No hay ítems para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Cerrar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipo de condición de acceso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Seleccione una condición de acceso para aplicar a los objetos seleccionados.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Establecer acceso desde",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Escoja la fecha desde la cuál se aplicarán las condiciones de acceso especificadas",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Establecer acceso hasta",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
+
+
 
 }
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 62e7e6bffe..122d95704a 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "valtuuttamaton",
 
-
-
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "Sinulla ei ole oikeutta nähdä sivua. Voit palata etusivulle alla olevalla painikkeella.",
 
@@ -20,10 +18,17 @@
   // "403.forbidden": "forbidden",
   "403.forbidden": "kielletty",
 
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Palvelu ei ole saatavilla",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Palvelin ei tilapäisesti pysty käsittelemään pyyntöäsi huoltokatkon tai kapasiteettiongelmien vuoksi. Yritä myöhemmin uudelleen.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Palaa etusivulle",
 
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  "404.help": "Hakemaasi sivua ei löytynyt. Sivu on voitu siirtää tai poistaa. Painamalla alapuolella olevaa nappia palaat etusivulle. ",
+  "404.help": "Hakemaasi sivua ei löytynyt. Sivu on voitu siirtää tai poistaa. Painamalla alapuolella olevaa painiketta palaat etusivulle. ",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Palaa etusivulle",
@@ -31,6 +36,36 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "sivua ei löytynyt",
 
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "valtuuttamaton",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "kielletty",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Palvelu ei ole saatavilla",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "sivua ei löytynyt",
+
+  // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
+  "error-page.orcid.generic-error": "Virhe ORCID-kirjautumisessa. Varmista, että olet tuonut ORCID-tilisi sähköpostiosoitteen DSpaceen. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargo",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Vain metadata",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Open Access",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Rajattu",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Tuntematon",
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Järjestelmän kuratointitehtävät",
 
@@ -157,11 +192,11 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nimi",
 
-  // "admin.registries.bitstream-formats.table.id" : "ID",
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  "admin.registries.bitstream-formats.table.return": "Palaa",
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "Paluu",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Tunnettu",
@@ -175,10 +210,8 @@
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Tukitaso",
 
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Tiedostoformaattirekisteri",
-
-
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Tiedostoformaattirekisteri",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Metadatarekisteri",
@@ -216,10 +249,8 @@
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Nimiavaruus",
 
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Metadatarekisteri",
-
-
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Metadatarekisteri",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metadataskeema",
@@ -293,13 +324,11 @@
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Valmis",
 
-  // "admin.registries.schema.return": "Return",
-  "admin.registries.schema.return": "Palaa",
-
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Metadataskeemarekisteri",
-
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "Paluu",
 
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Metadataskeemarekisteri",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Poista käyttäjä",
@@ -313,7 +342,10 @@
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "Lopeta käyttäjänä esiintyminen",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Käyttäjät",
+
+  // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "DSpace Angular :: Käyttäjät",
 
   // "admin.access-control.epeople.head": "EPeople",
@@ -334,6 +366,9 @@
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Hae",
 
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Hae käyttäjiä...",
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "Lisää käyttäjä",
 
@@ -352,6 +387,9 @@
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "Muokkaa \"{{name}}\"",
 
+  // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Sinulla ei ole valtuuksia muokata tätä ryhmää",
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Poista \"{{name}}\"",
 
@@ -382,6 +420,9 @@
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Vaatii sertifikaatin",
 
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Paluu",
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "Käyttäjä \"{{name}}\" luotu",
 
@@ -415,6 +456,9 @@
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Nimi",
 
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Tämä käyttäjä ei kuulu mihinkään ryhmään",
 
@@ -427,16 +471,23 @@
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Käyttäjä poistettu: \"{{name}}\"",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Ryhmät",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Ryhmät",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Ryhmät",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Ryhmän muokkaus",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Ryhmän muokkaus",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Ryhmän muokkaus",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Uusi ryhmä",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Uusi ryhmä",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "uusi ryhmä",
 
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Ryhmät",
@@ -453,12 +504,18 @@
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Hae",
 
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Hae ryhmiä...",
+
   // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "Nimi",
 
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Jäsenet",
 
@@ -483,8 +540,6 @@
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Syy: \"{{cause}}\"",
 
-
-
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Tämä ryhmä on pysyvä, eikä sitä voi muokata tai poistaa. Ryhmään voi kuitenkin lisätä ja poistaa jäseniä tällä sivulla.",
 
@@ -500,6 +555,9 @@
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Ryhmän nimi",
 
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Yhteisö tai kokoelma",
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Kuvaus",
 
@@ -572,6 +630,15 @@
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "Nimi",
 
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identiteetti",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "Sähköpostiosoite",
+
+  // "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.netid": "Käyttäjätunnus",
+
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.members-list.table.edit": "Poista / Lisää",
 
@@ -626,6 +693,9 @@
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Nimi",
 
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Poista / Lisää",
 
@@ -662,10 +732,420 @@
   // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Ryhmällä ei ole alaryhmiä.",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
-  "admin.access-control.groups.form.return": "Palaa ryhmiin",
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Paluu",
+
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Tällä sivulla voit muokata ryhmän ominaisuuksia ja jäseniä. Yläosassa voit muokata ryhmän nimeä ja kuvausta, paitsi jos kyseessä on kokoelman tai yhteisön ylläpitäjäryhmä, jolloin ryhmän nimi ja kuvaus luodaan automaattisesti, eikä niitä voi muokata. Muissa osioissa voit muokata ryhmän jäsenyyttä. Katso lisätietoja wiki-sivulta (https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Voit lisätä tai poistaa ryhmän käyttäjän joko napsauttamalla 'Selaa kaikkia' -painiketta tai käyttämällä alla olevaa hakupalkkia käyttäjien etsimiseen (käytä hakupalkin vasemmalla puolella olevaa pudotusvalikkoa valitaksesi, haetaanko metatietojen vai sähköpostin perusteella). Napsauta sitten plus-kuvaketta jokaisen käyttäjän kohdalla, jonka haluat lisätä alla olevaan luetteloon, tai roskakorikuvaketta jokaisen käyttäjän kohdalla, jonka haluat poistaa. Alla olevassa luettelossa voi olla useita sivuja: voit siirtyä seuraaville sivuille luettelon alapuolella olevilla sivunohjaimilla. Kun olet valmis, tallenna muutokset napsauttamalla yläosassa olevaa Tallenna-painiketta.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Jos haluat lisätä tai poistaa alaryhmän tähän ryhmään tai tästä ryhmästä, napsauta joko 'Selaa kaikkia' -painiketta tai käytä alla olevaa hakupalkkia ryhmien etsimiseen. Napsauta sitten luettelossa plus-kuvaketta jokaisen ryhmän kohdalla, jonka haluat lisätä, tai roskakorikuvaketta jokaisen ryhmän kohdalla, jonka haluat poistaa. Luettelossa voi olla useita sivuja: voit siirtyä seuraaville sivuille luettelon alapuolella olevilla sivunohjaimilla. Kun olet valmis, tallenna muutokset napsauttamalla yläosassa olevaa Tallenna-painiketta.",
+
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
 
 
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Ylläpitäjän haku",
@@ -682,17 +1162,17 @@
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Muokkaa",
 
-  // "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
   "admin.search.item.make-private": "Tee yksityiseksi",
 
-  // "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
   "admin.search.item.make-public": "Tee julkiseksi",
 
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Siirrä",
 
   // "admin.search.item.reinstate": "Reinstate",
-  "admin.search.item.reinstate": "Palauta käyttöön",
+  "admin.search.item.reinstate": "Palauta",
 
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Poista käytöstä",
@@ -703,9 +1183,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Ylläpitäjän haku",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Hallinnoi työnkulkua",
 
@@ -715,43 +1192,191 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Työnkulku",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Työtila",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Poista",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Lähetä takaisin",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Käytännöt",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Valvonta",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importoi metadata",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importoi erä",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importoi metadata",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importoi erä",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importoi metadata",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importoi erä",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
   "admin.metadata-import.page.help": "Voit pudottaa tähän tai selata CSV-tiedostoja, joilla voit tehdä metadatatoimintoja usealle tietueelle",
 
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Valitse kokoelma, johon tietueet importoidaan. Sen jälkeen pudota tai selaa esiin importoitavat tietueet sisältävä Simple Archive Format (SAF) -ZIP-tiedosto.",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Importoinnin voi tehdä joko lataamalla tiedoston tai URL-osoitteen kautta. Käytä yllä olevaa kytkintä valitaksesi syöttötavan.",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Pudota CSV-metadata importoimista varten",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Pudota erän ZIP-tiedosto importoimista varten",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Pudota korvataksesi importoitava CSV-metadata",
 
-  // "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Pudota korvataksesi importoitava erän ZIP-tiedosto",
+
+  // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Paluu",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Jatka",
 
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Valitse kokoelma",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Valitse ensin tiedosto!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Syötä tiedoston URL ensin!",
 
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Valitse ZIP-tiedosto ensin!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Lataa",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Syötä erän ZIP-URL importoitavaksi",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Pelkkä validointi",
+
+  // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "Kun tämä valitaan, ladattu CSV-tiedosto validoidaan. Saat raportin havaituista muutoksista, mutta muutoksia ei tallenneta.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Arviointi",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Sinun on arvioitava tietua",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Tarkasta",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Sinun on annettava arvostelu lähettääksesi tämän arvioinnin",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Valitse arviointi alapuolelta",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Valitse arviointi alapuolelta. Lisää myös arvostelu",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Valitse yksi tarkastaja alapuolelta ennen lähettämistä",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Valitse yksi tai useampi tarkastaja alapuolelta ennen lähettämistä",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Käyttäjät",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Lisää käyttäjiä",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Selaa kaikkia",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Nykyiset jäsenet",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Sähköpostiosoite (oikea)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hae",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nimi",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identiteetti",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Sähköpostiosoite",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "Käyttäjätunnus",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Poista / Lisää",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Poista jäsen nimellä \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Jäsen lisätty: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Jäsenen lisäys epäonnistui: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Jäsen poistettu: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Jäsenen poisto epäonnistui: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Lisää jäsen nimellä \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Ei aktiivista ryhmää, syötä ensin nimi",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Ryhmässä ei ole vielä jäseniä, hae ja lisää.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Haku ei palauttanut käyttäjiä",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Ei valittua tarkastajaa.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Kun tämä valitaan, ladattu ZIP-tiedosto validoidaan.  the uploaded ZIP will be validated. Saat raportin havaituista muutoksista, mutta muutoksia ei tallenneta.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "poista",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Virheellinen sähköpostiosoite tai salasana.",
@@ -759,7 +1384,23 @@
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Istuntosi on vanhentunut. Kirjaudu uudelleen.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "Istuntotunnisteen päivittäminen epäonnistui. Kirjaudu uudelleen.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Nyt ladataan {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Paluu",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Muokkaa tiedostokäytäntöjä",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Muokkaa tiedostokäytäntöjä",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Paluu",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "Tiedosto: ",
@@ -803,6 +1444,33 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Virhe tallennettaessa tiedoston formaattia",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Virhe tallennettaessa päätiedostoa",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF-nimike",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Kuvan canvasin nimike. Ellei nimikettä anneta, käytetään oletusnimikettä.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "IIIF-sisällysluettelo",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "Jos tekstiä lisätään tähän, tästä alkaa uusi sisällysluetteloaihe.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "IIIF-canvasin leveys",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "Canvasin leveyden tulee vastata kuvan leveyttä.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "IIIF-canvasin korkeus",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "Canvasin korkeuden tulee vastata kuvan korkeutta.",
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Muutokset tiedostoon on tallennettu.",
 
@@ -812,7 +1480,65 @@
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Muokkaa tiedostoa",
 
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  "bitstream-request-a-copy.alert.canDownload1": "Sinulla on jo pääsy tähän tiedostoon. Jos haluat ladata tiedoston, napsauta ",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "tässä",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Pyydä tiedostokopiota",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Syötä seuraavat tiedot pyytääksesi kopiota tietueesta: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Pyydetään seuraavaa tiedostoa: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Pyydetään kaikkia tiedostoja. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Nimi *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Nimi on pakollinen tieto",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Sähköpostiosoite *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Tätä sähköpostiosoitetta käytetään tiedostoa lähetettäessä.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Syötä toimiva sähköpostiosoite.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Tiedostot",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Vain pyydetty tiedosto",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Kaikilla (tämän tietueen) tiedostoilla on rajattu käyttöoikeus",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Viesti",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Paluu",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Pyydä kopio",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "Tietuepyyntö on lähetetty.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Tapahtui virhe lähetettäessä tietuepyyntöä",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Kaikki selaustulokset",
 
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Tekijän mukaan",
@@ -823,6 +1549,9 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Asiasanan mukaan",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Aihekategorian mukaan",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Nimekkeen mukaan",
 
@@ -853,17 +1582,35 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Selaa asiasanan mukaan",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Selaa aihekategorian luokan mukaan",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Selaa nimekkeen mukaan",
 
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Seuraava",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Edellinen",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Ei enempää tulossivuja",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", alkaa kirjaimella {{ startsWith }}",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Valitse alku)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Valitse vuosi)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Hyppää indeksin kohtaan:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Valitse julkaisuvuosi",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Suodata tulokset vuoden tai kuukauden mukaan",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Huhtikuu",
@@ -895,6 +1642,9 @@
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Valitse kuukausi)",
 
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Valitse julkaisukuukausi",
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "Marraskuu",
 
@@ -904,23 +1654,44 @@
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Syyskuu",
 
-  // "browse.startsWith.submit": "Go",
-  "browse.startsWith.submit": "Ok",
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Selaa",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Tai anna päiväys (vuosi-kuukausi):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Suodata tulokset päivämäärän mukaan",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  "browse.startsWith.type_text": "Tai anna muutama alkukirjain:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Tai syötä päiväys (vuosi-kuukausi) ja napsauta Selaa-painiketta",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Selataan {{ collection }}-kokoelmaa {{ field }}-kentän arvolla {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Suodata tuloksia antamalla muutama alkukirjain",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Suodata",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Selaa",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Selataan {{ collection }}-kokoelmaa {{ field }}{{ startsWith }}-kentän arvolla {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Selataan {{ collection }}-kokoelmaa {{ field }}-kentän arvolla {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Paluu tuloksiin",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Poista chip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Hyväksytty",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Hylätty, lähetetty takaisin tallentajalle",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Kieltäydytty, lähetetty takaisin päätarkastajan työnkulkuun",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Luo kokoelma",
@@ -940,6 +1711,9 @@
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Vahvista",
 
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Poistetaan",
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Poista kokoelma",
 
@@ -952,8 +1726,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Haluatko varmasti poistaa kokoelman \"{{ dso }}\"",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Poista kokoelma",
 
@@ -963,8 +1735,6 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Muokkaa kokoelmaa",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Tietueliitosväline",
 
@@ -1016,13 +1786,20 @@
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Poista valitut tietueliitokset",
 
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Hae tietueita...",
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Selaa liitettyjä tietueita",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Liitä uusia tietueita",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Poista logo",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Kumoa poisto",
 
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Kokoelman logo",
@@ -1045,15 +1822,11 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Pudota kokoelman logo ladattavaksi",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Kokoelman muokkaus onnistui",
 
-  // "collection.edit.return": "Return",
-  "collection.edit.return": "Palaa",
-
-
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "Paluu",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Kuratoi",
@@ -1067,6 +1840,15 @@
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "Kokoelman muokkaus - Käyttöoikeudet",
 
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Lataa lisää nippuja",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Lataa lisää",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Näytä nipun tiedostokäytännöt",
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Muokkaa metadataa",
 
@@ -1115,7 +1897,7 @@
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "collection.edit.tabs.source.notifications.discarded.content": "Muutokset hylätty. Valitse 'Kumoa' palauttaaksesi muutokset",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "Muutokset hylätty",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
@@ -1133,8 +1915,6 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Kokoelman muokkaus - Sisältölähde",
 
-
-
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Lisää",
 
@@ -1150,12 +1930,18 @@
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Muokkaa",
 
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Virhe noudettaessa mallitietuetta",
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
   "collection.edit.template.head": "Muokkaa kokoelman \"{{ collection }}\" mallitietuetta",
 
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Mallitietue",
 
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Ladataan mallitietuetta...",
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Tietueen mallipohjan poisto epäonnistui",
 
@@ -1165,8 +1951,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Muokkaa mallitietuetta",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Lyhyt kuvaus",
 
@@ -1191,13 +1975,12 @@
   // "collection.form.title": "Name",
   "collection.form.title": "Nimi",
 
-
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Entiteettityyppi",
 
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Kokoelma",
 
-
-
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Viimeksi lisätyt",
 
@@ -1216,8 +1999,6 @@
   // "collection.page.news": "News",
   "collection.page.news": "Uutiset",
 
-
-
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Vahvista valinta",
 
@@ -1227,7 +2008,74 @@
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Nimeke",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Harvointikontrollit",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Virhe asetusten testaamisen valmistelussa",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "Asetusten testausskripti epäonnistui",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "Asetusten testausskripti suoritettu",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Testikonfiguraatio",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Testataan konfiguraatiota...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "Importointi valmisteltu",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Virhe importoinnin valmistelussa",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importoi nyt",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importoidaan...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Virhe importoinnissa",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "Importointi valmis",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "Nollaus ja uudelleenimportointi valmisteltu",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Virhe nollauksen ja uudelleenimportoinnin valmistelussa",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Virhe nollauksessa ja uudelleenimportoinnissa",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Nollaus ja uudelleenimportointi valmis",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Nollaus ja uudelleenimportointi",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Nollataan ja uudelleenimportoidaan...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Harvestoinnin tila:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Harvestoinnin aloitusaika:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Harvestoitu viimeksi::",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Harvestointitiedot:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "Ei saatavilla",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "Annetut asetukset on testattu. Ne eivät toimi.",
@@ -1235,10 +2083,11 @@
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Palvelinvirhe",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Yhteisöluettelo",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  "communityList.tabTitle": "DSpace - Yhteisöluettelo",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Yhteisöluettelo",
 
   // "communityList.title": "List of Communities",
   "communityList.title": "Luettelo yhteisöistä",
@@ -1246,8 +2095,6 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Näytä lisää",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Luo yhteisö",
 
@@ -1266,6 +2113,9 @@
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Vahvista",
 
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Poistetaan...",
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Poista yhteisö",
 
@@ -1287,6 +2137,11 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Muokkaa yhteisöä",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Poista logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Kumoa poisto",
 
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Yhteisön logo",
@@ -1309,8 +2164,6 @@
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Pudota yhteisön logo ladattavaksi",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Yhteisön muokkaus onnistui",
 
@@ -1320,10 +2173,8 @@
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Virhe muokattaessa yhteisöä",
 
-  // "community.edit.return": "Return",
-  "community.edit.return": "Palaa",
-
-
+  // "community.edit.return": "Back",
+  "community.edit.return": "Paluu",
 
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Kuratoi",
@@ -1349,25 +2200,26 @@
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Yhteisön muokkaus - Käyttöoikeudet",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Yhteisö",
 
-
-
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ei mitään",
 
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Luo",
 
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Ryhmän luonti '{{ role }}'-roolille epäonnistui",
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Rajoita",
 
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "Poista",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "'{{ role }}'-roolin ryhmän poisto epäonnistui",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Ylläpitäjät",
@@ -1375,21 +2227,18 @@
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Ylläpitäjät",
 
-
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.community-admin.description": "Yhteisön ylläpitäjät voivat luoda alayhteisöjä tai kokoelmia ja hallita niitä sekä myöntää niihin hallintaoikeuksia. He päättävät, kuka saa tallentaa tietueita alakokoelmiin, muokata metadataa (tallennuksen jälkeen) ja lisätä (liittää) olemassa olevia tietueita muista kokoelmista (käyttöoikeuksien puitteissa).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
   "comcol-role.edit.collection-admin.description": "Kokoelman ylläpitäjät päättävät, kuka saa tallentaa tietueita alakokoelmiin, muokata metadataa (tallennuksen jälkeen) ja lisätä (liittää) olemassa olevia tietueita muista kokoelmista (k.o. kokoelman käyttöoikeuksien puitteissa).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Tallentajat",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
   "comcol-role.edit.submitters.description": "Käyttäjät ja ryhmät, joilla on oikeus tallentaa uusia tietueita tähän kokoelmaan",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Tietueen oletuslukuoikeus",
 
@@ -1399,7 +2248,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Uusien tietuiden oletuslukuoikeus on tällä hetkellä Anonymous.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Tiedostojen oletuslukuoikeus",
 
@@ -1409,28 +2257,29 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Uusien tiedostojen oletuslukuoikeus on tällä hetkellä Anonymous.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Muokkaajat",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Muokkaajat voivat muokata uusien tallennusten metadataa sekä hyväksyä tai hylätä tallennukset.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Loppumuokkaajat",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Loppumuokkaajat voivat muokata uusien tallennusten metadataa. He eivät voi hylätä tallennuksia.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Tarkastajat",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Tarkastajat voivat hyväksyä tai hylätä uudet tallennukset. He eivät voi muokata tallennusten metadataa.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Arvosanatarkastajat",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Tarkastajat voivat antaa tallennettaville julkaisuille arvosanan, joka määrittää, hylätäänkö vai hyväksytäänkö tallennus.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Lyhyt kuvaus",
@@ -1471,8 +2320,6 @@
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Yhteisön alayhteisöt",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Hyväksy kaikki",
 
@@ -1494,6 +2341,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(aina pakollinen)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Tästä kytkimestä voit ottaa kaikki palvelut käyttöön tai poistaa ne käytöstä",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Ota käyttöön tai poista käytöstä kaikki palvelut",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Viime käyntisi jälkeen on tehty muutoksia. Ole hyvä ja päivitä suostumuksesi.",
 
@@ -1503,9 +2356,21 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Kieltäydy",
 
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "OK",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Tallenna",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Evästeiden hyväksyntä",
+
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-notice.description": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>. <br/> Lisätietoa saat lukemalla tämän: {privacyPolicy}.",
 
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>.",
+
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Räätälöi",
 
@@ -1521,7 +2386,11 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Keräämämme tieto",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "palvelut",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "palvelu",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Todentaminen",
@@ -1529,30 +2398,29 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Vaadittu kirjautumista varten",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Asetukset",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Vaadittu asetustesi tallentamista varten",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Kuittaus",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Vaadittu kuittaustesi ja hyväksyntäsi tallentamista varten",
 
-
-
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Sallii tilastollisen datan seurannan",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Käytämme Googlen reCAPTCHA-palvelua rekisteröinnin ja salasanan palauttamisen yhteydessä.",
 
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Toiminnallinen",
@@ -1560,8 +2428,16 @@
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Tilastollinen",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Rekisteröinti ja salasanan palauttaminen",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Jakaminen",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Luo viittaussivu",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Tarkista metadatan linkit",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -1579,7 +2455,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virusskannaus",
 
-
+  // "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Rekisteröi DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tehtävä:",
@@ -1599,13 +2476,38 @@
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Virhe kuratointitehtävää aloitettaessa.",
 
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Kohteen handlea ei voitu määrittää",
+
   // "curation.form.handle.label": "Handle:",
   "curation.form.handle.label": "Handle:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
   "curation.form.handle.hint": "Vinkki: Syötä [oma-handle-prefix]/0 suorittaaksesi tehtävän koko sivustolla (kaikki tehtävät eivät tue tätä toimintoa)",
 
+  // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "Hyvä {{ recipientName }},\nValitettavasti emme voi lähettää kopiota pyytämistänne tiedostoista (dokumentti \"{{ itemUrl }}\" ({{ itemName }})), joiden tekijä olen. Ystävällisin terveisin \n{{ authorName }} <{{ authorEmail }}>",
 
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Dokumenttikopion pyyntö",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Tapahtui virhe",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Epää dokumenttikopion pyyntö",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Tämä viesti lähetetään pyynnön esittäjälle",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Tietuepyyntö evätty",
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Nimetön",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Nimeämätön",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Uusi kokoelma",
@@ -1616,6 +2518,9 @@
   // "dso-selector.create.community.head": "New community",
   "zxzcommunity.head": "Uusi yhteisö",
 
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "tai",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Luo uusi yhteisö tänne: ",
 
@@ -1640,16 +2545,92 @@
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Muokkaa tietuetta",
 
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Virhe etsittäessä tyyppiä {{ type }}",
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Eksportoi metadata täältä: ",
 
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Eksportoi erä (ZIP): ",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importoi erä: ",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Ei {{ type }}-tyyppiä.",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Hae {{ type }}-tyyppiä",
 
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Valitse kokoelma",
 
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Valitse hakualue",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Hae koko julkaisuarkistosta",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "tai",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Hae yhteisöä tai kokoelmaa",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Profiilivinkkejä",
+
+  // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.",
+  "dso-selector.claim.item.body": "Nämä ovat olemassa olevia profiileja, jotka saattavat liittyä sinuun. Jos tunnistat jonkin näistä profiileista omaksesi, valitse se ja valitse tarkentavan sivun vaihtoehdoista, että otat sen itsellesi. Muussa tapauksessa voit luoda uuden profiilin käyttämällä alla olevaa painiketta.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Mikään näistä ei ole minun",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Luo uusi",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Tapahtui virhe, päivitä uudelleen ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Ohjausryhmän valitsin",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Valitse tilauksen tyyppi",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "EI MITÄÄN",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "MUOKKAAJA",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "KATSELIJA",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Valitse ryhmä",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Peruuta",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Tallenna",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Valitse tilauksen tyyppi",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Valitse ryhmä",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ohjausmääräys luotu {{ name }}-ryhmälle",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Virhe",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Tietueelle on jo ohjausmääräys valitulle ryhmälle",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Eksportoi {{ dsoName }}:n metadata",
@@ -1663,11 +2644,23 @@
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Eksportoi",
 
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportoi erä (ZIP) {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Haluatko varmasti eksportoida erän (ZIP)  {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Peruuta",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Eksportoi",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Poista käyttäjä \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "Haluatko varmasti poistaa käyttäjän \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Haluatko varmasti poistaa käyttäjän \"{{ dsoName }}\"?",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Peruuta",
@@ -1675,6 +2668,29 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Poista",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Poista profiili",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Haluatko varmasti poistaa profiilisi?",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Peruuta",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Poista",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Poista tilaus",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Haluatko varmasti poistaa tilauksen: \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Peruuta",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Poista",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Virhe tiedostoa noudettaessa",
@@ -1712,6 +2728,9 @@
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Virhe hakutuloksia noudettaessa",
 
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "Hakulauseke on virheellinen. Tarkista <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr-kyselysyntaksi</a> ja sieltä parhaat käytännöt saadaksesi lisätietoja.",
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Virhe alakokoelmia noudettaessa",
 
@@ -1733,13 +2752,45 @@
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Tiedoston lataus on pakollinen",
 
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Kenttä on pakollinen",
 
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Sähköpostiosoite ei ole toimiva sähköpostiosoite.",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Sähköpostiosoite on jo käytössä",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Ryhmä on jo olemassa",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä. Käytä tämän kentän sijasta  Elementti- ja Tarkenne-kenttiä.",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Kenttään voi laittaa vain 32 merkkiä",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Kenttään voi laittaa vain 256 merkkiä",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä. Käytä tämän kentän sijasta Elementti- ja Tarkenne-kenttiä.",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Kenttään voi laittaa vain 64 merkkiä",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Kenttään voi laittaa vain 64 merkkiä",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Jakelusyöte",
 
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Virhe tietueen tiedostoja noudettaessa",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "tekijänoikeus © 2002-{{ year }}",
 
@@ -1755,16 +2806,17 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Yksilönsuoja",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement": "Käyttöehdot",
-
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Käyttöoikeussopimus",
 
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Lähetä palautetta",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Unohtunut salasana",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "forgot-email.form.info": "Rekisteröi käyttäjätili voidaksesi tilata sähköposti-ilmoituksia kokoelmien päivityksistä ja lisätä uusia tietueita julkaisuarkistoon.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Syötä tiliin liittyvä sähköpostiosoite.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Sähköpostiosoite *",
@@ -1772,28 +2824,26 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Anna sähköpostiosoite",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Anna oikea sähköpostiosoite",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Anna toimiva sähköpostiosoite",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  "forgot-email.form.email.hint": "Osoite varmistetaan, ja se toimii käyttäjätunnuksenasi kirjautumisessa.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Sähköpostiosoitteeseen lähetetään viesti, jossa on lisäohjeita.",
 
-  // "forgot-email.form.submit": "Submit",
-  "forgot-email.form.submit": "Lähetä",
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Nollaa salasana",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  "forgot-email.form.success.head": "Varmistusviesti lähetetty",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "Salasanan nollausviesti lähetetty",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Viesti on lähetetty osoitteeseen {{ email }}. Viestissä on URL-osoite ja lisäohjeita.",
 
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  "forgot-email.form.error.head": "Virhe sähköpostiosoitetta rekisteröitäessä",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Virhe rekisteröitäessä tätä sähköpostiosoitetta: {{ email }}",
-
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Virhe salasanaa nollattaessa",
 
+  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Virhe nollattaessa tähän sähköpostiosoitteeseen liittyvän tilin salasanaa {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Unohtunut salasana",
@@ -1801,8 +2851,8 @@
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Unohtunut salasana",
 
-  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "forgot-password.form.info": "Syötä uusi salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään. Salasanan on oltava vähintään kuusi merkkiä pitkä.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info": "Syötä uusi salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Turvallisuus",
@@ -1825,9 +2875,6 @@
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Virhe uutta salasanaa lähetettäessä",
 
@@ -1840,10 +2887,8 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Lähetä salasana",
 
-
-
-  // "form.add": "Add",
-  "form.add": "Lisää",
+  // "form.add": "Add more",
+  "form.add": "Lisää vielä",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Valitse lisätäksesi nykyisen kohteen ja toisen kohteen",
@@ -1855,13 +2900,19 @@
   "form.clear": "Tyhjennä",
 
   // "form.clear-help": "Click here to remove the selected value",
-  "form.clear-help": "Napauta tästä poistaaksesi valitun arvon",
+  "form.clear-help": "Napsauta tästä poistaaksesi valitun arvon",
+
+  // "form.discard": "Discard",
+  "form.discard": "Hylkää",
+
+  // "form.drag": "Drag",
+  "form.drag": "Raahaa",
 
   // "form.edit": "Edit",
   "form.edit": "Muokkaa",
 
   // "form.edit-help": "Click here to edit the selected value",
-  "form.edit-help": "Napauta tästä muokataksesi valittua arvoa",
+  "form.edit-help": "Napsauta tästä muokataksesi valittua arvoa",
 
   // "form.first-name": "First name",
   "form.first-name": "Etunimi",
@@ -1896,6 +2947,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Ei syötettyä arvoa",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Sähköpostiosoite",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Etunimi",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Solr-indeksissä",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Instituutio",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Sukunimi",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID-tunniste",
+
   // "form.remove": "Remove",
   "form.remove": "Poista",
 
@@ -1911,10 +2980,134 @@
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Valitse etsiäksesi olemassa olevaa vastaavuutta",
 
-  // "form.submit": "Submit",
-  "form.submit": "Lähetä",
+  // "form.submit": "Save",
+  "form.submit": "Tallenna",
 
+  // "form.create": "Create",
+  "form.create": "Luo",
 
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Pudota tietue uuteen paikkaan",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Älä lähetä kopiota",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Paluu",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Valinnainen lisäviesti",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Kirjoita viesti",
+
+  // "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "Voit harkita uudelleen dokumentin pääsyrajoituksia, jotta sinun ei tarvitse vastata näihin pyyntöihin. Rastita alla oleva ruutu pyytääksesi julkaisuarkiston ylläpitäjää poistamaan rajoitukset.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Valitse Open Access",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Lähetä",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Asiasana",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Syötä asiasana",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Lähetä kopio",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Dokumenttikopion pyyntö",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Palaa etusivulle",
+
+  // "grant-deny-request-copy.intro1": "If you are one of the authors of the document <a href='{{ url }}'>{{ name }}</a>, then please use one of the options below to respond to the user's request.",
+  "grant-deny-request-copy.intro1": "Jos olet dokumentin <a href='{{ url }}'>{{ name }}</a> tekijä, vastaa käyttäjän pyyntöön jollakin alla olevista vaihtoehdoista.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "Valittuasi vaihtoehdon näet sähköpostiviestiehdotuksen. Voit muokata ehdotusta halutessasi.",
+
+  // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  "grant-deny-request-copy.processed": "Pyyntö on käsitelty. Voit käyttää alla olevaa painiketta palataksesi etusivulle.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Pyydä kopiota dokumentista",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Tapahtui virhe",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Hyväksy dokumenttikopion pyyntö",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Viesti lähetetään pyynnön esittäjälle. Pyydetyt dokumentit liitetään viestiin.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Tietuepyyntö hyväksytty",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Järjestelmän kunto",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Järjestelmän kunto",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Tiedot",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Tila",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Järjestelmän kunnon tarkistus on väliaikaisesti poissa käytöstä",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Tilakoodi",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Tietokanta",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: auktoriteettiydin",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: OAI-ydin",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "Solr: hakuydin",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: tilastoydin",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Taustasovellus",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Tila",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Toiminnassa",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Ongelmia havaittu",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Mahdollisia ongelmia havaittu",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Järjestelmän kunto",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Ei havaittuja ongelmia",
 
   // "home.description": "",
   "home.description": "",
@@ -1922,11 +3115,11 @@
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Etusivu",
 
-  //  "home.search-form.placeholder": "Search the repository ...",
+  // "home.search-form.placeholder": "Search the repository ...",
   "home.search-form.placeholder": "Hae julkaisuarkistosta ...",
 
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Etusivu",
+  // "home.title": "Home",
+  "home.title": "Etusivu",
 
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Julkaisuarkiston yhteisöt",
@@ -1934,19 +3127,17 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Valitse yhteisö, jonka kokoelmia haluat selata.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  "info.end-user-agreement.accept": "Olen lukenut ja hyväksyn käyttöehdot",
+  "info.end-user-agreement.accept": "Olen lukenut ja hyväksyn käyttöoikeussopimuksen",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  "info.end-user-agreement.accept.error": "Virhe hyväksyttäessä käyttöehtoja",
+  "info.end-user-agreement.accept.error": "Virhe hyväksyttäessä käyttöoikeussopimusta",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  "info.end-user-agreement.accept.success": "Käyttöehdot päivitetty",
+  "info.end-user-agreement.accept.success": "Käyttöoikeussopimus päivitetty",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  "info.end-user-agreement.breadcrumbs": "Käyttöehdot",
+  "info.end-user-agreement.breadcrumbs": "Käyttöoikeussopimus",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Peruuta",
@@ -1955,10 +3146,13 @@
   "info.end-user-agreement.buttons.save": "Tallenna",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  "info.end-user-agreement.head": "Käyttöehdot",
+  "info.end-user-agreement.head": "Käyttöoikeussopimus",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  "info.end-user-agreement.title": "Käyttöehdot",
+  "info.end-user-agreement.title": "Käyttöoikeussopimus",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "Suomi",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Tietosuojalauseke",
@@ -1969,39 +3163,68 @@
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Tietosuojalauseke",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Palaute",
 
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Palaute",
 
-  // "item.alerts.private": "This item is private",
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Palaute",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Kiitos antamastasi palautteesta. Havaintosi ovat arvokkaita!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Tätä osoitetta käytetään palautteesi käsittelyssä.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Lähetä palautetta",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Kommentit",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Sähköpostiosoitteesi",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Palaute lähetetty!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Toimiva sähköpostiosoite on pakollinen",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Kommentti on pakollinen",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Sivu",
+
+  // "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "Sivu, johon palautteesi kohdistuu",
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Tietue on yksityinen",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Tietue on poistettu käytöstä",
 
-
-
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Tässä voit tarkastella ja muokata tietuekäytäntöjä sekä tietueen yksittäisten komponenttien eli nippujen ja tiedostojen käytäntöjä. Tietue on nippujen säiliö ja niput ovat tiedostojen säiliöitä. Säiliöillä on yleensä LISÄYS/POISTO/LUKU/KIRJOITUS-käytännöt, mutta tiedostoihin sovelletaan vain LUKU/KIRJOITUS-käytäntöjä.",
 
-
-
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Muokkaa tietuekäytäntöjä",
 
-
-
-  // "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Yksityinen",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Poistettu käytöstä",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Nippu",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  "item.bitstreams.upload.bundle.placeholder": "Valitse nippu",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Valitse nippu tai syötä uuden nipun nimi",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Luo nippu",
@@ -2030,8 +3253,6 @@
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Lataa tiedosto",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Lataus",
 
@@ -2063,7 +3284,7 @@
   "item.edit.bitstreams.edit.buttons.remove": "Poista",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  "item.edit.bitstreams.edit.buttons.undo": "Peruuta muutokset",
+  "item.edit.bitstreams.edit.buttons.undo": "Kumoa muutokset",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Tietueeseen ei liity tiedostoja. Valitse latauspainike luodaksesi tiedoston.",
@@ -2122,8 +3343,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Lataa",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Peruuta",
 
@@ -2148,6 +3367,8 @@
   // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "Muokkaa tietuetta",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "Sinulla ei ole valtuuksia tähän välilehteen",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Kokoelmaliitosväline",
@@ -2155,6 +3376,69 @@
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Tietueen muokkaus - Kokoelmaliitosväline",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Tuntematon",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Rekisteröintijonossa",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Varausjonossa",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Rekisteröity",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Varattu",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Varattu (päivitysjonossa)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Rekisteröity (päivitysjonossa)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Päivitys- ja rekisteröintijonossa",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Poistojonossa",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Poistettu",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Vireillä (ei rekisteröity)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Luotu (ei rekisteröity)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Rekisteröi uusi tai vireillä oleva DOI",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Rekisteröi DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Rekisteröi uusi tai vireillä oleva DOI",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Tarkasta vireillä olevat tunnisteet ja tietueitten metadata alapuolella. Napsauta Vahvista jatkaaksesi DOI-tunnuksen rekisteröintiä tai Peruuta peruuttaaksesi.",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Vahvista",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Peruuta",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI lisätty rekisteröintijonoon.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Virhe rekisteröitäessä DOI-tunnusta",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "DOI on jo luotu ja lisätään rekisteröintijonoon verkossa",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Liitä tietue valittuihin kokoelmiin",
 
@@ -2200,20 +3484,27 @@
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Liitos poistettu",
 
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Hae kokoelmia...",
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Selaa liitettyjä kokoelmia",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Liitä uusia kokoelmia",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Lisää",
 
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Hylkää",
 
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Vahvista",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Raahaa uudelleenjärjestääksesi",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Muokkaa",
 
@@ -2226,6 +3517,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Lopeta muokkaus",
 
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Tämä on virtuaalinen metadata-arvo eli arvo, joka on peritty liittyvältä entiteetiltä. Sitä ei voi muokata suoraan. Lisää tai poista yhteys \"Suhteet\"-välilehdellä,",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Tietueessa ei ole metadataa. Valitse Lisää lisätäksesi metadataa.",
 
@@ -2241,13 +3535,16 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Arvo",
 
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Virhe validoitaessa metadatakenttää",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Valitse oikea metadatakenttä",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Muutokset hylätty. Valitse 'Kumoa' palauttaaksesi muutokset",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   "item.edit.metadata.notifications.discarded.title": "Muutokset hylätty",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
@@ -2262,7 +3559,7 @@
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
   "item.edit.metadata.notifications.outdated.content": "Toinen käyttäjä on muuttanut parhaillaan muokkaamaasi tietuetta. Tekemäsi muutokset on hylätty ristiriitojen estämiseksi",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   "item.edit.metadata.notifications.outdated.title": "Muutokset vanhentuneet",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
@@ -2272,13 +3569,14 @@
   "item.edit.metadata.notifications.saved.title": "Metadata tallennettu",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  "item.edit.metadata.reinstate-button": "Peruuta",
+  "item.edit.metadata.reinstate-button": "Kumoa",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Kumoa uudelleenjärjestäminen",
 
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Tallenna",
 
-
-
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Kenttä",
 
@@ -2288,10 +3586,14 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Arvo",
 
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Paluu",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Tallenna",
 
-  // "item.edit.move.cancel": "Cancel",
-  "item.edit.move.cancel": "Peruuta",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Hylkää",
 
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
   "item.edit.move.description": "Valitse kokoelma, johon haluat siirtää tietueen. Voit antaa hakulausekkeen kokoelmien määrän pienentämiseksi.",
@@ -2323,48 +3625,42 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Siirrä tietue",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Peruuta",
 
-  // "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "Muuta yksityiseksi",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  "item.edit.private.description": "Haluatko varmasti muuttaa tietueen yksityiseksi?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "Haluatko varmasti muuttaa tietueen yksityiseksi? Yksityinen tietue ei löydy haettaessa.",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
   "item.edit.private.error": "Virhe muutettaessa tietuetta yksityiseksi",
 
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  "item.edit.private.header": "Muuta yksityiseksi tietue: {{ id }}",
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Muuta tietue yksityiseksi: {{ id }}",
 
-  // "item.edit.private.success": "The item is now private",
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "Tietue on yksityinen",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Peruuta",
 
-  // "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
   "item.edit.public.confirm": "Muuta julkiseksi",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  "item.edit.public.description": "Haluatko varmasti muuttaa tietueen julkiseksi?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "Haluatko varmasti muuttaa tietueen julkiseksi? Julkinen tietue löytyy haettaessa.",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
   "item.edit.public.error": "Virhe muutettaessa tietuetta julkiseksi",
 
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  "item.edit.public.header": "Muuta julkiseksi tietue: {{ id }}",
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Muuta tietue julkiseksi: {{ id }}",
 
-  // "item.edit.public.success": "The item is now public",
+  // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "Tietue on julkinen",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Peruuta",
 
@@ -2383,8 +3679,6 @@
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Tietue palautettu käyttöön",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Hylkää",
 
@@ -2395,13 +3689,13 @@
   "item.edit.relationships.edit.buttons.remove": "Poista",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  "item.edit.relationships.edit.buttons.undo": "Peruuta muutokset",
+  "item.edit.relationships.edit.buttons.undo": "Kumoa muutokset",
 
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Ei yhteyksiä",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Muutoksesi hylättiin. Valitse 'Peruuta' palauttaaksesi ne.",
+  "item.edit.relationships.notifications.discarded.content": "Muutoksesi hylättiin. Valitse 'Kumoa' palauttaaksesi ne.",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Muutokset hylätty",
@@ -2422,7 +3716,7 @@
   "item.edit.relationships.notifications.saved.title": "Yhteydet tallennettu",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  "item.edit.relationships.reinstate-button": "Peruuta",
+  "item.edit.relationships.reinstate-button": "Kumoa",
 
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Tallenna",
@@ -2430,6 +3724,9 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Lisää 'dspace.entity.type' -metadataa aktivoidaksesi yhteydet tietueessa",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "Paluu",
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Tietueen tiedostot",
 
@@ -2442,6 +3739,9 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Tietueen muokkaus - Kuratointi",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Kuratoi tietuetta: {{item}}",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Tietueen metadata",
 
@@ -2478,23 +3778,26 @@
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Siirrä tietue toiseen kokoelmaan",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
   "item.edit.tabs.status.buttons.private.button": "Muuta yksityiseksi...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
   "item.edit.tabs.status.buttons.private.label": "Muuta tietue yksityiseksi",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
   "item.edit.tabs.status.buttons.public.button": "Muuta julkiseksi...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
   "item.edit.tabs.status.buttons.public.label": "Muuta tietue julkiseksi",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Palauta käyttöön...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue arkistoon",
+  "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue julkaisuarkistoon",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Sinulla ei ole valtuuksia suorittaa tätä toimintoa",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   "item.edit.tabs.status.buttons.withdraw.button": "Poista tämä kohde",
@@ -2509,7 +3812,7 @@
   "item.edit.tabs.status.head": "Tietueen tila",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  "item.edit.tabs.status.labels.handle": "Handle-tunnus",
+  "item.edit.tabs.status.labels.handle": "Handle",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Tietueen sisäinen ID",
@@ -2538,8 +3841,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Tietueen muokkaus -  Näytä",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Peruuta",
 
@@ -2558,7 +3859,8 @@
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Tietue poistettu käytöstä",
 
-
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Paluu",
 
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Tietue",
@@ -2584,10 +3886,38 @@
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Tietuehaun tulokset",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace Angular :: Tietuehaku",
+  // "item.search.title": "Item Search",
+  "item.search.title": "Tietuehaku",
 
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Näytä lisää",
 
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Sulje",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Poista ohjausmääräys",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Haluatko varmasti poistaa ohjausmääräyksen?",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Peruuta",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Poista",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Ohjausmääräys poistettu \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Ohjausmääräyksen poisto epäonnistui \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Ohjaajana:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Poista ohjausryhmä",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Tiivistelmä",
@@ -2601,6 +3931,12 @@
   // "item.page.collections": "Collections",
   "item.page.collections": "Kokoelmat",
 
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Ladataan...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Lataa lisää",
+
   // "item.page.date": "Date",
   "item.page.date": "Päivämäärä",
 
@@ -2634,6 +3970,12 @@
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Tietueen suppeat tiedot",
 
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID-tunniste",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Avaa ORCID-asetusten sivu",
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Tekijän artikkelit",
 
@@ -2667,12 +4009,27 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Sulje",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Alkuperäinen nippu",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Lisenssinippu",
 
+  // "item.page.return": "Back",
+  "item.page.return": "Paluu",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "Luo uusi versio",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Ota itsellesi",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Ota tämä kohde profiiliksi",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Tunnus:",
 
@@ -2680,7 +4037,7 @@
   "item.preview.dc.contributor.author": "Tekijät:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  "item.preview.dc.date.issued": "Julkaisuajankohta:",
+  "item.preview.dc.date.issued": "Julkaisuaika:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Tiivistelmä:",
@@ -2697,6 +4054,33 @@
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Nimeke:",
 
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Tyyppi:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Numero",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "Vuosikerta",
+
+  // "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.relation.issn": "ISSN-tunnus",
+
+  // "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Tunnisteet:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Kausijulkaisu tai sarja",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Julkaisija:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Sukunimi:",
 
@@ -2706,6 +4090,23 @@
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID-tunniste:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Rahoittaja:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Rahoittajan tunniste:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "Rahoitustunnus:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Kirjainlyhemme:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Toimivalta:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Rahoituslähde:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Vahvista valinta",
@@ -2722,19 +4123,21 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Nimeke",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Tietueesta ei ole muita versioita.",
 
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Versiohistoria",
 
-  // "item.version.history.return": "Return",
-  "item.version.history.return": "Palaa",
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "Paluu",
 
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Valittu versio",
 
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Tarkastelet tietueen versiota {{version}}.",
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Versio",
 
@@ -2750,12 +4153,191 @@
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Yhteenveto",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Työtilan tietue",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Työtilan tietue",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Toiminto",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Muokkaa työtilan tietuetta",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Muokkaa yhteenvetoa",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Tallenna yhteenvedon muokkaukset",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Hylkää yhteenvedon muokkaukset",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Luo tästä uusi versio",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Poista versio",
+
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Tämä ei ole tietueen uusin versio. Uusin versio löytyy <a href='{{destination}}'>täältä</a>.",
 
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "uusi versio",
 
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Luodaan tietueesta uusi versio",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "alkaen versiosta {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Luo",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Luo uusi versio",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Peruuta",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Älä luo uutta versiota",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Yhteenveto",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Syötä uuden version yhteenveto",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Luodaan uutta versiota...",
+
+  // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+  "item.version.create.modal.submitted.text": "Uutta versiota luodaan. Luonti voi kestää, jos tietueella on paljon yhteyksiä.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Uusi versio on luotu, sen versionumero on  {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "Uutta versiota ei luotu",
+
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Poista versio",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Haluatko poistaa version {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Poista",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Poista tämä versio",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Peruuta",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Älä poista tätä versiota",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "Versio versionumerolla {{version}} poistettu",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "Versiota versionumerolla {{version}} ei poistettu",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Version versionumerolla {{version}} yhteenveto on muuttunut",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "Version versionumerolla {{version}} yhteenvetoa ei ole muutettu",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Lisää",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Hylkää",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Vahvista",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Raahaa uudelleenjärjestääksesi",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Muokkaa",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Poista",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Kumoa muutokset",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Lopeta muokkaus",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Mallipohjassa ei ole metadataa. Napsauta Lisää lisätäksesi metadata-arvoja.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Muokkaa",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Kenttä",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Kieli",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Arvo",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Virhe metadatakenttää validoitaessa",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Valitse kelvollinen metadatakenttä ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Muutoksesi hylättiin. Palauta muutokset napsauttamalla Kumoa-painiketta",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Muutokset peruttu",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Tapahtui virhe",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Muutoksia ei tallennettu. Tarkista kaikkien kenttien oikeellisuus ennen tallennusta.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Virheellinen metadata",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Toinen käyttäjä on muokannut käsittelemääsi mallipohjaa. Muutoksesi on hylätty konfliktien välttämiseksi.",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Muutokset vanhentuneet",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Muutokset mallipohjan metadataan on tallennettu.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata tallennettu",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Kumoa",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Kumoa uudelleenjärjestäminen",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Tallenna",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Kausijulkaisu",
@@ -2781,10 +4363,11 @@
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Kausijulkaisuhaun tulokset",
 
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Kausijulkaisuhaku",
-
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Kausijulkaisuhaun tulokset",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Kausijulkaisuhaku",
 
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Kausijulkaisun numero",
@@ -2813,8 +4396,6 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Kausijulkaisun numero: ",
 
-
-
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Kausijulkaisun vuosikerta",
 
@@ -2833,7 +4414,38 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Vuosikerta",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Dokumenttimedia",
 
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Dokumentti: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Pysyvä linkki: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Numero: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Kuvaus: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Käytä koko näytön tilaa nähdäksesi paremmin",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Kuvamedia",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Kuva: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Pysyvä linkki: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Numero: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Kuvaus: ",
 
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Ladataan tiedostoa...",
@@ -2889,8 +4501,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Ladataan ylätason yhteisöjä...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "Sähköpostiosoite",
 
@@ -2906,6 +4516,12 @@
   // "login.form.or-divider": "or",
   "login.form.or-divider": "tai",
 
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Kirjaudu OIDC-tunnuksella",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Kirjaudu ORCID-tunnuksella",
+
   // "login.form.password": "Password",
   "login.form.password": "Salasana",
 
@@ -2921,8 +4537,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Sisäänkirjautuminen",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Kirjaudu ulos",
 
@@ -2932,15 +4546,14 @@
   // "logout.title": "Logout",
   "logout.title": "Uloskirjautuminen",
 
-
-
-  // "menu.header.admin": "Admin",
-  "menu.header.admin": "Ylläpitäjä",
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "Hallinto",
 
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Arkiston logo",
 
-
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Hallintovalikko",
 
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Pääsyoikeudet",
@@ -2954,13 +4567,21 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Käyttäjät",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Ylläpitäjän haku",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Tämä yhteisö",
 
@@ -2968,7 +4589,7 @@
   "menu.section.browse_community_by_author": "Tekijän mukaan",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  "menu.section.browse_community_by_issue_date": "Julkaisuajankohdan mukaan",
+  "menu.section.browse_community_by_issue_date": "Julkaisuajan mukaan",
 
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Nimekkeen mukaan",
@@ -2980,27 +4601,26 @@
   "menu.section.browse_global_by_author": "Tekijän mukaan",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Julkaisuajankohdan mukaan",
+  "menu.section.browse_global_by_dateissued": "Julkaisuajan mukaan",
 
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Asiasanan mukaan",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Aihekategorian mukaan",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Nimekkeen mukaan",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Yhteisöt & kokoelmat",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Hallintapaneeli",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Kuratointitehtävä",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Muokkaa",
 
@@ -3013,8 +4633,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Tietue",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Eksportoi",
 
@@ -3030,19 +4648,24 @@
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadata",
 
-
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Erän eksportointi(ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Pääsyoikeudet",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Ylläpitäjän haku",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Hallintapaneeli",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  "menu.section.icon.curation_task": "Kuratointi",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Kuratointitehtävä",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Muokkaus",
@@ -3053,6 +4676,9 @@
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Haku",
 
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Järjestelmän kunnon tarkistus",
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Importointi",
 
@@ -3062,8 +4688,8 @@
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Kiinnitä sivupalkki",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  "menu.section.icon.processes": "Prosessit",
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Prosessien kunto",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Rekisterit",
@@ -3071,11 +4697,12 @@
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Tilastot",
 
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Työnkulku hallinta",
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Vapauta sivupalkki",
 
-
-
   // "menu.section.import": "Import",
   "menu.section.import": "Importoi",
 
@@ -3085,8 +4712,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadata",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Uusi",
 
@@ -3105,20 +4730,17 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Prosessi",
 
-
-
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Kiinnitä sivupalkki",
 
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Vapauta sivupalkki",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Prosessit",
 
-
+  // "menu.section.health": "Health",
+  "menu.section.health": "Järjestelmän kunto",
 
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Rekisterit",
@@ -3129,57 +4751,64 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadata",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Tilastot",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tilastointitehtävä",
 
-
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-  "menu.section.toggle.access_control": "Vaihda Pääsyoikeudet-osion tilaa",
+  "menu.section.toggle.access_control": "Näytä/piilota Pääsyoikeudet-osio",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  "menu.section.toggle.control_panel": "Vaihda Hallintapaneeli-osion tilaa",
+  "menu.section.toggle.control_panel": "Näytä/piilota Hallintapaneeli-osio",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Vaihda Kuratointitehtävä-osion tilaa",
+  "menu.section.toggle.curation_task": "Näytä/piilota Kuratointitehtävä-osio",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  "menu.section.toggle.edit": "Vaihda Muokkaus-osion tilaa",
+  "menu.section.toggle.edit": "Näytä/piilota Muokkaus-osio",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  "menu.section.toggle.export": "Vaihda Eksportointi-osion tilaa",
+  "menu.section.toggle.export": "Näytä/piilota Eksportointi-osio",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  "menu.section.toggle.find": "Vaihda Haku-osion tilaa",
+  "menu.section.toggle.find": "Näytä/piilota Haku-osio",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  "menu.section.toggle.import": "Vaihda Importointi-osion tilaa",
+  "menu.section.toggle.import": "Näytä/piilota Importointi-osio",
 
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Vaihda Uusi-osion tilaa",
+  "menu.section.toggle.new": "Näytä/piilota Uusi-osio",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Vaihda Rekisterit-osion tilaa",
+  "menu.section.toggle.registries": "Näytä/piilota Rekisterit-osio",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  "menu.section.toggle.statistics_task": "Vaihda Tilastointitehtävä-osion tilaa",
-
+  "menu.section.toggle.statistics_task": "Näytä/piilota Tilastointitehtävä-osio",
 
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Hallinnoi työnkulkua",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Eksportoi Hakutulokset CSV-tiedostona",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "Eksportointi aloitettu",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Eksportoinnin aloittaminen epäonnistui",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Oma DSpace",
 
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "tässä",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Valitse tämä, jos haluat lähettää viestin tietueen tallentajalle.",
 
@@ -3255,26 +4884,32 @@
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Ei URL-osoitetta",
 
-  // "mydspace.show.workflow": "All tasks",
-  "mydspace.show.workflow": "Kaikki tehtävät",
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Hae omasta DSpacesta...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Työnkulun tehtävät",
 
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Tallennuksesi",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arkistoitu",
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Valvotut tietueet",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Tarkastaminen",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arkistoitu",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Odotetaan tarkastajaa",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validointi",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Työnkulku",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Odottaa tarkastajaa",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Työtila",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Työnkulku",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Työtila",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Oma DSpace",
@@ -3291,31 +4926,35 @@
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} uutta työtilaa luotu.",
 
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Uusi työtila luotu. Napauta tästä muokataksesi sitä.",
-
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Näytä",
 
-
-
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Koko julkaisuarkisto",
 
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Yhteisön mukaan",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Näytä/piilota tilannekohtainen ohje",
+
   // "nav.language": "Language switch",
   "nav.language": "Kielivalinta",
 
   // "nav.login": "Log In",
   "nav.login": "Kirjaudu sisään",
 
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Käyttäjäprofiilivalikko ja uloskirjautuminen",
+
   // "nav.logout": "Log Out",
   "nav.logout": "Kirjaudu ulos",
 
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Päänavigointipalkki",
+
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "Omat tiedot",
+  "nav.mydspace": "Oma DSpace",
 
   // "nav.profile": "Profile",
   "nav.profile": "Profiili",
@@ -3323,17 +4962,33 @@
   // "nav.search": "Search",
   "nav.search": "Hae",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Lähetä haku",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Tilastot",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Lopeta käyttäjänä esiintyminen",
 
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Tilaukset",
 
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Näytä/piilota navigointi",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Käyttäjäprofiilipalkki",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Tietue",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organisaatioyksikkö",
 
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Nimetön",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Kaupunki",
 
@@ -3355,7 +5010,8 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organisaatioyksikkö: ",
 
-
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Sivutusvaihtoehdot",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Tuloksia sivulla",
@@ -3369,8 +5025,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Lajitteluvalinnat",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Käyttäjä",
 
@@ -3395,6 +5049,9 @@
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Sukunimi",
 
+  // "person.page.name": "Name",
+  "person.page.name": "Nimi",
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Näytä kaikki metadata",
 
@@ -3408,12 +5065,13 @@
   "person.page.titleprefix": "Käyttäjä: ",
 
   // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Käyttäjähaun tulokset",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Käyttäjähaku",
+  "person.search.results.head": "Henkilöhaun tulokset",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Henkilöhaun tulokset",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "Henkilöhaku",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametrit",
@@ -3421,8 +5079,8 @@
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Peruuta",
 
-  // "process.new.submit": "Submit",
-  "process.new.submit": "Lähetä",
+  // "process.new.submit": "Save",
+  "process.new.submit": "Tallenna",
 
   // "process.new.select-script": "Script",
   "process.new.select-script": "Skripti",
@@ -3463,6 +5121,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Virhe prosessia luotaessa",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Tiedoston koko ylittää latauksen maksimikoon",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Luo uusi prosessi",
 
@@ -3472,18 +5133,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Luo uusi prosessi",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Perustelut",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Prosessiin ei liity perusteluja",
 
-  // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments": "Muuttujat",
-
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty": "Prosessiin ei liity muuttujia",
-
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Paluu",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Prosessin tulos",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -3495,48 +5154,70 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Prosessilla ei tulosta",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Tulostiedostot",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Prosessilla ei ole tulostiedostoja",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Skripti",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Prosessi: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Aloitusaika",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Lopetusaika",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Tila",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Luo vastaava prosessi",
 
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Toiminnot",
 
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Poista prosessi",
 
-  // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish": "Lopetusaika",
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Poista prosessi",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Haluatko varmasti poistaa nykyisen prosessin?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Peruuta",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Poista prosessi",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Prosessi on poistettu.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Virhe prosessia poistettaessa",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Lopetusaika (UTC)",
+
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Prosessin ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nimi",
 
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start": "Aloitusaika",
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Aloitusaika (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Tila",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Käyttäjä",
 
   // "process.overview.title": "Processes Overview",
@@ -3548,6 +5229,32 @@
   // "process.overview.new": "New",
   "process.overview.new": "Uusi",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Toiminnot",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Poista {{count}} prosessi(a)",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Tyhjennä poistettavien valinta",
+
+  // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "{{count}} prosessi(a) poistetaan. Odota poiston päättymistä. Poisto saattaa kestää hetken.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Haluatko varmasti poistaa {{count}} prosessin/prosessia?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Poista prosessi",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Virhe poistettaessa prosessia",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "Prosessia, jonka ID on {{processId}}, ei voitu poistaa. Muiden prosessien poistamista jatketaan.",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} prosessi(a) poistettu",
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Päivitä profiili",
@@ -3558,11 +5265,14 @@
   // "profile.card.security": "Security",
   "profile.card.security": "Suojaus",
 
-  // "profile.form.submit": "Update Profile",
-  "profile.form.submit": "Päivitä profiili",
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "Tallenna",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  "profile.groups.head": "Ryhmät, joihin kuulut",
+  "profile.groups.head": "Käyttöoikeusryhmät, joihin kuulut",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Erityiset käyttöoikeusryhmät, joihin kuulut",
 
   // "profile.head": "Update Profile",
   "profile.head": "Päivitä profiili",
@@ -3603,11 +5313,8 @@
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "profile.security.form.info": "Voit kirjoittaa uuden salasanan alla olevaan kenttään ja varmentaa sen kirjoittamalla sen uudelleen seuraavaan kenttään. Salasanan pituus on vähintään kuusi merkkiä.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info": "Voit kirjoittaa uuden salasanan alla olevaan kenttään ja varmentaa sen kirjoittamalla sen uudelleen seuraavaan kenttään.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Salasana",
@@ -3615,6 +5322,9 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Kirjoita uudelleen",
 
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Nykyinen salasana",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Muuttunut salasana on tallennettu.",
 
@@ -3624,16 +5334,20 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Virhe salasanaa muutettaessa",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  "profile.security.form.notifications.error.not-long-enough": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Tapahtui virhe salasanaa muutettaessa. Tarkista, että nykyinen salasana on oikea.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Annetut salasanat eivät täsmää.",
 
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Täytä suojauslomakkeen vaaditut kentät.",
+
   // "profile.title": "Update Profile",
   "profile.title": "Päivitä profiili",
 
-
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Tutkijaprofiili",
 
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Tutkimusprojekti",
@@ -3668,7 +5382,8 @@
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Projektihaun tulokset",
 
-
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Projektihaun tulokset",
 
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Julkaisu",
@@ -3697,9 +5412,20 @@
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Aineistohaun tulokset",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace Angular :: Aineistohaku",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Aineistohaun tulokset",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Aineistohaku",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Seuraava",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Edellinen",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Soittolista",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Uuden käyttäjän rekisteröinti",
@@ -3734,8 +5460,8 @@
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Suojaus",
 
-  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "register-page.create-profile.security.info": "Syötä salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään. Salasanan on oltava vähintään kuusi merkkiä pitkä.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info": "Syötä salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään.",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Salasana *",
@@ -3749,14 +5475,11 @@
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  "register-page.create-profile.security.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Viimeistele rekisteröinti",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  "register-page.create-profile.submit.error.content": "Tapahtui virhe uuden käyttäjän rekisteröinnissä.",
+  "register-page.create-profile.submit.error.content": "Virhe uuden käyttäjän rekisteröinnissä.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "Rekisteröinti epäonnistui",
@@ -3767,7 +5490,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Rekisteröinti valmis",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Uuden käyttäjän rekisteröinti",
 
@@ -3780,8 +5502,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Anna sähköpostiosoite",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Anna toimiva sähköpostiosoite, ole hyvä",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Anna toimiva sähköpostiosoite",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Käytä sähköpostiosoitetta näillä verkkoalueilla: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Osoite varmistetaan, ja se toimii käyttäjätunnuksenasi kirjautumisessa.",
@@ -3801,7 +5526,29 @@
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Virhe rekisteröitäessä tätä sähköpostiosoitetta: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Virhe autentikoitaessa recaptcha-toiminnolla",
 
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Rekisteröityäksesi sinun on hyväksyttävä <b>Rekisteröinnin ja salasanan palauttamisen</b> (Google reCaptcha) evästeet.",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Annettu sähköpostiosoite ei ole rekisteröinnille sallittujen verkkoalueiden joukossa. Sallitut verkkoalueet ovat {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Avaa evästeasetukset",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Virhe reCaptcha-todennuksessa",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Todentaminen vanhentunut. Todenna uudelleen.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Tili voidaan rekisteröidä näiden verkkoalueiden sähköpostiosoitteille",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Ei {{ type }}-tyyppistä yhteysvastaavuutta kahden tietueen välillä",
@@ -3857,7 +5604,23 @@
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Muut tekijät",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Osallistuja (Organisaatioyksikkö)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Osallistuja",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Rahoittaja",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Julkaisuarkiston logo",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Julkaisuarkisto",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Julkaisuarkisto :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Lisää",
@@ -3910,6 +5673,12 @@
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Virhe muokattaessa resurssikäytäntöä.",
 
+  // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Tapahtui virhe muokattaessa resurssikäytännön kohdetta (käyttäjä tai ryhmä).",
+
+  // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Tapahtui virhe resurssikäytäntöä muokattaessa. Kohde (käyttäjä tai ryhmä) on päivitetty onnistuneesti.",
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Toiminto onnistui",
 
@@ -3943,10 +5712,25 @@
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Nimi",
 
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Tyypin muuttaminen ei onnistu",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Käyttäjän korvaaminen ryhmällä ei ole mahdollista.",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Ryhmän korvaaminen käyttäjällä ei ole mahdollista.",
+
+  // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Poista nykyinen resurssikäytäntö ja luo uusi halutulla tyypillä.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Loppupäivämäärä",
 
-  // "resource-policies.form.date.start.label": "Start Date
+  // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Alkupäivämäärä",
 
   // "resource-policies.form.description.label": "Description",
@@ -4009,21 +5793,19 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Kokoelmakäytännöt",
 
-
-
   // "search.description": "",
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Näytä",
 
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Hae",
+  // "search.title": "Search",
+  "search.title": "Hae",
 
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Hae",
 
-  //  "search.search-form.placeholder": "Search the repository ...",
+  // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Hae julkaisuarkistosta ...",
 
   // "search.filters.applied.f.author": "Author",
@@ -4038,7 +5820,7 @@
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Tallennusajankohta",
 
-  // "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
   "search.filters.applied.f.discoverable": "Yksityinen",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -4068,28 +5850,41 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Varhaisin syntymäaika",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Ohjaajana:",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Poistettu käytöstä",
 
-
-
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Tekijä",
 
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Tekijän nimi",
 
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Hae tekijän nimellä",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Syntymäaika",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Syntymäaika",
 
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Hae syntymäajalla",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Sulje suodatin",
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  "search.filters.filter.creativeDatePublished.head": "Julkaisuajankohta",
+  "search.filters.filter.creativeDatePublished.head": "Julkaisuaika",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  "search.filters.filter.creativeDatePublished.placeholder": "Julkaisuajankohta",
+  "search.filters.filter.creativeDatePublished.placeholder": "Julkaisuaika",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Hae julkaisuaikaa",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Toimittaja",
@@ -4097,26 +5892,41 @@
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Toimittaja",
 
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Hae toimittajaa",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Asiasana",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Asiasana",
 
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Hae asiasanaa",
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Julkaisija",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Julkaisija",
 
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Hae julkaisijaa",
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Päivämäärä",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "Alkupäivämäärä",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Suurin päivämäärä",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "Loppupäivämäärä",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Loppu",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Pienin päivämäärä",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Alku",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Tallennusajankohta",
@@ -4124,7 +5934,10 @@
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Tallennnusajankohta",
 
-  // "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Hakupäivä lähetetty",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
   "search.filters.filter.discoverable.head": "Yksityinen",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -4136,6 +5949,12 @@
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Tietueen tyyppi",
 
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Hae tietueen tyyppiä",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Laajenna suodinta",
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "On tiedostoja",
 
@@ -4145,53 +5964,80 @@
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Tyyppi",
 
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Hakutyyppi",
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Tehtävänimike",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Tehtävänimike",
 
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Hae tehtävänimikettä",
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Tunnettu kieli",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Tunnettu kieli",
 
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Hae tunnettua kieltä",
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Tila",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Tila",
 
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Haun tila",
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Käyttäjät",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Käyttäjät",
 
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Hae ihmisiä",
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Maa",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Maa",
 
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Hae maata",
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Kaupunki",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Kaupunki",
 
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Hae kaupunkia",
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Perustamispäivämäärä",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Perustamispäivämäärä",
 
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Hae perustamispäivämäärää",
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Rajaus",
 
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  "search.filters.filter.scope.placeholder": "Haun tarkennus",
+  "search.filters.filter.scope.placeholder": "Hakusuodattimet",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Hae hakusuodatinta",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sulje",
@@ -4205,13 +6051,29 @@
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Asiasana",
 
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Hae asiasanaa",
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Tallentaja",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Tallentaja",
 
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Hae tallentajaa",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Selaa {{ name }}-puuta",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Ohjaajana:",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Ohjaajana:",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hae ohjaajan mukaan",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Kausijulkaisun numero",
@@ -4240,25 +6102,23 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Ei",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Suodattimet",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Tyhjennä suodattimet",
 
-
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Lähetä",
 
   // "search.form.search": "Search",
   "search.form.search": "Hae",
 
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Hae arkistosta",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "Hae omista tiedoista",
-
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Koko julkaisuarkisto",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Koko julkaisuarkisto",
 
   // "search.results.head": "Search Results",
   "search.results.head": "Hakutulokset",
@@ -4272,7 +6132,17 @@
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "Ei hakutuloksia.",
 
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Näytä",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Virhe hakua suoritettaessa, yritä myöhemmin uudelleen",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Hakutulokset",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Hakutulokset",
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Paluu tuloksiin",
@@ -4295,19 +6165,15 @@
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Asetukset",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Näytä lisätiedot",
 
   // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Näydä ruudukkona",
+  "search.view-switch.show-grid": "Näytä ruudukkona",
 
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Näytä luettelona",
 
-
-
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Laskeva",
 
@@ -4320,10 +6186,29 @@
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Nimeke (Ö-A)",
 
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevanssi",
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Vähiten relevantti",
 
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Relevantein",
 
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Julkaisuaika nouseva",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Julkaisuaika laskeva",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Hyväksymispäivä nouseva",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Hyväksymispäivä laskeva",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Viimeksi muokattu nouseva",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Viimeksi muokattu laskeva",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Tilastot",
@@ -4358,12 +6243,19 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Katseluita",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(kohteen nimeä ei voitu ladata)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Muokkaa tallennusta",
 
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Muokkaa tallennusta",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Peruuta",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "Sinulla ei ole oikeuksia aineiston tallentamiseen.",
 
   // "submission.general.deposit": "Deposit",
@@ -4384,21 +6276,50 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Hylkää",
 
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Tallennettu",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Tallentamattomat muutokset",
+
   // "submission.general.save": "Save",
   "submission.general.save": "Tallenna",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Tallenna myöhemmäksi",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importoi metadata ulkoisesta lähteestä",
 
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Importoi metadata ulkoisesta lähteestä",
 
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importoi Muokkaa kausijulkaisu ulkoisesta lähteestä",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importoi kausijulkaisun numero ulkoisesta lähteestä",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importoi kausijulkaisun vuosikerta ulkoisesta lähteestä",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importoi julkaisija ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importoi käyttäjä ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importoi projekti ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importoi julkaisu ulkoisesta lähteestä",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importoi metadata ulkoisesta lähteestä",
+
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  "submission.import-external.page.hint": "Anna hakulauseke etsiäksesi verkosta arkistoon importoitavia tietueita.",
+  "submission.import-external.page.hint": "Anna hakulauseke etsiäksesi verkosta julkaisuarkistoon importoitavia tietueita.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Paluu omiin tietoihin",
@@ -4418,27 +6339,84 @@
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
 
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "NASA/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "CrossRef",
+
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "Scopus",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "VuFind",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "Web Of Science",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "Euroopan patenttivirasto (EPO)",
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Ladataan ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA-kausijulkaisut",
 
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA-kausijulkaisut ISSN-tunnuksen mukaan",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA-kustantajat",
 
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "OpenAIRE API-rahoitus",
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID-tunniste",
 
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "Pubmed",
 
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Euroopan Pubmed",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Library of Congress -nimet",
 
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Tietueen esikatselu",
 
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Julkaisun esikatselu",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Tietueen esikatselu",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Kausijulkaisun esikatselu",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Organisaatioyksikön esikatselu",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Käyttäjän esikatselu",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Projektin esikatselu",
+
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
   "submission.import-external.preview.subtitle": "Alla oleva metadata importoitiin ulkoisesta lähteestä. Sillä esitäytetään metadata, kun aloitat tallennuksen.",
 
@@ -4469,6 +6447,48 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importoi kausijulkaisun vuosikerta ulkoisesta lähteestä",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importoi tietue ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importoi tapahtuma ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Importoi tuote ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importoi laite ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importoi organisaatioyksikkö ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importoi rahoitus ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Importoi käyttäjä ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Importoi patentti ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importoi projekti ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importoi julkaisu ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Uusi entiteetti lisätty",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API-rahoitus",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importoi tekijä ulkoisesta lähteestä",
 
@@ -4562,6 +6582,9 @@
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Ok",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Haetaan...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Valitse kaikki",
 
@@ -4637,13 +6660,39 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Hae organisaatioyksiköitä",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "OpenAIRE API -rahoitus",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projektit",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Projektin rahoittaja",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Tekijän julkaisu",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "OpenAIRE API API-rahoitus",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projektit",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Projektin rahoittaja",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Haetaan...",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Nykyinen valinta ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Kausijulkaisun numerot",
 
-
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Kausijulkaisun numerot",
 
@@ -4689,8 +6738,11 @@
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Ylempi organisaatioyksikkö",
 
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Julkaisu",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Vaihda valikon tilaa",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Näytä/piilota pudotusvalikko",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Asetukset",
@@ -4767,6 +6819,24 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Hakutulokset",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Hakutulokset",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Haluatko tallentaa nimen \"{{ value }}\" käyttäjän vaihtoehtoiseksi nimeksi, jota muutkin voivat käyttää uudelleen myös tulevissa tallennuksissa? Ellet tallenna nimeä, voit silti käyttää sitä tässä tallennuksessa.",
 
@@ -4792,14 +6862,17 @@
   "submission.sections.ccLicense.option.select": "Valitse vaihtoehto…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  "submission.sections.ccLicense.link": "Olet valinunt seuraavan lisenssin:",
+  "submission.sections.ccLicense.link": "Olet valinnut seuraavan lisenssin:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  "submission.sections.ccLicense.confirmation": "Myönnän yllä olevan lisenssin",
+  "submission.sections.ccLicense.confirmation": "Hyväksyn yllä olevan lisenssin",
 
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Lisää enemmän",
 
+  // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "Tallennus ei onnistu, koska lomakkeella on virheitä.<br>Täytä kaikki pakolliset kentät viimeistelläksesi tallennuksen.",
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Kokoelma",
 
@@ -4839,7 +6912,26 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Tallennuksessa keskeneräisiä osioita.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Tietueellesi luodaan seuraavat tunnisteet:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Tietueelle ei ole luotu handleja.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Tietueelle ei ole luotu DOI-tunnuksia.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Muut tunnisteet: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Tietueen pääsyoikeudet",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "Creative commons -lisenssi",
@@ -4859,19 +6951,65 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Mahdollisia kaksoiskappaleita",
 
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Tunnisteet",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Tallennuslisenssi",
 
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa-käytännöt",
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Lataa tiedostoja",
 
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Tietoa julkaisijan open access -käytännöistä",
 
+  // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "Ei tietoa julkausijan käytännöistä. Jos työlläsi on ISSN-tunnus, syötä se alapuolella olevan kenttään nähdäksesi siihen liittyvät julkaisijan open access -käytännöt.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Virheet",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Hyväksytty",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Varoitukset",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "sisältää virheitä",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "on validi",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "sisältää varoituksia",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Lisätiedot",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Lisätiedot",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Avaa osio",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Sulje osio",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Laajenna {{sectionHeader}}-osio",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Sulje {{sectionHeader}}-osio",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Peruuta",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.sections.upload.delete.confirm.info": "Tätä toimintoa ei voi peruuttaa. Oletko varma?",
+  "submission.sections.upload.delete.confirm.info": "Tätä toimintoa ei voi perua. Oletko varma?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Kyllä, olen varma",
@@ -4882,18 +7020,36 @@
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Poista",
 
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Lataa tiedosto",
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Pudota tiedostot liittääksesi ne tietueeseen",
 
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Muokkaa tiedostoa",
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Pääsyoikeustyyppi",
 
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  "submission.sections.upload.form.access-condition-hint": "Valitse pääsyoikeus, jota sovelletaan tiedostoon tietueen tallentamisen jälkeen",
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Päivämäärä on pakollinen tieto.",
 
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Pääsyoikeuden alkupäivä on pakollinen tieto.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Pääsyoikeuden loppupäivä on pakollinen tieto.",
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Pääsyoikeus alkaa",
 
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Valitse päivämäärä josta lukien pääsyoikeutta sovelletaan",
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Alkaen",
 
@@ -4906,6 +7062,9 @@
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Pääsyoikeus päättyy",
 
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Valitse päivämäärä, johon asti pääsyoikeus on voimassa",
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Asti",
 
@@ -4915,7 +7074,7 @@
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
   "submission.sections.upload.header.policy.default.withlist": "Yksittäisten tiedostojen pääsyrajoitusten lisäksi {{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:",
 
-  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
+  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
   "submission.sections.upload.info": "Tietueen kaikki tiedostot on lueteltu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai <strong>ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan.</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -4936,18 +7095,149 @@
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Lataus valmis",
 
+  // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.",
+  "submission.sections.accesses.form.discoverable-description": "Kun tämä on valittu, tietue on löydettävissä haussa ja selailtaessa. Kun tätä ei ole valittu, tietue on saatavilla vain suoran linkin kautta, eikä se näy haussa tai selailtaessa.",
 
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Löydettävissä",
 
-  // "submission.submit.title": "Tallennus",
-  "submission.submit.title": "Julkaisu",
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Pääsyoikeustyyppi",
 
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  "submission.sections.accesses.form.access-condition-hint": "Valitse pääsyoikeus, jota sovelletaan tietueeseen tallentamisen jälkeen",
 
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Päivämäärä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Pääsyoikeuden alkupäivä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Pääsyoikeuden loppupäivä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Pääsyoikeus alkaa",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Valitse päivämäärä, josta alkaen pääsyoikeutta sovelletaan",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Alkaen",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Ryhmä",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Ryhmä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Pääsyoikeus päättyy",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Valitse päivämäärä, johon asti pääsyoikeutta sovelletaan",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Asti",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Vahvistan edellä olevan lisenssin",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Sinun on hyväksyttävä lisenssi",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "Sinun on hyväksyttävä lisenssi",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Julkaisun tiedot",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Nimeke",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-tunnukset",
+
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url": "URL",
+
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Julkaisija",
+
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Julkaisukäytännöt",
+
+  // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Alla olevat tiedot on noudettu Sherpa Romeosta. Julkaisijan käytännöt määrittävät, vaaditaanko embargoa ja mitkä tiedostoista ovat ladattavissa. Jos sinulla on kysyttävää, ota yhteyttä ylläpitäjään.",
+
+  // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Tämän kausijulkaisun käytäntöjen sallimat Open Access -reitit on lueteltu alla artikkeliversioittain. Napsauttamalla polkua saat yksityiskohtaisempia tietoja",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Lisätietoa saat seuraavista linkeistä:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versio",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Ei embargoa",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Ei mitään",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Lisenssi",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Vaatimukset",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Sijainti",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Ehdot",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Päivitä",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Tietueen tiedot",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "ID",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Luontipäivä",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Viimeksi muokattu",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri": "URI",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Virhe haettaessa Sherpa-tietoja",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Uusi tallennus",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Uusi tallennus",
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Poista",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Valitse \"Poista\" hylätäksesi tietueen. Poisto pyydetään vielä vahvistamaan.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Valitse hylätäksesi tietueen. Poisto pyydetään vielä vahvistamaan.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Muokkaa",
@@ -4961,7 +7251,17 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Valitse tämä katsoaksesi tietueen metadataa.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Valitse tarkastaja",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Arvioi",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Hyväksy",
@@ -4975,6 +7275,12 @@
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Valitse tämä muuttaaksesi tietueen metadataa.",
 
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Hylkää",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Syötä kenttään syy tallennuksen hylkäämiselle. Kerro myös, voiko tallentaja korjata ongelman ja lähettää aineiston uudelleen.",
 
@@ -4999,8 +7305,6 @@
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Palauta tehtävä tehtäväjonoon, jotta toinen käyttäjä voi suorittaa tehtävän.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Virhe toimintoa suoritettaessa...",
 
@@ -5013,8 +7317,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Toiminto onnistui",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Ota itsellesi",
 
@@ -5027,13 +7329,147 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Näytä lisätiedot",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Näytå",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Valitse tarkastellaksesi tietueen metadataa.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "Ei saatavilla",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Tilaukset",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Tietueiden tilaukset",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Kokoelmien tilaukset",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Yhteisöjen tilaukset",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tilaustyyppi",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Tilaustiheys",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Päivittäin",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Kuukausittain",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Viikoittain",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Tilaa",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Tilaukset",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tyyppi ja tiheys",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Sulje",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Voit poistaa tilauksen käyttäjäprofiilisi \"Tilaukset\"-sivulla ",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Sisältö",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Päivittäin",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Viikottain",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Kuukausittain",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Lähetä",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Käsitellään...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Tilaus {{ type }} onnistui.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Tilaus poistettu",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Tilaus {{ type }} päivitetty",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Virhe tilausta luotaessa",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Virhe tilausta poistettaessa",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Virhe tilausta päivitettäessä",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Asiasana",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tilaustyyppi",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Tilaustiheys",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Toiminto",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Muokkaa",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Poista",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Ei saatavilla",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "Tilattu tietue on poistettu, tai sinulla ei ole oikeuksia nähdä sitä",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Sinulla ei tällä hetkellä ole tilauksia. Voit tilata yhteisön tai kokoelman sähköposti-ilmoitukset kohteen sivulla olevalla tilauspainikkeella.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Pienoiskuva",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Ei pienoiskuvaa saatavilla",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Projektin logo",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Projektin paikkamerkin kuva",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Organisaatioykiskön logo",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Organisaatioyksikön paikkamerkin kuva",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Profiilikuva",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Ei profiilikuva saatavilla",
 
   // "title": "DSpace",
   "title": "Julkaisuarkisto",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Hierarkkinen puunäkymä",
 
@@ -5055,7 +7491,8 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Tutkimusaiheiden kategoriat",
 
-
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Valitse asiasana hakusuodattimeksi",
 
   // "uploader.browse": "browse",
   "uploader.browse": "selaa",
@@ -5063,6 +7500,9 @@
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Raahaa tiedostot tähän",
 
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Poista",
+
   // "uploader.or": ", or ",
   "uploader.or": " tai",
 
@@ -5081,30 +7521,44 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Valitse tietueet, joiden virtuaalisen metadatan haluat tallentaa varsinaiseksi metadataksi",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Valvotut tietueet",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Tallennuksesi",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Hallinnoi työnkulkua",
 
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Työnkulun tehtävät",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Työnkulun ja työtilan tehtävät",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Muokkaa työnkulun tietuetta",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Muokkaa työnkulun tietuetta",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Poistettu",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Tarkastamaton tietue poistettu",
+  "workflow-item.delete.notification.success.content": "Työnkulun tietue poistettu",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Tapahtui virhe",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  "workflow-item.delete.notification.error.content": "Tarkastamatonta tietuetta ei voitu poistaa",
+  "workflow-item.delete.notification.error.content": "Työnkulun tietuetta ei voitu poistaa",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  "workflow-item.delete.title": "Poista tarkastamaton tietue",
+  "workflow-item.delete.title": "Poista työnkulkuun tietue",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  "workflow-item.delete.header": "Poista tarkastamaton tietue",
+  "workflow-item.delete.header": "Poista työnkulkuun tietue",
 
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "Peruuta",
@@ -5112,30 +7566,565 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Poista",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Lähetetty takaisin tallentajalle",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Tarkastamaton tietue lähetetty takaisin tallentajalle",
+  "workflow-item.send-back.notification.success.content": "Työnkulun tietue lähetetty takaisin tallentajalle",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Tapahtui virhe",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  "workflow-item.send-back.notification.error.content": "Tarkastamatonta tietuetta ei voitu lähettää takaisin tallentajalle",
+  "workflow-item.send-back.notification.error.content": "Työnkulun tietuetta ei voitu lähettää takaisin tallentajalle",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Lähetä tarkastamaton tietue takaisin tallentajalle",
+  "workflow-item.send-back.title": "Lähetä työnkulkuun tietue takaisin tallentajalle",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Lähetä tarkastamaton tietue takaisin tallentajalle",
+  "workflow-item.send-back.header": "Lähetä työnkulun tietue takaisin tallentajalle",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Peruuta",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
+  // "workflow-item.send-back.button.confirm": "Send back",
   "workflow-item.send-back.button.confirm": "Lähetä takaisin",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Työnkulkunäkymä",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Työnkulkunäkymä",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Työnkulkunäkymä",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Työnkulku - poisto",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Poista työnkulun tietue",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Poista",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Peruuta",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Poistettu",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Työnkulun tietue poistettu",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Tapahtui virhe",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Työnkulun tietuetta ei voitu poistaa",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Laajennettu työnkulku",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Valittu tarkastaja",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Työnkulun tarkastaja on valittu",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Tapahtui virhe",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Työnkulun tietueelle ei voitu valita tarkastajaa",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Valitse tarkastaja",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Valitse tarkastaja",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Peruuta",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Vahvista",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Arviointikatselmus",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "Tietueen arviointi on lähetetty",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Tapahtui virhe",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Tietueen arviointi epäonnistui",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Arvioi tietue",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Arvioi tietue",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Peruuta",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Vahvista",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "Istunto vanhenee pian",
+
+  // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
+  "idle-modal.info": "Turvallisuussyistä käyttäjän istunto vanhenee, kun käyttäjä on ollut epäaktiivinen {{ timeToExpire }} minuuttia. Istuntosi vanhenee pian. Haluatko pidentää istuntoasi vai kirjautua ulos?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Kirjaudu ulos",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Pidennä istuntoa",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Käsitellään...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Tutkijaprofiili liitetty",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Odottamaton virhe muutettaessa profiilin näkyvyyttä",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Luo uusi",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Tutkijaprofiili luotu",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Virhe luotaessa tutkijaprofiilia",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Poista",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Paljasta",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Piilota",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Tutkijaprofiilia ei ole vielä liitetty",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Näytä",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "YKSITYINEN",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "JULKINEN",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Tila :",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Sinulla ei ole valtuuksia ottaa itsellesi tätä tietuetta. Lisätietoa saat ylläpitäjiltä.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Tapahtui virhe profiilia haettaessa, yritä myöhemmin uudelleen",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Virhe",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profiili haettu",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Valmis",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Luo ORCID-tunniste",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Myönnetyt valtuudet",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Myönnä valtuuksia",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Yhdistä ORCID-tunniste",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liitetään profiilia ORCID-tunnisteeseen...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "Virhe yhdistettäessä profiilia ORCID-tunnisteeseen. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "Tämän profiilin ORCID-tunnistetta ({{ orcid }}) ei ole vielä yhdistetty tiliin ORCID-rekisterissä tai yhteys on vanhentunut.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Katkaise yhteys ORCIDiin",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Käsitellään...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Puuttuvia valtuuksia",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Seuraavat valtuudet puuttuvat:",
+
+  // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "Hyvä! Tämä laatikko on tyhjä, joten olet myöntänyt kaikki käyttöoikeudet instituutiosi tarjoamiin toimintoihin.",
+
+  // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "ORCID-tunnistetta ei ole vielä liitetty. Painamalla alapuolella olevaa painiketta voit yhdistää tämän profiilin ORCID-tiliin.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Profiiliasetukset",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Rahoitusasetukset",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Julkaisuasetukset",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Jos haluat poistaa ORCID-tunnuksesi, ota yhteyttä julkaisuarkiston ylläpitäjään",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Muokkaa asetuksia",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliaatio",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Elämäkerralliset tiedot",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Koulutus",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Tunnisteet",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Kaikki rahoitukset",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Omat rahoitukset",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Valitut rahoitukset",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Poistettu käytöstä",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Kaikki julkaisut",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Omat julkaisut",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Valitut julkaisut",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Poistettu käytöstä",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Hylkää muutos. Älä synkronoi ORCID-rekisterin kanssa.",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "ORCID-jonotietueen hylkääminen epäonnistui",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "ORCID-jonotietue hylätty",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "ORCID-jonorekisteri on tyhjä",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Tyyppi",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Kuvaus",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Toiminto",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliaatiot",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Maa",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Koulutukset",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Ulkoiset tunnisteet",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Muut nimet",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Pätevyydet",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "Tutkijan URL-osoitteet",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Avainsanat",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Lisää uusi kohde ORCID-rekisteriin",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Päivitä tämä kohde ORCID-rekisterissä",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Poista tämä kohde ORCID-rekisteristä",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Julkaisu",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekti",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliaatio",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Koulutus",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Pätevyys",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Toinen nimi",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Maa",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Asiasana",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Ulkoinen tunniste",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "Tutkijan URL-osoite",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synkronoi ORCID-rekisterin kanssa",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "ORCID-tunnisteen lähettäminen epäonnistui puuttuvien käyttöoikeuksien takia.",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Napsauta <a href='{{orcid}}'>tästä</a> myöntääksesi vaaditut käyttöoikeudet. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "ORCID-lähetys epäonnistui, koska ORCID-rekisteriin lähetetty resurssi ei ole kelvollinen",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "ORCID-lähetys epäonnistui",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "ORCID-lähetys epäonnistui, koska lähetetty resurssi on jo ORCID-rekisterissä",
+
+  // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Resurssia ei enää ole ORCID-rekisterissä..",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "ORCID-lähetys onnistui",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "ORCIDin kanssa synkronoitava data ei ole kelvollista",
+
+  // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Valuutta on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Lähetettävällä resurssilla on oltava ainakin yksi tunniste",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Nimeke on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Alkupäivämäärä on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Rahoittaja on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Virheelliset kaksi merkkiä ISO 3166 -maatunnisteessa",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Organisaatio on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Organisaation nimi on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Julkaisuajan on oltava vuoden 1900 jälkeen",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Organisaatiolla on oltava osoite",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Organisaation osoitteessa on oltava kaupunki",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Organisaation osoitteessa on oltava oikeelliset kaksi ISO 3166 -maatunnisteen merkkiä",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Tunniste vaaditaan organisaatioiden erottelemiseksi. Tuetut tunnisteet ovat GRID, Ringgold, Legal Entity identifier -tunnisteet (LEIt) ja Crossrefin rahoittaharekisterin tunnisteet (FUNDREF)",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Organisaation tunnisteilla on oltava arvo",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Organisaation tunnisteilla on oltava lähde",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Organisaation tunnisteen lähde ei ole validi. Tuetut lähteet ovat RINGGOLD, GRID, LEI ja FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Synkronointimoodi",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Erä",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Synkronointimoodi",
+
+  // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "Valitse, miten haluat synkronoinnin ORCIDiin tapahtuvan. Vaihtoehdot ovat \"Manuaalinen\" (sinun on lähetettävä tietosi ORCIDiin manuaalisesti) tai \"Erä\" (järjestelmä lähettää tietosi ORCIDiin ajastetun skriptin avulla).",
+
+  // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "Valitse, lähetetäänkö linkitetyt projektisi ORCID-rekisterin rahoitustietoluetteloon.",
+
+  // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "Valitse, lähetetäänkö linkitetyt julkaisusi ORCID-rekisterin luetteloon.",
+
+  // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "Valitse, lähetetäänkö elämäkerralliset tietosi tai henkilökohtaiset tunnisteesi ORCID-rekisteriin.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Synkronisointiasetukset päivitetty",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Synkronisointiasetusten päivittäminen epäonnistui",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuaalinen",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Hae ORCID-tunnisteesi",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Lue omat tietosi Trusted Parties -näkyvyysasetuksilla",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Lisää/päivitä tutkimustoimiasi",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Lisää/päivitä muita tietojasi",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Yhteys katkaistu profiilin ja ORCID-rekisterin välillä",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Tapahtui virhe katkaistaessa yhteyttä profiilin ja ORCID-rekisterin välillä. Yritä uudelleen",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "ORCIDin synkronisointiasetukset",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "ORCIDin rekisteröintijono",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "ORCID-käyttöoikeudet",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Viimeksi tallennetut",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Kohdetta ei voitu noutaa",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Virhe noudettaessa järjestelmänlaajuista hälytysbanneria",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Aikaa",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} päivää(ä),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} tunti(a) and",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuutti(a):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Järjestelmänlaajuinen hälytys",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Järjestelmänlaajuinen hälytys",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Virhe noudettaessa järjestelmänlaajuista hälytystä",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Peruuta",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Tallenna",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "AKTIIVINEN",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "EI-AKTIIVINEN",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "Järjestelmänlaajuisessa hälytyksessä on oltava viesti",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Hälytysviesti",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Ota käyttöön lähtölaskennan ajastin",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Vinkki: Aseta lähtölaskennan ajastin. Kun se on käytössä, voidaan päivämäärä asettaa tulevaisuuteen,  jolloin  järjestelmänlaajuinen hälytysbanneri suorittaa lähtölaskennan asetettuun päivämäärään. Kun ajastin päättyy, hälytys katoaa. Palvelinta EI pysäytetä automaattisesti.",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Järjestelmänlaajuisen hälytyksen esikatselu",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "Järjestelmänlaajuinen hälytys päivitetty",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Virhe päivitettäessä järjestelmänlaajuista hälytystä",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "Järjestelmänlaajuinen hälytys luotu",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Virhe luotaessa järjestelmänlaajuista hälytystä",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Järjestelmänlaajuiset hälytykset",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Järjestelmänlaajuiset hälytykset",
 
 }
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8ee4dc7d22..ba427292bc 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -718,6 +718,303 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Retour",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Rapport de collections filtrées",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Collections filtrées",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Rapport de collections filtrées",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Afficher les collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Rapport des collections",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Éléments résultants",
+
+  //"admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Communauté",
+
+  //"admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. d'éléments",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Correspondant à tous les filtres sélectionnés",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  "admin.reports.items.title": "Rapport de requête de métadonnées",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Requête de métadonnées",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Rapport de requête de métadonnées",
+
+  //"admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Exécuter la requête",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Sélecteur de collections",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Requêtes sur les champs de métadonnées",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Requêtes prédéfinies",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limiter/paginer les résultats",
+
+  //"admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Limite",
+
+  //"admin.reports.items.limit": "Offset/",
+  "admin.reports.items.offset": "À partir de",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Tout le dépôt",
+
+  //"admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Tous les champs",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "n'existe pas",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "est égal à",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "n'est pas égal à",
+
+  //"admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "est de forme (like)",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "n'est pas de forme (not like)",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contient",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "ne contient pas",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "correspond à (matches)",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "ne correspond pas à (does not match)",
+
+  //"admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nouvelle requête",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Sans titre",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Sans dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "A un sujet composite",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "A un dc.contributor.author composite",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "A un dc.creator composite",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "A un URL dans dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "A des documents texte dans dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "N'a pas de document texte dans dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "A des métadonnées vides",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "A du contenu insécable dans la description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "A des entités XML dans les métadonnées",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ASCII character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "A des caractères non ASCII dans les métadonnées",
+
+  //"admin.reports.items.number": "No.",
+  "admin.reports.items.number": "Nº",
+
+  //"admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Titre",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtres",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Données additionnelles",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Page précédente",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Page suivante",
+
+  //"admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exporter les métadonnées",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Désélectionner tous les filtres",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Sélectionner tous les filtres",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Tous les filtres spécifiés",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtres de propriétés d'éléments",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "Est un élément - toujours vrai",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Éléments retirés",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Éléments disponibles - Non retirés",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Éléments découvrables - Non privés",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Éléments non découvrables - Privés",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtres Bitstream de base",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "L'élément a plusieurs Bitstreams originaux",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "L'élément n'a pas de Bitstreams originaux",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "L'élément a un seul Bitstream original",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtres Bitstream par type MIME",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "L'élément a un Bitstream original de type document (PDF, Office, Text, HTML, XML, etc.)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "L'élément a un Bitstream original de type image",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "L'élément a d'autres types de Bitstream (ni document ni image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "L'élément a des Bitstreams originaux de types multiples (document, image, autres)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "L'élément a un Bitstream original PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "L'élément a un Bitstream original JPG",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "L'élément a un PDF anormalement petit",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "L'élément a un PDF anormalement grand",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "L'élément a un Bitstream sans élément TEXT",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtres de types MIME pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "L'élément a des Bitstreams image pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "L'élément a des Bitstreams image non pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Les Bitstreams document de l'élément sont pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "L'élément a des Bitstreams document non pris en charge",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtres de Bitstreams de type Bundle",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "L'élément a un Bitstream dans un Bundle non pris en charge",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "L'élément a une vignette anormalement petite",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "L'élément a un Bitstream original sans vignette",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "L'élément a une vignette ayant un nom invalide (une vignette par original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "L'élément a une vignette non générée",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "L'élément n'a pas de licence",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "L'élément a de la documentation dans le Bundle de licence",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtres de permissions",
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "L'élément a un Bitstream original à accès restreint",
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip":  "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "L'élément a au moins un Bitstream original non accessible aux utilisateurs anonymes",
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "L'élément a une vignette à accès restreint",
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "L'élément a au moins une vignette non accessible aux utilisateurs anonymes",
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "L'élément a des métadonnées à accès restreint",
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "L'élément a des métadonnées non accessibles aux utilisateurs anonymes",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Recherche Administrateur",
 
@@ -3528,6 +3825,15 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Utilisateurs",
 
+  //"menu.section.reports": "Reports",
+  "menu.section.reports": "Rapports",
+
+  //"menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Collections filtrées",
+
+  //"menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Requête de métadonnées",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Recherche Administrateur",
 
@@ -3600,6 +3906,9 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Section du menu relative au contrôle d'accès",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  "menu.section.icon.reports": "Section du menu d'accès aux rapports",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Section du menu relative à la recherche Administrateur",
 
@@ -3699,6 +4008,9 @@
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Ouvrir/Fermer section Contrôle d'accès",
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Ouvrir/Fermer section Rapports",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Ouvrir/Fermer section Panneau de configuration",
 
@@ -3822,20 +4134,20 @@
   //"mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Items supervisés",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivés",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivés",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "En cours de validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "En cours de validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "En attente d'assignation",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "En attente d'assignation",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "En traitement",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "En traitement",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Dépôts en cours",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Dépôts en cours",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mon compte DSpace",
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 6096073d56..4d0e77c086 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -710,6 +710,409 @@
 
 
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Rannsachadh Rianachd",
 
@@ -3550,6 +3953,18 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Rannsachadh Rianachd",
 
@@ -3629,6 +4044,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": " Earrann clàr-iùil Riaghladh Cothruim",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Earrann clàr-iùil rannsachadh rianachd",
 
@@ -3735,6 +4154,9 @@
   "menu.section.statistics_task": "Obair Staitistigs",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Suids earrann Riaghladh Cothruim",
@@ -3867,20 +4289,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Do Chur-a-steachan",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "San Tasglann",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "San Tasglann",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Dearbhadh",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Dearbhadh",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "A' feitheamh riaghladair",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "A' feitheamh riaghladair",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Sruth-obrach",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Sruth-obrach",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Raon-obrach",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Raon-obrach",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MoDSpace",
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index 53fc106187..b4e23856bf 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -297,6 +297,413 @@
 
   "admin.access-control.groups.table.edit.buttons.remove": "\"{{name}}\" हटाएं",
 
+
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+
+  "admin.curation-tasks.breadcrumbs": "प्रणाली क्यूरेशन कार्य",
+
   "admin.access-control.groups.table.id": "पहचान",
 
   "admin.access-control.groups.table.members": "सदस्य",
@@ -2463,6 +2870,20 @@
 
   "menu.header.admin": "प्रबंधन",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+  "menu.section.admin_search": "व्यवस्थापक खोज",
+
   "menu.header.admin.description": "प्रबंधन मेनू",
 
   "menu.header.image.logo": "संग्रहालय चिन्ह",
@@ -2511,6 +2932,12 @@
 
   "menu.section.export": "निर्यात करें",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  "menu.section.icon.admin_search": "व्यवस्थापक खोज मेनू अनुभाग",
+
   "menu.section.export_collection": "संग्रह",
 
   "menu.section.export_community": "समुदाय",
@@ -2573,6 +3000,12 @@
 
   "menu.section.pin": "साइडबार नत्थी करें",
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  "menu.section.toggle.access_control": "अभिगम नियंत्रण अनुभाग टॉगल करें",
+
   "menu.section.processes": "प्रक्रियाएं",
 
   "menu.section.registries": "रजिस्ट्री",
@@ -2677,15 +3110,15 @@
 
   "mydspace.show.workspace": "आपकी प्रस्तुतियां",
 
-  "mydspace.status.archived": "संग्रहीत",
+  "mydspace.status.mydspaceArchived": "संग्रहीत",
 
-  "mydspace.status.validation": "सत्यापन",
+  "mydspace.status.mydspaceValidation": "सत्यापन",
 
-  "mydspace.status.waiting-for-controller": "नियंत्रक की प्रतीक्षा कर रहा है",
+  "mydspace.status.mydspaceWaitingController": "नियंत्रक की प्रतीक्षा कर रहा है",
 
-  "mydspace.status.workflow": "कार्यप्रवाह",
+  "mydspace.status.mydspaceWorkflow": "कार्यप्रवाह",
 
-  "mydspace.status.workspace": "कार्यस्थान",
+  "mydspace.status.mydspaceWorkspace": "कार्यस्थान",
 
   "mydspace.title": "मेरा डीस्पेस",
 
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 373d73aec5..e1ae33e85b 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -759,6 +759,409 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Adminisztratív keresés",
 
@@ -2228,9 +2631,9 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virus ellenőrzés",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
+  // "curation-task.task.registerdoi.label": "Register DOI",
   // TODO New key - Add a translation
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Register DOI",
 
 
 
@@ -4640,6 +5043,20 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Admin keresés",
 
@@ -4718,10 +5135,13 @@
   // TODO New key - Add a translation
   "menu.section.export_batch": "Batch Export (ZIP)",
 
-
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Hozzáférés kontroll menü felület",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Admin keresés menü felület",
 
@@ -4839,6 +5259,10 @@
   "menu.section.statistics_task": "Statisztikai feladatok",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Váltás a Hozzáférés kontrol felületre",
@@ -4983,20 +5407,20 @@
   // TODO New key - Add a translation
   "mydspace.show.supervisedWorkspace": "Supervised items",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Tárolva",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Tárolva",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Érvényesítés",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Érvényesítés",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Várakozás a kontrollerre",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Várakozás a kontrollerre",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Munkafolyamat",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Munkafolyamat",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Munkafelület",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Munkafelület",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index 4131d0bee6..0960b9fae1 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -195,7 +195,6 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
   // "admin.registries.bitstream-formats.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -277,7 +276,6 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
   // "admin.registries.schema.fields.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -501,7 +499,6 @@
   "admin.access-control.groups.addGroup.breadcrumbs": "Nuovo Gruppo",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO Source message changed - Revise the translation
   "admin.access-control.groups.head": "Gruppi/Ruoli",
 
   // "admin.access-control.groups.button.add": "Add group",
@@ -538,8 +535,7 @@
   "admin.access-control.groups.table.edit.buttons.edit": "Modifica \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Elimina \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
   "admin.access-control.groups.no-items": "Nessun gruppo trovato con questo nel loro nome o questo come UUID",
@@ -751,16 +747,13 @@
   "admin.access-control.groups.form.return": "Indietro",
 
   // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "In questa pagina è possibile modificare le proprietà e i membri di un gruppo. Nella sezione in alto, è possibile modificare il nome e la descrizione del gruppo, a meno che non si tratti di un gruppo di amministratori di una collection o una community. In quel caso il nome e la descrizione del gruppo sono generati automaticamente e non possono essere modificati. Nelle sezioni successive è possibile modificare l'appartenenza al gruppo. Per maggiori dettagli, vedere [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+o+gestire+un+gruppo+utente)",
 
   // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per aggiungere o rimuovere un EPerson a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti (utilizzare il menu a tendina a sinistra della barra di ricerca per selezionare la ricerca per metadati o per e-mail). Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salvare' nella sezione in alto.",
 
   // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per aggiungere o rimuovere un Sottogruppo a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti. Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salva' nella sezione in alto.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Ricerca amministrativa",
@@ -811,7 +804,6 @@
   "admin.workflow.item.workflow": "Flusso di lavoro",
 
   // "admin.workflow.item.workspace": "Workspace",
-  // TODO New key - Add a translation
   "admin.workflow.item.workspace": "Workspace",
 
   // "admin.workflow.item.delete": "Delete",
@@ -821,12 +813,10 @@
   "admin.workflow.item.send-back": "Rinviare",
 
   // "admin.workflow.item.policies": "Policies",
-  // TODO New key - Add a translation
-  "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Policy",
 
   // "admin.workflow.item.supervision": "Supervision",
-  // TODO New key - Add a translation
-  "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisione",
 
 
 
@@ -834,43 +824,37 @@
   "admin.metadata-import.breadcrumbs": "Importare metadati",
 
   // "admin.batch-import.breadcrumbs": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Batch Import",
 
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importare metadati",
 
   // "admin.batch-import.title": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Batch Import",
 
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importare metadati",
 
   // "admin.batch-import.page.header": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Batch Import",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  "admin.metadata-import.page.help": "È possibile eliminare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui",
+  "admin.metadata-import.page.help": "È possibile rilasciare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui",
 
   // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Selezionare la Collection in cui effettuare l'import. Quindi, rilasciare o sfogliare un file zip Simple Archive Format (SAF) che include gli elementi da importare",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Rilasciare un CSV di metadati da importare",
 
   // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Rilasciare un batch ZIP da importare",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  "admin.metadata-import.page.dropMsgReplace": "Rilascia per sostituire i metadati CSV da importare",
+  "admin.metadata-import.page.dropMsgReplace": "Rilasciare per sostituire i metadati CSV da importare",
 
   // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Rilasciare per sostituire il batch ZIP da importare",
 
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Indietro",
@@ -879,15 +863,13 @@
   "admin.metadata-import.page.button.proceed": "Procedere",
 
   // "admin.metadata-import.page.button.select-collection": "Select Collection",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Selezionare una Collection",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Seleziona prima il file!",
 
   // "admin.batch-import.page.error.addFile": "Select Zip file first!",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Seleziona prima il file ZIP!",
 
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Solo Validazione",
@@ -896,138 +878,105 @@
   "admin.metadata-import.page.validateOnly.hint": "Una volta selezionato, il CSV caricato sarà validato. Riceverai un report delle modifiche rilevate, ma nessuna modifica verrà salvata.",
 
   // "advanced-workflow-action.rating.form.rating.label": "Rating",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Valutazione",
 
   // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "È necessario valutare l'item",
 
   // "advanced-workflow-action.rating.form.review.label": "Review",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisione",
 
   // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Per inviare questa valutazione è necessario inserire una revisione",
 
   // "advanced-workflow-action.rating.description": "Please select a rating below",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Selezionare una valutazione qui sotto",
 
   // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Selezionare una valutazione qui sotto e aggiungere anche una revisione",
 
 
   // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Selezionare un solo revisione prima di procedere con l'inserimento",
 
   // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Selezionare uno o più revisori prima di procedere con l'inserimento",
 
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Aggiungi EPeople",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Sfoglia tutto",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membri attuali",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadati",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (esatta)",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Ricerca",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nome",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identità",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Rimuovi / Aggiungi",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Rimuovi membro con il nome \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membro inserito con successo: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Impossibile aggiungere il membro: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membro eliminato con successo: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Impossibile eliminare il membro: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Aggiungi membro con il nome \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Nessun gruppo attivo al momento, inserire prima un nome.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Questo gruppo è vuoto, cercare e aggiungere membri.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "La ricerca non ha trovato EPeople",
 
   // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nessun revisore selezionato.",
 
   // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Una volta selezionato, il file ZIP caricato verrà convalidato. Si riceverà un rapporto sulle modifiche rilevate, ma non verrà salvata alcuna modifica.",
 
   // "admin.batch-import.page.remove": "remove",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "rimuovere",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Indirizzo e-mail o password non validi.",
@@ -1043,8 +992,7 @@
   // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
   "bitstream.download.page": "Sto scaricando {{bitstream}}...",
 
-  // "bitstream.download.page.back": "Back" ,
-  // TODO Source message changed - Revise the translation
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Indietro",
 
 
@@ -1073,7 +1021,7 @@
   "bitstream.edit.form.embargo.label": "Embargo fino a data specifica",
 
   // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  "bitstream.edit.form.fileName.hint": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL , i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà  .",
+  "bitstream.edit.form.fileName.hint": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL, i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Filename",
@@ -1246,8 +1194,7 @@
   "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine di risultati",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
-  // TODO New key - Add a translation
-  "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", inizia per {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Scegli start)",
@@ -1323,8 +1270,7 @@
 
 
   // "search.browse.item-back": "Back to Results",
-  // TODO New key - Add a translation
-  "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Torna ai risultati",
 
 
   // "chips.remove": "Remove chip",
@@ -1332,23 +1278,20 @@
 
 
   // "claimed-approved-search-result-list-element.title": "Approved",
-  // TODO New key - Add a translation
-  "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Approvato",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  // TODO New key - Add a translation
-  "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Respinto, rinviato al submitter",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
-  // TODO New key - Add a translation
-  "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Rifiutato, rinviato al flusso di lavoro del Responsabile delle revisioni",
 
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Creare una collection",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  "collection.create.notifications.success": "Creata con successo la collection",
+  "collection.create.notifications.success": "Collection creata con successo",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Creare una collection per la Community {{ parent }}",
@@ -1478,8 +1421,6 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Rilascia un logo della collection da caricare",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Modificata correttamente la collection",
 
@@ -1507,8 +1448,7 @@
   "collection.edit.item.authorizations.load-more-button": "Carica più risorse",
 
   // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
-  // TODO New key - Add a translation
-  "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostra le policy del bitstream per il bundle",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Modifica metadati",
@@ -1559,8 +1499,7 @@
   "collection.edit.tabs.source.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
 
   // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
-  // TODO Source message changed - Revise the translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Modifiche eliminate",
+  "collection.edit.tabs.source.notifications.discarded.title": "Modifiche annullate",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
   "collection.edit.tabs.source.notifications.invalid.content": "Le modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.",
@@ -1718,16 +1657,12 @@
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Reimpostazione e reimportazione...",
   // "collection.source.controls.harvest.status": "Harvest status:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Stato dell'harvest:",
   // "collection.source.controls.harvest.start": "Harvest start time:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Ora di inizio dell'harvest:",
   // "collection.source.controls.harvest.last": "Last time harvested:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Ulimo harvest effettuato:",
   // "collection.source.controls.harvest.message": "Harvest info:",
-  // TODO New key - Add a translation
   "collection.source.controls.harvest.message": "Harvest info:",
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/D",
@@ -1954,12 +1889,10 @@
 
 
   // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Valutatori",
 
   // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "I valutatori possono assegnare un punteggio ai contributi in entrata, questo definirà se il contributo verrà rifiutato o meno.",
 
 
 
@@ -2026,12 +1959,10 @@
   "cookies.consent.app.required.title": "(sempre obbligatorio)",
 
   // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Utilizzare questo interruttore per abilitare o disabilitare tutti i servizi.",
 
   // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Abilitare o disabilitare tutti i servizi",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Ci sono stati dei cambiamenti dal tuo ultimo accesso, aggiorna il tuo consenso.",
@@ -2043,23 +1974,19 @@
   "cookies.consent.decline": "Declinare",
 
   // "cookies.consent.ok": "That's ok",
-  // TODO New key - Add a translation
-  "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Accetta",
 
   // "cookies.consent.save": "Save",
-  // TODO New key - Add a translation
-  "cookies.consent.save": "Save",
+  "cookies.consent.save": "Salvare",
 
   // "cookies.consent.content-notice.title": "Cookie Consent",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Consenso ai cookie",
 
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-notice.description": "Raccogliamo e processiamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>. <br/> Per saperne di più, leggi la nostra {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>. <br/> Per saperne di più, leggi la nostra {privacyPolicy}.",
 
   // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizza",
@@ -2077,12 +2004,10 @@
   "cookies.consent.content-modal.title": "Informazioni che raccogliamo",
 
   // "cookies.consent.content-modal.services": "services",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "servizi",
 
   // "cookies.consent.content-modal.service": "service",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servizio",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticazione",
@@ -2116,12 +2041,10 @@
 
 
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password",
 
 
   // "cookies.consent.purpose.functional": "Functional",
@@ -2131,18 +2054,15 @@
   "cookies.consent.purpose.statistical": "Statistico",
 
   // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registrazione e recupero password",
 
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Condivisione",
 
   // "curation-task.task.citationpage.label": "Generate Citation Page",
-  // TODO New key - Add a translation
-  "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Genera una pagina di citazioni",
 
   // "curation-task.task.checklinks.label": "Check Links in Metadata",
-  // TODO Source message changed - Revise the translation
   "curation-task.task.checklinks.label": "Controllare i collegamenti nei metadati",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2161,8 +2081,7 @@
   "curation-task.task.vscan.label": "Scansione antivirus",
 
   // "curation-task.task.register-doi.label": "Register DOI",
-  // TODO New key - Add a translation
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Registra DOI",
 
 
 
@@ -2230,8 +2149,7 @@
   "dso-selector.create.community.head": "Nuova Community",
 
   // "dso-selector.create.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "oppure",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Creare una nuova community in",
@@ -2264,12 +2182,10 @@
   "dso-selector.export-metadata.dspaceobject.head": "Esportare metadati da",
 
   // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
-  // TODO New key - Add a translation
-  "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Esporta batch (ZIP) da",
 
   // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
-  // TODO New key - Add a translation
-  "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importa batch da",
 
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Nessun {{ type }} trovato",
@@ -2287,8 +2203,7 @@
   "dso-selector.set-scope.community.button": "Cerca in tutto DSpace",
 
   // "dso-selector.set-scope.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "oppure",
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Cercare una community o una collection",
@@ -2306,60 +2221,46 @@
   "dso-selector.claim.item.create-from-scratch": "Crea uno nuovo profilo",
 
   // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
-  // TODO New key - Add a translation
-  "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Qualcosa è andato storto, aggiorna di nuovo ↻",
 
   // "supervision-group-selector.header": "Supervision Group Selector",
-  // TODO New key - Add a translation
-  "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selezione del gruppo di supervisione",
 
   // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleziona un tipo di ordine",
 
   // "supervision-group-selector.select.type-of-order.option.none": "NONE",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "NESSUNO",
 
   // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITORE",
 
   // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OSSERVATORE",
 
   // "supervision-group-selector.select.group.label": "Select a Group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleziona un gruppo",
 
   // "supervision-group-selector.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Annulla",
 
   // "supervision-group-selector.button.save": "Save",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Salva",
 
   // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Seleziona un tipo di ordine",
 
   // "supervision-group-selector.select.group.error": "Please select a group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Seleziona un gruppo",
 
   // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ordine di supervisione per il gruppo {{ name }} creato con successo",
 
   // "supervision-group-selector.notification.create.failure.title": "Error",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Errore",
 
   // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Per questo item esiste già un ordine di supervisione per il gruppo selezionato",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Esportare i metadati per {{ dsoName }}",
@@ -2374,20 +2275,16 @@
   "confirmation-modal.export-metadata.confirm": "Export",
 
   // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Esporta batch (ZIP) per {{ dsoName }}",
 
   // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Sei sicuro di voler esportare batch (ZIP) per {{ dsoName }}?",
 
   // "confirmation-modal.export-batch.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Annulla",
 
   // "confirmation-modal.export-batch.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Esporta",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Elimina EPerson \"{{ dsoName }}\"",
@@ -2478,11 +2375,10 @@
   "error.top-level-communities": "Errore durante il recupero delle community di primo livello",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "È necessario concedere questa licenza per completare la submission. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere la submission.",
+  "error.validation.license.notgranted": "È necessario concedere questa licenza per completare l'immisione. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere l'immissione.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "L'input è limitato dal pattern in uso: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Il caricamento del file è obbligatorio",
@@ -2501,7 +2397,6 @@
 
 
   // "feed.description": "Syndication feed",
-  // TODO New key - Add a translation
   "feed.description": "Syndication feed",
 
 
@@ -2525,12 +2420,10 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Informativa sulla privacy",
 
-  // "footer.link.end-user-agreement": "End User Agreement",
-  // TODO Source message changed - Revise the translation
+  // "footer.link.end-user-agreement":"End User Agreement",
   "footer.link.end-user-agreement": "Accordo con l'utente finale",
 
-  // "footer.link.feedback": "Send Feedback",
-  // TODO Source message changed - Revise the translation
+  // "footer.link.feedback":"Send Feedback",
   "footer.link.feedback": "Invia Feedback",
 
 
@@ -2539,8 +2432,7 @@
   "forgot-email.form.header": "Password dimenticata",
 
   // "forgot-email.form.info": "Enter the email address associated with the account.",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.info": "Accedi a registra un account per iscriverti alle collections, per ricevere aggiornamenti via email e per poter inserire nuovi item in DSpace.",
+  "forgot-email.form.info": "Inserisci l'indirizzo email associato all'account.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Indirizzo email *",
@@ -2549,31 +2441,25 @@
   "forgot-email.form.email.error.required": "Si prega di inserire un indirizzo email",
 
   // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Si prega di inserire un idirizzo email valido",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.email.hint": "Questo indirizzo verrà verificato e utilizzato come login name.",
+  "forgot-email.form.email.hint": "Una email con ulteriori indicazioni sarà invita a questo indrizzo.",
 
   // "forgot-email.form.submit": "Reset password",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.submit": "Salva",
+  "forgot-email.form.submit": "Reimposta la password",
 
   // "forgot-email.form.success.head": "Password reset email sent",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.success.head": "Email di verifica inviata",
+  "forgot-email.form.success.head": "Email di reimpostazione password inviata",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "È stata inviata un'email a {{ email }} contenente un URL speciale e ulteriori indicazioni.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.error.head": "Errore durante il tentativo di registrare l'email",
+  "forgot-email.form.error.head": "Errore durante il tentativo di reimpostare la password",
 
   // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Si è verificato un errore durante il tentativo di reimpostare la password per l'account associato al seguente indirizzo email: {{ email }}",
 
 
 
@@ -2584,8 +2470,7 @@
   "forgot-password.form.head": "Password dimenticata",
 
   // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella. Dovrebbe avere una lunghezza di almeno sei caratteri.",
+  "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Sicurezza",
@@ -2651,21 +2536,14 @@
   // "form.first-name": "First name",
   "form.first-name": "Nome",
 
-  // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "Collapse",
+  // "form.group.add": "Add",
+  "form.group.add": "Aggiungi",
 
-  // "form.group-collapse-help": "Click here to collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse-help": "Click here to collapse",
+  // "form.group.close": "Close",
+  "form.group.close": "Chiudi",
 
-  // "form.group-expand": "Expand",
-  // TODO New key - Add a translation
-  "form.group-expand": "Expand",
-
-  // "form.group-expand-help": "Click here to expand and add more elements",
-  // TODO New key - Add a translation
-  "form.group-expand-help": "Click here to expand and add more elements",
+  // "form.group.set": "Set",
+  "form.group.set": "Set",
 
   // "form.last-name": "Last name",
   "form.last-name": "Cognome",
@@ -2685,9 +2563,8 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Non è stato inserito nessun valore",
 
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
+  // "form.other-information": "",
+  "form.other-information": "",
 
   // "form.remove": "Remove",
   "form.remove": "Rimuovi",
@@ -2708,8 +2585,7 @@
   "form.submit": "Salva",
 
   // "form.create": "Create",
-  // TODO New key - Add a translation
-  "form.create": "Create",
+  "form.create": "Crea",
 
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Rilascia l'item nella nuova posizione",
@@ -2783,49 +2659,39 @@
 
 
   // "health.breadcrumbs": "Health",
-  // TODO New key - Add a translation
   "health.breadcrumbs": "Health",
 
   // "health-page.heading": "Health",
-  // TODO New key - Add a translation
   "health-page.heading": "Health",
 
   // "health-page.info-tab": "Info",
-  // TODO New key - Add a translation
-  "health-page.info-tab": "Info",
+  "health-page.info-tab": "Informazioni",
 
   // "health-page.status-tab": "Status",
-  // TODO New key - Add a translation
-  "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stato",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "Il servizio di health check è temporaneamente non disponibile.",
 
   // "health-page.property.status": "Status code",
-  // TODO New key - Add a translation
-  "health-page.property.status": "Status code",
+  "health-page.property.status": "Codice di stato",
 
   // "health-page.section.db.title": "Database",
   "health-page.section.db.title": "Database",
 
   // "health-page.section.geoIp.title": "GeoIp",
-  // TODO New key - Add a translation
   "health-page.section.geoIp.title": "GeoIp",
 
   // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
-  // TODO New key - Add a translation
   "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
   // "health-page.section.solrOaiCore.title": "Solr: oai core",
-  // TODO New key - Add a translation
   "health-page.section.solrOaiCore.title": "Solr: oai core",
 
   // "health-page.section.solrSearchCore.title": "Solr: search core",
-  // TODO New key - Add a translation
   "health-page.section.solrSearchCore.title": "Solr: search core",
 
   // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
-  // TODO New key - Add a translation
   "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   // "health-page.section-info.app.title": "Application Backend",
@@ -2835,12 +2701,10 @@
   "health-page.section-info.java.title": "Java",
 
   // "health-page.status": "Status",
-  // TODO New key - Add a translation
-  "health-page.status": "Status",
+  "health-page.status": "Stato",
 
   // "health-page.status.ok.info": "Operational",
-  // TODO New key - Add a translation
-  "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Operativo",
 
   // "health-page.status.error.info": "Problems detected",
   "health-page.status.error.info": "Sono stati rilevati dei problemi",
@@ -2849,7 +2713,6 @@
   "health-page.status.warning.info": "Sono stati rilevati dei potenziali problemi",
 
   // "health-page.title": "Health",
-  // TODO New key - Add a translation
   "health-page.title": "Health",
 
   // "health-page.section.no-issues": "No issues detected",
@@ -2869,10 +2732,9 @@
   "home.title": "Home",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Community in DSpace",
+  "home.top-level-communities.head": "DSpace Communities",
 
-  // "home.top-level-communities.help": "Select a community to browse its collections.",
-  // TODO Source message changed - Revise the translation
+  // "home.top-level-communities.help": "Search for a collection",
   "home.top-level-communities.help": "Cerca una collection",
 
 
@@ -2935,23 +2797,18 @@
   "info.feedback.email-label": "La tua email",
 
   // "info.feedback.create.success": "Feedback Sent Successfully!",
-  // TODO Source message changed - Revise the translation
   "info.feedback.create.success": "Feedback inviato con successo!",
 
   // "info.feedback.error.email.required": "A valid email address is required",
-  // TODO Source message changed - Revise the translation
   "info.feedback.error.email.required": "Inserire un un indirizzo email valido",
 
   // "info.feedback.error.message.required": "A comment is required",
-  // TODO Source message changed - Revise the translation
   "info.feedback.error.message.required": "Inserire un commento",
 
   // "info.feedback.page-label": "Page",
-  // TODO Source message changed - Revise the translation
   "info.feedback.page-label": "Pagina",
 
   // "info.feedback.page_help": "Tha page related to your feedback",
-  // TODO Source message changed - Revise the translation
   "info.feedback.page_help": "In questa pagina trovi i tuoi feedback",
 
 
@@ -2973,7 +2830,6 @@
 
 
   // "item.badge.private": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.badge.private": "Privato",
 
   // "item.badge.withdrawn": "Withdrawn",
@@ -2985,14 +2841,12 @@
   "item.bitstreams.upload.bundle": "Bundle",
 
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
-  // TODO Source message changed - Revise the translation
   "item.bitstreams.upload.bundle.placeholder": "Seleziona un bundle o inserisci il nome di un nuovo bundle",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Crea un bundle",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO Source message changed - Revise the translation
   "item.bitstreams.upload.bundles.empty": "Questo item non contiene alcun bundle in cui caricare un bitstream.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -3145,88 +2999,67 @@
   "item.edit.tabs.item-mapper.title": "Modifica item - Mapper Collection",
 
   // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Sconosciuto",
 
   // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "In coda per la registrazione",
 
   // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "In coda per l'assegnazione",
 
   // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrato",
 
   // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Assegnato",
 
   // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Assegnato (aggiornamento in coda)",
 
   // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrato (aggiornamento in coda)",
 
   // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "In coda per aggiornamento e registrazione",
 
   // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "In coda per l'eliminazione",
 
   // "item.edit.identifiers.doi.status.DELETED": "Deleted",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminato",
 
   // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "In sospeso (non registrato)",
 
   // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Creato (non registrato)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registra un nuovo DOI o un DOI in sospeso",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registra DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registra un nuovo DOI o un DOI in sospeso",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Esaminare gli identificatori e i metadati dell'item in sospeso e cliccare su Conferma per procedere con la registrazione DOI, oppure su Annulla per tornare indietro",
 
   // "item.edit.register-doi.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Conferma",
 
   // "item.edit.register-doi.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Annulla",
 
   // "item.edit.register-doi.success": "DOI queued for registration successfully.",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI in coda per la registrazione.",
 
   // "item.edit.register-doi.error": "Error registering DOI",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Errore nella registrazione del DOI",
 
   // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "Il seguente DOI è stato già creato e sarà inserito in coda per la registrazione online",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Mappare l'item nelle collections selezionate",
@@ -3291,12 +3124,10 @@
   "item.edit.metadata.discard-button": "Annulla",
 
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Conferma",
 
   // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Trascina per riordinare",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Edita",
@@ -3311,8 +3142,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Interrompi la modifica",
 
   // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Si tratta di un valore virtuale di metadati, cioè un valore ereditato da un'entità correlata. Non può essere modificato direttamente. Aggiungere o rimuovere la relazione corrispondente nella scheda 'Relazioni'.",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Attualmente l'item non contiene metadati. Fai clic su Aggiungi per iniziare ad aggiungere il valore di un metadata.",
@@ -3330,8 +3160,7 @@
   "item.edit.metadata.headers.value": "Valore",
 
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Si è verificato un errore nella validazione del campo dei metadati",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Scegli un campo di metadati valido",
@@ -3340,7 +3169,6 @@
   "item.edit.metadata.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
 
   // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
-  // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.discarded.title": "Modifiche eliminate",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
@@ -3356,7 +3184,6 @@
   "item.edit.metadata.notifications.outdated.content": "L'item su cui stai attualmente lavorando è stato modificato da un altro utente. Le modifiche correnti verranno eliminate per evitare conflitti",
 
   // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
-  // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.outdated.title": "Modifiche obsolete",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
@@ -3369,8 +3196,7 @@
   "item.edit.metadata.reinstate-button": "Annulla",
 
   // "item.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Annulla il riordinamento",
 
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Salva",
@@ -3433,16 +3259,13 @@
   "item.edit.private.cancel": "Annulla",
 
   // "item.edit.private.confirm": "Make it non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.confirm": "Rendilo privato",
 
   // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
-  "item.edit.private.description": "Sei sicuro che questo oggetto debba essere reso privato nell'archivio?",
+  "item.edit.private.description": "Sei sicuro che questo item debba essere reso privato nell'archivio?",
 
   // "item.edit.private.error": "An error occurred while making the item non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.edit.private.error": "Si è verificato un errore durante la creazione di un item privato",
+  "item.edit.private.error": "Si è verificato un errore durante la modifica dell'item in privato",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
   "item.edit.private.header": "Rendi privato l'item: {{ id }}",
@@ -3456,22 +3279,18 @@
   "item.edit.public.cancel": "Annulla",
 
   // "item.edit.public.confirm": "Make it discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.confirm": "Rendilo pubblico",
 
   // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
-  "item.edit.public.description": "Sei sicuro che questo articolo debba essere reso pubblico nell'archivio?",
+  "item.edit.public.description": "Sei sicuro che questo item debba essere reso pubblico nell'archivio?",
 
   // "item.edit.public.error": "An error occurred while making the item discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.edit.public.error": "Si è verificato un errore durante la creazione di un item pubblico",
+  "item.edit.public.error": "Si è verificato un errore durante la modifica dell'item in pubblico",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
   "item.edit.public.header": "Rendi pubblico l'item: {{ id }}",
 
   // "item.edit.public.success": "The item is now discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.success": "L'item è ora pubblico",
 
 
@@ -3558,7 +3377,6 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Modifica item - Curate",
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  // TODO New key - Add a translation
   "item.edit.curate.title": "Curate Item: {{item}}",
 
   // "item.edit.tabs.metadata.head": "Metadata",
@@ -3592,26 +3410,21 @@
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gestire le collections mappate",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.move.button": "Sposta...",
+  "item.edit.tabs.status.buttons.move.button": "Sposta questo item in un'altra collection...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Spostare l'item in un'altra collection",
 
   // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.private.button": "...",
+  "item.edit.tabs.status.buttons.private.button": "Rendilo privato...",
 
   // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.private.label": "Rendere l'item privato",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.public.button": "...",
+  "item.edit.tabs.status.buttons.public.button": "Rendilo pubblico...",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.public.label": "Rendere l'item pubblico",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
@@ -3624,8 +3437,7 @@
   "item.edit.tabs.status.buttons.unauthorized": "Non sei autorizzato a eseguire questa azione",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Rimozione...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Rimuovi questo item",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Rimuovere l'item dal repository",
@@ -3723,37 +3535,45 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Riduci",
 
-  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
   // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "item.qa-event-notification-info.check.button": "View",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Elimina l'ordine di supervisione",
 
   // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Sei sicuro di voler eliminare l'ordine di supervisione?",
 
   // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Annulla",
 
   // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Elimina",
 
   // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Ordine di supervisione \"{{name}}\" eliminato con successo",
 
   // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Impossibile eliminare l'ordine di supervisione \"{{name}}\"",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisionato da:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Rimuovi gruppo di supervisione",
 
 
 
@@ -3848,11 +3668,9 @@
   "item.page.bitstreams.collapse": "Riduci",
 
   // "item.page.filesection.original.bundle": "Original bundle",
-  // TODO New key - Add a translation
   "item.page.filesection.original.bundle": "Original bundle",
 
   // "item.page.filesection.license.bundle": "License bundle",
-  // TODO New key - Add a translation
   "item.page.filesection.license.bundle": "License bundle",
 
   // "item.page.return": "Back",
@@ -3889,8 +3707,7 @@
   "item.preview.dc.language.iso": "Lingua:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Soggetti:",
 
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Titolo:",
@@ -3899,30 +3716,24 @@
   "item.preview.dc.type": "Tipologia:",
 
   // "item.preview.oaire.citation.issue": "Issue",
-  // TODO Source message changed - Revise the translation
   "item.preview.oaire.citation.issue": "Fascicolo",
 
   // "item.preview.oaire.citation.volume": "Volume",
-  // TODO Source message changed - Revise the translation
   "item.preview.oaire.citation.volume": "Volume",
 
   // "item.preview.dc.relation.issn": "ISSN",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.relation.issn": "ISSN",
 
   // "item.preview.dc.identifier.isbn": "ISBN",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificativo:",
 
   // "item.preview.dc.relation.ispartof": "Journal or Serie",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.relation.ispartof": "Periodico or Serie",
 
   // "item.preview.dc.identifier.doi": "DOI",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.identifier.doi": "DOI",
 
   // "item.preview.person.familyName": "Surname:",
@@ -3944,8 +3755,7 @@
   "item.preview.oaire.awardNumber": "ID del finanziamento:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acronimo:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
   "item.preview.dc.coverage.spatial": "Giurisdizione:",
@@ -4070,15 +3880,12 @@
   "item.version.create.modal.submitted.text": "La nuova versione è in fase di creazione. Questa operazione potrebbe richiedere un po' di temo se l'item ha molte relazioni.",
 
   // "item.version.create.notification.success": "New version has been created with version number {{version}}",
-  // TODO Source message changed - Revise the translation
   "item.version.create.notification.success": "È stata creata una nuova versione con il numero {{version}}",
 
   // "item.version.create.notification.failure": "New version has not been created",
-  // TODO Source message changed - Revise the translation
   "item.version.create.notification.failure": "Non è stata creata una nuova versione",
 
   // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
-  // TODO Source message changed - Revise the translation
   "item.version.create.notification.inProgress": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
 
 
@@ -4101,131 +3908,100 @@
   "item.version.delete.modal.button.cancel.tooltip": "Non eliminare questa versione",
 
   // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
-  // TODO Source message changed - Revise the translation
   "item.version.delete.notification.success": "La versione numero {{version}} è stata eliminata",
 
   // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
-  // TODO Source message changed - Revise the translation
   "item.version.delete.notification.failure": "La versione numero {{version}} non è stata eliminata",
 
 
   // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
-  // TODO Source message changed - Revise the translation
   "item.version.edit.notification.success": "Il riepilogo della versione numero {{version}} è stato modificato",
 
   // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
-  // TODO Source message changed - Revise the translation
   "item.version.edit.notification.failure": "Il riepilogo della versione numero {{version}} non è stato modificato",
 
 
 
   // "itemtemplate.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Aggiungi",
 
   // "itemtemplate.edit.metadata.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Elimina",
 
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Conferma",
 
   // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Trascina per riordinare",
 
   // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Modifica",
 
   // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Rimuovi",
 
   // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Annulla le modifiche",
 
   // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Smetti di modificare",
 
   // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Il template dell'item al momento non contiene nessun metadato. Clicca su 'Aggiungi' per inserire un metadato.",
 
   // "itemtemplate.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Modifica",
 
   // "itemtemplate.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Campo",
 
   // "itemtemplate.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Lingua",
 
   // "itemtemplate.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valore",
 
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Si è verificato un errore durante la validazione del campo dei metadati",
 
   // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Si prega di scegliere un campo di metadati valido",
 
   // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Le tue modifiche sono state eliminate. Per riprtinarle, cliccare sul tasto 'Annulla'",
 
-  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Modifiche eliminate",
 
   // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Si è verificato un errore",
 
   // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Le tue modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.",
 
   // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadati non validi",
 
   // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Il template dell'item su cui stai lavorando è stato modificato da un altro utente. Le tue ultime modifiche sono state eliminate per prevenire conflitti",
 
-  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Modifiche obsolete",
 
   // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Le tue modifiche ai metadati di questo template sono state salvate.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadati salvati",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Annulla",
 
   // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Annulla riordinamento",
 
   // "itemtemplate.edit.metadata.save-button": "Save",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Salva",
 
 
 
@@ -4492,27 +4268,22 @@
 
   // "menu.section.browse_global": "All of DSpace",
   // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Tutto DSpace",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Per autore",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Per data di pubblicazione",
 
   // "menu.section.browse_global_by_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Per argomento",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Per titolo",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.communities_and_collections": "Community & Collezioni",
 
 
 
@@ -4554,7 +4325,6 @@
   "menu.section.export_metadata": "Metadati",
 
   // "menu.section.export_batch": "Batch Export (ZIP)",
-  // TODO New key - Add a translation
   "menu.section.export_batch": "Batch Export (ZIP)",
 
 
@@ -4580,8 +4350,7 @@
   "menu.section.icon.find": "Trova sezione menu",
 
   // "menu.section.icon.health": "Health check menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Sezione del menu Health check",
 
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Sezione del menu Importa",
@@ -4593,8 +4362,7 @@
   "menu.section.icon.pin": "Fissa la barra laterale",
 
   // "menu.section.icon.processes": "Processes Health",
-  // TODO Source message changed - Revise the translation
-  "menu.section.icon.processes": "Sezione del menu Processi",
+  "menu.section.icon.processes": "Processi",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Sezione del menu Registri",
@@ -4810,23 +4578,22 @@
   "mydspace.show.workspace": "I tuoi contributi",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  // TODO New key - Add a translation
-  "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Item supervisionati",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archiviati",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviati",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Convalida",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Convalida",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "In attesa del controllo",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "In attesa del controllo",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -4855,8 +4622,7 @@
   "nav.community-browse.header": "Per Community",
 
   // "nav.context-help-toggle": "Toggle context help",
-  // TODO New key - Add a translation
-  "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Attivare la guida contestuale",
 
   // "nav.language": "Language switch",
   "nav.language": "Cambio di lingua",
@@ -4865,12 +4631,10 @@
   "nav.login": "Accedi",
 
   // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
-  // TODO New key - Add a translation
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menu profilo utente e Disconnetti",
 
   // "nav.logout": "Log Out",
-  // TODO Source message changed - Revise the translation
-  "nav.logout": "Menu profilo utente e Disconnetti",
+  "nav.logout": "Disconnetti",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra di navigazione principale",
@@ -4885,8 +4649,7 @@
   "nav.search": "Ricerca",
 
   // "nav.search.button": "Submit search",
-  // TODO New key - Add a translation
-  "nav.search.button": "Submit search",
+  "nav.search.button": "Invia ricerca",
 
 
   // "nav.statistics.header": "Statistics",
@@ -4896,27 +4659,23 @@
   "nav.stop-impersonating": "Smetti di impersonare EPerson",
 
   // "nav.subscriptions": "Subscriptions",
-  // TODO New key - Add a translation
-  "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscription",
 
   // "nav.toggle": "Toggle navigation",
-  // TODO New key - Add a translation
-  "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Attivare la navigazione",
 
   // "nav.user.description": "User profile bar",
-  // TODO New key - Add a translation
-  "nav.user.description": "User profile bar",
+  "nav.user.description": "Barra del profilo utente",
 
   // "none.listelement.badge": "Item",
-  "none.listelement.badge": "Articolo",
+  "none.listelement.badge": "Item",
 
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unità organizzativa",
 
   // "orgunit.listelement.no-title": "Untitled",
-  // TODO New key - Add a translation
-  "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Senza titolo",
 
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Città",
@@ -4937,8 +4696,7 @@
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Unità organizzativa: ",
 
 
 
@@ -4984,8 +4742,7 @@
   "person.page.lastname": "Cognome",
 
   // "person.page.name": "Name",
-  // TODO New key - Add a translation
-  "person.page.name": "Name",
+  "person.page.name": "Nome",
 
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Mostra tutti i metadati",
@@ -5000,11 +4757,10 @@
   "person.page.titleprefix": "Persona: ",
 
   // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Risultati della ricerca per Ricercatore",
+  "person.search.results.head": "Risultati della ricerca per persona",
 
   // "person-relationships.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Risultati della ricerca per persona",
 
   // "person.search.title": "Person Search",
   "person.search.title": "Cerca i Ricercatori",
@@ -5045,8 +4801,7 @@
   "process.new.parameter.type.file": "file",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "I seguenti parametri mancanti sono obbligatori:",
 
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Successo",
@@ -5061,8 +4816,7 @@
   "process.new.notification.error.content": "Si è verificato un errore durante la creazione di questo processo",
 
   // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
-  // TODO New key - Add a translation
-  "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Il file è più grande della dimensione massima di upload",
 
   // "process.new.header": "Create a new process",
   "process.new.header": "Creare un nuovo processo",
@@ -5076,20 +4830,16 @@
 
 
   // "process.detail.arguments": "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Parametri",
 
   // "process.detail.arguments.empty": "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Questo processo non contiene alcun parametro",
 
   // "process.detail.back": "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
+  "process.detail.back": "Indietro",
 
   // "process.detail.output": "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  "process.detail.output": "Output del processo",
 
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Recupera l'output del processo",
@@ -5101,94 +4851,72 @@
   "process.detail.logs.none": "Questo processo non ha output",
 
   // "process.detail.output-files": "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "File di output",
 
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
-  // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Questo processo non contiene nessun file di output",
 
   // "process.detail.script": "Script",
-  // TODO New key - Add a translation
   "process.detail.script": "Script",
 
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Processo: {{ id }} - {{ name }}",
 
   // "process.detail.start-time": "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Orario di inizio",
 
   // "process.detail.end-time": "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Orario di fine",
 
   // "process.detail.status": "Status",
-  // TODO New key - Add a translation
-  "process.detail.status": "Status",
+  "process.detail.status": "Stato",
 
   // "process.detail.create": "Create similar process",
-  // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.detail.create": "Crea un processo analogo",
 
   // "process.detail.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.detail.actions": "Actions",
+  "process.detail.actions": "Azioni",
 
   // "process.detail.delete.button": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Elimina processo",
 
   // "process.detail.delete.header": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Elimina processo",
 
   // "process.detail.delete.body": "Are you sure you want to delete the current process?",
-  // TODO New key - Add a translation
-  "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Sei sicuro di voler eliminare il processo corrente?",
 
   // "process.detail.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Annulla",
 
   // "process.detail.delete.confirm": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Elimina processo",
 
   // "process.detail.delete.success": "The process was successfully deleted.",
-  // TODO New key - Add a translation
-  "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Il processo è stato eliminato con successo",
 
   // "process.detail.delete.error": "Something went wrong when deleting the process",
-  // TODO New key - Add a translation
-  "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Qualcosa è andato storto durante l'elininazione del processo",
 
 
 
   // "process.overview.table.finish": "Finish time (UTC)",
-  // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Orario di fine (UTC)",
 
   // "process.overview.table.id": "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID del processo",
 
   // "process.overview.table.name": "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  "process.overview.table.name": "Nome",
 
   // "process.overview.table.start": "Start time (UTC)",
-  // TODO New key - Add a translation
-  "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Orario di inizio (UTC)",
 
   // "process.overview.table.status": "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status": "Status",
+  "process.overview.table.status": "Stato",
 
   // "process.overview.table.user": "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  "process.overview.table.user": "Utente",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Panoramica dei processi",
@@ -5200,40 +4928,31 @@
   "process.overview.new": "Nuovo",
 
   // "process.overview.table.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Azioni",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  // TODO New key - Add a translation
-  "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Elimina {{count}} processi",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  // TODO New key - Add a translation
-  "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Ripulisci la sezione Elimina",
 
   // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
-  // TODO New key - Add a translation
-  "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "{{count}} processi sono in fase di eliminazione. Attendere che l'attività sia completata. Potrebbe volerci qualche minuto.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
-  // TODO New key - Add a translation
-  "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Sei sicuro di voler eliminare {{count}} processo/i?",
 
   // "process.overview.delete.header": "Delete processes",
-  // TODO New key - Add a translation
-  "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina processi",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
-  // TODO New key - Add a translation
-  "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Errore nell'eliminazione dei processi",
 
   // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
-  // TODO New key - Add a translation
-  "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "Il processo con l'ID {{processId}} non può essere eliminato. I restanti processi saranno eliminati.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
-  // TODO New key - Add a translation
-  "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} processi sono stati eliminati con successo",
 
 
 
@@ -5246,16 +4965,14 @@
   // "profile.card.security": "Security",
   "profile.card.security": "Sicurezza",
 
-  // "profile.form.submit": "Save",
-  // TODO Source message changed - Revise the translation
+  // "profile.form.submit": "Update Profile",
   "profile.form.submit": "Aggiorna profilo",
 
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Gruppi di autorizzazione a cui appartieni",
 
   // "profile.special.groups.head": "Authorization special groups you belong to",
-  // TODO New key - Add a translation
-  "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Gruppi speciali di autorizzazione a cui appartieni",
 
   // "profile.head": "Update Profile",
   "profile.head": "Aggiorna profilo",
@@ -5297,8 +5014,7 @@
   "profile.security.form.error.matching-passwords": "Le password non corrispondono.",
 
   // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.",
+  "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Password",
@@ -5307,8 +5023,7 @@
   "profile.security.form.label.passwordrepeat": "Ridigitare per confermare",
 
   // "profile.security.form.label.current-password": "Current password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Password corrente",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Le modifiche apportate alla password sono state salvate.",
@@ -5320,15 +5035,13 @@
   "profile.security.form.notifications.error.title": "Errore durante la modifica delle password",
 
   // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Si è verificato un errore durante la modifica della password. Assicurati che la password corrente sia corretta.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Le password fornite non sono le stesse.",
 
   // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Si prega di inserire i campi richiesti nel modulo di sicurezza.",
 
   // "profile.title": "Update Profile",
   "profile.title": "Aggiorna profilo",
@@ -5364,15 +5077,13 @@
   "project.page.status": "Parole chiave",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Progetto di ricerca: ",
 
   // "project.search.results.head": "Project Search Results",
-  "project.search.results.head": "Progetto di ricerca: ",
+  "project.search.results.head": "Risultati della ricerca per progetti",
 
   // "project-relationships.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Risultati della ricerca per progetti",
 
 
 
@@ -5395,18 +5106,16 @@
   "publication.page.publisher": "Editore",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Pubblicazione: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Titolo volume",
 
   // "publication.search.results.head": "Publication Search Results",
-  "publication.search.results.head": "Risultati della ricerca di pubblicazioni",
+  "publication.search.results.head": "Risultati della ricerca per pubblicazioni",
 
   // "publication-relationships.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Risultati della ricerca per pubblicazioni",
 
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Ricerca pubblicazione",
@@ -5456,8 +5165,7 @@
   "register-page.create-profile.security.header": "Sicurezza",
 
   // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.",
+  "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella.",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Password *",
@@ -5500,12 +5208,10 @@
   "register-page.registration.email.error.required": "Inserire un indirizzo e-mail",
 
   // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Inserisci un indirizzo e-mail valido.",
 
   // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilizza una e-mail con un dominio valido: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Questo indirizzo verrà verificato e utilizzato come nome di accesso.",
@@ -5523,39 +5229,30 @@
   "register-page.registration.error.head": "Errore durante il tentativo di registrazione dell'e-mail",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Si è verificato un errore durante la registrazione del seguente indirizzo e-mail: {{ email }}",
 
   // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
-  // TODO New key - Add a translation
-  "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Errore durante l'autenticazione con reCaptcha",
 
   // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Per registrarsi è obbligatorio accettare i cookie <b>Registration and Password recovery</b> (Google reCaptcha).",
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Questo indirizzo e-mail non è nella lista dei dominii che possono essere registrati. I domini validi sono {{ domains }}",
 
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Aprire le impostazioni dei cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Si è verificato un errore durante la verifica reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verifica scaduta. Si prega di verificare di nuovo.",
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
-  // TODO New key - Add a translation
-  "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Gli account possono essere registrati per gli indirizzi e-mail dei dominii",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Non è stata trovata alcuna corrispondenza adatta per il tipo di relazione {{ type }} tra i due item",
@@ -5625,7 +5322,6 @@
   "repository.image.logo": "Logo del repository",
 
   // "repository.title.prefix": "DSpace Angular :: ",
-  // TODO New key - Add a translation
   "repository.title.prefix": "DSpace Angular :: ",
 
   // "repository.title.prefixDSpace": "DSpace Angular ::",
@@ -5636,60 +5332,58 @@
   "resource-policies.add.button": "Aggiungi",
 
   // "resource-policies.add.for.": "Add a new policy",
-  "resource-policies.add.for.": "Aggiungi un nuovo criterio",
+  "resource-policies.add.for.": "Aggiungi una nuova policy",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  "resource-policies.add.for.bitstream": "Aggiungi un nuovo criterio Bitstream",
+  "resource-policies.add.for.bitstream": "Aggiungi una nuova policy di Bitstream",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  "resource-policies.add.for.bundle": "Aggiungi un nuovo criterio Bundle",
+  "resource-policies.add.for.bundle": "Aggiungi una nuova policy di Bundle",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Aggiungi un nuovo criterio item",
+  "resource-policies.add.for.item": "Aggiungi una nuova policy di Item",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Aggiungere un nuovo criterio comunitario",
+  "resource-policies.add.for.community": "Aggiungi una nuova policy di community",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Aggiungere un nuovo criterio di collezione",
+  "resource-policies.add.for.collection": "Aggiungi una nuova policy di collezione",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Creare nuovi criteri di risorsa per ",
+  "resource-policies.create.page.heading": "Creare una nuova policy di risorsa per ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione del criterio della risorsa.",
+  "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione della policy di risorsa.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Operazione riuscita",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  "resource-policies.create.page.title": "Creare nuovi criteri risorse",
+  "resource-policies.create.page.title": "Creare nuove policy di risorsa",
 
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Elimina selezionato",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  "resource-policies.delete.btn.title": "Elimina criteri risorse selezionati",
+  "resource-policies.delete.btn.title": "Elimina le policy di risorsa selezionate",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione dei criteri delle risorse selezionati.",
+  "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione delle policy di risorsa selezionate.",
 
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "Operazione riuscita",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Modifica criterio risorse",
+  "resource-policies.edit.page.heading": "Modifica policy di risorsa",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica del criterio delle risorse.",
+  "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica della policy di risorsa.",
 
   // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Si è verificato un errore durante la modifica dell'obiettivo (ePerson o gruppo) della policy di risorsa.",
 
   // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Si è verificato un errore durante la modifica della policy di risorsa. L'obiettio (ePerson o gruppo) è stato aggiornato con successo.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Operazione riuscita",
@@ -5725,20 +5419,16 @@
   "resource-policies.form.eperson-group-list.table.headers.name": "Nome",
 
   // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Impossibile modificare il tipo",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Impossibile sostituire una ePerson con un gruppo.",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Impossibile sostituire un gruppo con una ePerson.",
 
   // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Elimina la policy di risorsa corrente e creane una nuova con il tipo desiderato.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
@@ -5840,7 +5530,6 @@
   "search.filters.applied.f.dateSubmitted": "Data di invio",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.applied.f.discoverable": "Privato",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -5856,23 +5545,22 @@
   "search.filters.applied.f.namedresourcetype": "Stato",
 
   // "search.filters.applied.f.subject": "Subject",
-  "search.filters.applied.f.subject": "Oggetto",
+  "search.filters.applied.f.subject": "Soggetto",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Mittente",
+  "search.filters.applied.f.submitter": "Submitter",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  "search.filters.applied.f.jobTitle": "Titolo di lavoro",
+  "search.filters.applied.f.jobTitle": "Ruolo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Data di fine nascita",
+  "search.filters.applied.f.birthDate.max": "Data di nascita finale",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Data di nascita iniziale",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisionato da",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Ritirato",
@@ -5961,7 +5649,6 @@
   "search.filters.filter.dateSubmitted.label": "Data di ricerca inviata",
 
   // "search.filters.filter.discoverable.head": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.filter.discoverable.head": "Privato",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -5974,7 +5661,7 @@
   "search.filters.filter.entityType.placeholder": "Tipo di item",
 
   // "search.filters.filter.entityType.label": "Search item type",
-  "search.filters.filter.entityType.label": "Tipo di item di ricerca",
+  "search.filters.filter.entityType.label": "Cerca tipo di item",
 
   // "search.filters.filter.expand": "Expand filter",
   "search.filters.filter.expand": "Espandi filtro",
@@ -6010,13 +5697,13 @@
   "search.filters.filter.knowsLanguage.label": "Cerca nella lingua nota",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Stato",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Stato",
 
   // "search.filters.filter.namedresourcetype.label": "Search status",
-  "search.filters.filter.namedresourcetype.label": "Status Ricerca",
+  "search.filters.filter.namedresourcetype.label": "Cerca stato",
 
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Ricercatori",
@@ -6088,20 +5775,19 @@
   "search.filters.filter.submitter.label": "Mittente della ricerca",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Sfoglia l'albero di {{ name }}",
 
   // "search.filters.filter.supervisedBy.head": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisionato da",
 
   // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionato da",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Cerca supervisionato da",
+
+  // "search.filters.filter.types.head": "Type",
+  "search.filters.filter.types.head": "Tipo",
 
 
 
@@ -6168,19 +5854,16 @@
   "search.results.empty": "La tua ricerca non ha prodotto risultati.",
 
   // "search.results.view-result": "View",
-  // TODO New key - Add a translation
-  "search.results.view-result": "View",
+  "search.results.view-result": "Vedi",
 
   // "search.results.response.500": "An error occurred during query execution, please try again later",
-  // TODO New key - Add a translation
-  "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Si è verificato un errore durante l'esecuzione, si prega di riprovare più tardi",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Risultati della ricerca",
 
   // "default-relationships.search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Risultati della ricerca",
 
 
   // "search.sidebar.close": "Back to results",
@@ -6218,13 +5901,13 @@
 
 
   // "sorting.ASC": "Ascending",
-  "sorting.ASC": "Ascendente",
+  "sorting.ASC": "Crescente",
 
   // "sorting.DESC": "Descending",
-  "sorting.DESC": "Discendente",
+  "sorting.DESC": "Decrescente",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-  "sorting.dc.title.ASC": "Titolo ascendente",
+  "sorting.dc.title.ASC": "Titolo crescente",
 
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Titolo decrescente",
@@ -6270,32 +5953,25 @@
   "statistics.table.no-data": "Nessun dato disponibile",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.rppublicationsReports.title.TotalVisits": "Visite totali",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Visite totali al mese",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Download",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Migliori nazioni",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Migliori città",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Visite",
 
   // "statistics.table.no-name": "(object name could not be loaded)",
-  // TODO New key - Add a translation
-  "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(il nome dell'oggetto non può essere caricato)",
 
 
 
@@ -6403,7 +6079,6 @@
   "submission.import-external.source.crossref": "CrossRef",
 
   // "submission.import-external.source.datacite": "DataCite",
-  // TODO New key - Add a translation
   "submission.import-external.source.datacite": "DataCite",
 
   // "submission.import-external.source.scielo": "SciELO",
@@ -6452,22 +6127,19 @@
   "submission.import-external.source.lcname": "Nomi della Biblioteca del Congresso",
 
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Anteprima item",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
   "submission.import-external.preview.title.Publication": "Anteprima pubblicazione",
 
   // "submission.import-external.preview.title.none": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Anteprima item",
 
   // "submission.import-external.preview.title.Journal": "Journal Preview",
   "submission.import-external.preview.title.Journal": "Anteprima journal",
 
   // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  // TODO Source message changed - Revise the translation
-  "submission.import-external.preview.title.OrgUnit": "Anteprima editore",
+  "submission.import-external.preview.title.OrgUnit": "Anteprima struttura",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
   "submission.import-external.preview.title.Person": "Anteprima persona",
@@ -6509,8 +6181,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Progetto",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importa item remoti",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importa evento remoto",
@@ -6522,8 +6193,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importare apparecchiature remote",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
-  // TODO Source message changed - Revise the translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importa editore remoto",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importa unitá remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importa fondo remoto",
@@ -6625,8 +6295,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Importato e aggiunto con successo volume di journal esterno alla selezione",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleziona una corrispondenza locale:",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleziona tutto",
@@ -6728,8 +6397,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finanziatore del progetto",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Pubblicazioni dell'autore",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finanziamento dell'API OpenAIRE",
@@ -6798,11 +6466,10 @@
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unità organizzativa padre",
 
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Pubblicazioni",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Attiva dropdown",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Impostazioni",
@@ -6894,8 +6561,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Risultati della ricerca",
 
-  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
-  // TODO Source message changed - Revise the translation
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Desideri salvare \"{{ value }}\" come variante del nome per questa persona in modo che tu e altri possiate riutilizzarlo per immissioni future? Se non lo fai, puoi comunque usarlo per questa immissione.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -6920,8 +6586,7 @@
   "submission.sections.ccLicense.option.select": "Seleziona un'opzione...",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Hai selezionato la seguente licenza:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Concedo la licenza di cui sopra",
@@ -6930,14 +6595,13 @@
   "submission.sections.general.add-more": "Aggiungi altro",
 
   // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
-  // TODO New key - Add a translation
-  "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "L'immissione non può essere competata a causa di errori nel modulo.<br> Si prega di compilare tutti i campi obbligatori.",
 
   // "submission.sections.general.collection": "Collection",
-  "submission.sections.general.collection": "collezione",
+  "submission.sections.general.collection": "Collezione",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'articolo, riprova più tardi.",
+  "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'item, riprova più tardi.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Immissione depositata con successo.",
@@ -6960,8 +6624,7 @@
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Nessuna opzione disponibile",
 
-  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO Source message changed - Revise the translation
+  // "submission.sections.general.save_error_notice": "There was an unexpected error when saving the item. Refresh the page and try again. After refreshing unsaved modifications could be lost.",
   "submission.sections.general.save_error_notice": "Si è verificato un errore imprevisto durante il salvataggio dell'item. Aggiorna la pagina e riprova. Dopo aver aggiornato le modifiche non salvate potrebbero andare perse.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
@@ -6974,28 +6637,22 @@
   "submission.sections.general.sections_not_valid": "Ci sono sezioni incomplete.",
 
   // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Per questo item saranno generati i seguenti identificativi:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Non sono stati generati handle per questo item.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Non sono stati generati DOI per questo item.",
 
   // "submission.sections.identifiers.handle_label": "Handle: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.handle_label": "Handle: ",
 
   // "submission.sections.identifiers.doi_label": "DOI: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.doi_label": "DOI: ",
 
   // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Altri identificativi: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condizioni di accesso all'item",
@@ -7019,27 +6676,23 @@
   "submission.sections.submit.progressbar.detect-duplicate": "Potenziali duplicati",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificativi",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licenza di deposito",
 
   // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Policy di Sherpa",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Carica file",
 
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informazioni sulla policy di open access dell'editore",
 
 
   // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "Non sono disponibili informazioni sulle policy dell'editore. Se il lavoro ha un ISSN associato, si prega di inserirlo qui sopra per vedere le policy di open access dell'editore.",
 
   // "submission.sections.status.errors.title": "Errors",
   "submission.sections.status.errors.title": "Errori",
@@ -7060,12 +6713,10 @@
   "submission.sections.status.warnings.aria": "ha avvisi",
 
   // "submission.sections.status.info.title": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Informazioni aggiuntive",
 
   // "submission.sections.status.info.aria": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Informazioni aggiuntive",
 
   // "submission.sections.toggle.open": "Open section",
   "submission.sections.toggle.open": "Apri sezione",
@@ -7143,16 +6794,13 @@
   "submission.sections.upload.form.until-placeholder": "Fino a quando",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "I file caricati nella collection {{collectionName}} saranno accessibili in base ai seguenti gruppi:",
 
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "Si prega di notare che i file caricati nella collection {{collectionName}} saranno accessibili, in aggiunta a quanto esplicitamente deciso per il singolo file, con i seguenti gruppi:",
 
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
-  // TODO Source message changed - Revise the translation
-  "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'articolo. È possibile aggiornare i metadati dei file e le condizioni di accesso o <fortng>upload di file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina</strong>",
+  "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'item. È possibile aggiornare i metadati dei file e le condizioni di accesso o <strong>caricare file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "No",
@@ -7218,121 +6866,92 @@
   "submission.sections.accesses.form.until-placeholder": "Fino a quando",
 
   // "submission.sections.license.granted-label": "I confirm the license above",
-  // TODO New key - Add a translation
-  "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confermo la licenza di cui sopra",
 
   // "submission.sections.license.required": "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "È necessario accettare la licenza",
 
   // "submission.sections.license.notgranted": "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "È necessario accettare la licenza",
 
 
   // "submission.sections.sherpa.publication.information": "Publication information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informazioni sulla pubblicazione",
 
   // "submission.sections.sherpa.publication.information.title": "Title",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Titolo",
 
   // "submission.sections.sherpa.publication.information.issns": "ISSNs",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN",
 
   // "submission.sections.sherpa.publication.information.url": "URL",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.url": "URL",
 
   // "submission.sections.sherpa.publication.information.publishers": "Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Editore",
 
   // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
 
   // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
 
   // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Policy dell'editore",
 
   // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Le informazioni riportate di seguito sono state reperite tramite Sherpa Romeo. In base alle policy del vostro editore, fornisce consigli sull'eventuale necessità di un embargo e/o su quali file è possibile caricare. In caso di domande, contattare l'amministratore del sito tramite il modulo di feedback nel piè di pagina.",
 
   // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "I percorsi open access consentiti dalle policy di questa rivista sono elencati di seguito per versione dell'articolo. Clicca su un percorso per vederlo nel dettaglio",
 
   // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Per maggiori informazioni si prega di consultare il seguente link:",
 
   // "submission.sections.sherpa.publisher.policy.version": "Version",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versione",
 
   // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
 
   // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Nessun embargo",
 
   // "submission.sections.sherpa.publisher.policy.nolocation": "None",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nessuno",
 
   // "submission.sections.sherpa.publisher.policy.license": "License",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licenza",
 
   // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisiti",
 
   // "submission.sections.sherpa.publisher.policy.location": "Location",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Località",
 
   // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condizioni",
 
   // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Ricarica",
 
   // "submission.sections.sherpa.record.information": "Record Information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informazioni sulla registrazione",
 
   // "submission.sections.sherpa.record.information.id": "ID",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.id": "ID",
 
   // "submission.sections.sherpa.record.information.date.created": "Date Created",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Data di creazione",
 
   // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Ultima modifica",
 
   // "submission.sections.sherpa.record.information.uri": "URI",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Si è verificato un errore nel recuperare le informazioni da Sherpa",
 
 
 
@@ -7347,8 +6966,7 @@
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Elimina",
 
-  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
-  // TODO Source message changed - Revise the translation
+  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
   "submission.workflow.generic.delete-help": "Se si desidera eliminare questo item, selezionare \"Elimina\".  Ti verrà quindi chiesto di confermarlo.",
 
   // "submission.workflow.generic.edit": "Edit",
@@ -7365,20 +6983,16 @@
 
 
   // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleziona revisore",
 
   // "submission.workflow.generic.submit_select_reviewer-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_select_reviewer-help": "",
 
 
   // "submission.workflow.generic.submit_score": "Rate",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Valuta",
 
   // "submission.workflow.generic.submit_score-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_score-help": "",
 
 
@@ -7395,11 +7009,9 @@
   "submission.workflow.tasks.claimed.edit_help": "Selezionare questa opzione per modificare i metadati dell'item.",
 
   // "submission.workflow.tasks.claimed.decline": "Decline",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Rifiuta",
 
   // "submission.workflow.tasks.claimed.decline_help": "",
-  // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
@@ -7490,72 +7102,55 @@
   "subscriptions.frequency.W": "Settimanale",
 
   // "subscriptions.tooltip": "Subscribe",
-  // TODO New key - Add a translation
-  "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Sottoscrivi",
 
   // "subscriptions.modal.title": "Subscriptions",
-  // TODO New key - Add a translation
-  "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Sottoscrizioni",
 
   // "subscriptions.modal.type-frequency": "Type and frequency",
-  // TODO New key - Add a translation
-  "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipo e frequenza",
 
   // "subscriptions.modal.close": "Close",
-  // TODO New key - Add a translation
-  "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Chiudi",
 
   // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Per rimuovere questa sottoscrizione si prega di visitare la pagina \"Sottoscrizioni\" nel proprio profilo utente",
 
   // "subscriptions.modal.new-subscription-form.type.content": "Content",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenuto",
 
   // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Giornaliero",
 
   // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Settimanale",
 
   // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensile",
 
   // "subscriptions.modal.new-subscription-form.submit": "Submit",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Invia",
 
   // "subscriptions.modal.new-subscription-form.processing": "Processing...",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Elaborazione...",
 
   // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Sottoscrzione a {{ type }} avvenuta con successo.",
 
   // "subscriptions.modal.delete.success": "Subscription deleted successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Sottoscrizione eliminata con successo",
 
   // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Sottoscrizione a {{ type }} aggiornata con successo",
 
   // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Si è verificato un errore durante la creazione della sottoscrizione",
 
   // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Si è verificato un errore durante l'eliminazione della sottoscrizione",
 
   // "subscriptions.modal.update.error": "An error occurs during the subscription update",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Si è verificato un errore durante l'aggiornamento della sottoscrizione",
 
   // "subscriptions.table.dso": "Subject",
   "subscriptions.table.dso": "Oggetto",
@@ -7570,24 +7165,19 @@
   "subscriptions.table.action": "Azione",
 
   // "subscriptions.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Modifica",
 
   // "subscriptions.table.delete": "Delete",
-  // TODO New key - Add a translation
-  "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Elimina",
 
   // "subscriptions.table.not-available": "Not available",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Non disponibile",
 
   // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'elemento sottoscritto è stato cancellato o non si ha l'autorizzazione per visualizzarlo.",
 
   // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
-  // TODO Source message changed - Revise the translation
-  "subscriptions.table.empty.message": "Non hai ancora sottoscritto alcuna notifica. Per sottoscrivere la notifica relativa a un oggetto, usa il menu contestuale nella pagina di dettaglio dell'oggetto",
+  "subscriptions.table.empty.message": "Al momento non ci sono sottoscrizioni. Per ricevere aggiornamenti via e-mail di una Community o di una Collection, utilizzare il pulsante di sottoscrizione sulla pagina dell'oggetto",
 
 
   // "thumbnail.default.alt": "Thumbnail Image",
@@ -7643,8 +7233,7 @@
   "vocabulary-treeview.tree.description.srsc": "Categorie di argomenti di ricerca",
 
   // "vocabulary-treeview.info": "Select a subject to add as search filter",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Seleziona un soggetto da aggiungere come filtro di ricerca",
 
   // "uploader.browse": "browse",
   "uploader.browse": "sfoglia",
@@ -7659,8 +7248,7 @@
   "uploader.or": ", oppure ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Elaborazione",
+  "uploader.processing": "Elaborazione dei file caricati... (è ora possibile chiudere questa pagina)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Lunghezza coda",
@@ -7677,8 +7265,7 @@
 
 
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  // TODO New key - Add a translation
-  "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Item supervisionati",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "I tuoi invii",
@@ -7690,8 +7277,7 @@
   "workflow.search.results.head": "Task del workflow",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
-  // TODO New key - Add a translation
-  "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Task del workflow e del workspace",
 
 
 
@@ -7761,74 +7347,57 @@
 
 
   // "workflow-item.advanced.title": "Advanced workflow",
-  // TODO New key - Add a translation
-  "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Workflow avanzato",
 
 
   // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisore selezionato",
 
   // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Il revisore per questo item nel workflow è stato selezionato con successo",
 
   // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Qualcosa è andato storto",
 
   // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Non è stato possibile selezionare il revisore per questo item nel workflow",
 
   // "workflow-item.selectrevieweraction.title": "Select Reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleziona revisore",
 
   // "workflow-item.selectrevieweraction.header": "Select Reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleziona revisore",
 
   // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Annulla",
 
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Conferma",
 
 
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Valuta revisione",
 
   // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La valutazione per il workflow di questo item è stata inserita con successo",
 
   // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Qualcosa è andato storto",
 
   // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Non è stato possibile valutare questo item",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Valuta questo item",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Valuta questo item",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Annulla",
 
   // "workflow-item.scorereviewaction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Conferma",
 
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sessione scadrà presto",
@@ -7843,7 +7412,6 @@
   "idle-modal.extend-session": "Estendi sessione",
 
   // "researcher.profile.action.processing": "Processing...",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.action.processing": "Elaborazione...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7877,11 +7445,9 @@
   "researcher.profile.view": "Visualizza",
 
   // "researcher.profile.private.visibility": "PRIVATE",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.private.visibility": "PRIVATO",
 
   // "researcher.profile.public.visibility": "PUBLIC",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.public.visibility": "PUBBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -7891,19 +7457,15 @@
   "researcherprofile.claim.not-authorized": "Non sei autorizzato a richiedere questo item. Per maggiori dettagli contattare l'amministratore/i",
 
   // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.error.claim.body": "Si è verificato un errore durante l'associazione del profilo, prova più tardi",
 
   // "researcherprofile.error.claim.title": "Error",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.error.claim.title": "Errore",
 
   // "researcherprofile.success.claim.body": "Profile claimed with success",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.success.claim.body": "Profilo associato con successo",
 
   // "researcherprofile.success.claim.title": "Success",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.success.claim.title": "Successo",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7913,7 +7475,6 @@
   "person.page.orcid.granted-authorizations": "Autorizzazioni concesse",
 
   // "person.page.orcid.grant-authorizations": "Grant authorizations",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.grant-authorizations": "Concedere autorizzazioni",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7962,55 +7523,42 @@
   "person.page.orcid.save.preference.changes": "Impostazioni di aggiornamento",
 
   // "person.page.orcid.sync-profile.affiliation": "Affiliation",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.affiliation": "Affiliazione",
 
   // "person.page.orcid.sync-profile.biographical": "Biographical data",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.biographical": "Riferimenti biografici",
 
   // "person.page.orcid.sync-profile.education": "Education",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.education": "Educazione",
 
   // "person.page.orcid.sync-profile.identifiers": "Identifiers",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.identifiers": "Identificativi",
 
   // "person.page.orcid.sync-fundings.all": "All fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.all": "Tutti i finanziamenti",
 
   // "person.page.orcid.sync-fundings.mine": "My fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.mine": "I miei finanziamenti",
 
   // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.my_selected": "Finanziamenti selezionati",
 
   // "person.page.orcid.sync-fundings.disabled": "Disabled",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.disabled": "Disabilitato",
 
   // "person.page.orcid.sync-publications.all": "All publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.all": "Tutte le pubblicazioni",
 
   // "person.page.orcid.sync-publications.mine": "My publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.mine": "Le mie pubblicazioni",
 
   // "person.page.orcid.sync-publications.my_selected": "Selected publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.my_selected": "Pubblicazioni selezionate",
 
   // "person.page.orcid.sync-publications.disabled": "Disabled",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.disabled": "Disabilitato",
 
   // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.discard": "Scarta la modifica e non sincronizzarla con il registro ORCID.",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -8023,15 +7571,12 @@
   "person.page.orcid.sync-queue.empty-message": "Il Registro di sistema della coda ORCID è vuoto",
 
   // "person.page.orcid.sync-queue.table.header.type": "Type",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
   // "person.page.orcid.sync-queue.table.header.description": "Description",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.description": "Descrizione",
 
   // "person.page.orcid.sync-queue.table.header.action": "Action",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.action": "Azione",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -8098,7 +7643,6 @@
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL ricercatore",
 
   // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send": "Sincronizza con il registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -8135,7 +7679,6 @@
   "person.page.orcid.sync-queue.send.validation-error.title.required": "Il titolo è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.type.required": "Il tipo è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
@@ -8154,7 +7697,6 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Il nome dell'organizzazione è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La data di pubblicazione deve partire dal 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
@@ -8164,7 +7706,6 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "L'indirizzo dell'organizzazione da inviare richiede una città",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "L'indirizzo dell'organizzazione da inviare richiede un paese (inserire 2 cifre secondo l'ISO 3166)",
 
   // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
@@ -8189,8 +7730,7 @@
   "person.page.orcid.synchronization-mode.label": "Sincronizzazione",
 
   // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
-  // TODO Source message changed - Revise the translation
-  "person.page.orcid.synchronization-mode-message": "Abilitare la modalità di sincronizzazione \"manuale\" per disabilitare la sincronizzazione batch in modo da dover inviare manualmente i dati al Registro ORCID",
+  "person.page.orcid.synchronization-mode-message": "Selezionare la modalità di sincronizzazione con ORCID. Le opzioni includono 'Manuale' (sarà necessario inviare i dati a ORCID manualmente) o 'Batch' (il sistema invierà i dati a ORCID tramite uno script programmato).",
 
   // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
   "person.page.orcid.synchronization-mode-funding-message": "Scegli se sincronizzare i tuoi Progetti con la lista delle informazioni dei progetti sul profilo ORCID.",
@@ -8237,107 +7777,80 @@
   // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorizzazioni ORCID",
   // "home.recent-submissions.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Immissioni recenti",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
-  // TODO New key - Add a translation
-  "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Questo oggetto non può essere recuperato",
 
 
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Qualcosa è andato storto nel recupero del banner di allarme di sistema",
 
   // "system-wide-alert-banner.countdown.prefix": "In",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Tra",
 
   // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} giorni,",
 
   // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} ore e",
 
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
-
-
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuti:",
 
   // "menu.section.system-wide-alert": "System-wide Alert",
-  // TODO New key - Add a translation
-  "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Allarme di sistema",
 
   // "system-wide-alert.form.header": "System-wide Alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Allarme di sistema",
 
   // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Qualcosa è andato storto nel recupero dell'allarme di sistema",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Annulla",
 
   // "system-wide-alert.form.save": "Save",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Salva",
 
   // "system-wide-alert.form.label.active": "ACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ATTIVO",
 
   // "system-wide-alert.form.label.inactive": "INACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "DISATTIVO",
 
   // "system-wide-alert.form.error.message": "The system wide alert must have a message",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "L'allarme di sistema deve avere un messaggio",
 
   // "system-wide-alert.form.label.message": "Alert message",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Messaggio di allarme",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Attiva un conto alla rovescia",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Suggerimento: Imposta un conto alla rovescia. Se abilitato, è possibile impostare una data futura e il banner di allarme di sistema eseguirà un conto alla rovescia fino alla data impostata. Quando il timer terminerà, l'avviso scomparirà. Il server NON verrà arrestato automaticamente.",
 
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Anteprima dell'allarme di sistema",
 
   // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "L'allarme di sistema è stato aggiornato con successo",
 
   // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Qualcosa è andato storto durante l'aggiornamento dell'allarme di sistema",
 
   // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "L'allarme di sistema è stato creato con successo",
 
   // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Qualcosa è andato storto nella creazione dell'allarme di sistema",
 
   // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
-  // TODO New key - Add a translation
-  "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema",
 
   // "admin.system-wide-alert.title": "System-wide Alerts",
-  // TODO New key - Add a translation
-  "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Allarmi di sistema",
 
 
 }
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index 94dfc9aa98..c74c8636c7 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -878,7 +878,408 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   // TODO New key - Add a translation
@@ -3878,6 +4279,18 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
@@ -3980,6 +4393,10 @@
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
@@ -4113,6 +4530,9 @@
   "menu.section.statistics_task": "Statistics Task",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
@@ -4276,25 +4696,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 354eb1104a..d6ec02437c 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -748,6 +748,411 @@
 
 
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Әкімшілік іздеу",
 
@@ -3809,6 +4214,18 @@
   "menu.section.access_control_people": "Адамдар",
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Әкімші іздеу",
@@ -3889,6 +4306,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Қатынасты басқару мәзірі бөлімі",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Әкімші іздеу мәзірі бөлімі",
 
@@ -4001,6 +4422,9 @@
   "menu.section.statistics_task": "Статистика тапсырмасы",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Қатынасты басқару бөлімін ауыстырып-қосқыш",
@@ -4139,20 +4563,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Сіздің өтініштеріңіз",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Мұрағатталған",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Мұрағатталған",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Валидация",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Валидация",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Контроллерді күтуде",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Контроллерді күтуде",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Жұмыс барысы",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Жұмыс барысы",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Жұмыс кеңістігі",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Жұмыс кеңістігі",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 9b4058a3e6..f5fb47777d 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -703,6 +703,409 @@
 
 
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Administratīvā Meklēšana",
 
@@ -3179,7 +3582,17 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Personas",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Administratora Meklēšana",
@@ -3260,6 +3673,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Piekļuves kontroles izvēlnes sadaļa",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Administratoru meklēšanas izvēlnes sadaļa",
 
@@ -3365,6 +3782,9 @@
   "menu.section.statistics_task": "Statistikas Uzdevumi",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Pārslēgt Piekļuvas Kontronles sadaļu",
@@ -3492,20 +3912,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Jūsu Iesniegumi",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arhivēts",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arhivēts",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validācija",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validācija",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Gaida kontrolieri",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Gaida kontrolieri",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Darba plūsma",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Darba plūsma",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Darbavieta",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Darbavieta",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mans DSpace",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index 520a8ca427..6c8403b972 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -798,7 +798,408 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   // TODO New key - Add a translation
@@ -3450,6 +3851,15 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Verslagen",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Gefilterde collecties",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Metagegevensquery",
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
@@ -3530,6 +3940,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Menusectie toegangscontrole",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
@@ -3637,6 +4051,9 @@
   "menu.section.statistics_task": "Statistiektaken",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Sectie Toegangscontrole aan/uit",
@@ -3764,20 +4181,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Uw Submissions",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Opgeslagen",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Opgeslagen",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validatie",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validatie",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Wachten op controlleur",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Wachten op controlleur",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index d748b94888..951389e1e5 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -57,7 +57,7 @@
   "admin.registries.bitstream-formats.table.supportLevel.head": "Obsługiwany format",
   "admin.registries.bitstream-formats.title": "Rejestr formatów plików",
   "admin.registries.metadata.breadcrumbs": "Rejestr metadanych",
-  "admin.registries.metadata.description": "W rejestrze metadanych przechowywana jest lista wszystkich pól metadanych dostępnych w repozytorium. Przechowywane pola są  przechowywane w kilku rejestrach. DSpace wymaga kwalifikowanego rejestru metadanych Dublin Core.",
+  "admin.registries.metadata.description": "W rejestrze metadanych przechowywana jest lista wszystkich pól metadanych dostępnych w repozytorium. Przechowywane pola są przechowywane w kilku rejestrach. DSpace wymaga kwalifikowanego rejestru metadanych Dublin Core.",
   "admin.registries.metadata.form.create": "Utwórz schemat metadanych",
   "admin.registries.metadata.form.edit": "Edytuj schemat metadanych",
   "admin.registries.metadata.form.name": "Nazwa",
@@ -228,6 +228,410 @@
   "admin.access-control.groups.form.subgroups-list.no-items": "Nie znaleziono grup z tą nazwą lub UUID",
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Brak podgrup w grupie.",
   "admin.access-control.groups.form.return": "Powrót",
+
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   "admin.search.breadcrumbs": "Wyszukiwanie administracyjne",
   "admin.search.collection.edit": "Edytuj",
   "admin.search.community.edit": "Edytuj",
@@ -885,7 +1289,7 @@
   "item.edit.tabs.curate.head": "Administruj",
   "item.edit.tabs.curate.title": "Edytowanie pozycji - administruj",
   "item.edit.tabs.metadata.head": "Metadane",
-  "item.edit.tabs.metadata.title": "Edycja pozycji -  metadane",
+  "item.edit.tabs.metadata.title": "Edycja pozycji - metadane",
   "item.edit.tabs.relationships.head": "Relacje",
   "item.edit.tabs.relationships.title": "Edycja pozycja - relacje",
   "item.edit.tabs.status.buttons.authorizations.button": "Dostępy...",
@@ -911,12 +1315,12 @@
   "item.edit.tabs.status.labels.id": "ID pozycji",
   "item.edit.tabs.status.labels.itemPage": "Strona pozycji",
   "item.edit.tabs.status.labels.lastModified": "Ostatnia modyfikacja",
-  "item.edit.tabs.status.title": "Edycja pozycji -  Status",
+  "item.edit.tabs.status.title": "Edycja pozycji - Status",
   "item.edit.tabs.versionhistory.head": "Historia wersji",
   "item.edit.tabs.versionhistory.title": "Edycja pozycji - historia wersji",
   "item.edit.tabs.versionhistory.under-construction": "Edytowanie lub dodawanie nowych wersji jest niedostępne w tego poziomu interfejsu.",
   "item.edit.tabs.view.head": "Widok pozycji",
-  "item.edit.tabs.view.title": "Edycja pozycji -  widok",
+  "item.edit.tabs.view.title": "Edycja pozycji - widok",
   "item.edit.withdraw.cancel": "Anuluj",
   "item.edit.withdraw.confirm": "Wycofaj",
   "item.edit.withdraw.description": "Czy na pewno chcesz wycofać pozycję?",
@@ -1112,6 +1516,19 @@
   "menu.section.access_control_authorizations": "Dostępy",
   "menu.section.access_control_groups": "Grupy",
   "menu.section.access_control_people": "Użytkownicy",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   "menu.section.admin_search": "Wyszukiwanie administracyjne",
   "menu.section.browse_community": "Ten zbiór",
   "menu.section.browse_community_by_author": "Wg autorów",
@@ -1135,6 +1552,11 @@
   "menu.section.export_item": "Pozycja",
   "menu.section.export_metadata": "Metadane",
   "menu.section.icon.access_control": "Sekcja menu Uprawnienia",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   "menu.section.icon.admin_search": "Sekcja menu Wyszukiwanie administracyjne",
   "menu.section.icon.control_panel": "Sekcja menu Panel sterowania",
   "menu.section.icon.curation_tasks": "Sekcja menu Zadanie administracyjne",
@@ -1167,6 +1589,11 @@
   "menu.section.statistics": "Statystyki",
   "menu.section.statistics_task": "Zadanie statystyczne",
   "menu.section.toggle.access_control": "Przełącz sekcję Uprawnienia",
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   "menu.section.toggle.control_panel": "Przełącz sekcję Panel sterowania",
   "menu.section.toggle.curation_task": "Przełącz sekcję Zadanie kuratora",
   "menu.section.toggle.edit": "Przełącz sekcję Edytuj",
@@ -1207,11 +1634,11 @@
   "mydspace.search-form.placeholder": "Wyszukaj w mydspace...",
   "mydspace.show.workflow": "Wszystkie zadania",
   "mydspace.show.workspace": "Twoje zadania",
-  "mydspace.status.archived": "Zarchiwizowano",
-  "mydspace.status.validation": "Walidacja",
-  "mydspace.status.waiting-for-controller": "Oczekiwanie na redaktora",
-  "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workspace": "Wersja robocza",
+  "mydspace.status.mydspaceArchived": "Zarchiwizowano",
+  "mydspace.status.mydspaceValidation": "Walidacja",
+  "mydspace.status.mydspaceWaitingController": "Oczekiwanie na redaktora",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkspace": "Wersja robocza",
   "mydspace.title": "Mój DSpace",
   "mydspace.upload.upload-failed": "Bład podczas tworzenia nowej wersji roboczej. Sprawdź poprawność plików i spróbuj ponownie.",
   "mydspace.upload.upload-failed-manyentries": "Plik jest niemożliwy do przetworzenia. Wykryto wiele wejść, a dopuszczalne jest tylko jedno dla jednego pliku.",
@@ -1953,7 +2380,7 @@
   "submission.submit.breadcrumbs": "Nowe zgłoszenie",
   "submission.submit.title": "Nowe zgłoszenie",
   "submission.workflow.generic.delete": "Usuń",
-  "submission.workflow.generic.delete-help": "Jeśli chcesz odrzucić tę pozycję, wybierz \"Delete\".  Będzie wymagane potwierdzenie tej decyzji.",
+  "submission.workflow.generic.delete-help": "Jeśli chcesz odrzucić tę pozycję, wybierz \"Delete\". Będzie wymagane potwierdzenie tej decyzji.",
   "submission.workflow.generic.edit": "Edytuj",
   "submission.workflow.generic.edit-help": "Wybierz tę opcję, aby zmienić metadane pozycji.",
   "submission.workflow.generic.view": "Podgląd",
@@ -1967,7 +2394,7 @@
   "submission.workflow.tasks.claimed.reject.reason.submit": "Odrzuć pozycję",
   "submission.workflow.tasks.claimed.reject.reason.title": "Powód",
   "submission.workflow.tasks.claimed.reject.submit": "Odrzuć",
-  "submission.workflow.tasks.claimed.reject_help": "Jeśli po przejrzeniu pozycji stwierdzono, że nie nadaje się ona do włączenia do kolekcji, wybierz opcję \"Reject\".  Zostaniesz wtedy poproszony o określenie powodu odrzucenia, i wskazanie czy zgłaszający powinien wprowadzić zmiany i przesłać ponownie pozycję.",
+  "submission.workflow.tasks.claimed.reject_help": "Jeśli po przejrzeniu pozycji stwierdzono, że nie nadaje się ona do włączenia do kolekcji, wybierz opcję \"Reject\". Zostaniesz wtedy poproszony o określenie powodu odrzucenia, i wskazanie czy zgłaszający powinien wprowadzić zmiany i przesłać ponownie pozycję.",
   "submission.workflow.tasks.claimed.return": "Cofnij do puli zadań",
   "submission.workflow.tasks.claimed.return_help": "Cofnij zadanie do puli, aby inny użytkownik mógł się go podjąć.",
   "submission.workflow.tasks.generic.error": "Podczas działania wystąpił błąd...",
@@ -2296,4 +2723,326 @@
   "submission.sections.license.required": "Najpierw musisz zaakceptować licencję",
   "confirmation-modal.export-batch.confirm": "Eksportuj",
   "confirmation-modal.export-batch.cancel": "Anuluj",
+  "admin.access-control.bulk-access.breadcrumbs": "Zbiorcza edycja dostępu do osiągnięć",
+  "administrativeBulkAccess.search.results.head": "Wyniki wyszukiwania",
+  "admin.access-control.bulk-access": "Zbiorcza edycja dostępu do osiągnięć",
+  "admin.access-control.bulk-access.title": "Zbiorcza edycja dostępu do osiągnięć",
+  "admin.access-control.bulk-access-browse.header": "Krok 1: Wybierz pozycje",
+  "admin.access-control.bulk-access-browse.search.header": "Wyszukaj",
+  "admin.access-control.bulk-access-browse.selected.header": "Obecny wybór({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Krok 2: Działanie do wykonania",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na tej stronie można edytować opcje grupy i przypisane do niej osoby. W górnej sekcji można edytować nazwę i opis grupy, chyba że jest to grupa administratorów dla zbioru i kolekcji. W tym przypadku nazwa i opis grupy są generowane automatycznie i nie można ich edytować. W kolejnych sekcjach można edytować przypisanie użytkowników do grupy. Szczegóły na [stronie](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Aby dodać lub usunąć użytkownika do/z tej grupy, kliknij przycisk 'Przeglądaj wszystko' lub użyj paska wyszukiwania poniżej, aby wyszukać użytkowników (użyj listy rozwijanej po lewej stronie paska wyszukiwania, aby wybrać, czy chcesz wyszukiwać według imienia i nazwiska, czy według adresu e-mail). Następnie kliknij ikonę plusa przy każdym użytkowniku, którego chcesz dodać do poniższej listy, lub ikonę kosza przy każdym użytkowniku, którego chcesz usunąć. Poniższa lista może mieć kilka stron: użyj strzałek pod listą, aby przejść do kolejnych stron. Gdy wszystkie zmiany zostaną wprowadzone, zapisz je, klikając przycisk 'Zapisz' w górnej sekcji.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Aby dodać lub usunąć podgrupę do/z tej grupy, kliknij przycisk 'Przeglądaj wszystko' lub użyj wyszukiwarki poniżej, aby wyszukać użytkowników. Następnie kliknij ikonę plusa przy każdym użytkowniku, którego chcesz dodać do poniższej listy, lub ikonę kosza przy każdym użytkowniku, którego chcesz usunąć. Poniższa lista może składać się z kilku stron: użyj przycisków pod listą, aby przejść do kolejnych stron. Gdy wszystkie zmiany zostaną wprowadzone, zapisz je, klikając przycisk 'Zapisz' w górnej sekcji.",
+  "admin.workflow.item.workspace": "Przestrzeń robocza",
+  "admin.workflow.item.policies": "Polityki",
+  "admin.workflow.item.supervision": "Recenzja",
+  "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.metadata-import.page.error.addFileUrl": "Najpierw wpisz URL pliku!",
+  "admin.metadata-import.page.toggle.upload": "Prześlij",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Wpisz URL pliku ZIP, aby wykonać import masowy",
+  "advanced-workflow-action.rating.form.rating.label": "Ocena",
+  "advanced-workflow-action.rating.form.rating.error": "Ta pozycja musi zostać oceniona",
+  "advanced-workflow-action.rating.form.review.label": "Recenzja",
+  "advanced-workflow-action.rating.form.review.error": "Musisz wpisać tekst recenzji",
+  "advanced-workflow-action.rating.description": "Wybierz ocenę poniżej",
+  "advanced-workflow-action.rating.description-requiredDescription": "Wybierz ocenę poniżej i wpisz uzasadnienie",
+  "advanced-workflow-action.select-reviewer.description-single": "Wybierz recenzenta przed zdeponowaniem pozycji",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Wybierz jednego lub więcej recenzentów przed zdeponowaniem pozycji",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Użytkownicy",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Dodaj użytkownika",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Przeglądaj wszystko",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktualni użytkownicy",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadane",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Adres e-mail (dokładny)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Wyszukaj",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nazwa",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Tożsamość",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Adres e-mail",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Usuń / Dodaj",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Usuń użytkownika z nazwę \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Dodano użytkownika o nazwie: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Nie dodano użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Usunięto użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Nie usunięto użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Dodano użytkownika \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Brak aktywnej grupy, najpierw wpisz nazwę.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "W tej grupie nie ma użytkowników, wyszukaj ich i dodaj.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nie znaleziono żadnych użytkowników",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Recenzent nie jest wybrany.",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Wystąpił błąd podczas zapisu pliku.",
+  "browse.comcol.by.srsc": "Wg słów kluczowych",
+  "browse.metadata.srsc.breadcrumbs": "Przeglądaj wg słów kluczowych",
+  "browse.startsWith.input": "Filtr",
+  "browse.taxonomy.button": "Przeglądaj",
+  "search.browse.item-back": "Powrót do wyników wyszukiwania",
+  "claimed-approved-search-result-list-element.title": "Zaakceptowano",
+  "claimed-declined-search-result-list-element.title": "Odrzucono i przesłano do deponującego",
+  "claimed-declined-task-search-result-list-element.title": "Odrzucono i przesłano do recenzenta",
+  "collection.edit.tabs.access-control.head": "Dostępy",
+  "collection.edit.tabs.access-control.title": "Edycja kolekcji - dostępy",
+  "collection.listelement.badge": "Kolekcja",
+  "community.edit.tabs.access-control.head": "Dostępy",
+  "community.edit.tabs.access-control.title": "Edycja zbioru - dostępy",
+  "comcol-role.edit.scorereviewers.name": "Ocena recenzenta",
+  "comcol-role.edit.scorereviewers.description": "Recenzenci mogą oceniać zdeponowane pozycje, co określi, czy pozycja zostanie przyjęta lub odrzucona.",
+  "curation-task.task.register-doi.label": "Rejestracja DOI",
+  "dso.name.unnamed": "Bez nazwy",
+  "dso-selector.create.community.or-divider": "lub",
+  "dso-selector.set-scope.community.or-divider": "lub",
+  "dso-selector.results-could-not-be-retrieved": "Wystąpił błąd, proszę odświeżyć stronę",
+  "supervision-group-selector.header": "Wybór grupy recenzenckiej",
+  "supervision-group-selector.select.type-of-order.label": "Wybierz typ funkcji",
+  "supervision-group-selector.select.type-of-order.option.none": "BRAK",
+  "supervision-group-selector.select.type-of-order.option.editor": "REDAKTOR",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERWATOR",
+  "supervision-group-selector.select.group.label": "Wybierz grupę",
+  "supervision-group-selector.button.cancel": "Anuluj",
+  "supervision-group-selector.button.save": "Zapisz",
+  "supervision-group-selector.select.type-of-order.error": "Wybierz typ funkcji",
+  "supervision-group-selector.select.group.error": "Wybierz grupę",
+  "supervision-group-selector.notification.create.success.title": "Grupa recenzencka został dodana dla grupy {{ name }}",
+  "supervision-group-selector.notification.create.failure.title": "Błąd",
+  "supervision-group-selector.notification.create.already-existing": "Funkcja recenzenta już jest przypisana do tej grupy",
+  "confirmation-modal.delete-subscription.header": "Usuń subksrypcje",
+  "confirmation-modal.delete-subscription.info": "Czy na pewno chcesz usunąć subskrypcję: \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Anuluj",
+  "confirmation-modal.delete-subscription.confirm": "Usuń",
+  "error.validation.metadata.name.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji. Zamiast tego This field cannot contain dots, commas or spaces. Zamiast tego może użyć pól z notacji SNEQ",
+  "error.validation.metadata.name.max-length": "To pole nie może zawierać więcej niż 32 znaki",
+  "error.validation.metadata.namespace.max-length": "To pole nie może zawierać więcej niż 256 znaków",
+  "error.validation.metadata.element.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji. Zamiast tego This field cannot contain dots, commas or spaces. Zamiast tego może użyć pól z notacji SNEQ",
+  "error.validation.metadata.element.max-length": "To pole nie może zawierać więcej niż 64 znaki",
+  "error.validation.metadata.qualifier.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji",
+  "error.validation.metadata.qualifier.max-length": "To pole nie może zawierać więcej niż 64 znaki",
+  "forgot-email.form.email.error.not-email-form": "Wpisz prawidłowy adres e-mail",
+  "form.other-information.email": "Adres e-mail",
+  "form.other-information.first-name": "Imię",
+  "form.other-information.insolr": "Solr Index",
+  "form.other-information.institution": "Instytucja",
+  "form.other-information.last-name": "Nazwisko",
+  "form.other-information.orcid": "ORCID",
+  "form.create": "Utwórz",
+  "info.end-user-agreement.hosting-country": "Stany Zjednoczone",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Nieznane",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "W kolejce do rejestracji",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "W kolejce do rezerwacji",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Zarejestrowane",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Zarezerwowane",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Zarezerwowane (aktualizacja w kolejce)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Zarejestrowane (aktualizacja w kolejce)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "W kolejce do aktualizacji i rejestracji",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Zakolejkowane do usunięcia",
+  "item.edit.identifiers.doi.status.DELETED": "Usunięte",
+  "item.edit.identifiers.doi.status.PENDING": "Oczekujące (niezarejestrowane)",
+  "item.edit.identifiers.doi.status.MINTED": "Rezerwowanie nazwy (niezarejestrowane)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Zarejestruj nowe lub oczekujące DOI",
+  "item.edit.tabs.status.buttons.register-doi.button": "Rejestruj DOI...",
+  "item.edit.register-doi.header": "Zarejestruj nowe lub oczekujące DOI",
+  "item.edit.register-doi.description": "Zweryfikuj poniższe identyfikatory i metadane pozycji i rozpocznij rejestrację DOI lub anuluj",
+  "item.edit.register-doi.confirm": "Zatwierdź",
+  "item.edit.register-doi.cancel": "Anuluj",
+  "item.edit.register-doi.success": "DOI jest w kolejce do rejestracji.",
+  "item.edit.register-doi.error": "Wystąpił błąd poczas rejestracji DOI",
+  "item.edit.register-doi.to-update": "To DOI zostało zarezerwowane i będzie znajdować się w kolejce do rejestracji",
+  "item.edit.metadata.edit.buttons.confirm": "Zatwierdź",
+  "item.edit.metadata.edit.buttons.drag": "Przeciągnij, aby zmienić kolejność",
+  "item.edit.metadata.edit.buttons.virtual": "To pole przechowuje wirutalne wartości metadanych, np. wartość pobraną z encji, z którą jest połączona ta pozycja. Dodaj lub usuń relację w zakładce 'Relacje' ",
+  "item.edit.metadata.metadatafield.error": "Wystąpił błąd podczas walidcji pól metadanych",
+  "item.edit.metadata.reset-order-button": "Cofnij zamianę kolejności",
+  "item.edit.curate.title": "Zarządzaj pozycją: {{item}}",
+  "item.edit.tabs.access-control.head": "Dostęp",
+  "item.edit.tabs.access-control.title": "Edycja pozycji - dostęp",
+  "workflow-item.search.result.delete-supervision.modal.header": "Usuń zadanie dla recenzenta",
+  "workflow-item.search.result.delete-supervision.modal.info": "Czy na pewno usunąć zadanie dla recenzenta",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Anuluj",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Usuń",
+  "workflow-item.search.result.notification.deleted.success": "Usunięto zadanie dla recenzenta \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Nie usunięto zadania dla recenzenta \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Recenzja:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Usuń grupę recenzencką",
+  "item.preview.dc.subject": "Słowo kluczowe:",
+  "item.preview.dc.publisher": "Wydawca:",
+  "itemtemplate.edit.metadata.add-button": "Dodaj",
+  "itemtemplate.edit.metadata.discard-button": "Cofnij",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Zatwierdź",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Przeciągnij, aby zmienić kolejność",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Edytuj",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Usuń",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Cofnij zmiany",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Nie edytuj",
+  "itemtemplate.edit.metadata.empty": "To pozycja nie zawiera żadnych metadanych. Wybierz Dodaj, aby je wprowadzić.",
+  "itemtemplate.edit.metadata.headers.edit": "Edytuj",
+  "itemtemplate.edit.metadata.headers.field": "Pole",
+  "itemtemplate.edit.metadata.headers.language": "Język",
+  "itemtemplate.edit.metadata.headers.value": "Wartość",
+  "itemtemplate.edit.metadata.metadatafield.error": "Wystąpił błąd podczas walidowania pola metadanych",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Wybierz odpowiednie pole metadanych",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Twoje zmiany nie zostały zachowane. Aby spróbować wprowadzić je ponownie wybierz Cofnij",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Zmiany nie zostały zachowane",
+  "itemtemplate.edit.metadata.notifications.error.title": "Wystąpił błąd",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Twoje zmiany nie zostały zapisane. Upewnij się, że wszystkie pola zostały wypełnione prawidłowo.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Nieprawidłowe metadan",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Wzór dla pozycji, na którą w tym momencie pracujesz, został zmodyfikowany przez innego użytkownika. Twoje zmiany zostały odrzucone, aby uniknąć konfliktów pomiędzy wersjami.",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Zmiany zostały odrzucone",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Zmiany w metadanych wzoru pozycji zostały zapisane.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadane zostały zapisane",
+  "itemtemplate.edit.metadata.reinstate-button": "Cofnij",
+  "itemtemplate.edit.metadata.reset-order-button": "Cofnij zmianę kolejności",
+  "itemtemplate.edit.metadata.save-button": "Zapisz",
+  "menu.section.access_control_bulk": "Zbiorowe zarządzanie dostępem",
+  "menu.section.browse_global_by_srsc": "Wg słów kluczowych",
+  "mydspace.show.supervisedWorkspace": "Pozycje recenzowane",
+  "mydspace.status.mydspaceArchived": "Opublikowano",
+  "mydspace.status.mydspaceValidation": "Walidacja",
+  "mydspace.status.mydspaceWaitingController": "Oczekiwanie na redakctora",
+  "mydspace.status.mydspaceWorkflow": "Redakcja",
+  "mydspace.status.mydspaceWorkspace": "Przestrzeń robocza",
+  "nav.context-help-toggle": "Przełącz pomoc kontekstową",
+  "nav.search.button": "Wpisz wyszukiwaną frazę",
+  "nav.subscriptions": "Subksrypcje",
+  "process.new.notification.error.max-upload.content": "Plik jest większy niż maksymalny dozwolony rozmiar pliku",
+  "register-page.registration.email.error.not-email-form": "Wprowadź poprawny adres e-mail",
+  "register-page.registration.email.error.not-valid-domain": "Użyj adresu e-mail z domeny: {{ domains }}",
+  "register-page.registration.error.maildomain": "Tego adresu e-mail nie możesz zarejestrować, ponieważ nie ma go na liście domen. Dozwolone domeny to: {{ domains }}",
+  "register-page.registration.info.maildomain": "Konta mogą być założone dla adresów e-mail z domeną",
+  "repository.title": "Repozytorium DSpace",
+  "search.filters.applied.f.supervisedBy": "Recenzent",
+  "search.filters.filter.show-tree": "Przeglądaj {{ name }} strukturę recenzentów",
+  "search.filters.filter.supervisedBy.head": "Recenzent",
+  "search.filters.filter.supervisedBy.placeholder": "Recenzent",
+  "search.filters.filter.supervisedBy.label": "Wyszukaj recenzenta",
+  "statistics.table.no-name": "(nazwa obiektu nie może zostać załadowana)",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikacje autora",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikacje",
+  "submission.sections.identifiers.info": "Te identyfikatory zostaną utworzone dla pozycji:",
+  "submission.sections.identifiers.no_handle": "Do tej pozycji nie zostały przypisane żadne Handle",
+  "submission.sections.identifiers.no_doi": "Do tej pozycji nie zostały przypisane żadne DOI",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Inne identyfikatory: ",
+  "submission.sections.submit.progressbar.identifiers": "Identyfikatory",
+  "submission.workflow.generic.submit_select_reviewer": "Wybierz recenzenta",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_score": "Wynik",
+  "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.tasks.claimed.decline": "Odrzuć",
+  "submission.workflow.tasks.claimed.decline_help": "",
+  "submitter.empty": "n.d.",
+  "subscriptions.title": "Subskrypcje",
+  "subscriptions.item": "Subskrypcje pozycji",
+  "subscriptions.collection": "Subskrypcje kolekcji",
+  "subscriptions.community": "Subskrypcje zbiorów",
+  "subscriptions.subscription_type": "Typ subksrypcji",
+  "subscriptions.frequency": "Częstotliwość subskrypcji",
+  "subscriptions.frequency.D": "Codziennie",
+  "subscriptions.frequency.M": "Co miesiąc",
+  "subscriptions.frequency.W": "Co tydzień",
+  "subscriptions.tooltip": "Subskrybuj",
+  "subscriptions.modal.title": "Subksrypcje",
+  "subscriptions.modal.type-frequency": "Rodzaj i częstotliwość subksrypcji",
+  "subscriptions.modal.close": "Zamknij",
+  "subscriptions.modal.delete-info": "Aby usunąć tę subksrypcję przejdź do strony 'Subskrypcje', która znajduje się w profilu użytkownika",
+  "subscriptions.modal.new-subscription-form.type.content": "Zawartość",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Codziennie",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Co tydzień",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Co miesiąc",
+  "subscriptions.modal.new-subscription-form.submit": "Zapisz",
+  "subscriptions.modal.new-subscription-form.processing": "Ładowanie...",
+  "subscriptions.modal.create.success": "Zasubskrybowano {{ type }}",
+  "subscriptions.modal.delete.success": "Subskrypcja została anulowana",
+  "subscriptions.modal.update.success": "Twoja subskrypcja {{ type }} została zaktualizowana",
+  "subscriptions.modal.create.error": "Wystąpił bład podczas tworzenia subskrypcji",
+  "subscriptions.modal.delete.error": "Wystąpił bład podczas usuwania subskrypcji",
+  "subscriptions.modal.update.error": "Wystąpił bład podczas aktualizacji subskrypcji",
+  "subscriptions.table.dso": "Słowo kluczowe",
+  "subscriptions.table.subscription_type": "Typ subskrypcji",
+  "subscriptions.table.subscription_frequency": "Częstotliwość subskrypcji",
+  "subscriptions.table.action": "Akcja",
+  "subscriptions.table.edit": "Edytuj",
+  "subscriptions.table.delete": "Usuń",
+  "subscriptions.table.not-available": "Niedostępne",
+  "subscriptions.table.not-available-message": "Ta pozycja została usunięta lun nie masz do niej dostępu, aby ją wyswietlić",
+  "subscriptions.table.empty.message": "Ta pozycja nie ma w tym momencie żadnych subksrypcji. Aby zasubkrybować i otrzymywać aktualizacje o tym zbiorze lub kolekcji, wybierz przycisk subskrypcji na stronie pozycji.",
+  "vocabulary-treeview.info": "Wybierz słowo kluczowe, aby dodać je do filtra",
+  "supervisedWorkspace.search.results.head": "Pozycje recenzowane",
+  "supervision.search.results.head": "Status zadań: Szkic i redakcja",
+  "workspace-item.delete.breadcrumbs": "Usunięto wersję roboczą",
+  "workspace-item.delete.header": "Usuń wersję roboczą",
+  "workspace-item.delete.button.confirm": "Usuń",
+  "workspace-item.delete.button.cancel": "Anuluj",
+  "workspace-item.delete.notification.success.title": "Usunięto",
+  "workspace-item.delete.title": "Wersja robocza została usunieta",
+  "workspace-item.delete.notification.error.title": "Coś poszło nie tak",
+  "workspace-item.delete.notification.error.content": "Wersja robocza nie może zostać usunieta",
+  "workflow-item.advanced.title": "Zaawansowane workflow",
+  "workflow-item.selectrevieweraction.notification.success.title": "Wybrany recenzent",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent został przypisany",
+  "workflow-item.selectrevieweraction.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nie udało się wybrać recenzenta dla pozycji",
+  "workflow-item.selectrevieweraction.title": "Wybierz recenzenta",
+  "workflow-item.selectrevieweraction.header": "Wybierz recenzenta",
+  "workflow-item.selectrevieweraction.button.cancel": "Anuluj",
+  "workflow-item.selectrevieweraction.button.confirm": "Zatwierdź",
+  "workflow-item.scorereviewaction.notification.success.title": "Ocena recenzji",
+  "workflow-item.scorereviewaction.notification.success.content": "Ocena tej pozycji została zapisana",
+  "workflow-item.scorereviewaction.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.scorereviewaction.notification.error.content": "Nie można ocenić tej pozycji",
+  "workflow-item.scorereviewaction.title": "Oceń pozycję",
+  "workflow-item.scorereviewaction.header": "Oceń pozycję",
+  "workflow-item.scorereviewaction.button.cancel": "Anuluj",
+  "workflow-item.scorereviewaction.button.confirm": "Potwierdź",
+  "listable-notification-object.default-message": "Ta pozycja nie może być odzyskana",
+  "system-wide-alert-banner.retrieval.error": "Coś poszło nie tak podczas odzyskiwania alertu systemowego",
+  "system-wide-alert-banner.countdown.prefix": "W",
+  "system-wide-alert-banner.countdown.days": "{{days}} dni,",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} godziny",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut:",
+  "menu.section.system-wide-alert": "Alert systemowy",
+  "system-wide-alert.form.header": "Alert systemowy",
+  "system-wide-alert-form.retrieval.error": "Coś poszło nie tak podczas odzyskiwania alertu systemowego",
+  "system-wide-alert.form.cancel": "Anuluj",
+  "system-wide-alert.form.save": "Zapisz",
+  "system-wide-alert.form.label.active": "AKTYWNE",
+  "system-wide-alert.form.label.inactive": "NIEAKTYWNE",
+  "system-wide-alert.form.error.message": "Alert systemowy musi zawierać wiadomość",
+  "system-wide-alert.form.label.message": "Alert systemowy",
+  "system-wide-alert.form.label.countdownTo.enable": "Wprowadź licznik czasowy",
+  "system-wide-alert.form.label.countdownTo.hint": "Wskazówka: Wpisz wartość licznika czasu. Kiedy licznik jest włączony, alert systemowy zostanie wyświetlony o wybranym czasie. Kiedy odliczanie zostanie zakończone, alert systemowy zostanie wyłączony. Serwer NIE zostanie zatrzymany automatycznie.",
+  "system-wide-alert.form.label.preview": "Podgląd alertu systemowego",
+  "system-wide-alert.form.update.success": "Alert systemowy został zaktualizowany",
+  "system-wide-alert.form.update.error": "Coś poszło nie tak podczas aktualizacji alertu systemowego",
+  "system-wide-alert.form.create.success": "Alert systemowy został utworzony",
+  "system-wide-alert.form.create.error": "Coś poszło nie tak podczas tworzenia alertu systemowego",
+  "admin.system-wide-alert.breadcrumbs": "Alerty systemowe",
+  "admin.system-wide-alert.title": "Alerty systemowe",
+  "item-access-control-title": "Ta strona pozwala na zmianę dostępów metadanych pozycji i plików do nich dołączonych.",
+  "collection-access-control-title": "Ta strona pozwala na zmianę warunków dostępu dla wszystkich pozycji w tej kolekcji. Zmiany mogą być wykonywane zarówno na metadanych pozycji jak i plikach do nich dołączonych.",
+  "community-access-control-title": "Ta strona pozwala na zmianę warunków dostępu dla wszystkich pozycji w każdej kolekcji w tym zbiorze. Zmiany mogą być wykonywane zarówno na metadanych pozycji jak i plikach do nich dołączonych.",
+  "access-control-item-header-toggle": "Metadane pozycji",
+  "access-control-bitstream-header-toggle": "Pliki",
+  "access-control-mode": "Tryb",
+  "access-control-access-conditions": "Warunki dostępu",
+  "access-control-no-access-conditions-warning-message": "W tym momencie żadne warunki dostępu nie zostały określone. Jeśli zadanie zostanie rozpoczęte, obecne warunki dostępu zostaną zastąpione domyślnymi warunkami dostępu z nadrzędnej kolekcji.",
+  "access-control-replace-all": "Zastąp warunki dostępu",
+  "access-control-add-to-existing": "Dodaj do już istniejących",
+  "access-control-limit-to-specific": "Ogranicz zmiany do wybranych plików",
+  "access-control-process-all-bitstreams": "Zaktualizuj wszystkie pliki dla tej pozycji",
+  "access-control-bitstreams-selected": "wybrane pliki",
+  "access-control-cancel": "Anuluj",
+  "access-control-execute": "Wykonaj",
+  "access-control-add-more": "Dodaj więcej",
+  "access-control-select-bitstreams-modal.title": "Wybierz pliki",
+  "access-control-select-bitstreams-modal.no-items": "Brak pozycji do wyświetlenia.",
+  "access-control-select-bitstreams-modal.close": "Zamknij",
+  "access-control-option-label": "Typ warunków dostępu",
+  "access-control-option-note": "Wybierz warunki dostępu, które chcesz przypisać do zaznaczonych pozycji.",
+  "access-control-option-start-date": "Dostęp od",
+  "access-control-option-start-date-note": "Wybierz datę, kiedy wybrane warunki dostępu mają obowiązywać",
+  "access-control-option-end-date": "Dostęp do",
+  "access-control-option-end-date-note": "Wybierz datę, kiedy wybrane warunki dostępu mają obowiązywać",
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 25f1e0fb7c..157da4c8a2 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1,5 +1,4 @@
 {
-
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
   "401.help": "Você não tem autorização para acessar esta página. Clique no botão abaixo para ir à página inicial.",
 
@@ -27,7 +26,6 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Ir à página inicial",
 
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "Não encontramos a página que você procura. A página pode ter sido movida ou apagada. Você pode utilizar o botão abaixo para voltar à página inicial. ",
 
@@ -193,7 +191,7 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
 
-  // TODO New key - Add a translation
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -271,7 +269,7 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
-  // TODO New key - Add a translation
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -331,6 +329,30 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registro de Esquema de Metadados",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access.breadcrumbs": "Gerenciamento de acesso em massa",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results", (Auto-Translated)
+  "administrativeBulkAccess.search.results.head": "Resultados da Busca",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access": "Gerenciamento de acesso em massa",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access.title": "Gerenciamento de acesso em massa",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.header": "Etapa 1: Selecione objetos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.search.header": "Procurar",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.selected.header": "Seleção atual ({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform", (Auto-Translated)
+  "admin.access-control.bulk-access-settings.header": "Etapa 2: Operação para executar",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Apagar EPerson",
 
@@ -355,7 +377,6 @@
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Procurar",
 
-
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Pesquisar Todos",
 
@@ -419,7 +440,6 @@
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Pode entrar",
 
-
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Requer certificado",
 
@@ -450,7 +470,6 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Falha ao apagar EPerson \"{{name}}\"",
 
-
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro destes grupos:",
 
@@ -739,32 +758,417 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
-  //"admin.batch-import.breadcrumbs": "Import Batch",
-  "admin.batch-import.breadcrumbs": "Importar um Lote",
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
-  //"admin.batch-import.title": "Import Batch",
-  "admin.batch-import.title": "Importar um Lote",
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
 
-  //"admin.batch-import.page.header": "Import Batch",
-  "admin.batch-import.page.header": "Importar um Lote",
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
 
-  //"admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
-  "admin.batch-import.page.help": "Selecione a Coleção para o qual deseja importar. Arraste ou selecione um arquivo zip no formato Simple Archive Format (SAF) que inclua os Items para importar",
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
 
-  //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
-  "admin.batch-import.page.dropMsg": "Arraste e solte um lote ZIP para importar",
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
 
-  //"admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
-  "admin.batch-import.page.dropMsgReplace": "Arraste e solte um lote ZIP para substituir o lote para importar",
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
 
-  //"admin.batch-import.page.error.addFile": "Select Zip file first!",
-  "admin.batch-import.page.error.addFile": "Selecione um arquivo ZIP primeiro!",
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
 
-  //"admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
-  "admin.batch-import.page.validateOnly.hint": "Quando selecionado , o ZIP enviado sera validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
 
-  //"admin.batch-import.page.remove": "remove",
-  "admin.batch-import.page.remove": "remover",
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Nesta página, você pode modificar as propriedades e os membros de um grupo. Na seção superior, você pode editar o nome e a descrição do grupo, a menos que este seja um grupo de administração para uma coleção ou comunidade; nesse caso, o nome e a descrição do grupo são gerados automaticamente e não podem ser editados. Nas seções a seguir, você pode editar a associação ao grupo.Veja [o wiki] (https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) para obter mais detalhes.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para adicionar ou remover uma EPerson para/deste grupo, clique no botão 'Navegar por tudo' ou use a barra de pesquisa abaixo para pesquisar usuários (use o dropdown à esquerda da barra de pesquisa para escolher se deve pesquisar por metadados ou por e-mail). Em seguida, clique no ícone mais para cada usuário que você deseja adicionar na lista abaixo, ou o ícone da lata de lixo para cada usuário que você deseja remover. A lista abaixo pode ter várias páginas: use os controles da página abaixo da lista para navegar até as próximas páginas.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um subgrupo de/para este grupo, clique no botão 'Navegar por tudo' ou use a barra de pesquisa abaixo para pesquisar por grupos. Em seguida, clique no ícone mais para cada grupo que você deseja adicionar na lista abaixo, ou o ícone da lata de lixo para cada grupo que você deseja remover. A lista abaixo pode ter várias páginas: use os controles da página abaixo da lista para navegar até as próximas páginas.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa Administrativa",
@@ -811,48 +1215,192 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Workflow",
 
+  // "admin.workflow.item.workspace": "Workspace", (Auto-Translated)
+  "admin.workflow.item.workspace": "Área de trabalho",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Apagar",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Devolver",
 
+  // "admin.workflow.item.policies": "Policies", (Auto-Translated)
+  "admin.workflow.item.policies": "Políticas",
+
+  // "admin.workflow.item.supervision": "Supervision", (Auto-Translated)
+  "admin.workflow.item.supervision": "Supervisão",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar Metadados",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importar um Lote",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importar Metadados",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importar um Lote",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importar Metadados",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importar um Lote",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
   "admin.metadata-import.page.help": "Você arrastar soltar ou procurar arquivos CSV que contêm operações de metadados em lote em arquivos aqui",
 
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Selecione a Coleção para o qual deseja importar. Arraste ou selecione um arquivo zip no formato Simple Archive Format (SAF) que inclua os Items para importar",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", (Auto-Translated)
+  "admin.batch-import.page.toggle.help": "É possível executar a importação com o upload de arquivo ou via URL, use o controle acima para definir a fonte de entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Arraste um CSV de metadados para importar",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Arraste e solte um lote ZIP para importar",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Solte para substituir o CSV de metadados a ser importado",
 
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Arraste e solte um lote ZIP para substituir o lote para importar",
+
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Voltar",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Continuar",
 
-  //"admin.metadata-import.page.button.select-collection": "Select Collection",
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
   "admin.metadata-import.page.button.select-collection": "Selecione a  Coleção",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Selecione o arquivo primeiro!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!", (Auto-Translated)
+  "admin.metadata-import.page.error.addFileUrl": "Insira o URL do arquivo primeiro!",
+
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Selecione um arquivo ZIP primeiro!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload", (Auto-Translated)
+  "admin.metadata-import.page.toggle.upload": "Carregar",
+
+  // "admin.metadata-import.page.toggle.url": "URL", (Auto-Translated)
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import", (Auto-Translated)
+  "admin.metadata-import.page.urlMsg": "Insira o URL do lote em ZIP para importar",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Validar Somente",
 
   // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
   "admin.metadata-import.page.validateOnly.hint": "Quando selecionado, o CSV carregado será validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating", (Auto-Translated)
+  "advanced-workflow-action.rating.form.rating.label": "Avaliação",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item", (Auto-Translated)
+  "advanced-workflow-action.rating.form.rating.error": "Você deve avaliar o item",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review", (Auto-Translated)
+  "advanced-workflow-action.rating.form.review.label": "Análise",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating", (Auto-Translated)
+  "advanced-workflow-action.rating.form.review.error": "Você deve inserir uma revisão para enviar esta classificação",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below", (Auto-Translated)
+  "advanced-workflow-action.rating.description": "Selecione uma classificação abaixo",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review", (Auto-Translated)
+  "advanced-workflow-action.rating.description-requiredDescription": "Selecione uma classificação abaixo e também adicione uma revisão",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.description-single": "Selecione um único revisor abaixo antes de enviar",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.description-multiple": "Selecione um ou mais revisores abaixo antes de enviar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Adicione EPeople",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Navegar por tudo",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membros atuais",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadados",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exato)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Procurar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nome",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identidade",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remover / adicionar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remova o membro com o nome \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membro adicionado com sucesso: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Falha ao adicionar membro: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membro excluído com sucesso: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Falha ao excluir membro: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Adicionar membro com o nome \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Nenhum grupo ativo atual, envie um nome primeiro.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Ainda não há membros do grupo, procure e adicione.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nenhuma EPeople encontrou nessa pesquisa",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nenhum revisor selecionado.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Quando selecionado , o ZIP enviado sera validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "remover",
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Endereço de email ou senha inválidos.",
 
@@ -862,12 +1410,11 @@
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "Falha ao atualizar seu token de sessão. Por favor faça login novamente.",
 
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-  "bitstream.download.page": "Baixando {{bitstream}} agora ..." ,
-
-  // "bitstream.download.page.back": "Back" ,
-  "bitstream.download.page.back": "Voltar" ,
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Baixando {{bitstream}} agora ...",
 
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Voltar",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Editar as políticas do bitstream's",
@@ -887,7 +1434,7 @@
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Descrição",
 
-  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Autorizações...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
   "bitstream.edit.form.embargo.hint": "O primeiro dia a partir do qual o acesso é permitido. <b>Esta data não pode ser modificada neste formulário.</b> Para definir uma data de embargo para este bitstream, vá para a guia <i>Status do Item</i>, clique em <i>Autorizações...</i >, crie ou edite a política <i>READ</i> do bitstream e defina a <i>Data de Início</i> conforme desejado.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
@@ -920,6 +1467,9 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Um erro ocorreu salvando o formato do bitstream's",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream", (Auto-Translated)
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Ocorreu um erro salvando o BitStream primário",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -944,7 +1494,6 @@
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "A altura da tela geralmente deve corresponder à altura da imagem.",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Suas alterações neste bitstream foram salvas.",
 
@@ -968,6 +1517,7 @@
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Solicitando o seguinte arquivo: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos os arquivos. ",
 
@@ -1022,6 +1572,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Por Assunto",
 
+  // "browse.comcol.by.srsc": "By Subject Category", (Auto-Translated)
+  "browse.comcol.by.srsc": "Por categoria de assunto",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index", (Auto-Translated)
+  "browse.comcol.by.nsi": "Pelo Índice de Ciências Norueguesas",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por Título",
 
@@ -1052,6 +1608,12 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Pesquisar por Assunto",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", (Auto-Translated)
+  "browse.metadata.srsc.breadcrumbs": "Navegue por categoria de assunto",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index", (Auto-Translated)
+  "browse.metadata.nsi.breadcrumbs": "Navegue pelo Índice de Ciência Norueguês",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
 
@@ -1133,15 +1695,33 @@
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "browse.startsWith.type_text": "Filtrar resultados informando as primeiras letras:",
 
+  // "browse.startsWith.input": "Filter", (Auto-Translated)
+  "browse.startsWith.input": "Filtro",
+
+  // "browse.taxonomy.button": "Browse", (Auto-Translated)
+  "browse.taxonomy.button": "Navegar",
+
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Navegando {{ collection }} por {{ field }} {{ value }}",
+  "browse.title": "Navegando {{ collection }} por {{ field }}{{ startsWith }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title.page": "Navegando {{ collection }} por {{ field }} {{ value }}",
 
+  // "search.browse.item-back": "Back to Results", (Auto-Translated)
+  "search.browse.item-back": "De volta aos resultados",
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Remover chip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved", (Auto-Translated)
+  "claimed-approved-search-result-list-element.title": "Approved",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter", (Auto-Translated)
+  "claimed-declined-search-result-list-element.title": "Rejeitado, enviado de volta ao submissor",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", (Auto-Translated)
+  "claimed-declined-task-search-result-list-element.title": "Recusou, enviado de volta ao fluxo de trabalho do gerente de revisão",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Criar uma coleção",
 
@@ -1235,8 +1815,8 @@
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Remover mapeamentos selecionados",
 
-  // "collection.edit.item-mapper.search-form.placeholder": "Search Item to Map...",
-  "collection.edit.item-mapper.search-form.placeholder": "Pesquisar Item a Mapear...",
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Pesquisar Itens...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Navegar por itens mapeados",
@@ -1274,9 +1854,15 @@
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Coleção editada com sucesso",
 
-  // "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
   "collection.edit.return": "Voltar",
 
+  // "collection.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "collection.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control", (Auto-Translated)
+  "collection.edit.tabs.access-control.title": "Edição de coleção - Controle de acesso",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curadoria",
 
@@ -1400,7 +1986,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Editar Template de Item",
 
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Descrição curta",
 
@@ -1460,48 +2045,70 @@
 
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Controles de Colheita(Harvest)",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Alguma coisa errada durante a inicialização e teste das configurações",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "O script de teste das configurações falhou",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "O script de teste das configurações terminou com sucesso",
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Testar a configuração",
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Testando a configuração...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "A importação foi iniciada com sucesso",
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Alguma coisa errada durante a inicialização da importação",
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Importar agora",
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importando...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "Um erro ocorreu durante a importação",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "A importação concluiu",
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "A redefinição e reimportação foram iniciadas com sucesso",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Alguma coisa errada durante a inicialização da redefinição e reimportação",
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Um erro ocorreu durante a redifinição e reimportação",
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "Completou a redefinição e a reimportação",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Redefinir e reimportar",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Redefinindo e importando...",
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "Status da Colheita (Harvest):",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Hora de ínicio da Colheita(Harvest):",
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Última hora de colhida:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Informação sobre Colheita (Harvest):",
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/D",
 
@@ -1610,6 +2217,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Editar Comunidade - Curador",
 
+  // "community.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "community.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control", (Auto-Translated)
+  "community.edit.tabs.access-control.title": "Edição da comunidade - Controle de acesso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar Metadado",
 
@@ -1676,7 +2289,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "A leitura padrão para itens de entrada está atualmente definida como Anônima.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Acesso de leitura de bitstream padrão",
 
@@ -1686,27 +2298,29 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "A leitura padrão para bitstreams de entrada está atualmente definida como Anônima.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editores",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Editores podem editar metadados de submissões de entrada, e  aceitar ou rejeitar elas.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Editores Finais",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Editores Finais podem editar os metadadods de submissões de entrada, mas não podem rejeitar elas.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Revisores",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Revisores podem aceitar ou rejeitar submissões de entrada.. Entretanto, eles não podem editar os metadados da submissão.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers", (Auto-Translated)
+  "comcol-role.edit.scorereviewers.name": "Revisores de pontuação",
+
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.", (Auto-Translated)
+  "comcol-role.edit.scorereviewers.description": "Os revisores podem dar uma pontuação para os envios de entrada, isso definirá se o envio será rejeitado ou não.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Descrição curta",
@@ -1741,11 +2355,11 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-Comunidade e Coleções",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "Coleções desta Comunidade",
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "Coleções nesta Comunidade",
 
-  // "community.sub-community-list.head": "Communities of this Community",
-  "community.sub-community-list.head": "Comunidades desta Comunidade",
+  // "community.sub-community-list.head": "Communities in this Community",
+  "community.sub-community-list.head": "Comunidades nesta Comunidade",
 
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Aceitar tudo",
@@ -1768,6 +2382,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre requerido)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.", (Auto-Translated)
+  "cookies.consent.app.disable-all.description": "Use esse comutador para ativar ou desativar todos os serviços.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services", (Auto-Translated)
+  "cookies.consent.app.disable-all.title": "Ativar ou desativar todos os serviços",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Houve alterações desde sua última visita, atualize seu consentimento.",
 
@@ -1777,6 +2397,15 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Recusar",
 
+  // "cookies.consent.ok": "That's ok", (Auto-Translated)
+  "cookies.consent.ok": "Isso está ok",
+
+  // "cookies.consent.save": "Save", (Auto-Translated)
+  "cookies.consent.save": "Salvar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent", (Auto-Translated)
+  "cookies.consent.content-notice.title": "Consentimento de cookies",
+
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-notice.description": "Coletamos e processamos suas informações pessoais para os seguintes propósitos: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>. <br/> Para aprender mais, por favor leia  nossa {privacyPolicy}.",
 
@@ -1798,6 +2427,12 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informações que coletamos",
 
+  // "cookies.consent.content-modal.services": "services", (Auto-Translated)
+  "cookies.consent.content-modal.services": "Serviços",
+
+  // "cookies.consent.content-modal.service": "service", (Auto-Translated)
+  "cookies.consent.content-modal.service": "serviço",
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Authenticação",
 
@@ -1822,16 +2457,28 @@
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Nos permite rastrear dados estatísticos",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha", (Auto-Translated)
+  "cookies.consent.app.title.google-recaptcha": "Google reCAPTCHA",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery", (Auto-Translated)
+  "cookies.consent.app.description.google-recaptcha": "Usamos o serviço Google reCAPTCHA durante o registro e recuperação de senha",
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Estatística",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery", (Auto-Translated)
+  "cookies.consent.purpose.registration-password-recovery": "Registro e recuperação de senha",
+
+  // "cookies.consent.purpose.sharing": "Sharing", (Auto-Translated)
+  "cookies.consent.purpose.sharing": "Compartilhamento",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Gerar página de citação",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Verificar links em metadados",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -1849,6 +2496,9 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Escanear Virus",
 
+  // "curation-task.task.registerdoi.label": "Register DOI", (Auto-Translated)
+  "curation-task.task.registerdoi.label": "Registrar DOI",
+
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarefa:",
 
@@ -1897,6 +2547,9 @@
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sem título",
 
+  // "dso.name.unnamed": "Unnamed", (Auto-Translated)
+  "dso.name.unnamed": "Sem nome",
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova coleção",
 
@@ -1906,6 +2559,9 @@
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nova comunidade",
 
+  // "dso-selector.create.community.or-divider": "or", (Auto-Translated)
+  "dso-selector.create.community.or-divider": "ou",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Criar uma nova coleção em",
 
@@ -1936,10 +2592,10 @@
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Exportar metadados de",
 
-  //"dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
   "dso-selector.export-batch.dspaceobject.head": "Exportar Lote (ZIP) de",
 
-  //"dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
   "dso-selector.import-batch.dspaceobject.head": "Importar lote de",
 
   // "dso-selector.no-results": "No {{ type }} found",
@@ -1957,6 +2613,9 @@
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "Pesquisar em todo o DSpace",
 
+  // "dso-selector.set-scope.community.or-divider": "or", (Auto-Translated)
+  "dso-selector.set-scope.community.or-divider": "ou",
+
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Pesquisar uma comunidade ou coleção",
 
@@ -1972,6 +2631,48 @@
   // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "Criar um novo",
 
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻", (Auto-Translated)
+  "dso-selector.results-could-not-be-retrieved": "Algo deu errado, por favor, recarregue novamente ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector", (Auto-Translated)
+  "supervision-group-selector.header": "Seletor de grupo de supervisão",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.label": "Selecione um tipo de pedido",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.none": "NENHUM",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group", (Auto-Translated)
+  "supervision-group-selector.select.group.label": "Selecione um grupo",
+
+  // "supervision-group-selector.button.cancel": "Cancel", (Auto-Translated)
+  "supervision-group-selector.button.cancel": "Cancelar",
+
+  // "supervision-group-selector.button.save": "Save", (Auto-Translated)
+  "supervision-group-selector.button.save": "Salvar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.error": "Selecione um tipo de pedido",
+
+  // "supervision-group-selector.select.group.error": "Please select a group", (Auto-Translated)
+  "supervision-group-selector.select.group.error": "Selecione um grupo",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}", (Auto-Translated)
+  "supervision-group-selector.notification.create.success.title": "Ordem de supervisão criada com sucesso para o grupo {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error", (Auto-Translated)
+  "supervision-group-selector.notification.create.failure.title": "Erro",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group", (Auto-Translated)
+  "supervision-group-selector.notification.create.already-existing": "Já existe uma ordem de supervisão neste item para o grupo selecionado",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportar metadados para {{ dsoName }}",
 
@@ -1984,16 +2685,16 @@
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Exportar",
 
-  //"confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.header": "Exportar lote (ZIP) para {{ dsoName }}",
 
-  //"confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.info": "Você tem certeza que deseja exportar o lote (ZIP) para {{ dsoName }}",
 
-  //"confirmation-modal.export-batch.cancel": "Cancel",
+  // "confirmation-modal.export-batch.cancel": "Cancel",
   "confirmation-modal.export-batch.cancel": "Cancelar",
 
-  //"confirmation-modal.export-batch.confirm": "Export",
+  // "confirmation-modal.export-batch.confirm": "Export",
   "confirmation-modal.export-batch.confirm": "Exportar",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
@@ -2020,6 +2721,18 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Apagar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription", (Auto-Translated)
+  "confirmation-modal.delete-subscription.header": "Excluir assinatura",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"", (Auto-Translated)
+  "confirmation-modal.delete-subscription.info": "Tem certeza de que deseja excluir a assinatura para \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel", (Auto-Translated)
+  "confirmation-modal.delete-subscription.cancel": "Cancelar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete", (Auto-Translated)
+  "confirmation-modal.delete-subscription.confirm": "Excluir",
+
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Erro ao carregar bitstream",
 
@@ -2092,6 +2805,27 @@
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "Este Grupo já existe",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead", (Auto-Translated)
+  "error.validation.metadata.name.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços. Ao invés, por favor, use os campos de Elemento e Qualificador",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters", (Auto-Translated)
+  "error.validation.metadata.name.max-length": "Este campo pode não conter mais de 32 caracteres",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters", (Auto-Translated)
+  "error.validation.metadata.namespace.max-length": "Este campo pode não conter mais de 256 caracteres",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead", (Auto-Translated)
+  "error.validation.metadata.element.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços. Por favor, use o campo Qualificador em vez disso",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters", (Auto-Translated)
+  "error.validation.metadata.element.max-length": "Este campo pode não conter mais de 64 caracteres",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces", (Auto-Translated)
+  "error.validation.metadata.qualifier.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters", (Auto-Translated)
+  "error.validation.metadata.qualifier.max-length": "Este campo pode não conter mais de 64 caracteres",
+
   // "feed.description": "Syndication feed",
   "feed.description": "Feed de distribuição",
 
@@ -2113,10 +2847,10 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Política de Privacidade",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Termos de Uso",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar uma Sugestão",
 
   // "forgot-email.form.header": "Forgot Password",
@@ -2131,8 +2865,8 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Por favor preencha o endereço de email",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Por favor preencha com um e-mail válido",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address", (Auto-Translated)
+  "forgot-email.form.email.error.not-email-form": "Por favor preencha com um endereço de email válido",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
   "forgot-email.form.email.hint": "Um e-mail será enviado para este endereço com mais instruções.",
@@ -2254,6 +2988,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Nenhum valor informado",
 
+  // "form.other-information.email": "Email", (Auto-Translated)
+  "form.other-information.email": "E-mail",
+
+  // "form.other-information.first-name": "First Name", (Auto-Translated)
+  "form.other-information.first-name": "Primeiro nome",
+
+  // "form.other-information.insolr": "In Solr Index", (Auto-Translated)
+  "form.other-information.insolr": "No índice Solr",
+
+  // "form.other-information.institution": "Institution", (Auto-Translated)
+  "form.other-information.institution": "Instituição",
+
+  // "form.other-information.last-name": "Last Name", (Auto-Translated)
+  "form.other-information.last-name": "Sobrenome",
+
+  // "form.other-information.orcid": "ORCID", (Auto-Translated)
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Apagar",
 
@@ -2272,6 +3024,9 @@
   // "form.submit": "Save",
   "form.submit": "Salvar",
 
+  // "form.create": "Create", (Auto-Translated)
+  "form.create": "Criar",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Solte o item na nova posição",
 
@@ -2281,8 +3036,8 @@
   // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "Voltar",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  "grant-deny-request-copy.email.message": "Mensagem",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Mensagem adicional opcional",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
   "grant-deny-request-copy.email.message.empty": "Por favor coloque uma mensagem",
@@ -2333,8 +3088,8 @@
   // "grant-request-copy.header": "Grant document copy request",
   "grant-request-copy.header": "Conceder solicitação de cópia do documento",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
-  "grant-request-copy.intro": "Esta mensagem será enviada ao requerente do pedido. O(s) documento(s) solicitado(s) será(ão) anexado(s).",
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Uma mensagem será enviada ao requerente do pedido. O(s) documento(s) solicitado(s) será(ão) anexado(s).",
 
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Solicitação de item concedida com sucesso",
@@ -2342,13 +3097,13 @@
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Saúde",
 
-  // "health-page.heading" : "Health",
+  // "health-page.heading": "Health",
   "health-page.heading": "Saúde",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Informação",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Status",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2441,6 +3196,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Contrato de Usuário Final",
 
+  // "info.end-user-agreement.hosting-country": "the United States", (Auto-Translated)
+  "info.end-user-agreement.hosting-country": "os Estados Unidos",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Política de privacidade",
 
@@ -2474,19 +3232,19 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Seu Email",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Sugestão Enviada com Sucesso!",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
+  // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "Um endereço de email válido é requerido",
 
-  // "info.feedback.error.message.required" : "A comment is required",
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "Um comentário é requerido",
 
-  // "info.feedback.page-label" : "Page",
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Página",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // "info.feedback.page_help": "Tha page related to your feedback",
   "info.feedback.page_help": "A página relacionada a sua sugestão",
 
   // "item.alerts.private": "This item is non-discoverable",
@@ -2501,7 +3259,7 @@
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar Política de item",
 
-  // "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privado",
 
   // "item.badge.withdrawn": "Withdrawn",
@@ -2657,13 +3415,75 @@
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "Você não está autorizado a acessar esta guia",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Mapeamento de Coleção",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Editar Item - Mapeamento de Coleção",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconhecido",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Fila para registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Fila para reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered", (Auto-Translated)
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrado",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved", (Auto-Translated)
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservado",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservado (atualiza a fila)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrado (atualiza a fila)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Fila para atualização e registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Fila para exclusão",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted", (Auto-Translated)
+  "item.edit.identifiers.doi.status.DELETED": "Excluído",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.PENDING": "Pendente (não registrado)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.MINTED": "Cunhado (não registrado)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI", (Auto-Translated)
+  "item.edit.tabs.status.buttons.register-doi.label": "Registre um DOI novo ou pendente",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", (Auto-Translated)
+  "item.edit.tabs.status.buttons.register-doi.button": "Registre DOI ...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI", (Auto-Translated)
+  "item.edit.register-doi.header": "Registre um DOI novo ou pendente",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", (Auto-Translated)
+  "item.edit.register-doi.description": "Revise todos os identificadores pendentes e metadados do item abaixo e clique em Confirmar para prosseguir com o registro do DOI ou cancelar para desistir",
+
+  // "item.edit.register-doi.confirm": "Confirm", (Auto-Translated)
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel", (Auto-Translated)
+  "item.edit.register-doi.cancel": "Cancelar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.", (Auto-Translated)
+  "item.edit.register-doi.success": "DOI enfileirado para registro com sucesso.",
+
+  // "item.edit.register-doi.error": "Error registering DOI", (Auto-Translated)
+  "item.edit.register-doi.error": "Erro ao registrar DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", (Auto-Translated)
+  "item.edit.register-doi.to-update": "O seguinte DOI já foi cunhado e será enfileirado para registro online",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Mapear item na(s) coleção(ões) seleciona(s)",
 
@@ -2724,6 +3544,12 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.drag": "Arraste para reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
 
@@ -2736,6 +3562,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Parar edição",
 
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the "Relationships" tab", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.virtual": "Este é um valor de metadados virtuais, ou seja, um valor herdado de uma entidade relacionada. Não pode ser modificado diretamente. Adicione ou remova o relacionamento correspondente na guia \"Relacionamentos\"",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "O item atualmente não contém metadados. Clique em Adicionar para começar a adicionar um valor de metadados.",
 
@@ -2751,6 +3580,9 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", (Auto-Translated)
+  "item.edit.metadata.metadatafield.error": "Ocorreu um erro ao validar o campo de metadados",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Por favor escolha um campo de metadados válido",
 
@@ -2784,6 +3616,9 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfazer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder", (Auto-Translated)
+  "item.edit.metadata.reset-order-button": "Desfazer reordenar",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Salvar",
 
@@ -2838,37 +3673,37 @@
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancelar",
 
-  // "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "Tornar Privado",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
   "item.edit.private.description": "Tem certeza de que este item deve ser tornado privado no arquivo?",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
   "item.edit.private.error": "Ocorreu um erro ao tornar o item privado",
 
-  // "item.edit.private.header": "Make item private: {{ id }}",
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
   "item.edit.private.header": "Tornar o item privado: {{ id }}",
 
-  // "item.edit.private.success": "The item is now private",
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "O item agora é privado",
 
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Cancelar",
 
-  // "item.edit.public.confirm": "Make it public",
+  // "item.edit.public.confirm": "Make it discoverable",
   "item.edit.public.confirm": "Tornar público",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
   "item.edit.public.description": "Você tem certeza que deseja tornar este item público no arquivo?",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
   "item.edit.public.error": "Ocorreu um erro ao tornar o item público",
 
-  // "item.edit.public.header": "Make item public: {{ id }}",
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
   "item.edit.public.header": "Tornar o item público: {{ id }}",
 
-  // "item.edit.public.success": "The item is now public",
+  // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "O item agora é público",
 
   // "item.edit.reinstate.cancel": "Cancel",
@@ -2949,6 +3784,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Editar Item - Curadoria",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}", (Auto-Translated)
+  "item.edit.curate.title": "Fazer curadoria do Item: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "item.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control", (Auto-Translated)
+  "item.edit.tabs.access-control.title": "Edição de item - Controle de acesso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadados",
 
@@ -3102,6 +3946,30 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Fechar",
 
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.header": "Excluir ordem de supervisão",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.info": "Tem certeza que deseja excluir o pedido de supervisão",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancelar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Excluir",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", (Auto-Translated)
+  "workflow-item.search.result.notification.deleted.success": "Ordem de supervisão excluída com sucesso \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"", (Auto-Translated)
+  "workflow-item.search.result.notification.deleted.failure": "Falha ao excluir a ordem de supervisão \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:", (Auto-Translated)
+  "workflow-item.search.result.list.element.supervised-by": "Supervisionado por:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group", (Auto-Translated)
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remover o grupo de supervisão",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumo",
 
@@ -3192,10 +4060,10 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Pacote Original",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Licença do Pacote",
 
   // "item.page.return": "Back",
@@ -3240,27 +4108,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Questão",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volume",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
-  "item.preview.dc.relation.ispartof": "Revista ou Série",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "Revista ou Séries",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:", (Auto-Translated)
+  "item.preview.dc.publisher": "Editora:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Sobrenome:",
 
@@ -3399,13 +4270,13 @@
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "A nova versão está sendo criada. Isso pode levar algum tempo se o item tiver muitos relacionamentos.",
 
-  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "Uma nova versão foi criada com o número de versão {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "A nova versão não foi criada",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
   "item.version.create.notification.inProgress": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3426,18 +4297,99 @@
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "Não apague esta versão",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "Versão número {{version}} foi apagada",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "Versão número {{version}} não foi apagada",
 
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
   "item.version.edit.notification.success": "O resumo da versão número {{version}} foi alterado",
 
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "O resumo da versão número {{version}} não foi alterado",
 
+  // "itemtemplate.edit.metadata.add-button": "Add", (Auto-Translated)
+  "itemtemplate.edit.metadata.add-button": "Adicionar",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard", (Auto-Translated)
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arraste para reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remover",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfazer mudanças",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Parar de editar",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", (Auto-Translated)
+  "itemtemplate.edit.metadata.empty": "O modelo de item atualmente não contém metadados. Clique em Adicionar para começar a adicionar um valor de metadados.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.field": "Campo",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", (Auto-Translated)
+  "itemtemplate.edit.metadata.metadatafield.error": "Ocorreu um erro validando o campo de metadados",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", (Auto-Translated)
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Escolha um campo de metadados válido",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Suas mudanças foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Mudanças descartadas",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.error.title": "Um erro ocorreu",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Suas mudanças não foram salvas. Certifique-se de que todos os campos sejam válidos antes de salvar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadados inválidos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.outdated.content": "O modelo de item em que você está trabalhando atualmente foi alterado por outro usuário. Suas alterações atuais serão descartadas para evitar conflitos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Mudanças desatualizadas",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.saved.content": "Suas alterações nos metadados do modelo deste item foram salvas.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadados salvos",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo", (Auto-Translated)
+  "itemtemplate.edit.metadata.reinstate-button": "Desfazer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder", (Auto-Translated)
+  "itemtemplate.edit.metadata.reset-order-button": "Desfazer reordenar",
+
+  // "itemtemplate.edit.metadata.save-button": "Save", (Auto-Translated)
+  "itemtemplate.edit.metadata.save-button": "Salvar",
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
 
@@ -3523,8 +4475,7 @@
   "iiifsearchable.page.doi": "Link Permanente: ",
 
   // "iiifsearchable.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Edição: ",
 
   // "iiifsearchable.page.description": "Description: ",
   "iiifsearchable.page.description": "Descrição: ",
@@ -3542,8 +4493,7 @@
   "iiif.page.doi": "Link Permanente: ",
 
   // "iiif.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Edição: ",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descrição: ",
@@ -3614,9 +4564,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Novo usuário? Clique aqui para cadastrar.",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "ou",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Entrar com o OIDC",
 
@@ -3662,12 +4609,24 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizações",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management", (Auto-Translated)
+  "menu.section.access_control_bulk": "Gerenciamento de acesso em massa",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Relatórios",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Coleções filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consultas de metadados",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Pesquisa Administrativa",
 
@@ -3695,6 +4654,12 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Por Assunto",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category", (Auto-Translated)
+  "menu.section.browse_global_by_srsc": "Por categoria de assunto",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index", (Auto-Translated)
+  "menu.section.browse_global_by_nsi": "Pelo Índice de Ciências Norueguesas",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por Título",
 
@@ -3734,9 +4699,16 @@
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadados",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Exportação em Lote (ZIP)",
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Seção do menu Controle de Acesso",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Seção do menu de busca administrativa",
 
@@ -3788,9 +4760,6 @@
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Importação em Lote (ZIP)",
 
-  // "menu.section.export_batch": "Batch Export (ZIP)",
-  "menu.section.export_batch": "Exportação em Lote (ZIP)",
-
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadados",
 
@@ -3839,6 +4808,10 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarefas de Estatísticas",
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar Seção Controle de Acesso",
 
@@ -3874,8 +4847,10 @@
 
   // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "Exportar resultados de pesquisa como CSV",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
   "metadata-export-search.submit.success": "A exportação foi iniciada com sucesso",
+
   // "metadata-export-search.submit.error": "Starting the export has failed",
   "metadata-export-search.submit.error": "Falha ao iniciar a exportação",
 
@@ -3885,9 +4860,6 @@
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "aqui",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Selecione esta opção para enviar uma mensagem para o submetedor do item.",
 
@@ -3966,26 +4938,29 @@
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   "mydspace.search-form.placeholder": "Procurar no meudspace...",
 
-  // "mydspace.show.workflow": "All tasks",
-  "mydspace.show.workflow": "Todas as tarefas",
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Tarefas de fluxo de trabalho",
 
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Minhas Submissões",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arquivado",
+  // "mydspace.show.supervisedWorkspace": "Supervised items", (Auto-Translated)
+  "mydspace.show.supervisedWorkspace": "Itens supervisionados",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validação",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arquivado",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando pelo controlador",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validação",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Fluxo de trabalho",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperando pelo controlador",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espaço de trabalho",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Fluxo de trabalho",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espaço de trabalho",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MeuDSpace",
@@ -4014,14 +4989,20 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Por Comunidade",
 
+  // "nav.context-help-toggle": "Toggle context help", (Auto-Translated)
+  "nav.context-help-toggle": "Alternar a ajuda do contexto",
+
   // "nav.language": "Language switch",
   "nav.language": "Selecionar um idioma",
 
   // "nav.login": "Log In",
   "nav.login": "Entrar",
 
-  // "nav.logout": "User profile menu and Log Out",
-  "nav.logout": "Menu do Usuário e Sair",
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out", (Auto-Translated)
+  "nav.user-profile-menu-and-logout": "Menu do perfil de usuário e Sair",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Sair",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra de navegação principal",
@@ -4035,25 +5016,33 @@
   // "nav.search": "Search",
   "nav.search": "Buscar",
 
+  // "nav.search.button": "Submit search", (Auto-Translated)
+  "nav.search.button": "Enviar pesquisa",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estatísticas",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Deixar de assumir o papel do EPerson",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.subscriptions": "Subscriptions", (Auto-Translated)
+  "nav.subscriptions": "Assinaturas",
+
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegação",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil do usuário",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Item",
 
-
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidade Organizacional",
 
+  // "orgunit.listelement.no-title": "Untitled", (Auto-Translated)
+  "orgunit.listelement.no-title": "Sem título",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Cidade",
 
@@ -4186,6 +5175,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Um erro ocorreu enquanto criava o processo",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size", (Auto-Translated)
+  "process.new.notification.error.max-upload.content": "O arquivo excede o tamanho máximo de upload",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Criar novo processo",
 
@@ -4195,16 +5187,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Criar novo processo",
 
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Argumentos",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Este processo não contêm nenhum argumento",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Voltar",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Saída do Processo",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4216,28 +5208,28 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Este processo não tem saída",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Arquivos de saída",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Este processo não contém nenhum arquivo de saída",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Processo: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora de Início",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de Fim",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Status",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Criar processo similar",
 
   // "process.detail.actions": "Actions",
@@ -4264,22 +5256,22 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo deu errado ao excluir o processo",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de Fim (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID do Processo",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nome",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de Início (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuário",
 
   // "process.overview.title": "Processes Overview",
@@ -4384,6 +5376,9 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Redigite para confirmar",
 
+  // "profile.security.form.label.current-password": "Current password", (Auto-Translated)
+  "profile.security.form.label.current-password": "Senha atual",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Suas alterações na senha foram salvas.",
 
@@ -4393,6 +5388,9 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Erro trocando a senha",
 
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.", (Auto-Translated)
+  "profile.security.form.notifications.error.change-failed": "Ocorreu um erro ao tentar alterar a senha. Verifique se a senha atual está correta.",
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "As senhas fornecidas não são as mesmas.",
 
@@ -4558,8 +5556,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Por favor preencha o endereço de email",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Por favor preencha com um endereço válido de email",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.", (Auto-Translated)
+  "register-page.registration.email.error.not-email-form": "Por favor preencha com um endereço de email válido.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}", (Auto-Translated)
+  "register-page.registration.email.error.not-valid-domain": "Use email com domínios permitidos: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Este endereço será verificado e usado como seu nome de login.",
@@ -4579,6 +5580,30 @@
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Um erro ocorreu enquanto registrava o seguinte endereço de email: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha", (Auto-Translated)
+  "register-page.registration.error.recaptcha": "Erro ao tentar autenticar com o reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.", (Auto-Translated)
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registrar, você deve aceitar os cookies de <b> Registro e Recuperação de Senha </b> (Google reCAPTCHA).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}", (Auto-Translated)
+  "register-page.registration.error.maildomain": "Este endereço de e-mail não está na lista de domínios que podem se registrar. Os domínios permitidos são {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings", (Auto-Translated)
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Abra as configurações de cookies",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.title": "Google reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro durante a verificação de reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirada. Por favor, verifique novamente.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains", (Auto-Translated)
+  "register-page.registration.info.maildomain": "Contas podem ser registradas para endereços de correio dos domínios",
+
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Nenhuma correspondência adequada foi encontrada para o tipo de relacionamento {{ type }} entre os dois itens",
 
@@ -4645,11 +5670,11 @@
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Logo do Repositório",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular :: ",
+  // "repository.title": "DSpace Repository", (Auto-Translated)
+  "repository.title": "Repositório DSpace",
 
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositório DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Adicionar",
@@ -4879,6 +5904,9 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Início data de nascimento",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by", (Auto-Translated)
+  "search.filters.applied.f.supervisedBy": "Supervisionado por",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
@@ -4963,7 +5991,7 @@
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
   "search.filters.filter.dateSubmitted.label": "Procurar data de submissão",
 
-  // "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
   "search.filters.filter.discoverable.head": "Privado",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -5089,6 +6117,18 @@
   // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "Procurar submetedor",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree", (Auto-Translated)
+  "search.filters.filter.show-tree": "Navegar na árvore {{ name }}",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.head": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.label": "Pesquisa supervisionada por",
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de Revista",
 
@@ -5110,6 +6150,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sim",
 
+  // "search.filters.namedresourcetype.Archived": "Archived", (Auto-Translated)
+  "search.filters.namedresourcetype.Archived": "Arquivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation", (Auto-Translated)
+  "search.filters.namedresourcetype.Validation": "Validação",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for Controller", (Auto-Translated)
+  "search.filters.namedresourcetype.Waiting for Controller": "Esperando por controlador",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow", (Auto-Translated)
+  "search.filters.namedresourcetype.Workflow": "Fluxo de trabalho",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace", (Auto-Translated)
+  "search.filters.namedresourcetype.Workspace": "Área de trabalho",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sim",
 
@@ -5257,6 +6312,9 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visualizações",
 
+  // "statistics.table.no-name": "(object name could not be loaded)", (Auto-Translated)
+  "statistics.table.no-name": "(o nome do objeto não pôde ser carregado)",
+
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar Submissão",
 
@@ -5266,8 +6324,8 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  "submission.general.cannot_submit": "Você mão tem privilégios para fazer uma nova submissão.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "Você não tem privilégios para fazer uma nova submissão.",
 
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Depositar",
@@ -5309,8 +6367,7 @@
   "submission.import-external.title.Journal": "Importar uma revista de uma fonte externa",
 
   // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importar uma edição de revista de uma fonte externa",
 
   // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
   "submission.import-external.title.JournalVolume": "Importar um volume de revista de uma fonte externa",
@@ -5360,6 +6417,9 @@
   // "submission.import-external.source.crossref": "CrossRef",
   "submission.import-external.source.crossref": "CrossRef",
 
+  // "submission.import-external.source.datacite": "DataCite", (Auto-Translated)
+  "submission.import-external.source.datacite": "DataCite",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -5451,8 +6511,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar revista remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar uma edição de jornal remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volume de revista remoto",
@@ -5557,16 +6616,13 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista Externa importada e adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar uma edição de jornal remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Edição de jornal local adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Edição de jornal externo importada e adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar Volume de Revista Remoto",
@@ -5612,6 +6668,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas Locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos Locais ({{ count }})",
 
@@ -5635,11 +6692,13 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de Revista Local ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volumes de Revista Local ({{ count }})",
 
@@ -5679,6 +6738,9 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador do Projeto",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author", (Auto-Translated)
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicação do Autor",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento da API OpenAIRE",
 
@@ -5699,11 +6761,13 @@
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de Revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de Revista",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de Revista",
 
@@ -5715,6 +6779,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agências de Financiamento",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projetos",
 
@@ -5742,6 +6807,9 @@
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidade organizacional principal",
 
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication", (Auto-Translated)
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicação",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu suspenso",
 
@@ -5759,6 +6827,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume de Revista selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos Selecionados",
 
@@ -5782,6 +6851,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Problema selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de Revista selecionado",
 
@@ -5790,6 +6860,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamento selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Problema selecionado",
 
@@ -5910,6 +6981,24 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Há seções incompletas.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:", (Auto-Translated)
+  "submission.sections.identifiers.info": "Os seguintes identificadores serão criados para o seu item:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.", (Auto-Translated)
+  "submission.sections.identifiers.no_handle": "Nenhuma alça foi cunhada para este item.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.", (Auto-Translated)
+  "submission.sections.identifiers.no_doi": "Nenhum DOIs foi cunhado para este item.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ", (Auto-Translated)
+  "submission.sections.identifiers.handle_label": "Lidar:",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ", (Auto-Translated)
+  "submission.sections.identifiers.doi_label": "DOI:",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ", (Auto-Translated)
+  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores:",
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condições de acesso ao Item",
 
@@ -5931,6 +7020,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Duplicados em potencial",
 
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers", (Auto-Translated)
+  "submission.sections.submit.progressbar.identifiers": "Identificadores",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Depositar licença",
 
@@ -6076,8 +7168,7 @@
   "submission.sections.accesses.form.discoverable-description": "Quando marcado, este item poderá ser descoberto na pesquisa/navegação. Quando desmarcado, o item estará disponível apenas por meio de um link direto e nunca aparecerá na pesquisa/navegação.",
 
   // "submission.sections.accesses.form.discoverable-label": "Discoverable",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Público",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "Tipo de condição de acesso",
@@ -6118,16 +7209,15 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Até",
 
-  // "submission.sections.license.granted-label": "Confirmo a licença acima",
-  "submission.sections.license.granted-label": "I confirm the license above",
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confirmo a licença acima",
 
   // "submission.sections.license.required": "You must accept the license",
   "submission.sections.license.required": "Você deve aceitar a licença",
 
-  // "submission.sections.license.notgranted":  "You must accept the license",
+  // "submission.sections.license.notgranted": "You must accept the license",
   "submission.sections.license.notgranted": "Você deve aceitar a licença",
 
-
   // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "Informações de publicação",
 
@@ -6215,8 +7305,8 @@
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Apagar",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Se você gostaria de descartar este item, selecione \"Apagar\".  Você será questionado para confirmar.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Selecione esta opção para descartar este item. Em seguida, será solicitada confirmção.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
@@ -6230,6 +7320,18 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Selecione esta opção para ver o metadados do item.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", (Auto-Translated)
+  "submission.workflow.generic.submit_select_reviewer": "Selecione Revisor",
+
+  // "submission.workflow.generic.submit_select_reviewer-help": "", (Auto-Translated)
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate", (Auto-Translated)
+  "submission.workflow.generic.submit_score": "Avaliar",
+
+  // "submission.workflow.generic.submit_score-help": "", (Auto-Translated)
+  "submission.workflow.generic.submit_score-help": "",
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprovar",
 
@@ -6242,6 +7344,12 @@
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Selecione esta opção para modificar os metadados do item.",
 
+  // "submission.workflow.tasks.claimed.decline": "Decline", (Auto-Translated)
+  "submission.workflow.tasks.claimed.decline": "Recusar",
+
+  // "submission.workflow.tasks.claimed.decline_help": "", (Auto-Translated)
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Por favor informe o motivo pela rejeição da submissão na caixa abaixo, indicando se o submetedor pode corrigir um problema e reenviar.",
 
@@ -6296,6 +7404,114 @@
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Selecione esta opção para visualizar os metadados do item.",
 
+  // "submitter.empty": "N/A", (Auto-Translated)
+  "submitter.empty": "N/D",
+
+  // "subscriptions.title": "Subscriptions", (Auto-Translated)
+  "subscriptions.title": "Assinaturas",
+
+  // "subscriptions.item": "Subscriptions for items", (Auto-Translated)
+  "subscriptions.item": "Assinaturas para itens",
+
+  // "subscriptions.collection": "Subscriptions for collections", (Auto-Translated)
+  "subscriptions.collection": "Assinaturas para coleções",
+
+  // "subscriptions.community": "Subscriptions for communities", (Auto-Translated)
+  "subscriptions.community": "Assinaturas para comunidades",
+
+  // "subscriptions.subscription_type": "Subscription type", (Auto-Translated)
+  "subscriptions.subscription_type": "Tipo de assinatura",
+
+  // "subscriptions.frequency": "Subscription frequency", (Auto-Translated)
+  "subscriptions.frequency": "Frequência de assinatura",
+
+  // "subscriptions.frequency.D": "Daily", (Auto-Translated)
+  "subscriptions.frequency.D": "Diáriamente",
+
+  // "subscriptions.frequency.M": "Monthly", (Auto-Translated)
+  "subscriptions.frequency.M": "Mensalmente",
+
+  // "subscriptions.frequency.W": "Weekly", (Auto-Translated)
+  "subscriptions.frequency.W": "Semanalmente",
+
+  // "subscriptions.tooltip": "Subscribe", (Auto-Translated)
+  "subscriptions.tooltip": "Se inscrever",
+
+  // "subscriptions.modal.title": "Subscriptions", (Auto-Translated)
+  "subscriptions.modal.title": "Assinaturas",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency", (Auto-Translated)
+  "subscriptions.modal.type-frequency": "Tipo e frequência",
+
+  // "subscriptions.modal.close": "Close", (Auto-Translated)
+  "subscriptions.modal.close": "Fechar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the "Subscriptions" page under your user profile", (Auto-Translated)
+  "subscriptions.modal.delete-info": "Para remover esta assinatura, visite a página \"Assinaturas\" no seu perfil de usuário",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.type.content": "Conteúdo",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diáriamente",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.W": "Semanalmente",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensalmente",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.processing": "Em processamento...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", (Auto-Translated)
+  "subscriptions.modal.create.success": "Inscrito em {{type}} com sucesso.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully", (Auto-Translated)
+  "subscriptions.modal.delete.success": "Assinatura excluída com sucesso",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully", (Auto-Translated)
+  "subscriptions.modal.update.success": "Assinatura para {{type}} atualizado com sucesso",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation", (Auto-Translated)
+  "subscriptions.modal.create.error": "Um erro ocorre durante a criação de assinatura",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete", (Auto-Translated)
+  "subscriptions.modal.delete.error": "Um erro ocorre durante a exclusão de assinatura",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update", (Auto-Translated)
+  "subscriptions.modal.update.error": "Um erro ocorre durante a atualização da assinatura",
+
+  // "subscriptions.table.dso": "Subject", (Auto-Translated)
+  "subscriptions.table.dso": "Assunto",
+
+  // "subscriptions.table.subscription_type": "Subscription Type", (Auto-Translated)
+  "subscriptions.table.subscription_type": "Tipo de assinatura",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency", (Auto-Translated)
+  "subscriptions.table.subscription_frequency": "Frequência de assinatura",
+
+  // "subscriptions.table.action": "Action", (Auto-Translated)
+  "subscriptions.table.action": "Ação",
+
+  // "subscriptions.table.edit": "Edit", (Auto-Translated)
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete", (Auto-Translated)
+  "subscriptions.table.delete": "Excluir",
+
+  // "subscriptions.table.not-available": "Not available", (Auto-Translated)
+  "subscriptions.table.not-available": "Não disponível",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", (Auto-Translated)
+  "subscriptions.table.not-available-message": "O item inscrito foi excluído, ou você não tem permissão para vê-lo",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", (Auto-Translated)
+  "subscriptions.table.empty.message": "Você não tem nenhuma assinatura no momento. Para se inscrever em atualizações por e-mail para uma comunidade ou coleção, use o botão de assinatura na página do objeto.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Imagem de Miniatura",
 
@@ -6344,6 +7560,9 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Pesquisa",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter", (Auto-Translated)
+  "vocabulary-treeview.info": "Selecione um assunto para adicionar como filtro de pesquisa",
+
   // "uploader.browse": "browse",
   "uploader.browse": "Navegar",
 
@@ -6356,8 +7575,8 @@
   // "uploader.or": ", or ",
   "uploader.or": ", ou ",
 
-  // "uploader.processing": "Processing",
-  "uploader.processing": "Processando",
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "Processando arquivo(s) enviado(s)... (agora é seguro fechar esta página)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Tamanho da fila",
@@ -6371,6 +7590,9 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Selecione os itens para os quais você deseja salvar os metadados virtuais como metadados reais",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items", (Auto-Translated)
+  "supervisedWorkspace.search.results.head": "Itens supervisionados",
+
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Suas submissões",
 
@@ -6380,6 +7602,9 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tarefas do Workflow",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks", (Auto-Translated)
+  "supervision.search.results.head": "Tarefas de fluxo de trabalho e espaço de trabalho",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar item do workflow",
 
@@ -6443,6 +7668,81 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Visualização da Área de Trabalho (Workspace)",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete", (Auto-Translated)
+  "workspace-item.delete.breadcrumbs": "Excluir espaço de trabalho",
+
+  // "workspace-item.delete.header": "Delete workspace item", (Auto-Translated)
+  "workspace-item.delete.header": "Excluir item do espaço de trabalho",
+
+  // "workspace-item.delete.button.confirm": "Delete", (Auto-Translated)
+  "workspace-item.delete.button.confirm": "Excluir",
+
+  // "workspace-item.delete.button.cancel": "Cancel", (Auto-Translated)
+  "workspace-item.delete.button.cancel": "Cancelar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted", (Auto-Translated)
+  "workspace-item.delete.notification.success.title": "Excluído",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted", (Auto-Translated)
+  "workspace-item.delete.title": "Este item do espaço de trabalho foi excluído com sucesso",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workspace-item.delete.notification.error.title": "Algo deu errado",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", (Auto-Translated)
+  "workspace-item.delete.notification.error.content": "O item do espaço de trabalho não pôde ser excluído",
+
+  // "workflow-item.advanced.title": "Advanced workflow", (Auto-Translated)
+  "workflow-item.advanced.title": "Fluxo de trabalho avançado",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisor selecionado",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.success.content": "O revisor deste item de fluxo de trabalho foi selecionado com sucesso",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.error.title": "Algo deu errado",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.error.content": "Não foi possível selecionar o revisor para este item de fluxo de trabalho",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.title": "Selecione Revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.header": "Selecione Revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.selectrevieweraction.button.cancel": "Cancelar",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm", (Auto-Translated)
+  "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.success.title": "Revisão de classificação",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.success.content": "A classificação para este item de fluxo de trabalho do item foi enviada com sucesso",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.error.title": "Algo deu errado",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.error.content": "Não foi possível avaliar este item",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.title": "Avaliar este item",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.header": "Avaliar este item",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.scorereviewaction.button.cancel": "Cancelar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm", (Auto-Translated)
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "Sessão vai expirar em breve",
 
@@ -6455,7 +7755,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Estender sessão",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -6488,10 +7788,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -6500,16 +7800,16 @@
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
   "researcherprofile.claim.not-authorized": "Você não está autorizado a reivindicar este item. Para mais detalhes, entre em contato com o(s) administrador(es)",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "Ocorreu um erro ao reivindicar o perfil, tente novamente mais tarde",
 
-  // "researcherprofile.error.claim.title" : "Error",
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Erro",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Perfil reivindicado com sucesso",
 
-  // "researcherprofile.success.claim.title" : "Success",
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Successo",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -6518,7 +7818,7 @@
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "Autorizações concedidas",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Conceder autorizações",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -6566,43 +7866,43 @@
   // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "Atualizar configurações",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliação",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Dados biográficos",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Educação",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identificadores",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "Todos financiamentos",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "Meus financiamentos",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Financiamentos selecionados",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Desabilitado",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "Todas publicações",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "Minhas publicações",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicações selecionadas",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Desabilitado",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
   "person.page.orcid.sync-queue.discard": "Descarte a alteração e não sincronize com o registro ORCID",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -6614,13 +7914,13 @@
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
   "person.page.orcid.sync-queue.empty-message": "O registro da fila ORCID está vazio",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Descrição",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Ação",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -6686,7 +7986,7 @@
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL do pesquisador",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Sincronize com o registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -6740,7 +8040,7 @@
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "O nome da organização é obrigatório",
 
-  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
   "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "A data de publicação deve ser um ano após 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
@@ -6818,10 +8118,156 @@
   // "person.orcid.registry.queue": "ORCID Registry Queue",
   "person.orcid.registry.queue": "ORCID Registro na Fila",
 
-  // "person.orcid.registry.auth": "ORCID Autorizações",
-  "person.orcid.registry.auth": "ORCID Autorizações",
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorizações ORCID",
 
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Submissões Recentes",
 
+  // "listable-notification-object.default-message": "This object couldn't be retrieved", (Auto-Translated)
+  "listable-notification-object.default-message": "Este objeto não pôde ser recuperado",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner", (Auto-Translated)
+  "system-wide-alert-banner.retrieval.error": "Algo deu errado recuperar o banner de alerta em todo o sistema",
+
+  // "system-wide-alert-banner.countdown.prefix": "In", (Auto-Translated)
+  "system-wide-alert-banner.countdown.prefix": "Em",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),", (Auto-Translated)
+  "system-wide-alert-banner.countdown.days": "{{days}} dia (s),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and", (Auto-Translated)
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora (s) e",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):", (Auto-Translated)
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuto (s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert", (Auto-Translated)
+  "menu.section.system-wide-alert": "Alerta em todo o sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert", (Auto-Translated)
+  "system-wide-alert.form.header": "Alerta em todo o sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert", (Auto-Translated)
+  "system-wide-alert-form.retrieval.error": "Algo deu errado recuperando o alerta em todo o sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel", (Auto-Translated)
+  "system-wide-alert.form.cancel": "Cancelar",
+
+  // "system-wide-alert.form.save": "Save", (Auto-Translated)
+  "system-wide-alert.form.save": "Salvar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE", (Auto-Translated)
+  "system-wide-alert.form.label.active": "ATIVO",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE", (Auto-Translated)
+  "system-wide-alert.form.label.inactive": "INATIVO",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message", (Auto-Translated)
+  "system-wide-alert.form.error.message": "O alerta amplo do sistema deve ter uma mensagem",
+
+  // "system-wide-alert.form.label.message": "Alert message", (Auto-Translated)
+  "system-wide-alert.form.label.message": "Mensagem de alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer", (Auto-Translated)
+  "system-wide-alert.form.label.countdownTo.enable": "Ativar um cronômetro de contagem regressiva",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.", (Auto-Translated)
+  "system-wide-alert.form.label.countdownTo.hint": "Dica: defina um cronômetro de contagem regressiva. Quando ativado, uma data pode ser definida no futuro e o banner de alerta em todo o sistema executará uma contagem regressiva para a data definida. Quando esse timer terminar, ele desaparecerá do alerta. O servidor NÃO será interrompido automaticamente.",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview", (Auto-Translated)
+  "system-wide-alert.form.label.preview": "Visualização de alerta em todo o sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated", (Auto-Translated)
+  "system-wide-alert.form.update.success": "O alerta em todo o sistema foi atualizado com sucesso",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert", (Auto-Translated)
+  "system-wide-alert.form.update.error": "Algo deu errado ao atualizar o alerta em todo o sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created", (Auto-Translated)
+  "system-wide-alert.form.create.success": "O alerta em todo o sistema foi criado com sucesso",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert", (Auto-Translated)
+  "system-wide-alert.form.create.error": "Algo deu errado ao criar o alerta em todo o sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", (Auto-Translated)
+  "admin.system-wide-alert.breadcrumbs": "Alertas em todo o sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts", (Auto-Translated)
+  "admin.system-wide-alert.title": "Alertas em todo o sistema",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.", (Auto-Translated)
+  "item-access-control-title": "Este formulário permite que você execute alterações nas condições de acesso dos metadados do item ou seus bitstreams.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).", (Auto-Translated)
+  "collection-access-control-title": "Este formulário permite executar alterações nas condições de acesso de todos os itens de propriedade desta coleção. As alterações podem ser realizadas em todos os metadados do item ou em todo o conteúdo (BitStreams).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).", (Auto-Translated)
+  "community-access-control-title": "Este formulário permite executar alterações nas condições de acesso de todos os itens pertencentes a qualquer coleção nesta comunidade. As alterações podem ser realizadas em todos os metadados do item ou em todo o conteúdo (BitStreams).",
+
+  // "access-control-item-header-toggle": "Item's Metadata", (Auto-Translated)
+  "access-control-item-header-toggle": "Metadados do item",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams", (Auto-Translated)
+  "access-control-bitstream-header-toggle": "BitStreams",
+
+  // "access-control-mode": "Mode", (Auto-Translated)
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions", (Auto-Translated)
+  "access-control-access-conditions": "Condições de acesso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.", (Auto-Translated)
+  "access-control-no-access-conditions-warning-message": "Atualmente, nenhuma condição de acesso é especificada abaixo. Se executado, isso substituirá as condições de acesso atuais pelas condições de acesso padrão herdadas da coleção proprietária.",
+
+  // "access-control-replace-all": "Replace access conditions", (Auto-Translated)
+  "access-control-replace-all": "Substitua as condições de acesso",
+
+  // "access-control-add-to-existing": "Add to existing ones", (Auto-Translated)
+  "access-control-add-to-existing": "Adicione aos existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams", (Auto-Translated)
+  "access-control-limit-to-specific": "Limitar as alterações em transmissões específicas",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item", (Auto-Translated)
+  "access-control-process-all-bitstreams": "Atualize todos os streams de bits no item",
+
+  // "access-control-bitstreams-selected": "bitstreams selected", (Auto-Translated)
+  "access-control-bitstreams-selected": "BitStreams selecionados",
+
+  // "access-control-cancel": "Cancel", (Auto-Translated)
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute", (Auto-Translated)
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more", (Auto-Translated)
+  "access-control-add-more": "Adicione mais",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams", (Auto-Translated)
+  "access-control-select-bitstreams-modal.title": "Selecione BitStreams",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.", (Auto-Translated)
+  "access-control-select-bitstreams-modal.no-items": "Sem itens para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close", (Auto-Translated)
+  "access-control-select-bitstreams-modal.close": "Fechar",
+
+  // "access-control-option-label": "Access condition type", (Auto-Translated)
+  "access-control-option-label": "Tipo de condição de acesso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.", (Auto-Translated)
+  "access-control-option-note": "Escolha uma condição de acesso para aplicar em objetos selecionados.",
+
+  // "access-control-option-start-date": "Grant access from", (Auto-Translated)
+  "access-control-option-start-date": "Conceder acesso de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied", (Auto-Translated)
+  "access-control-option-start-date-note": "Selecione a data a partir da qual a condição de acesso relacionada é aplicada",
+
+  // "access-control-option-end-date": "Grant access until", (Auto-Translated)
+  "access-control-option-end-date": "Conceder acesso até",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied", (Auto-Translated)
+  "access-control-option-end-date-note": "Selecione a data até a qual a condição de acesso relacionada é aplicada",
 }
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index a187ff927c..9e6d678622 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -737,6 +737,409 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
   // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
   "admin.access-control.groups.form.tooltip.editGroupPage": "Nesta página, pode modificar as propriedades e os membros de um grupo. Na secção superior, pode editar o nome e a descrição do grupo, a menos que se trate de um grupo administrativo para uma coleção ou comunidade, em que o nome e a descrição do grupo são auto-gerados e não podem ser editados. Nas seções seguintes, pode editar o nome e a descrição do grupo. Ver [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+ou+gerir+a+utilizador+grupo) para mais detalhes.",
 
@@ -2054,8 +2457,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Scan de vírus",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
-  "curation-task.task.register-doi.label": "Registo DOI",
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registo DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarefa:",
@@ -2259,7 +2662,7 @@
   "confirmation-modal.delete-eperson.header": "Apagar Utilizador \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "Pretende apagar o utilizar \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Pretende apagar o utilizador \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Cancelar",
@@ -2666,7 +3069,7 @@
   "health-page.property.status": "Código Estado",
 
   // "health-page.section.db.title": "Database",
-  "health-page.section.db.title": "Base Dados",
+  "health-page.section.db.title": "Base de Dados",
 
   // "health-page.section.geoIp.title": "GeoIp",
   "health-page.section.geoIp.title": "GeoIp",
@@ -4163,6 +4566,17 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
 
+
+
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Relatórios",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Coleções filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consultas de metadados",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Pesquisa administrativa",
 
@@ -4238,6 +4652,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secção do menu controle de acesso",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Secção do menu pesquisa administrativa",
 
@@ -4335,6 +4753,13 @@
   "menu.section.statistics": "Estatísticas",
 
   // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "Tarefas de Estatísticas",
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   "menu.section.statistics_task": "Tarefa de estatísticas",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
@@ -4478,7 +4903,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Em validação",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Aguarda validador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
@@ -7713,20 +8138,20 @@
   // "browse.metadata.srsc": "Subject Category",
   "browse.metadata.srsc": "vocabulário controlado (SRSC)",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Depositado",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Depositado",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Em validação",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Em validação",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for Controller",
-  "mydspace.status.waiting-for-controller": "Aguarda validador",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for Controller",
+  "mydspace.status.mydspaceWaitingController": "Aguarda validador",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Em fluxo de trabalho",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Em fluxo de trabalho",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Depósito por terminar",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Depósito por terminar",
 
   // "search.filters.namedresourcetype.Archived": "Archived",
   "search.filters.namedresourcetype.Archived": "Depositado",
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
new file mode 100644
index 0000000000..81b776529c
--- /dev/null
+++ b/src/assets/i18n/sr-cyr.json5
@@ -0,0 +1,2616 @@
+{
+  // Initial version provided by University of Kragujevac, Serbia 2023.
+  "401.help": "Нисте овлашћени да приступите овој страници. Можете користити дугме испод да се вратите на почетну страницу.",
+  "401.link.home-page": "Одведи ме на почетну страницу",
+  "401.unauthorized": "Неовлашћен приступ",
+  "403.help": "Немате дозволу да приступите овој страници. Можете користити дугме испод да се вратите на почетну страницу.",
+  "403.link.home-page": "Одведи ме на почетну страницу",
+  "403.forbidden": "Забрањен приступ",
+  "500.page-internal-server-error": "Услуга није доступна",
+  "500.help": "Сервер привремено није у могућности да сервисира ваш захтев због застоја у одржавању или проблема са капацитетом. Покушајте поново касније.",
+  "500.link.home-page": "Одведи ме на почетну страницу",
+  "404.help": "Не можемо да пронађемо страницу коју тражите. Страница је можда премештена или избрисана. Можете користити дугме испод да се вратите на почетну страницу.",
+  "404.link.home-page": "Одведи ме на почетну страницу",
+  "404.page-not-found": "Страница није пронађена",
+  "error-page.description.401": "Неовлашћен приступ",
+  "error-page.description.403": "Забрањен приступ",
+  "error-page.description.500": "Услуга није доступна",
+  "error-page.description.404": "Страница није пронађена",
+  "error-page.orcid.generic-error": "Дошло је до грешке приликом пријављивања преко ORCID-а. Уверите се да сте поделили имејл адресу свог ORCID налога са DSpace-ом. Ако грешка и даље постоји, контактирајте администратора",
+  "access-status.embargo.listelement.badge": "Ембарго",
+  "access-status.metadata.only.listelement.badge": "Само метаподаци",
+  "access-status.open.access.listelement.badge": "Отворен приступ",
+  "access-status.restricted.listelement.badge": "Ограничен приступ",
+  "access-status.unknown.listelement.badge": "Непознато",
+  "admin.curation-tasks.breadcrumbs": "Задаци курирања система",
+  "admin.curation-tasks.title": "Задаци курирања система",
+  "admin.curation-tasks.header": "Задаци курирања система",
+  "admin.registries.bitstream-formats.breadcrumbs": "Форматирајте регистар",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Формат битстрим-а",
+  "admin.registries.bitstream-formats.create.failure.content": "Дошло је до грешке при креирању новог формата битстрим-а.",
+  "admin.registries.bitstream-formats.create.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.create.head": "Креирајте формат битстрим-а",
+  "admin.registries.bitstream-formats.create.new": "Додајте нови формат битстрим-а",
+  "admin.registries.bitstream-formats.create.success.content": "Нови формат битстрим-а је успешно креиран.",
+  "admin.registries.bitstream-formats.create.success.head": "Успешно",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Уклањање {{ amount }} формата није успело",
+  "admin.registries.bitstream-formats.delete.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.delete.success.amount": "Успешно уклоњен {{ amount }} формат",
+  "admin.registries.bitstream-formats.delete.success.head": "Успешно",
+  "admin.registries.bitstream-formats.description": "Ова листа формата битстрим-а пружа информације о познатим форматима и нивоу њихове подршке.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Формат битстрим-а",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.label": "Опис",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Екстензије су екстензије фајлова које се користе за аутоматску идентификацију формата отпремљених фајлова. Можете да унесете неколико екстензија за сваки формат.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Екстензије фајлова",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Унесите екстензију фајла без тачке",
+  "admin.registries.bitstream-formats.edit.failure.content": "Дошло је до грешке при уређивању формата битстрим-а",
+  "admin.registries.bitstream-formats.edit.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.edit.head": "Формат битстрим-а: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Формати означени као интерни су скривени од корисника и користе се у административне сврхе.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Унутрашње",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "MIME тип повезан са овим форматом не мора бити јединствен.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME тип",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Јединствено име за овај формат, (нпр. Microsoft Word XP или Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Име",
+  "admin.registries.bitstream-formats.edit.success.content": "Формат битстрим-а је успешно измењен.",
+  "admin.registries.bitstream-formats.edit.success.head": "Успешно",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Ниво подршке коју ваша институција обећава за овај формат.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Ниво подршке",
+  "admin.registries.bitstream-formats.head": "Регистар формата битстрим-а",
+  "admin.registries.bitstream-formats.no-items": "Нема формата битова за приказ.",
+  "admin.registries.bitstream-formats.table.delete": "Избриши изабрано",
+  "admin.registries.bitstream-formats.table.deselect-all": "Поништите све",
+  "admin.registries.bitstream-formats.table.internal": "Унутрашње",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME тип",
+  "admin.registries.bitstream-formats.table.name": "Име",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.return": "Назад",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Познато",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Подржано",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Непознато",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Ниво подршке",
+  "admin.registries.bitstream-formats.title": "Регистар формата битстрим-а",
+  "admin.registries.metadata.breadcrumbs": "Регистар метаподатака",
+  "admin.registries.metadata.description": "Регистар метаподатака одржава листу свих поља метаподатака доступних у спремишту. Ова поља могу бити подељена на више шема. Међутим, DSpace захтева квалификовану Dublin Core шему",
+  "admin.registries.metadata.form.create": "Креирајте шему метаподатака",
+  "admin.registries.metadata.form.edit": "Уредите шему метаподатака",
+  "admin.registries.metadata.form.name": "Име",
+  "admin.registries.metadata.form.namespace": "Простор имена",
+  "admin.registries.metadata.head": "Регистар метаподатака",
+  "admin.registries.metadata.schemas.no-items": "Нема шема метаподатака за приказ.",
+  "admin.registries.metadata.schemas.table.delete": "Избриши изабрано",
+  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.name": "Име",
+  "admin.registries.metadata.schemas.table.namespace": "Простор имена",
+  "admin.registries.metadata.title": "Регистар метаподатака",
+  "admin.registries.schema.breadcrumbs": "Шема метаподатака",
+  "admin.registries.schema.description": "Ово је шема метаподатака за \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Поља метаподатака шеме",
+  "admin.registries.schema.fields.no-items": "Нема поља метаподатака за приказ.",
+  "admin.registries.schema.fields.table.delete": "Избриши изабрано",
+  "admin.registries.schema.fields.table.field": "Поље",
+  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.scopenote": "Сцопе напомена",
+  "admin.registries.schema.form.create": "Креирајте поље за метаподатке",
+  "admin.registries.schema.form.edit": "Измените поље за метаподатке",
+  "admin.registries.schema.form.element": "Елемент",
+  "admin.registries.schema.form.qualifier": "Квалификатор",
+  "admin.registries.schema.form.scopenote": "Сцопе напомена",
+  "admin.registries.schema.head": "Шема метаподатака",
+  "admin.registries.schema.notification.created": "Успешно креирана шема метаподатака \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Неуспешно брисање {{amount}} шема метаподатака",
+  "admin.registries.schema.notification.deleted.success": "Успешно избрисане {{amount}} шеме метаподатака",
+  "admin.registries.schema.notification.edited": "Успешно измењена шема метаподатака \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Грешка",
+  "admin.registries.schema.notification.field.created": "Успешно креирано поље метаподатака \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Неуспешно брисање {{amount}} поља метаподатака",
+  "admin.registries.schema.notification.field.deleted.success": "Успешно избрисана {{amount}} поља метаподатака",
+  "admin.registries.schema.notification.field.edited": "Успешно измењено поље метаподатака \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Успешно",
+  "admin.registries.schema.return": "Назад",
+  "admin.registries.schema.title": "Регистар шеме метаподатака",
+  "admin.access-control.bulk-access.breadcrumbs": "Управљање масовним приступом",
+  "administrativeBulkAccess.search.results.head": "Резултати претраге",
+  "admin.access-control.bulk-access": "Управљање масовним приступом",
+  "admin.access-control.bulk-access.title": "Управљање масовним приступом",
+  "admin.access-control.bulk-access-browse.header": "Корак 1: Изаберите објекте",
+  "admin.access-control.bulk-access-browse.search.header": "Претрага",
+  "admin.access-control.bulk-access-browse.selected.header": "Тренутни избор ({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Корак 2: Операција коју треба извршити",
+  "admin.access-control.epeople.actions.delete": "Избришите EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Опонашати EPerson",
+  "admin.access-control.epeople.actions.reset": "Ресетујте шифру",
+  "admin.access-control.epeople.actions.stop-impersonating": "Заустави представљање као EPerson",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.search.head": "Претрага",
+  "admin.access-control.epeople.button.see-all": "Прегледајте све",
+  "admin.access-control.epeople.search.scope.metadata": "Метаподаци",
+  "admin.access-control.epeople.search.scope.email": "Е-мејл (тачно)",
+  "admin.access-control.epeople.search.button": "Претрага",
+  "admin.access-control.epeople.search.placeholder": "Претражите људе...",
+  "admin.access-control.epeople.button.add": "Додајте EPerson",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Име",
+  "admin.access-control.epeople.table.email": "Е-мејл (тачно)",
+  "admin.access-control.epeople.table.edit": "Измена",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Измените \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Нисте овлашћени за уређивање ове групе",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Избришите \"{{name}}\"",
+  "admin.access-control.epeople.no-items": "Нема EPeople за приказ.",
+  "admin.access-control.epeople.form.create": "Креирајте EPerson",
+  "admin.access-control.epeople.form.edit": "Измените EPerson",
+  "admin.access-control.epeople.form.firstName": "Име",
+  "admin.access-control.epeople.form.lastName": "Презиме",
+  "admin.access-control.epeople.form.email": "Е-мејл",
+  "admin.access-control.epeople.form.emailHint": "Мора бити важећа Е-мејл адреса",
+  "admin.access-control.epeople.form.canLogIn": "Може се пријавити",
+  "admin.access-control.epeople.form.requireCertificate": "Потребан је сертификат",
+  "admin.access-control.epeople.form.return": "Назад",
+  "admin.access-control.epeople.form.notification.created.success": "Успешно креиран EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Неуспешно креирање EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Неуспешно креирање EPerson \"{{name}}\", емаил \"{{email}}\" се већ користи.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Неуспешна измена EPerson \"{{name}}\", емаил \"{{email}}\" се већ користи.",
+  "admin.access-control.epeople.form.notification.edited.success": "Успешно измењен EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Неуспешна измена EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Успешно избрисан EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Неуспешно брисање EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Члан ових група:",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Име",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Овај EPerson није члан ниједне групе",
+  "admin.access-control.epeople.form.goToGroups": "Додајте групама",
+  "admin.access-control.epeople.notification.deleted.failure": "Неуспешно брисање EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Успешно избрисан EPerson: \"{{name}}\"",
+  "admin.access-control.groups.title": "Групе",
+  "admin.access-control.groups.breadcrumbs": "Групе",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Измените групу",
+  "admin.access-control.groups.title.singleGroup": "Измените групу",
+  "admin.access-control.groups.title.addGroup": "Нова група",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Нова група",
+  "admin.access-control.groups.head": "Групе",
+  "admin.access-control.groups.button.add": "Додајте групу",
+  "admin.access-control.groups.search.head": "Претрага група",
+  "admin.access-control.groups.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.search.button": "Претрага",
+  "admin.access-control.groups.search.placeholder": "Претражите групе...",
+  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.name": "Име",
+  "admin.access-control.groups.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.groups.table.members": "Чланови",
+  "admin.access-control.groups.table.edit": "Изменити",
+  "admin.access-control.groups.table.edit.buttons.edit": "Измените \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Избришите \"{{name}}\"",
+  "admin.access-control.groups.no-items": "Није пронађена ниједна група са овим у свом имену или овим као UUID",
+  "admin.access-control.groups.notification.deleted.success": "Успешно избрисана група \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Неуспешно брисање групе \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Узрок: \"{{cause}}\"",
+  "admin.access-control.groups.form.alert.permanent": "Ова група је трајна, тако да се не може мењати или брисати. И даље можете да додајете и уклањате чланове групе користећи ову страницу.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Ова група се не може изменити или избрисати јер одговара улози у процесу слања и тока посла у \"{{name}}\" {{comcol}}. Можете је избрисати са картице <a href='{{comcolEditRolesRoute}}'>\"додели улоге\"</a> на страници за уређивање {{comcol}}. И даље можете да додајете и уклањате чланове групе користећи ову страницу.",
+  "admin.access-control.groups.form.head.create": "Креирај групу",
+  "admin.access-control.groups.form.head.edit": "Измени групу",
+  "admin.access-control.groups.form.groupName": "Назив групе",
+  "admin.access-control.groups.form.groupCommunity": "Заједница или колекција",
+  "admin.access-control.groups.form.groupDescription": "Опис",
+  "admin.access-control.groups.form.notification.created.success": "Успешно креирана Група \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Неуспешно креирање Групе \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Неуспешно креирање Групе са именом: \"{{name}}\", проверите да име није већ употребљено.",
+  "admin.access-control.groups.form.notification.edited.failure": "Неуспешна измена Групе \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Назив \"{{name}}\" се већ користи!",
+  "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" је успешно измењена",
+  "admin.access-control.groups.form.actions.delete": "Избришите групу",
+  "admin.access-control.groups.form.delete-group.modal.header": "Избришите групу \"{{ dsoName}}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Да ли сте сигурни да желите да избришете групу \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Поништити, отказати",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Избришите",
+  "admin.access-control.groups.form.notification.deleted.success": "Група \"{{ name }}\" је успешно обрисана",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Брисање групе \"{{ name }}\" није успело",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Узрок: \"{{ cause }}\"",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Додајте EPeople",
+  "admin.access-control.groups.form.members-list.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.form.members-list.headMembers": "Тренутни чланови",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Метаподатак",
+  "admin.access-control.groups.form.members-list.search.scope.email": "Е-мејл (тачно)",
+  "admin.access-control.groups.form.members-list.search.button": "Претрага",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.name": "Име",
+  "admin.access-control.groups.form.members-list.table.identity": "Идентитет",
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.edit": "Уклони / Додај",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Уклоните члана са именом \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Члан је успешно додат: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Додавање члана није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Успешно обрисан члан: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Брисање члана није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Додај члана са именом \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Нема тренутно активне групе, прво пошаљите име.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Још нема чланова у групи, претражите и додајте.",
+  "admin.access-control.groups.form.members-list.no-items": "Ниједан EPeople није пронађен у тој претрази",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Нешто није у реду: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.head": "Групе",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Додајте подгрупу",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Тренутне подгрупе",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Претрага",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Име",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Уклони / Додај",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Уклоните подгрупу са именом \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Додајте подгрупу са именом \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Тренутна група",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Подгрупа је успешно додата: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Додавање подгрупе није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Успешно обрисана подгрупа: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Брисање подгрупе није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Нема тренутно активне групе, прво пошаљите име.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Ово је тренутна група, не може се додати.",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Није пронађена ниједна група са овим у свом имену или овим као UUID",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Још нема подгрупа у групи.",
+  "admin.access-control.groups.form.return": "Назад",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "На овој страници можете да мењате својства и чланове групе. У горњем одељку можете да измените име и опис групе, осим ако је ово администраторска група за колекцију или заједницу, у ком случају се име и опис групе аутоматски генеришу и не могу се мењати. У следећим одељцима можете да мењате чланство у групи. Погледајте [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) за више детаља.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Да бисте додали или уклонили EPerson-у/из ове групе, или кликните на дугме 'Прегледај све' или користите траку за претрагу испод да бисте претражили кориснике (користите падајући мени са леве стране траке за претрагу да бисте изабрали да ли ћете претраживати према метаподацима или према е-маилу). Затим кликните на икону плус за сваког корисника којег желите да додате на листу испод или на икону корпе за смеће за сваког корисника којег желите да уклоните. Листа у наставку може имати неколико страница: користите контроле странице испод листе да бисте прешли на следеће странице. Када будете спремни, сачувајте промене кликом на дугме \"Сачувај\" у горњем делу.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Да бисте додали или уклонили подгрупу у/из ове групе, кликните на дугме 'Прегледај све' или користите траку за претрагу испод да бисте претражили кориснике. Затим кликните на икону плус за сваког корисника којег желите да додате на листу испод или на икону корпе за смеће за сваког корисника којег желите да уклоните. Листа у наставку може имати неколико страница: користите контроле странице испод листе да бисте прешли на следеће странице. Када будете спремни, сачувајте промене кликом на дугме \"Сачувај\" у горњем делу.",
+  "admin.search.breadcrumbs": "Административна претрага",
+  "admin.search.collection.edit": "Уредите",
+  "admin.search.community.edit": "Уредите",
+  "admin.search.item.delete": "Избришите",
+  "admin.search.item.edit": "Уредите",
+  "admin.search.item.make-private": "Учините невидљивим",
+  "admin.search.item.make-public": "Учините видљивим",
+  "admin.search.item.move": "Померите",
+  "admin.search.item.reinstate": "Реинстате",
+  "admin.search.item.withdraw": "Одустати",
+  "admin.search.title": "Административна претрага",
+  "administrativeView.search.results.head": "Административна претрага",
+  "admin.workflow.breadcrumbs": "Администрирање радног процеса",
+  "admin.workflow.title": "Администрирање радног процеса",
+  "admin.workflow.item.workflow": "Процес рада",
+  "admin.workflow.item.workspace": "Радни простор",
+  "admin.workflow.item.delete": "Избришите",
+  "admin.workflow.item.send-back": "Вратите",
+  "admin.workflow.item.policies": "Политике",
+  "admin.workflow.item.supervision": "Надзор",
+  "admin.metadata-import.breadcrumbs": "Увези метаподатке",
+  "admin.batch-import.breadcrumbs": "Увези Batch",
+  "admin.metadata-import.title": "Увези метаподатке",
+  "admin.batch-import.title": "Увези Batch",
+  "admin.metadata-import.page.header": "Увезите метаподатке",
+  "admin.batch-import.page.header": "Увези Batch",
+  "admin.metadata-import.page.help": "Овде можете да превучете или прегледате CSV фајлове који садрже Batch операције метаподатака за фајлове",
+  "admin.batch-import.page.help": "Изаберите колекцију у коју желите да увезете. Затим превуците или потражите ZIP фајл једноставног архивског формата (SAF) која укључује ставке за увоз",
+  "admin.batch-import.page.toggle.help": "Могуће је извршити увоз било са отпремањем фајла или преко URL-а, користите горњи прекидач да бисте подесили извор уноса",
+  "admin.metadata-import.page.dropMsg": "Превуците CSV са метаподацима за увоз",
+  "admin.batch-import.page.dropMsg": "Превуците Batch ZIP за увоз",
+  "admin.metadata-import.page.dropMsgReplace": "Превуците да замените CSV са метаподацима за увоз",
+  "admin.batch-import.page.dropMsgReplace": "Превуците да замените Batch ZIP за увоз",
+  "admin.metadata-import.page.button.return": "Назад",
+  "admin.metadata-import.page.button.proceed": "Наставите",
+  "admin.metadata-import.page.button.select-collection": "Изаберите колекцију",
+  "admin.metadata-import.page.error.addFile": "Прво изаберите фајл!",
+  "admin.metadata-import.page.error.addFileUrl": "Прво унесите URL фајл!",
+  "admin.batch-import.page.error.addFile": "Прво изаберите ZIP фајл!",
+  "admin.metadata-import.page.toggle.upload": "Отпремите",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Уметните Batch ZIP URL за увоз",
+  "admin.metadata-import.page.validateOnly": "Само валидирај",
+  "admin.metadata-import.page.validateOnly.hint": "Када се изабере, отпремљени CSV ће бити потврђен. Добићете извештај о утврђеним променама, али промене неће бити сачуване.",
+  "advanced-workflow-action.rating.form.rating.label": "Оцена",
+  "advanced-workflow-action.rating.form.rating.error": "Морате оценити ставку",
+  "advanced-workflow-action.rating.form.review.label": "Преглед",
+  "advanced-workflow-action.rating.form.review.error": "Морате унети рецензију да бисте послали ову оцену",
+  "advanced-workflow-action.rating.description": "Молимо изаберите оцену испод",
+  "advanced-workflow-action.rating.description-requiredDescription": "Молимо изаберите оцену испод и додајте рецензију",
+  "advanced-workflow-action.select-reviewer.description-single": "Молимо изаберите једног рецензента испод пре слања",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Молимо изаберите једног или више рецензената испод пре слања",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Додајте EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Прегледајте све",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Тренутни чланови",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Метаподаци",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Е-мејл (тачно)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Претрага",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Име",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Идентитет",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Уклоните / Додајте",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Уклоните члана са именом \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Успешно додат члан: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Неуспешно додавање члана: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Успешно избрисан члан: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Неуспешно брисање члана: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Додајте члана са именом \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Тренутно нема активне групе, прво унесите име.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Још нема чланова у групи, претражите и додајте.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Ниједан EPeople није пронађен у тој претрази",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Није изабран рецензент.",
+  "admin.batch-import.page.validateOnly.hint": "Када се изабере, отпремљени ZIP ће бити потврђен. Добићете извештај о утврђеним променама, али промене неће бити сачуване.",
+  "admin.batch-import.page.remove": "уклонити",
+  "auth.errors.invalid-user": "Погрешна Е-мејл адреса или лозинка.",
+  "auth.messages.expired": "Ваша сесија је истекла. Молимо пријавите се поново.",
+  "auth.messages.token-refresh-failed": "Освежавање токена сесије није успело. Молимо пријавите се поново.",
+  "bitstream.download.page": "Тренутно се преузима {{bitstream}}...",
+  "bitstream.download.page.back": "Назад",
+  "bitstream.edit.authorizations.link": "Измените полисе битстрим-а",
+  "bitstream.edit.authorizations.title": "Измените полисе битстрим-а",
+  "bitstream.edit.return": "Назад",
+  "bitstream.edit.bitstream": "битстрим:",
+  "bitstream.edit.form.description.hint": "Опционо, наведите кратак опис фајла, на пример \"<i>Главни чланак</i>\" или \"<i>Очитавања података експеримента</i>\".",
+  "bitstream.edit.form.description.label": "Опис",
+  "bitstream.edit.form.embargo.hint": "Први дан од којег је приступ дозвољен. <b>Овај датум се не може изменити у овом обрасцу.</b> Да бисте поставили датум забране за битстрим, идите на картицу <i>Статус ставке</i>, кликните на <i>Овлашћења...</i >, креирајте или измените политику битстрим-ова<i>ПРОЧИТАЈТЕ</i> и поставите <i>Датум почетка</i> по жељи.",
+  "bitstream.edit.form.embargo.label": "Забрана до одређеног датума",
+  "bitstream.edit.form.fileName.hint": "Промените име фајла за битстрим. Имајте на уму да ће се овим променити приказани битстрим URL, али ће се стари линкови и даље разрешити све док се ID секвенце не промени.",
+  "bitstream.edit.form.fileName.label": "Име фајла",
+  "bitstream.edit.form.newFormat.label": "Опишите нови формат",
+  "bitstream.edit.form.newFormat.hint": "Апликација коју сте користили за креирање фајла, и број верзије (на пример, \"<i>ACMESoft SuperApp верзија 1.5</i>\").",
+  "bitstream.edit.form.primaryBitstream.label": "Примарни битстрим",
+  "bitstream.edit.form.selectedFormat.hint": "Ако формат није на горњој листи, <b>изаберите \"формат није на листи\" изнад</b> и опишите га под \"Опишите нови формат\".",
+  "bitstream.edit.form.selectedFormat.label": "Изабрани формат",
+  "bitstream.edit.form.selectedFormat.unknown": "Формат није на листи",
+  "bitstream.edit.notifications.error.format.title": "Дошло је до грешке приликом чувања битстрим формата",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Дошло је до грешке приликом чувања примарног битстрим-а",
+  "bitstream.edit.form.iiifLabel.label": "IIIF ознака",
+  "bitstream.edit.form.iiifLabel.hint": "Ознака canvas-а за ову слику. Ако није дата, користиће се подразумевана ознака.",
+  "bitstream.edit.form.iiifToc.label": "IIIF Преглед садржаја",
+  "bitstream.edit.form.iiifToc.hint": "Додавање текста овде, чини ово место почетком новог опсега садржаја.",
+  "bitstream.edit.form.iiifWidth.label": "IIIF ширина canvas-а",
+  "bitstream.edit.form.iiifWidth.hint": "Ширина платна обично треба да одговара ширини слике.",
+  "bitstream.edit.form.iiifHeight.label": "IIIF висина canvas-a",
+  "bitstream.edit.form.iiifHeight.hint": "Висина canvas-а обично треба да одговара висини слике.",
+  "bitstream.edit.notifications.saved.content": "Ваше промене у овом битстрим-у су сачуване.",
+  "bitstream.edit.notifications.saved.title": "битстрим је сачуван",
+  "bitstream.edit.title": "Измените битстрим",
+  "bitstream-request-a-copy.alert.canDownload1": "Већ имате приступ овом фајлу. Ако желите да преузмете фајл, кликните",
+  "bitstream-request-a-copy.alert.canDownload2": "овде",
+  "bitstream-request-a-copy.header": "Затражите копију фајла",
+  "bitstream-request-a-copy.intro": "Унесите следеће информације да бисте затражили копију следеће ставке:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Захтева се следећи фајл:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Захтевају се сви фајлови.",
+  "bitstream-request-a-copy.name.label": "име *",
+  "bitstream-request-a-copy.name.error": "Име је обавезно",
+  "bitstream-request-a-copy.email.label": "Ваша емаил адреса *",
+  "bitstream-request-a-copy.email.hint": "Ова Е-мејл адреса се користи за слање фајла.",
+  "bitstream-request-a-copy.email.error": "Молим Вас унесите исправну Е-мејл адресу.",
+  "bitstream-request-a-copy.allfiles.label": "Фајлови",
+  "bitstream-request-a-copy.files-all-false.label": "Само тражени фајл",
+  "bitstream-request-a-copy.files-all-true.label": "Све фајлови (ове ставке) у ограниченом приступу",
+  "bitstream-request-a-copy.message.label": "Порука",
+  "bitstream-request-a-copy.return": "Назад",
+  "bitstream-request-a-copy.submit": "Захтевај копију",
+  "bitstream-request-a-copy.submit.success": "Захтев за ставку је успешно достављен.",
+  "bitstream-request-a-copy.submit.error": "Нешто није у реду са слањем захтева за ставку.",
+  "browse.back.all-results": "Сви резултати прегледа",
+  "browse.comcol.by.author": "По аутору",
+  "browse.comcol.by.dateissued": "По датуму издања",
+  "browse.comcol.by.subject": "По предмету",
+  "browse.comcol.by.srsc": "По категорији предмета",
+  "browse.comcol.by.title": "По наслову",
+  "browse.comcol.head": "Прегледајте",
+  "browse.empty": "Нема ставки за приказ.",
+  "browse.metadata.author": "Аутору",
+  "browse.metadata.dateissued": "Датуму издања",
+  "browse.metadata.subject": "Предмету",
+  "browse.metadata.title": "Наслову",
+  "browse.metadata.author.breadcrumbs": "Преглед по аутору",
+  "browse.metadata.dateissued.breadcrumbs": "Преглед по датуму",
+  "browse.metadata.subject.breadcrumbs": "Преглед по предмету",
+  "browse.metadata.srsc.breadcrumbs": "Преглед по категорији предмета",
+  "browse.metadata.title.breadcrumbs": "Преглед по наслову",
+  "pagination.next.button": "Следеће",
+  "pagination.previous.button": "Претходно",
+  "pagination.next.button.disabled.tooltip": "Нема више страница са резултатима",
+  "browse.startsWith": ", почевши од {{ startsWith }}",
+  "browse.startsWith.choose_start": "(Изаберите почетак)",
+  "browse.startsWith.choose_year": "(Изаберите годину)",
+  "browse.startsWith.choose_year.label": "Изаберите годину издања",
+  "browse.startsWith.jump": "Филтрирајте резултате по години или месецу",
+  "browse.startsWith.months.april": "Април",
+  "browse.startsWith.months.august": "Август",
+  "browse.startsWith.months.december": "Децембар",
+  "browse.startsWith.months.february": "Фебруар",
+  "browse.startsWith.months.january": "Јануар",
+  "browse.startsWith.months.july": "Јул",
+  "browse.startsWith.months.june": "Јун",
+  "browse.startsWith.months.march": "Март",
+  "browse.startsWith.months.may": "Мај",
+  "browse.startsWith.months.none": "(Изаберите месец)",
+  "browse.startsWith.months.none.label": "Изаберите месец издања",
+  "browse.startsWith.months.november": "Новембар",
+  "browse.startsWith.months.october": "Октобар",
+  "browse.startsWith.months.september": "Септембар",
+  "browse.startsWith.submit": "Прегледај",
+  "browse.startsWith.type_date": "Филтрирајте резултате по датуму",
+  "browse.startsWith.type_date.label": "Или унесите датум (година-месец) и кликните на дугме Прегледај",
+  "browse.startsWith.type_text": "Филтрирајте резултате уписивањем првих неколико слова",
+  "browse.startsWith.input": "Филтер",
+  "browse.taxonomy.button": "Прегледај",
+  "browse.title": "Прегледање {{ collection }} према {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Прегледање {{ collection }} према {{ field }} {{ value }}",
+  "search.browse.item-back": "Назад на резултате",
+  "chips.remove": "Уклоните чип",
+  "claimed-approved-search-result-list-element.title": "Одобрено",
+  "claimed-declined-search-result-list-element.title": "Одбијено, враћено подносиоцу",
+  "claimed-declined-task-search-result-list-element.title": "Одбијено, враћено менаджеру за преглед",
+  "collection.create.head": "Направите колекцију",
+  "collection.create.notifications.success": "Колекција је успешно направљена",
+  "collection.create.sub-head": "Направите колекцију за заједницу {{ parent }}",
+  "collection.curate.header": "Сачувај колекцију: {{collection}}",
+  "collection.delete.cancel": "Поништити, отказати",
+  "collection.delete.confirm": "Потврди",
+  "collection.delete.processing": "Брисање",
+  "collection.delete.head": "Избришите колекцију",
+  "collection.delete.notification.fail": "Колекција се не може избрисати",
+  "collection.delete.notification.success": "Колекција је успешно избрисана",
+  "collection.delete.text": "Да ли сте сигурни да желите да избришете колекцију \"{{ dso }}\"",
+  "collection.edit.delete": "Избришите ову колекцију",
+  "collection.edit.head": "Уредите колекцију",
+  "collection.edit.breadcrumbs": "Уредите колекцију",
+  "collection.edit.tabs.mapper.head": "Мапирање ставки",
+  "collection.edit.tabs.item-mapper.title": "Уређивање колекције - мапирање ставки",
+  "collection.edit.item-mapper.cancel": "Поништити, отказати",
+  "collection.edit.item-mapper.collection": "Колекција: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Мапирајте изабране ставке",
+  "collection.edit.item-mapper.description": "Ово је алатка за мапирање ставки која омогућава администраторима колекције да мапирају ставке из других колекција у ову колекцију. Можете тражити ставке из других колекција и мапирати их или прегледати листу тренутно мапираних ставки.",
+  "collection.edit.item-mapper.head": "Мапирање ставки - мапа ставки из других колекција",
+  "collection.edit.item-mapper.no-search": "Унесите упит за претрагу",
+  "collection.edit.item-mapper.notifications.map.error.content": "Дошло је до грешака за мапирање {{amount}} ставки.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Грешке у мапирању",
+  "collection.edit.item-mapper.notifications.map.success.content": "Успешно мапиране {{amount}} ставке.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Мапирање је завршено",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Дошло је до грешака при уклањању мапирања ставки {{amount}}.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Уклоните грешке мапирања",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Успешно су уклоњена мапирања {{amount}} ставки.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Уклањање мапирања је завршено",
+  "collection.edit.item-mapper.remove": "Уклањање мапирања изабраних ставки",
+  "collection.edit.item-mapper.search-form.placeholder": "Претражи ставке...",
+  "collection.edit.item-mapper.tabs.browse": "Прегледајте мапиране ставке",
+  "collection.edit.item-mapper.tabs.map": "Мапирајте нове ставке",
+  "collection.edit.logo.delete.title": "Избришите лого",
+  "collection.edit.logo.delete-undo.title": "Опозови брисање",
+  "collection.edit.logo.label": "Лого колекције",
+  "collection.edit.logo.notifications.add.error": "Отпремање лога колекције није успело. Проверите садржај пре поновног покушаја.",
+  "collection.edit.logo.notifications.add.success": "Отпремање лога колекције је успешно.",
+  "collection.edit.logo.notifications.delete.success.title": "Лого је избрисан",
+  "collection.edit.logo.notifications.delete.success.content": "Успешно је обрисан лого колекције",
+  "collection.edit.logo.notifications.delete.error.title": "Грешка при брисању лога",
+  "collection.edit.logo.upload": "Превуците логотип колекције за отпремање",
+  "collection.edit.notifications.success": "Успешно уређена колекција",
+  "collection.edit.return": "Назад",
+  "collection.edit.tabs.access-control.head": "Контрола приступа",
+  "collection.edit.tabs.access-control.title": "Уређивање колекције - Контрола приступа",
+  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.title": "Уређивање колекције - Curate",
+  "collection.edit.tabs.authorizations.head": "Овлашћења",
+  "collection.edit.tabs.authorizations.title": "Уређивање колекције - овлашћења",
+  "collection.edit.item.authorizations.load-bundle-button": "Учитајте још пакета",
+  "collection.edit.item.authorizations.load-more-button": "Учитај више",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Прикажи битстрим смернице за пакет",
+  "collection.edit.tabs.metadata.head": "Уреди метаподатке",
+  "collection.edit.tabs.metadata.title": "Уређивање колекције - Метаподаци",
+  "collection.edit.tabs.roles.head": "Додели улоге",
+  "collection.edit.tabs.roles.title": "Уређивање колекције - Улоге",
+  "collection.edit.tabs.source.external": "Ова колекција прикупља свој садржај из спољашњег извора",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Морате да обезбедите сет ID циљне колекције.",
+  "collection.edit.tabs.source.form.harvestType": "Садржај се прикупља",
+  "collection.edit.tabs.source.form.head": "Конфигуришите спољни извор",
+  "collection.edit.tabs.source.form.metadataConfigId": "Формат метаподатака",
+  "collection.edit.tabs.source.form.oaiSetId": "ID специфичног скупа за OAI",
+  "collection.edit.tabs.source.form.oaiSource": "OAI провајдер",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Сакупите метаподатке и битстрим-ове (захтева ORE подршку)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Сакупите метаподатке и референце на битстрим-ове (захтева ORE подршку)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Само прикупљени метаподаци",
+  "collection.edit.tabs.source.head": "Извор садржаја",
+  "collection.edit.tabs.source.notifications.discarded.content": "Ваше промене су одбачене. Да бисте поново поставили своје промене, кликните на дугме \"Опозови\".",
+  "collection.edit.tabs.source.notifications.discarded.title": "Промене су одбачене",
+  "collection.edit.tabs.source.notifications.invalid.content": "Ваше промене нису сачуване. Проверите да ли су сва поља исправна пре него што сачувате.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Метаподаци су неважећи",
+  "collection.edit.tabs.source.notifications.saved.content": "Ваше промене извора садржаја ове колекције су сачуване.",
+  "collection.edit.tabs.source.notifications.saved.title": "Извор садржаја је сачуван",
+  "collection.edit.tabs.source.title": "Уређивање колекције – Извор садржаја",
+  "collection.edit.template.add-button": "Додати",
+  "collection.edit.template.breadcrumbs": "Шаблон ставке",
+  "collection.edit.template.cancel": "Отказати",
+  "collection.edit.template.delete-button": "Избришите",
+  "collection.edit.template.edit-button": "Измените",
+  "collection.edit.template.error": "Дошло је до грешке при преузимању ставке шаблона",
+  "collection.edit.template.head": "Измените ставку шаблона за колекцију \"{{ collection }}\"",
+  "collection.edit.template.label": "Ставка шаблона",
+  "collection.edit.template.loading": "Учитава се ставка шаблона...",
+  "collection.edit.template.notifications.delete.error": "Неуспешно брисање шаблона ставке",
+  "collection.edit.template.notifications.delete.success": "Успешно обрисан шаблон ставке",
+  "collection.edit.template.title": "Измените ставку шаблона",
+  "collection.form.abstract": "Кратак опис",
+  "collection.form.description": "Уводни текст (HTML)",
+  "collection.form.errors.title.required": "Молимо унесите име колекције",
+  "collection.form.license": "Лиценца",
+  "collection.form.provenance": "Порекло",
+  "collection.form.rights": "Ауторски текст (HTML)",
+  "collection.form.tableofcontents": "Вести (HTML)",
+  "collection.form.title": "Име",
+  "collection.form.entityType": "Тип ентитета",
+  "collection.listelement.badge": "Колекција",
+  "collection.page.browse.recent.head": "Недавни поднесци",
+  "collection.page.browse.recent.empty": "Нема ставки за приказ",
+  "collection.page.edit": "Измените ову колекцију",
+  "collection.page.handle": "Трајни URI за ову колекцију",
+  "collection.page.license": "Лиценца",
+  "collection.page.news": "Вести",
+  "collection.select.confirm": "Потврдите изабрано",
+  "collection.select.empty": "Нема колекција за приказ",
+  "collection.select.table.title": "Наслов",
+  "collection.source.controls.head": "Контрола прикупљања",
+  "collection.source.controls.test.submit.error": "Нешто није у реду са покретањем тестирања подешавања",
+  "collection.source.controls.test.failed": "Скрипта за тестирање подешавања није успела",
+  "collection.source.controls.test.completed": "Скрипта за тестирање подешавања је успешно завршена",
+  "collection.source.controls.test.submit": "Тестна конфигурација",
+  "collection.source.controls.test.running": "Тестирање конфигурације...",
+  "collection.source.controls.import.submit.success": "Увоз је успешно покренут",
+  "collection.source.controls.import.submit.error": "Нешто није у реду са покретањем увоза",
+  "collection.source.controls.import.submit": "Увезите сада",
+  "collection.source.controls.import.running": "Увоз...",
+  "collection.source.controls.import.failed": "Дошло је до грешке током увоза",
+  "collection.source.controls.import.completed": "Увоз је завршен",
+  "collection.source.controls.reset.submit.success": "Ресетовање и поновни увоз су успешно покренути",
+  "collection.source.controls.reset.submit.error": "Нешто није у реду са покретањем ресетовања и поновног увоза",
+  "collection.source.controls.reset.failed": "Дошло је до грешке током ресетовања и поновног увоза",
+  "collection.source.controls.reset.completed": "Ресетовање и поновни увоз су завршени",
+  "collection.source.controls.reset.submit": "Ресетујте и поново увезите",
+  "collection.source.controls.reset.running": "Ресетовање и поновни увоз...",
+  "collection.source.controls.harvest.status": "Статус прикупљаања:",
+  "collection.source.controls.harvest.start": "Време почетка прикупљања:",
+  "collection.source.controls.harvest.last": "Време почетка прикупљања:",
+  "collection.source.controls.harvest.message": "Информације о прикупљању:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.update.notifications.error.content": "Наведена подешавања су тестирана и нису функционисала.",
+  "collection.source.update.notifications.error.title": "Грешка на серверу",
+  "communityList.breadcrumbs": "Листа заједнице",
+  "communityList.tabTitle": "Лист заједнице",
+  "communityList.title": "Листа заједница",
+  "communityList.showMore": "Прикажи више",
+  "community.create.head": "Креирајте заједницу",
+  "community.create.notifications.success": "Заједница је успешно креирана",
+  "community.create.sub-head": "Креирајте подзаједницу за заједницу {{ parent }}",
+  "community.curate.header": "Уредник заједнице: {{community}}",
+  "community.delete.cancel": "Отказати",
+  "community.delete.confirm": "Потврдите",
+  "community.delete.processing": "Брисање...",
+  "community.delete.head": "Избришите заједницу",
+  "community.delete.notification.fail": "Није могуће избрисати заједницу",
+  "community.delete.notification.success": "Успешно избрисана заједница",
+  "community.delete.text": "Да ли сте сигурни да желите да избришете заједницу \"{{ dso }}\"",
+  "community.edit.delete": "Избришите ову заједницу",
+  "community.edit.head": "Измените заједницу",
+  "community.edit.breadcrumbs": "Измените заједницу",
+  "community.edit.logo.delete.title": "Избришите лого",
+  "community.edit.logo.delete-undo.title": "Поништите брисање",
+  "community.edit.logo.label": "Лого заједнице",
+  "community.edit.logo.notifications.add.error": "Отпремање логоа заједнице није успело. Молимо проверите садржај пре поновног покушаја.",
+  "community.edit.logo.notifications.add.success": "Успешно отпремање логоа заједнице.",
+  "community.edit.logo.notifications.delete.success.title": "Лого је избрисан",
+  "community.edit.logo.notifications.delete.success.content": "Успешно избрисан лого заједнице",
+  "community.edit.logo.notifications.delete.error.title": "Грешка при брисању логоа",
+  "community.edit.logo.upload": "Унесите лого заједнице да бисте га отпремили",
+  "community.edit.notifications.success": "Успешно је измењена заједница",
+  "community.edit.notifications.unauthorized": "Немате овлашћење да извршите ову промену",
+  "community.edit.notifications.error": "Дошло је до грешке при уређивању заједнице",
+  "community.edit.return": "Назад",
+  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.title": "Уређивање заједнице - Curate",
+  "community.edit.tabs.access-control.head": "Контрола приступа",
+  "community.edit.tabs.access-control.title": "Уређивање заједнице - Контрола приступа",
+  "community.edit.tabs.metadata.head": "Уреди метаподатке",
+  "community.edit.tabs.metadata.title": "Уређивање заједнице – Метаподаци",
+  "community.edit.tabs.roles.head": "Додели улоге",
+  "community.edit.tabs.roles.title": "Уређивање заједнице - Улоге",
+  "community.edit.tabs.authorizations.head": "Овлашћења",
+  "community.edit.tabs.authorizations.title": "Уређивање заједнице - овлашћења",
+  "community.listelement.badge": "Заједница",
+  "comcol-role.edit.no-group": "Ниједан",
+  "comcol-role.edit.create": "Креирајте",
+  "comcol-role.edit.create.error.title": "Прављење групе за улогу \"{{ role }}\" није успело",
+  "comcol-role.edit.restrict": "Ограничити",
+  "comcol-role.edit.delete": "Избришите",
+  "comcol-role.edit.delete.error.title": "Брисање групе улога \"{{ role }}\" није успело",
+  "comcol-role.edit.community-admin.name": "Администратори",
+  "comcol-role.edit.collection-admin.name": "Администратори",
+  "comcol-role.edit.community-admin.description": "Администратори заједнице могу да креирају подзаједнице или колекције и да управљају тим подзаједницама или збиркама или да им додељују управљање. Поред тога, они одлучују ко може да поднесе ставке у било коју подзбирку, уређују метаподатке ставки (након подношења) и додају (мапирају) постојеће ставке из других колекција (предмет овлашћења).",
+  "comcol-role.edit.collection-admin.description": "Администратори колекције одлучују ко може да шаље ставке у колекцију, уређују метаподатке ставки (након слања) и додају (мапирају) постојеће ставке из других колекција у ову колекцију (предмет овлашћења за ту колекцију).",
+  "comcol-role.edit.submitters.name": "Подносиоци",
+  "comcol-role.edit.submitters.description": "Е-људи и групе које имају дозволу да подносе нове ставке у ову колекцију.",
+  "comcol-role.edit.item_read.name": "Подразумевани приступ за читање ставке",
+  "comcol-role.edit.item_read.description": "Е-Људи и групе које могу да читају нове ставке послате у ову колекцију. Промене ове улоге нису ретроактивне. Постојеће ставке у систему ће и даље моћи да виде они који су имали приступ за читање у време њиховог додавања.",
+  "comcol-role.edit.item_read.anonymous-group": "Подразумевано читање за долазне ставке је тренутно постављено на Анонимно.",
+  "comcol-role.edit.bitstream_read.name": "Подразумевани приступ за читање битстреамова",
+  "comcol-role.edit.bitstream_read.description": "Администратори заједнице могу да креирају подзаједнице или колекције и да управљају тим подзаједницама или збиркама или да им додељују управљање. Поред тога, они одлучују ко може да поднесе ставке у било коју подзбирку, уређују метаподатке ставки (након подношења) и додају (мапирају) постојеће ставке из других колекција (предмет овлашћења).",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Подразумевано читање за долазне битстреамове је тренутно подешено на Анонимно.",
+  "comcol-role.edit.editor.name": "Уредници",
+  "comcol-role.edit.editor.description": "Уредници могу да уређују метаподатке долазних поднесака, а затим да их прихвате или одбију.",
+  "comcol-role.edit.finaleditor.name": "Коначни уредници",
+  "comcol-role.edit.finaleditor.description": "Коначни уредници могу да уређују метаподатке долазних поднесака, али неће моћи да их одбију.",
+  "comcol-role.edit.reviewer.name": "Рецензенти",
+  "comcol-role.edit.reviewer.description": "Рецензенти могу да прихвате или одбију долазне поднеске. Међутим, они не могу да уређују метаподатке поднеска.",
+  "comcol-role.edit.scorereviewers.name": "Резултат рецензената",
+  "comcol-role.edit.scorereviewers.description": "Рецензенти могу да дају оцену долазним поднесцима, што ће дефинисати да ли ће поднесак бити одбијен или не.",
+  "community.form.abstract": "Кратак опис",
+  "community.form.description": "Уводни текст (HTML)",
+  "community.form.errors.title.required": "Унесите назив заједнице",
+  "community.form.rights": "Текст ауторских права (HTML)",
+  "community.form.tableofcontents": "Вести (HTML)",
+  "community.form.title": "Име",
+  "community.page.edit": "Уредите ову заједницу",
+  "community.page.handle": "Стални URI за ову заједницу",
+  "community.page.license": "Лиценца",
+  "community.page.news": "Вести",
+  "community.all-lists.head": "Подзаједнице и колекције",
+  "community.sub-collection-list.head": "Колекције у овој заједници",
+  "community.sub-community-list.head": "Заједнице у овој заједници",
+  "cookies.consent.accept-all": "Прихватите све",
+  "cookies.consent.accept-selected": "Прихватите изабрано",
+  "cookies.consent.app.opt-out.description": "Ова апликација се подразумевано учитава (али можете да одустанете)",
+  "cookies.consent.app.opt-out.title": "(одустати)",
+  "cookies.consent.app.purpose": "Сврха",
+  "cookies.consent.app.required.description": "Ова апликација је увек потребна",
+  "cookies.consent.app.required.title": "(увек потребно)",
+  "cookies.consent.app.disable-all.description": "Користите овај прекидач да омогућите или онемогућите све услуге.",
+  "cookies.consent.app.disable-all.title": "Омогућите или онемогућите све услуге",
+  "cookies.consent.update": "Било је промена од ваше последње посете, ажурирајте своју сагласност.",
+  "cookies.consent.close": "Затворити",
+  "cookies.consent.decline": "Одбити",
+  "cookies.consent.ok": "То је у реду",
+  "cookies.consent.save": "сачувати",
+  "cookies.consent.content-notice.title": "Сагласност за колачиће",
+  "cookies.consent.content-notice.description": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>. <br/> Да бисте сазнали више, прочитајте нашу {privacyPolicy}.",
+  "cookies.consent.content-notice.description.no-privacy": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>.",
+  "cookies.consent.content-notice.learnMore": "Прилагодити",
+  "cookies.consent.content-modal.description": "Овде можете видети и прилагодити информације које прикупљамо о вама.",
+  "cookies.consent.content-modal.privacy-policy.name": "Правила о приватности",
+  "cookies.consent.content-modal.privacy-policy.text": "Да сазнате више, прочитајте нашу {privacyPolicy}.",
+  "cookies.consent.content-modal.title": "Информације које прикупљамо",
+  "cookies.consent.content-modal.services": "Услуге",
+  "cookies.consent.content-modal.service": "Услуга",
+  "cookies.consent.app.title.authentication": "Провера",
+  "cookies.consent.app.description.authentication": "Потребно за пријављивање",
+  "cookies.consent.app.title.preferences": "Подешавања",
+  "cookies.consent.app.description.preferences": "Потребно за чување ваших подешавања",
+  "cookies.consent.app.title.acknowledgement": "Потврда",
+  "cookies.consent.app.description.acknowledgement": "Потребно за чување ваших потврда и сагласности",
+  "cookies.consent.app.title.google-analytics": "Гоогле аналитике",
+  "cookies.consent.app.description.google-analytics": "Омогућава нам да пратимо статистичке податке",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.description.google-recaptcha": "Користимо Google reCAPTCHA услугу током регистрације и опоравка лозинке",
+  "cookies.consent.purpose.functional": "Функционални",
+  "cookies.consent.purpose.statistical": "Статистички",
+  "cookies.consent.purpose.registration-password-recovery": "Регистрација и опоравак лозинке",
+  "cookies.consent.purpose.sharing": "Дељење",
+  "curation-task.task.citationpage.label": "Генеришите страницу са цитатима",
+  "curation-task.task.checklinks.label": "Проверите везе у метаподацима",
+  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.profileformats.label": "Профил Битстрим формати",
+  "curation-task.task.requiredmetadata.label": "Проверите потребне метаподатке",
+  "curation-task.task.translate.label": "Мицрософт преводилац",
+  "curation-task.task.vscan.label": "Претрага вируса",
+  "curation-task.task.register-doi.label": "Региструјте DOI",
+  "curation.form.task-select.label": "Задатак:",
+  "curation.form.submit": "Почетак",
+  "curation.form.submit.success.head": "Задато курирање је успешно покренуто",
+  "curation.form.submit.success.content": "Бићете преусмерени на одговарајућу страницу процеса.",
+  "curation.form.submit.error.head": "Неуспешно покретање задатог курирања",
+  "curation.form.submit.error.content": "Дошло је до грешке при покушају покретања задатог курирања.",
+  "curation.form.submit.error.invalid-handle": "Није могуће одредити handle за овај објекат",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.hint": "Савет: Унесите [your-handle-prefix]/0 да бисте покренули задатак на целом сајту (ову могућност не подржавају сви задаци)",
+  "deny-request-copy.email.message": "Поштовани {{ recipientName }}, \n Као одговор на ваш захтев, са жаљењем вас обавештавам да није могуће послати копију фајла коју сте тражили, у вези са документом: \"{{ itemUrl }}\" ({{ itemName }}), чији сам аутор. \n Срдачан поздрав, \n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Затражите копију документа",
+  "deny-request-copy.error": "Дошло је до грешке",
+  "deny-request-copy.header": "Одбијен захтев за копирање документа",
+  "deny-request-copy.intro": "Ова порука биће послата подносиоцу захтева",
+  "deny-request-copy.success": "Захтев за ставку је одбијен успешно",
+  "dso.name.untitled": "Без наслова",
+  "dso.name.unnamed": "Без имена",
+  "dso-selector.create.collection.head": "Нова колекција",
+  "dso-selector.create.collection.sub-level": "Креирајте нову колекцију у",
+  "dso-selector.create.community.head": "Нова заједница",
+  "dso-selector.create.community.or-divider": "или",
+  "dso-selector.create.community.sub-level": "Креирајте нову заједницу у",
+  "dso-selector.create.community.top-level": "Креирајте нову заједницу највишег нивоа",
+  "dso-selector.create.item.head": "Нова ставка",
+  "dso-selector.create.item.sub-level": "Креирајте нову ставку у",
+  "dso-selector.create.submission.head": "Нови поднесак",
+  "dso-selector.edit.collection.head": "Измените колекцију",
+  "dso-selector.edit.community.head": "Измените заједницу",
+  "dso-selector.edit.item.head": "Измените ставку",
+  "dso-selector.error.title": "Дошло је до грешке при претрази {{ type }}",
+  "dso-selector.export-metadata.dspaceobject.head": "Извезите метаподатке из",
+  "dso-selector.export-batch.dspaceobject.head": "Извезите пакет (ZIP) из",
+  "dso-selector.import-batch.dspaceobject.head": "Увезите пакет из",
+  "dso-selector.no-results": "Није пронађен {{ type }}",
+  "dso-selector.placeholder": "Претражите {{ type }}",
+  "dso-selector.select.collection.head": "Изаберите колекцију",
+  "dso-selector.set-scope.community.head": "Изаберите опсег претраге",
+  "dso-selector.set-scope.community.button": "Претражите читав репозиторијум",
+  "dso-selector.set-scope.community.or-divider": "или",
+  "dso-selector.set-scope.community.input-header": "Претражите заједницу или колекцију",
+  "dso-selector.claim.item.head": "Смернице за профил",
+  "dso-selector.claim.item.body": "Ово су постојећи профили који се можда односе на Вас. Ако се препознате у једном од ових профила, изаберите га и на страници са детаљима, међу опцијама, изаберите да га затражите. У супротном, можете креирати нови профил од нуле користећи дугме испод.",
+  "dso-selector.claim.item.not-mine-label": "Ниједан од ових није мој",
+  "dso-selector.claim.item.create-from-scratch": "Креирајте нови",
+  "dso-selector.results-could-not-be-retrieved": "Нешто није у реду, молимо освежите поново ↻",
+  "supervision-group-selector.header": "Селектор групе за надзор",
+  "supervision-group-selector.select.type-of-order.label": "Изаберите тип налога",
+  "supervision-group-selector.select.type-of-order.option.none": "НИЈЕДАН",
+  "supervision-group-selector.select.type-of-order.option.editor": "УРЕДНИК",
+  "supervision-group-selector.select.type-of-order.option.observer": "ПОСМАТРАЧ",
+  "supervision-group-selector.select.group.label": "Изаберите групу",
+  "supervision-group-selector.button.cancel": "Отказати",
+  "supervision-group-selector.button.save": "Сачувати",
+  "supervision-group-selector.select.type-of-order.error": "Молимо изаберите тип налога",
+  "supervision-group-selector.select.group.error": "Молимо изаберите групу",
+  "supervision-group-selector.notification.create.success.title": "Успешно је креиран налог надзора за групу {{ name}}",
+  "supervision-group-selector.notification.create.failure.title": "Грешка",
+  "supervision-group-selector.notification.create.already-existing": "Већ постоји налог за надзор за ову ставку изабране групе",
+  "confirmation-modal.export-metadata.header": "Извоз метаподатака за {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Да ли сте сигурни да желите да извезете метаподатке за {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Отказати",
+  "confirmation-modal.export-metadata.confirm": "Извоз",
+  "confirmation-modal.export-batch.header": "Извезите пакет (ZIP) за {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Да ли сте сигурни да желите да извезете пакет (ZIP) за {{ dsoName }}",
+  "confirmation-modal.export-batch.cancel": "Отказати",
+  "confirmation-modal.export-batch.confirm": "Извоз",
+  "confirmation-modal.delete-eperson.header": "Избришите EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Да ли сте сигурни да желите да избришете EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.cancel": "Отказати",
+  "confirmation-modal.delete-eperson.confirm": "Избрисати",
+  "confirmation-modal.delete-profile.header": "Избришите профил",
+  "confirmation-modal.delete-profile.info": "Да ли сте сигурни да желите да избришете свој профил",
+  "confirmation-modal.delete-profile.cancel": "Отказати",
+  "confirmation-modal.delete-profile.confirm": "Избрисати",
+  "confirmation-modal.delete-subscription.header": "Уклонити претплату",
+  "confirmation-modal.delete-subscription.info": "Да ли сте сигурни да желите да избришете претплату за \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Отказати",
+  "confirmation-modal.delete-subscription.confirm": "Избрисати",
+  "error.bitstream": "Грешка при преузимању битстрим-а",
+  "error.browse-by": "Грешка при преузимању ставки",
+  "error.collection": "Грешка при преузимању колекције",
+  "error.collections": "Грешка при преузимању колекција",
+  "error.community": "Грешка при преузимању заједнице",
+  "error.identifier": "Није пронађена ниједна ставка за идентификатор",
+  "error.default": "Грешка",
+  "error.item": "Грешка при преузимању ставке",
+  "error.items": "Грешка при преузимању ставки",
+  "error.objects": "Грешка при преузимању објеката",
+  "error.recent-submissions": "Грешка при преузимању недавних поднесака",
+  "error.search-results": "Грешка при преузимању резултата претраге",
+  "error.invalid-search-query": "Упит за претрагу није исправан. Проверите најбоља решења за <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.HTML\" target=\"_blank\">Solr синтаксу упита</a> за додатне информације о овој грешци.",
+  "error.sub-collections": "Грешка при преузимању подколекција",
+  "error.sub-communities": "Грешка при преузимању подзаједница",
+  "error.submission.sections.init-form-error": "Дошло је до грешке током иницијализације одељка, молимо проверите конфигурацију обрасца за унос. Детаљи су испод: <br> <br>",
+  "error.top-level-communities": "Грешка при преузимању заједница највишег нивоа",
+  "error.validation.license.notgranted": "Морате доделити ову лиценцу да бисте довршили свој поднесак. Ако у овом тренутку нисте у могућности да доделите ову лиценцу, можете да сачувате свој рад и вратите се касније или уклоните поднесак.",
+  "error.validation.pattern": "Овај унос је ограничен тренутним обрасцем: {{ pattern}}.",
+  "error.validation.filerequired": "Отпремање фајла је обавезно",
+  "error.validation.required": "Ово поље је обавезно",
+  "error.validation.NotValidEmail": "Овај Е-мејл није важећи Е-мејл",
+  "error.validation.emailTaken": "Ова Е-мејл адреса је већ заузета",
+  "error.validation.groupExists": "Ова група већ постоји",
+  "error.validation.metadata.name.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке. Уместо тога, користите поља Елемент и квалификатор",
+  "error.validation.metadata.name.max-length": "Ово поље не сме да садржи више од 32 знака",
+  "error.validation.metadata.namespace.max-length": "Ово поље не сме да садржи више од 256 знакова",
+  "error.validation.metadata.element.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке. Уместо тога, користите поље Квалификатор",
+  "error.validation.metadata.element.max-length": "Ово поље не сме да садржи више од 64 знака",
+  "error.validation.metadata.qualifier.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке",
+  "error.validation.metadata.qualifier.max-length": "Ово поље не сме да садржи више од 64 знака",
+  "feed.description": "Syndication feed",
+  "file-section.error.header": "Грешка при прибављању фајлова за ову ставку",
+  "footer.copyright": "ауторска права © 2002-{{ year}}",
+  "footer.link.dspace": "DSpace софтвер",
+  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.cookies": "Подешавања колачића",
+  "footer.link.privacy-policy": "Правила о приватности",
+  "footer.link.end-user-agreement": "Уговор са крајњим корисником",
+  "footer.link.feedback": "Пошаљи повратне информације",
+  "forgot-email.form.header": "Заборавили сте лозинку",
+  "forgot-email.form.info": "Унесите Е-мејл адресу повезану са налогом.",
+  "forgot-email.form.email": "Е-мејл адреса *",
+  "forgot-email.form.email.error.required": "Унесите Е-мејл адресу",
+  "forgot-email.form.email.error.not-email-form": "Унесите важећу Е-мејл адресу",
+  "forgot-email.form.email.hint": "Е-мејл са даљим упутствима биће послат на ову адресу",
+  "forgot-email.form.submit": "Ресетујте лозинку",
+  "forgot-email.form.success.head": "Послат је Е-мејл за ресетовање лозинке",
+  "forgot-email.form.success.content": "Е-мејл који садржи посебну URL адресу и даља упутства биће послат на {{ email }}",
+  "forgot-email.form.error.head": "Грешка при покушају ресетовања лозинке",
+  "forgot-email.form.error.content": "Дошло је до грешке при покушају ресетовања лозинке за налог повезан са следећом адресом е-поште: {{ email }}",
+  "forgot-password.title": "Заборавили сте лозинку",
+  "forgot-password.form.head": "Заборавили сте лозинку",
+  "forgot-password.form.info": "Унесите нову лозинку у поље испод и потврдите је тако што ћете је поново укуцати у друго поље.",
+  "forgot-password.form.card.security": "Безбедност",
+  "forgot-password.form.identification.header": "Идентификовати",
+  "forgot-password.form.identification.email": "Е-мејл адреса:",
+  "forgot-password.form.label.password": "Лозинка",
+  "forgot-password.form.label.passwordrepeat": "Поново откуцајте да бисте потврдили",
+  "forgot-password.form.error.empty-password": "Унесите лозинку у поље испод.",
+  "forgot-password.form.error.matching-passwords": "Лозинке се не поклапају.",
+  "forgot-password.form.notification.error.title": "Грешка при покушају слања нове лозинке",
+  "forgot-password.form.notification.success.content": "Ресетовање лозинке је било успешно. Пријављени сте као креирани корисник.",
+  "forgot-password.form.notification.success.title": "Ресетовање лозинке је завршено",
+  "forgot-password.form.submit": "Пошаљи лозинку",
+  "form.add": "Додај још",
+  "form.add-help": "Кликните овде да додате тренутни унос и да додате још један",
+  "form.cancel": "Поништити, отказати",
+  "form.clear": "Јасно",
+  "form.clear-help": "Кликните овде да бисте уклонили изабрану вредност",
+  "form.discard": "Одбаците",
+  "form.drag": "Превуците",
+  "form.edit": "Уредите",
+  "form.edit-help": "Кликните овде да бисте изменили изабрану вредност",
+  "form.first-name": "Име",
+  "form.group-collapse": "Скупи",
+  "form.group-collapse-help": "Кликните овде за скупљање",
+  "form.group-expand": "Проширити",
+  "form.group-expand-help": "Кликните овде да бисте проширили и додали још елемената",
+  "form.last-name": "Презиме",
+  "form.loading": "Учитавање...",
+  "form.lookup": "Потражите",
+  "form.lookup-help": "Кликните овде да бисте потражили постојећу везу",
+  "form.no-results": "Нису пронађени резултати",
+  "form.no-value": "Није унета вредност",
+  "form.other-information.email": "Е-мејл",
+  "form.other-information.first-name": "Име",
+  "form.other-information.insolr": "У Solr индексу",
+  "form.other-information.institution": "Институција",
+  "form.other-information.last-name": "Презиме",
+  "form.other-information.orcid": "ORCID",
+  "form.remove": "Уклоните",
+  "form.save": "Сачувајте",
+  "form.save-help": "Сачувајте измене",
+  "form.search": "Претрага",
+  "form.search-help": "Кликните овде да бисте потражили постојећу преписку",
+  "form.submit": "Сачувајте",
+  "form.create": "Креирајте",
+  "form.repeatable.sort.tip": "Спустите ставку на нову позицију",
+  "grant-deny-request-copy.deny": "Не шаљи копију",
+  "grant-deny-request-copy.email.back": "Назад",
+  "grant-deny-request-copy.email.message": "Опциона додатна порука",
+  "grant-deny-request-copy.email.message.empty": "Унесите поруку",
+  "grant-deny-request-copy.email.permissions.info": "Можете искористити ову прилику да поново размотрите ограничења приступа документу, како бисте избегли да одговорите на ове захтеве. Ако желите да замолите администраторе спремишта да уклоне ова ограничења, означите поље испод.",
+  "grant-deny-request-copy.email.permissions.label": "Промените у отворени приступ",
+  "grant-deny-request-copy.email.send": "Пошаљите",
+  "grant-deny-request-copy.email.subject": "Предмет",
+  "grant-deny-request-copy.email.subject.empty": "Унесите тему",
+  "grant-deny-request-copy.grant": "Пошаљите копију",
+  "grant-deny-request-copy.header": "Захтев за копију документа",
+  "grant-deny-request-copy.home-page": "Врати ме на почетну страницу",
+  "grant-deny-request-copy.intro1": "Ако сте један од аутора документа <a href='{{ url }}'>{{ name }}</a>, онда користите једну од опција у наставку да одговорите на захтев корисника.",
+  "grant-deny-request-copy.intro2": "Након што одаберете опцију, биће вам представљен предложени одговор е-маила који можете да измените.",
+  "grant-deny-request-copy.processed": "Овај захтев је већ обрађен. Можете користити дугме испод да се вратите на почетну страницу.",
+  "grant-request-copy.email.subject": "Затражите копију документа",
+  "grant-request-copy.error": "Дошло је до грешке",
+  "grant-request-copy.header": "Одобрите захтев за копију документа",
+  "grant-request-copy.intro": "Подносиоцу захтева ће бити послата порука. Тражени документ(и) ће бити приложен.",
+  "grant-request-copy.success": "Захтев за ставку је успешно одобрен",
+  "health.breadcrumbs": "Здравље",
+  "health-page.heading": "Здравље",
+  "health-page.info-tab": "Информације",
+  "health-page.status-tab": "Статус",
+  "health-page.error.msg": "Услуга провере здравља је привремено недоступна",
+  "health-page.property.status": "Статусни код",
+  "health-page.section.db.title": "База података",
+  "health-page.section.geoIp.title": "GeoIP",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrOaiCore.title": "Solr: OAI core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section-info.app.title": "Backend апликације",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Статус",
+  "health-page.status.ok.info": "Оперативни",
+  "health-page.status.error.info": "Откривени су проблеми",
+  "health-page.status.warning.info": "Откривени су могући проблеми",
+  "health-page.title": "Здравље",
+  "health-page.section.no-issues": "Нису откривени проблеми",
+  "home.description": "",
+  "home.breadcrumbs": "Home",
+  "home.search-form.placeholder": "Претражите репозиторијум...",
+  "home.title": "Home",
+  "home.top-level-communities.head": "Заједнице у DSpace-у",
+  "home.top-level-communities.help": "Изаберите заједницу да бисте прегледали њене колекције.",
+  "info.end-user-agreement.accept": "Прочитао сам и прихватам Уговором са крајњим корисником",
+  "info.end-user-agreement.accept.error": "Дошло је до грешке при прихватању Уговора са крајњим корисником",
+  "info.end-user-agreement.accept.success": "Успешно ажуриран Уговор са крајњим корисником",
+  "info.end-user-agreement.breadcrumbs": "Уговор са крајњим корисником",
+  "info.end-user-agreement.buttons.cancel": "Отказати",
+  "info.end-user-agreement.buttons.save": "Сачувати",
+  "info.end-user-agreement.head": "Уговор са крајњим корисником",
+  "info.end-user-agreement.title": "Уговор са крајњим корисником",
+  "info.end-user-agreement.hosting-country": "Сједињене Државе",
+  "info.privacy.breadcrumbs": "Изјава о заштити приватности",
+  "info.privacy.head": "Изјава о заштити приватности",
+  "info.privacy.title": "Изјава о заштити приватности",
+  "info.feedback.breadcrumbs": "Повратна информација",
+  "info.feedback.head": "Повратна информација",
+  "info.feedback.title": "Повратна информација",
+  "info.feedback.info": "Хвала Вам што сте поделили повратне информације о DSpace систему. Ценимо Ваше коментаре!",
+  "info.feedback.email_help": "Ова адреса ће бити коришћена за праћење ваших повратних информација.",
+  "info.feedback.send": "Пошаљите повратне информације",
+  "info.feedback.comments": "Коментари",
+  "info.feedback.email-label": "Ваш Email",
+  "info.feedback.create.success": "Повратне информације су успешно послате!",
+  "info.feedback.error.email.required": "Потребна је важећа Е-мејл адреса",
+  "info.feedback.error.message.required": "Коментар је обавезан",
+  "info.feedback.page-label": "Страна",
+  "info.feedback.page_help": "Страница је у вези са Вашим повратним информацијама",
+  "item.alerts.private": "Ова ставка се не може открити",
+  "item.alerts.withdrawn": "Ова ставка је повучена",
+  "item.edit.authorizations.heading": "Помоћу овог едитора можете да прегледате и мењате опције ставке, као и да мењате опције појединачних компоненти ставке: пакете и битстрим-ове. Укратко, ставка је контејнер пакета, а пакети су контејнери битстрим-ова. Контејнери обично имају опције ДОДАВАЊЕ/БРИСАЊЕ/ЧИТАЊЕ/ПИСАЊЕ, док битстрим-ови имају само опције ЧИТАЊЕ/ПИСАЊЕ.",
+  "item.edit.authorizations.title": "Измените опције ставке",
+  "item.badge.private": "Невидљив",
+  "item.badge.withdrawn": "Повучено",
+  "item.bitstreams.upload.bundle": "Пакет",
+  "item.bitstreams.upload.bundle.placeholder": "Изаберите пакет или унесите ново име пакета",
+  "item.bitstreams.upload.bundle.new": "Креирајте пакет",
+  "item.bitstreams.upload.bundles.empty": "Ова ставка не садржи пакете за отпремање битстрим-ова.",
+  "item.bitstreams.upload.cancel": "Отказати",
+  "item.bitstreams.upload.drop-message": "Унесите датотеку за отпремање",
+  "item.bitstreams.upload.item": "Ставка:",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Успешно креиран нови пакет.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Креирани пакет",
+  "item.bitstreams.upload.notifications.upload.failed": "Отпремање неуспешно. Молимо Вас проверите садржај пре поновног покушаја.",
+  "item.bitstreams.upload.title": "Отпремање битстрим-а",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Отпремити",
+  "item.edit.bitstreams.bundle.displaying": "Тренутно се приказује {{ amount }} битстрим-ова од {{ total }}.",
+  "item.edit.bitstreams.bundle.load.all": "Учитајте све ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Учитајте још",
+  "item.edit.bitstreams.bundle.name": "ПАКЕТ: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Одбацити",
+  "item.edit.bitstreams.edit.buttons.download": "Преузимање",
+  "item.edit.bitstreams.edit.buttons.drag": "Превуците",
+  "item.edit.bitstreams.edit.buttons.edit": "Изменити",
+  "item.edit.bitstreams.edit.buttons.remove": "Уклонити",
+  "item.edit.bitstreams.edit.buttons.undo": "Поништити промене",
+  "item.edit.bitstreams.empty": "Ова ставка не садржи битстрим-ове. Кликните на дугме за отпремање да бисте га креирали.",
+  "item.edit.bitstreams.headers.actions": "Радње",
+  "item.edit.bitstreams.headers.bundle": "Пакет",
+  "item.edit.bitstreams.headers.description": "Опис",
+  "item.edit.bitstreams.headers.format": "Формат",
+  "item.edit.bitstreams.headers.name": "Име",
+  "item.edit.bitstreams.notifications.discarded.content": "Ваше промене су одбачене. Да бисте поново поставили своје промене, кликните на дугме \"Опозови\".",
+  "item.edit.bitstreams.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.bitstreams.notifications.move.failed.title": "Грешка при покретању битстрим-ова",
+  "item.edit.bitstreams.notifications.move.saved.content": "Промене које сте покренули у битстрим-овима и пакетима ове ставке су сачуване.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Покренуте промене су сачуване",
+  "item.edit.bitstreams.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "item.edit.bitstreams.notifications.outdated.title": "Застареле промене",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Грешка при брисању битстрим-а",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Ваше измене у вези са уклањањем битстрим-ова ове ставке су сачуване.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Промене уклањања су сачуване",
+  "item.edit.bitstreams.reinstate-button": "Поништити",
+  "item.edit.bitstreams.save-button": "Сачувати",
+  "item.edit.bitstreams.upload-button": "Отпремити",
+  "item.edit.delete.cancel": "Отказати",
+  "item.edit.delete.confirm": "Избрисати",
+  "item.edit.delete.description": "Да ли сте сигурни да ову ставку треба потпуно избрисати? Опрез: Тренутно не би остао ниједан обрисани запис.",
+  "item.edit.delete.error": "Дошло је до грешке приликом брисања ставке",
+  "item.edit.delete.header": "Избришите ставку: {{ id }}",
+  "item.edit.delete.success": "Ставка је избрисана",
+  "item.edit.head": "Уредите ставку",
+  "item.edit.breadcrumbs": "Уредите ставку",
+  "item.edit.tabs.disabled.tooltip": "Нисте овлашћени да приступите овој картици",
+  "item.edit.tabs.mapper.head": "Мапирање колекције",
+  "item.edit.tabs.item-mapper.title": "Уређивање ставке - мапирање колекције",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Непознато",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "На чекању за регистрацију",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "На чекању за резервацију",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Регистровано",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Резервисано",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Резервисано (на чекању за ажурирање)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Регистровано (на чекању за ажурирање)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "На чекању за ажурирање и регистрацију",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "На чекању за брисање",
+  "item.edit.identifiers.doi.status.DELETED": "Избрисано",
+  "item.edit.identifiers.doi.status.PENDING": "На чекању (није регистровано)",
+  "item.edit.identifiers.doi.status.MINTED": "Минтед (није регистровано)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Региструјте нови или DOI на чекању",
+  "item.edit.tabs.status.buttons.register-doi.button": "Региструјте DOI...",
+  "item.edit.register-doi.header": "Региструјте нови или DOI на чекању",
+  "item.edit.register-doi.description": "Прегледајте све идентификаторе и ставке метаподатака на чекању испод и кликните на Потврди да бисте наставили са DOI регистрацијом, или Откажи да бисте се повукли",
+  "item.edit.register-doi.confirm": "Потврдити",
+  "item.edit.register-doi.cancel": "Поништити, отказати",
+  "item.edit.register-doi.success": "DOI на чекању за регистрацију успешно.",
+  "item.edit.register-doi.error": "Грешка при регистрацији DOI",
+  "item.edit.register-doi.to-update": "Следећи DOI је већ минтед и биће на чекању за регистрацију на мрежи",
+  "item.edit.item-mapper.buttons.add": "Мапирајте ставку у изабране колекције",
+  "item.edit.item-mapper.buttons.remove": "Уклоните мапирање ставке за изабране колекције",
+  "item.edit.item-mapper.cancel": "Поништити, отказати",
+  "item.edit.item-mapper.description": "Ово је алатка за мапирање ставки која омогућава администраторима да мапирају ову ставку у друге колекције. Можете претражити колекције и мапирати их или прегледати листу колекција на које је ставка тренутно мапирана.",
+  "item.edit.item-mapper.head": "Мапирање ставке – мапирајте ставку у колекције",
+  "item.edit.item-mapper.item": "Ставка: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Унесите упит за претрагу",
+  "item.edit.item-mapper.notifications.add.error.content": "Дошло је до грешака при мапирању ставке у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.add.error.head": "Грешке у мапирању",
+  "item.edit.item-mapper.notifications.add.success.content": "Ставка је успешно мапирана у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.add.success.head": "Мапирање је завршено",
+  "item.edit.item-mapper.notifications.remove.error.content": "Дошло је до грешака при уклањању мапирања на {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Уклањање грешака у мапирању",
+  "item.edit.item-mapper.notifications.remove.success.content": "Успешно је уклоњено мапирање ставке у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Уклањање мапирања је завршено",
+  "item.edit.item-mapper.search-form.placeholder": "Претражи колекције...",
+  "item.edit.item-mapper.tabs.browse": "Прегледајте мапиране колекције",
+  "item.edit.item-mapper.tabs.map": "Мапирајте нове колекције",
+  "item.edit.metadata.add-button": "Додати",
+  "item.edit.metadata.discard-button": "Одбацити",
+  "item.edit.metadata.edit.buttons.confirm": "Потврдити",
+  "item.edit.metadata.edit.buttons.drag": "Превуците да бисте променили редослед",
+  "item.edit.metadata.edit.buttons.edit": "Уредити",
+  "item.edit.metadata.edit.buttons.remove": "Уклонити",
+  "item.edit.metadata.edit.buttons.undo": "Поништити промене",
+  "item.edit.metadata.edit.buttons.unedit": "Зауставити уређивање",
+  "item.edit.metadata.edit.buttons.virtual": "Ово је виртуелна вредност метаподатака, односно вредност наслеђена од повезаног ентитета. Не може се директно мењати. Додајте или уклоните одговарајући однос на картици \"Односи\".",
+  "item.edit.metadata.empty": "Ставка тренутно не садржи никакве метаподатке. Кликните на Додај да бисте почели да додајете вредност метаподатака.",
+  "item.edit.metadata.headers.edit": "Уредити",
+  "item.edit.metadata.headers.field": "Поље",
+  "item.edit.metadata.headers.language": "Језик",
+  "item.edit.metadata.headers.value": "Вредност",
+  "item.edit.metadata.metadatafield.error": "Дошло је до грешке при провери поља метаподатака",
+  "item.edit.metadata.metadatafield.invalid": "Изаберите важеће поље за метаподатке",
+  "item.edit.metadata.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништи\".",
+  "item.edit.metadata.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.metadata.notifications.error.title": "Дошло је до грешке",
+  "item.edit.metadata.notifications.invalid.content": "Ваше промене нису сачуване. Уверите се да су сва поља важећа пре него што сачувате.",
+  "item.edit.metadata.notifications.invalid.title": "Метаподаци су неважећи",
+  "item.edit.metadata.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "item.edit.metadata.notifications.outdated.title": "Промене су застареле",
+  "item.edit.metadata.notifications.saved.content": "Ваше промене метаподатака ове ставке су сачуване.",
+  "item.edit.metadata.notifications.saved.title": "Метаподаци су сачувани",
+  "item.edit.metadata.reinstate-button": "Поништити",
+  "item.edit.metadata.reset-order-button": "Поништите промену редоследа",
+  "item.edit.metadata.save-button": "Сачувати",
+  "item.edit.modify.overview.field": "Поље",
+  "item.edit.modify.overview.language": "Језик",
+  "item.edit.modify.overview.value": "Вредност",
+  "item.edit.move.cancel": "Назад",
+  "item.edit.move.save-button": "Сачувати",
+  "item.edit.move.discard-button": "Одбацити",
+  "item.edit.move.description": "Изаберите колекцију у коју желите да преместите ову ставку. Да бисте сузили листу приказаних колекција, можете да унесете упит за претрагу у оквир.",
+  "item.edit.move.error": "Дошло је до грешке при покушају премештања ставке",
+  "item.edit.move.head": "Преместите ставку: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Смернице наслеђивања",
+  "item.edit.move.inheritpolicies.description": "Наследите подразумеване смернице одредишне колекције",
+  "item.edit.move.move": "Преместите",
+  "item.edit.move.processing": "Премештање...",
+  "item.edit.move.search.placeholder": "Унесите упит за претрагу да бисте потражили колекције",
+  "item.edit.move.success": "Ставка је успешно премештена",
+  "item.edit.move.title": "Преместите ставку",
+  "item.edit.private.cancel": "Поништити, отказати",
+  "item.edit.private.confirm": "Учините неприступачним",
+  "item.edit.private.description": "Да ли сте сигурни да ова ставка треба да буде неприступачна у архиви?",
+  "item.edit.private.error": "Дошло је до грешке при постављању неприступачне ставке",
+  "item.edit.private.header": "Учините ставку неприступачном: {{ id }}",
+  "item.edit.private.success": "Ставка је сада неприступачна",
+  "item.edit.public.cancel": "Поништити, отказати",
+  "item.edit.public.confirm": "Учините приступачним",
+  "item.edit.public.description": "Да ли сте сигурни да ова ставка треба да буде приступачна у архиви?",
+  "item.edit.public.error": "Дошло је до грешке при омогућавању видљивости ставке",
+  "item.edit.public.header": "Учините ставку видљивом: {{ id }}",
+  "item.edit.public.success": "Ставка је сада видљива",
+  "item.edit.reinstate.cancel": "Отказати",
+  "item.edit.reinstate.confirm": "Обновити",
+  "item.edit.reinstate.description": "Да ли сте сигурни да ову ставку треба вратити у архиву?",
+  "item.edit.reinstate.error": "Дошло је до грешке при враћању ставке",
+  "item.edit.reinstate.header": "Вратите ставку: {{ id }}",
+  "item.edit.reinstate.success": "Ставка је успешно враћена",
+  "item.edit.relationships.discard-button": "Одбацити",
+  "item.edit.relationships.edit.buttons.add": "Додати",
+  "item.edit.relationships.edit.buttons.remove": "Уклонити",
+  "item.edit.relationships.edit.buttons.undo": "Поништити промене",
+  "item.edit.relationships.no-relationships": "Нема релација",
+  "item.edit.relationships.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништити\".",
+  "item.edit.relationships.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.relationships.notifications.failed.title": "Грешка при измени релација",
+  "item.edit.relationships.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене су одбачене да би се спречили конфликти",
+  "item.edit.relationships.notifications.outdated.title": "Застареле промене",
+  "item.edit.relationships.notifications.saved.content": "Ваше промене у релацијама ове ставке су сачуване.",
+  "item.edit.relationships.notifications.saved.title": "Релације су сачуване",
+  "item.edit.relationships.reinstate-button": "Поништи",
+  "item.edit.relationships.save-button": "Сачувати",
+  "item.edit.relationships.no-entity-type": "Додајте метаподатке \"DSpace.entity.type\" да бисте омогућили релације за ову ставку",
+  "item.edit.return": "Назад",
+  "item.edit.tabs.bitstreams.head": "битстрим-ови",
+  "item.edit.tabs.bitstreams.title": "Измена ставке - битстрим-ови",
+  "item.edit.tabs.curate.head": "Курирање",
+  "item.edit.tabs.curate.title": "Измена ставке - Курирање",
+  "item.edit.curate.title": "Курирање ставке: {{item}}",
+  "item.edit.tabs.access-control.head": "Контрола приступа",
+  "item.edit.tabs.access-control.title": "Измена ставке - Контрола приступа",
+  "item.edit.tabs.metadata.head": "Метаподаци",
+  "item.edit.tabs.metadata.title": "Измена ставке – Метаподаци",
+  "item.edit.tabs.relationships.head": "Релације",
+  "item.edit.tabs.relationships.title": "Измена ставке - Релације",
+  "item.edit.tabs.status.buttons.authorizations.button": "Овлашћења...",
+  "item.edit.tabs.status.buttons.authorizations.label": "Измените смернице овлашћења ставке",
+  "item.edit.tabs.status.buttons.delete.button": "Трајно избрисати",
+  "item.edit.tabs.status.buttons.delete.label": "Потпуно избрисати ставку",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Мапиране колекције",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Управљајте мапираним колекцијама",
+  "item.edit.tabs.status.buttons.move.button": "Премести ову ставку у другу колекцију",
+  "item.edit.tabs.status.buttons.move.label": "Премести ставку у другу колекцију",
+  "item.edit.tabs.status.buttons.private.button": "Поставите да буде невидљиво...",
+  "item.edit.tabs.status.buttons.private.label": "Поставите ставку да буде невидљива",
+  "item.edit.tabs.status.buttons.public.button": "Поставите да буде видљиво...",
+  "item.edit.tabs.status.buttons.public.label": "Поставите ставку да буде видљива",
+  "item.edit.tabs.status.buttons.reinstate.button": "Поново поставите...",
+  "item.edit.tabs.status.buttons.reinstate.label": "Вратите ставку у репозиторијум",
+  "item.edit.tabs.status.buttons.unauthorized": "Нисте овлашћени да извршите ову радњу",
+  "item.edit.tabs.status.buttons.withdraw.button": "Повуците ову ставку",
+  "item.edit.tabs.status.buttons.withdraw.label": "Повуците ставку из репозиторијума",
+  "item.edit.tabs.status.description": "Добродошли на страницу за управљање ставкама. Одавде можете повући, вратити, преместити или избрисати ставку. Такође можете ажурирати или додати нове метаподатке / битстрим-ове на другим картицама.",
+  "item.edit.tabs.status.head": "Статус",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.id": "Интерни ID ставке",
+  "item.edit.tabs.status.labels.itemPage": "Страница ставке",
+  "item.edit.tabs.status.labels.lastModified": "Последња измена",
+  "item.edit.tabs.status.title": "Измена ставке - Статус",
+  "item.edit.tabs.versionhistory.head": "Историја верзија",
+  "item.edit.tabs.versionhistory.title": "Измена ставке - Историја верзија",
+  "item.edit.tabs.versionhistory.under-construction": "Измена или додавање нових верзија још увек није могуће у овом корисничком интерфејсу.",
+  "item.edit.tabs.view.head": "Прикажи ставку",
+  "item.edit.tabs.view.title": "Измени ставку - Прикажи",
+  "item.edit.withdraw.cancel": "Отказати",
+  "item.edit.withdraw.confirm": "Повуците",
+  "item.edit.withdraw.description": "Да ли сте сигурни да ову ставку треба повући из архиве?",
+  "item.edit.withdraw.error": "Дошло је до грешке при повлачењу ставке",
+  "item.edit.withdraw.header": "Повуците ставку: {{ id }}",
+  "item.edit.withdraw.success": "Ставка је успешно повучена",
+  "item.orcid.return": "Назад",
+  "item.listelement.badge": "Ставка",
+  "item.page.description": "Опис",
+  "item.page.journal-issn": "ISSN часописа",
+  "item.page.journal-title": "Наслов часописа",
+  "item.page.publisher": "Издавач",
+  "item.page.titleprefix": "Ставка:",
+  "item.page.volume-title": "Наслов свеске",
+  "item.search.results.head": "Резултати претраге ставки",
+  "item.search.title": "Претрага ставке",
+  "item.truncatable-part.show-more": "Прикажите још",
+  "item.truncatable-part.show-less": "Скупити",
+  "workflow-item.search.result.delete-supervision.modal.header": "Избришите налог за надзор",
+  "workflow-item.search.result.delete-supervision.modal.info": "Да ли сте сигурни да желите да избришете налог за надзор",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Отказати",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Избрисати",
+  "workflow-item.search.result.notification.deleted.success": "Успешно је избрисан налог за надзор \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Неуспешно брисање налога за надзор \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Прегледао:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Уклонити групу за надзор",
+  "item.page.abstract": "Сажетак",
+  "item.page.author": "Аутори",
+  "item.page.citation": "Цитат",
+  "item.page.collections": "Колекције",
+  "item.page.collections.loading": "Учитавање...",
+  "item.page.collections.load-more": "Учитајте још",
+  "item.page.date": "Датум",
+  "item.page.edit": "Измените ову ставку",
+  "item.page.files": "Фајлови",
+  "item.page.filesection.description": "Опис:",
+  "item.page.filesection.download": "Преузимање",
+  "item.page.filesection.format": "Формат:",
+  "item.page.filesection.name": "име:",
+  "item.page.filesection.size": "Величина:",
+  "item.page.journal.search.title": "Чланци у овом часопису",
+  "item.page.link.full": "Пун запис ставке",
+  "item.page.link.simple": "Једноставан запис ставке",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Отворите страницу за подешавање ORCID-а",
+  "item.page.person.search.title": "Чланци овог аутора",
+  "item.page.related-items.view-more": "Прикажи још {{ amount }}",
+  "item.page.related-items.view-less": "Сакриј последњи {{ amount }}",
+  "item.page.relationships.isAuthorOfPublication": "Публикације",
+  "item.page.relationships.isJournalOfPublication": "Публикације",
+  "item.page.relationships.isOrgUnitOfPerson": "Аутори",
+  "item.page.relationships.isOrgUnitOfProject": "Истраживачки пројекти",
+  "item.page.subject": "Кључне речи",
+  "item.page.uri": "URI",
+  "item.page.bitstreams.view-more": "Прикажи више",
+  "item.page.bitstreams.collapse": "Скупити",
+  "item.page.filesection.original.bundle": "Оригинални пакет",
+  "item.page.filesection.license.bundle": "Лиценцни пакет",
+  "item.page.return": "Назад",
+  "item.page.version.create": "Креирајте нову верзију",
+  "item.page.version.hasDraft": "Нова верзија се не може креирати зато што је у току подношење",
+  "item.page.claim.button": "Потврда",
+  "item.page.claim.tooltip": "Потврди ову ставку као профил",
+  "item.preview.dc.identifier.uri": "Идентификатор:",
+  "item.preview.dc.contributor.author": "Аутори:",
+  "item.preview.dc.date.issued": "Датум објављивања:",
+  "item.preview.dc.description.abstract": "Сажетак:",
+  "item.preview.dc.identifier.other": "Други идентификатор:",
+  "item.preview.dc.language.iso": "Језик:",
+  "item.preview.dc.subject": "Предмети:",
+  "item.preview.dc.title": "Наслов:",
+  "item.preview.dc.type": "Тип:",
+  "item.preview.oaire.citation.issue": "Издање",
+  "item.preview.oaire.citation.volume": "Опсег",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier": "Идентификатор:",
+  "item.preview.dc.relation.ispartof": "Часопис или серија",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.publisher": "Издавач:",
+  "item.preview.person.familyName": "презиме:",
+  "item.preview.person.givenName": "Име:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.name": "Финансијер:",
+  "item.preview.project.funder.identifier": "Идентификатор финансијера:",
+  "item.preview.oaire.awardNumber": "ID финансирања:",
+  "item.preview.dc.title.alternative": "Акроним:",
+  "item.preview.dc.coverage.spatial": "Јурисдикција:",
+  "item.preview.oaire.fundingStream": "Ток финансирања:",
+  "item.select.confirm": "Потврдите изабрано",
+  "item.select.empty": "Нема ставки за приказ",
+  "item.select.table.author": "Аутор",
+  "item.select.table.collection": "Колекција",
+  "item.select.table.title": "Наслов",
+  "item.version.history.empty": "Још увек нема других верзија за ову ставку.",
+  "item.version.history.head": "Историја верзија",
+  "item.version.history.return": "Назад",
+  "item.version.history.selected": "Изабрана верзија",
+  "item.version.history.selected.alert": "Тренутно гледате верзију {{version}} ставке.",
+  "item.version.history.table.version": "Верзија",
+  "item.version.history.table.item": "Ставка",
+  "item.version.history.table.editor": "Уредник",
+  "item.version.history.table.date": "Датум",
+  "item.version.history.table.summary": "Резиме",
+  "item.version.history.table.workspaceItem": "Ставка радног простора",
+  "item.version.history.table.workflowItem": "Ставка процеса рада",
+  "item.version.history.table.actions": "Поступак",
+  "item.version.history.table.action.editWorkspaceItem": "Уредите ставку радног простора",
+  "item.version.history.table.action.editSummary": "Уредите резиме",
+  "item.version.history.table.action.saveSummary": "Сачувајте измене резимеа",
+  "item.version.history.table.action.discardSummary": "Одбаците измене резимеа",
+  "item.version.history.table.action.newVersion": "Креирајте нову верзију од овог",
+  "item.version.history.table.action.deleteVersion": "Избришите верзију",
+  "item.version.history.table.action.hasDraft": "Нова верзија се не може креирати зато што је у току прихват у историји верзија",
+  "item.version.notice": "Ово није најновија верзија ове ставке. Најновију верзију можете пронаћи <a href='{{destination}}'>овде</a>.",
+  "item.version.create.modal.header": "Нова верзија",
+  "item.version.create.modal.text": "Направите нову верзију за ову ставку",
+  "item.version.create.modal.text.startingFrom": "почевши од верзије {{version}}",
+  "item.version.create.modal.button.confirm": "Креирајте",
+  "item.version.create.modal.button.confirm.tooltip": "Креирајте нову верзију",
+  "item.version.create.modal.button.cancel": "Поништити, отказати",
+  "item.version.create.modal.button.cancel.tooltip": "Не креирајте нову верзију",
+  "item.version.create.modal.form.summary.label": "Резиме",
+  "item.version.create.modal.form.summary.placeholder": "Убаците резиме за нову верзију",
+  "item.version.create.modal.submitted.header": "Креирање нове верзије...",
+  "item.version.create.modal.submitted.text": "Нова верзија је у изради. Ово може потрајати неко време ако ставка има много веза.",
+  "item.version.create.notification.success": "Нова верзија је направљена са бројем верзије {{version}}",
+  "item.version.create.notification.failure": "Нова верзија није креирана",
+  "item.version.create.notification.inProgress": "Нова верзија се не може креирати зато што је у току прихват у историји верзија",
+  "item.version.delete.modal.header": "Избришите верзију",
+  "item.version.delete.modal.text": "Да ли желите да избришете верзију {{version}}?",
+  "item.version.delete.modal.button.confirm": "Избришите",
+  "item.version.delete.modal.button.confirm.tooltip": "Избришите ову верзију",
+  "item.version.delete.modal.button.cancel": "Поништити, отказати",
+  "item.version.delete.modal.button.cancel.tooltip": "Немојте брисати ову верзију",
+  "item.version.delete.notification.success": "Верзија број {{version}} је избрисана",
+  "item.version.delete.notification.failure": "Верзија број {{version}} није избрисана",
+  "item.version.edit.notification.success": "Сажетак верзије број {{version}} је промењен",
+  "item.version.edit.notification.failure": "Сажетак верзије број {{version}} није промењен",
+  "itemtemplate.edit.metadata.add-button": "Додати",
+  "itemtemplate.edit.metadata.discard-button": "Одбацити",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Потврдити",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Превуците да бисте променили редослед",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Изменити",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Уклонити",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Поништити промене",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Зауставите измене",
+  "itemtemplate.edit.metadata.empty": "Шаблон ставке тренутно не садржи никакве метаподатке. Кликните на Додај да бисте започели додавање вредности метаподатака.",
+  "itemtemplate.edit.metadata.headers.edit": "Изменити",
+  "itemtemplate.edit.metadata.headers.field": "Поље",
+  "itemtemplate.edit.metadata.headers.language": "Језик",
+  "itemtemplate.edit.metadata.headers.value": "Вредност",
+  "itemtemplate.edit.metadata.metadatafield.error": "Дошло је до грешке приликом провере поља метаподатака",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Молимо изаберите важеће поље метаподатака",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништи\".",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Промене су одбачене",
+  "itemtemplate.edit.metadata.notifications.error.title": "Дошло је до грешке",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Ваше промене нису сачуване. Молимо проверите да ли су сва поља исправна пре него што сачувате.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Метаподаци су неважећи",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Други корисник је променио шаблон ставке на коме тренутно радите. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Промене су застареле",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Ваше промене метаподатака овог шаблона ставке су сачуване.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Метаподаци су сачувани",
+  "itemtemplate.edit.metadata.reinstate-button": "Поништити",
+  "itemtemplate.edit.metadata.reset-order-button": "Поништити промену редоследа",
+  "itemtemplate.edit.metadata.save-button": "Сачувати",
+  "journal.listelement.badge": "Часопис",
+  "journal.page.description": "Опис",
+  "journal.page.edit": "Уредите ову ставку",
+  "journal.page.editor": "Главни уредник",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Издавач",
+  "journal.page.titleprefix": "Часопис:",
+  "journal.search.results.head": "Резултати претраге часописа",
+  "journal-relationships.search.results.head": "Резултати претраге часописа",
+  "journal.search.title": "Претрага часописа",
+  "journalissue.listelement.badge": "Издање часописа",
+  "journalissue.page.description": "Опис",
+  "journalissue.page.edit": "Измените ову ставку",
+  "journalissue.page.issuedate": "Датум издања",
+  "journalissue.page.journal-issn": "Часопис ISSN",
+  "journalissue.page.journal-title": "Наслов часописа",
+  "journalissue.page.keyword": "Кључне речи",
+  "journalissue.page.number": "Број",
+  "journalissue.page.titleprefix": "Издање часописа:",
+  "journalvolume.listelement.badge": "Свеска часописа",
+  "journalvolume.page.description": "Опис",
+  "journalvolume.page.edit": "Измените ову ставку",
+  "journalvolume.page.issuedate": "Датум издања",
+  "journalvolume.page.titleprefix": "Свеска часописа:",
+  "journalvolume.page.volume": "Свеска",
+  "iiifsearchable.listelement.badge": "Списак медија",
+  "iiifsearchable.page.titleprefix": "Документ:",
+  "iiifsearchable.page.doi": "Трајна веза:",
+  "iiifsearchable.page.issue": "Издање:",
+  "iiifsearchable.page.description": "Опис:",
+  "iiifviewer.fullscreen.notice": "Користите цео екран да боље видите.",
+  "iiif.listelement.badge": "Имаге Медиа",
+  "iiif.page.titleprefix": "Слика:",
+  "iiif.page.doi": "Трајна веза:",
+  "iiif.page.issue": "Издање:",
+  "iiif.page.description": "Опис:",
+  "loading.bitstream": "Учитавање битстрим-а...",
+  "loading.bitstreams": "Учитавање битстрим-ова...",
+  "loading.browse-by": "Учитавање ставки...",
+  "loading.browse-by-page": "Учитавање странице...",
+  "loading.collection": "Учитавање колекције...",
+  "loading.collections": "Учитавање колекција...",
+  "loading.content-source": "Учитавање извора садржаја...",
+  "loading.community": "Учитавање заједнице...",
+  "loading.default": "Учитавање...",
+  "loading.item": "Учитавање ставке...",
+  "loading.items": "Учитавање ставки...",
+  "loading.mydspace-results": "Учитавање ставки...",
+  "loading.objects": "Учитавање...",
+  "loading.recent-submissions": "Учитавање недавних поднесака...",
+  "loading.search-results": "Учитавање резултата претраге...",
+  "loading.sub-collections": "Учитавање потколекција...",
+  "loading.sub-communities": "Учитавање подзаједница...",
+  "loading.top-level-communities": "Учитавање заједница највишег нивоа...",
+  "login.form.email": "Емаил адреса",
+  "login.form.forgot-password": "Заборавили сте лозинку?",
+  "login.form.header": "Молимо пријавите се на DSpace",
+  "login.form.new-user": "Нови корисник? Кликните овде да се региструјете.",
+  "login.form.or-divider": "или",
+  "login.form.oidc": "Пријавите се са OIDC",
+  "login.form.orcid": "Пријавите се са ORCID-ом",
+  "login.form.password": "Лозинка",
+  "login.form.shibboleth": "Пријавите се са Shibboleth",
+  "login.form.submit": "Пријавите се",
+  "login.title": "Пријавите се",
+  "login.breadcrumbs": "Пријавите се",
+  "logout.form.header": "Одјавите се са DSpace-а",
+  "logout.form.submit": "Одјавите се",
+  "logout.title": "Одјавите се",
+  "menu.header.admin": "Менаџмент",
+  "menu.header.image.logo": "Лого репозиторијума",
+  "menu.header.admin.description": "Менаџмент мени",
+  "menu.section.access_control": "Контрола приступа",
+  "menu.section.access_control_authorizations": "Овлашћења",
+  "menu.section.access_control_bulk": "Управљање масовним приступом",
+  "menu.section.access_control_groups": "Групе",
+  "menu.section.access_control_people": "Људи",
+  "menu.section.admin_search": "Админ претрага",
+  "menu.section.browse_community": "Ова заједница",
+  "menu.section.browse_community_by_author": "По аутору",
+  "menu.section.browse_community_by_issue_date": "По датуму издања",
+  "menu.section.browse_community_by_title": "По наслову",
+  "menu.section.browse_global": "Читав репозиторијум",
+  "menu.section.browse_global_by_author": "По аутору",
+  "menu.section.browse_global_by_dateissued": "По датуму издања",
+  "menu.section.browse_global_by_subject": "По предмету",
+  "menu.section.browse_global_by_srsc": "По категорији предмета",
+  "menu.section.browse_global_by_title": "По наслову",
+  "menu.section.browse_global_communities_and_collections": "Заједнице и колекције",
+  "menu.section.control_panel": "Контролна табла",
+  "menu.section.curation_task": "Куративни задатак",
+  "menu.section.edit": "Уредити",
+  "menu.section.edit_collection": "Колекција",
+  "menu.section.edit_community": "Заједница",
+  "menu.section.edit_item": "Ставка",
+  "menu.section.export": "Извоз",
+  "menu.section.export_collection": "Колекција",
+  "menu.section.export_community": "Заједница",
+  "menu.section.export_item": "Ставка",
+  "menu.section.export_metadata": "Метаподаци",
+  "menu.section.export_batch": "Групни извоз (ZIP)",
+  "menu.section.icon.access_control": "Одељак менија Контрола приступа",
+  "menu.section.icon.admin_search": "Одељак менија за админ претрагу",
+  "menu.section.icon.control_panel": "Одељак менија контролне табле",
+  "menu.section.icon.curation_tasks": "Одељак менија Задатак курирања",
+  "menu.section.icon.edit": "Уредите одељак менија",
+  "menu.section.icon.export": "Извезите одељак менија",
+  "menu.section.icon.find": "Пронађите одељак менија",
+  "menu.section.icon.health": "Одељак менија за здравствену проверу",
+  "menu.section.icon.import": "Увезите одељак менија",
+  "menu.section.icon.new": "Нови одељак менија",
+  "menu.section.icon.pin": "Закачите бочну траку",
+  "menu.section.icon.processes": "Процеси провере здравља",
+  "menu.section.icon.registries": "Одељак менија Регистри",
+  "menu.section.icon.statistics_task": "Одељак менија Статистички задатак",
+  "menu.section.icon.workflow": "Одељак менија Администрација процеса рада",
+  "menu.section.icon.unpin": "Откачите бочну траку",
+  "menu.section.import": "Увоз",
+  "menu.section.import_batch": "Групни увоз (ZIP)",
+  "menu.section.import_metadata": "Метаподаци",
+  "menu.section.new": "Ново",
+  "menu.section.new_collection": "Колекција",
+  "menu.section.new_community": "Заједница",
+  "menu.section.new_item": "Ставка",
+  "menu.section.new_item_version": "Верзија ставке",
+  "menu.section.new_process": "Процес",
+  "menu.section.pin": "Закачите бочну траку",
+  "menu.section.unpin": "Откачите бочну траку",
+  "menu.section.processes": "Процеси",
+  "menu.section.health": "Здравље",
+  "menu.section.registries": "Регистри",
+  "menu.section.registries_format": "Формат",
+  "menu.section.registries_metadata": "Метаподаци",
+  "menu.section.statistics": "Статистика",
+  "menu.section.statistics_task": "Статистички задатак",
+  "menu.section.toggle.access_control": "Укључите одељак Контрола приступа",
+  "menu.section.toggle.control_panel": "Укључите одељак Контролна табла",
+  "menu.section.toggle.curation_task": "Укључи/искључи одељак Задатак курирања",
+  "menu.section.toggle.edit": "Укључите одељак Уреди",
+  "menu.section.toggle.export": "Укључите одељак Извези",
+  "menu.section.toggle.find": "Укључи одељак Пронађи",
+  "menu.section.toggle.import": "Укључите одељак Увези",
+  "menu.section.toggle.new": "Укључите нови одељак",
+  "menu.section.toggle.registries": "Укључите одељак Регистри",
+  "menu.section.toggle.statistics_task": "Укључи/искључи одељак статистички задатак",
+  "menu.section.workflow": "Администрација процеса рада",
+  "metadata-export-search.tooltip": "Извезите резултате претраге као CSV",
+  "metadata-export-search.submit.success": "Извоз је успешно започет",
+  "metadata-export-search.submit.error": "Покретање извоза није успело",
+  "mydspace.breadcrumbs": "Мој DSpace",
+  "mydspace.description": "",
+  "mydspace.messages.controller-help": "Изаберите ову опцију да бисте послали поруку подносиоцу ставке.",
+  "mydspace.messages.description-placeholder": "Унесите своју поруку овде...",
+  "mydspace.messages.hide-msg": "Сакријте поруку",
+  "mydspace.messages.mark-as-read": "Означите као прочитано",
+  "mydspace.messages.mark-as-unread": "Означите као непрочитану",
+  "mydspace.messages.no-content": "Без садржаја.",
+  "mydspace.messages.no-messages": "Још нема порука.",
+  "mydspace.messages.send-btn": "Пошаљи",
+  "mydspace.messages.show-msg": "Прикажи поруку",
+  "mydspace.messages.subject-placeholder": "Предмет...",
+  "mydspace.messages.submitter-help": "Изаберите ову опцију да бисте послали поруку контролору.",
+  "mydspace.messages.title": "Поруке",
+  "mydspace.messages.to": "До",
+  "mydspace.new-submission": "Нови поднесак",
+  "mydspace.new-submission-external": "Увезите метаподатке из спољног извора",
+  "mydspace.new-submission-external-short": "Увезите метаподатке",
+  "mydspace.results.head": "Ваши поднесци",
+  "mydspace.results.no-abstract": "Нема сажетка",
+  "mydspace.results.no-authors": "Нема аутора",
+  "mydspace.results.no-collections": "Нема колекција",
+  "mydspace.results.no-date": "Нема датума",
+  "mydspace.results.no-files": "Нема фајлова",
+  "mydspace.results.no-results": "Нема ставки за приказ",
+  "mydspace.results.no-title": "Без наслова",
+  "mydspace.results.no-uri": "Нема URI",
+  "mydspace.search-form.placeholder": "Претрага у MyDSpace...",
+  "mydspace.show.workflow": "Радни задаци",
+  "mydspace.show.workspace": "Ваши поднесци",
+  "mydspace.show.supervisedWorkspace": "Надзиране ставке",
+  "mydspace.status.mydspaceArchived": "Архивирано",
+  "mydspace.status.mydspaceValidation": "Валидација",
+  "mydspace.status.mydspaceWaitingController": "Чека се контролер",
+  "mydspace.status.mydspaceWorkflow": "Радни процес",
+  "mydspace.status.mydspaceWorkspace": "Радни простор",
+  "mydspace.title": "MyDSpace",
+  "mydspace.upload.upload-failed": "Грешка при креирању новог радног простора. Молимо проверите отпремљени садржај пре него што покушате поново.",
+  "mydspace.upload.upload-failed-manyentries": "Необрађен фајл. Откривено је превише уноса, али је дозвољен само за један фајл.",
+  "mydspace.upload.upload-failed-moreonefile": "Необрађен захтев. Дозвољен је само један фајл.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} нових ставки радног простора је креирано.",
+  "mydspace.view-btn": "Поглед",
+  "nav.browse.header": "Читав репозиторијум",
+  "nav.community-browse.header": "Од заједнице",
+  "nav.context-help-toggle": "Укључите додатну помоћ",
+  "nav.language": "Промена језика",
+  "nav.login": "Пријави се",
+  "nav.user-profile-menu-and-logout": "Мени корисничког профила и одјава",
+  "nav.logout": "Одјавити се",
+  "nav.main.description": "Главна навигациона трака",
+  "nav.mydspace": "MyDSpace",
+  "nav.profile": "Профил",
+  "nav.search": "Претрага",
+  "nav.search.button": "Пошаљите претрагу",
+  "nav.statistics.header": "Статистика",
+  "nav.stop-impersonating": "Престаните да се представљате као EPerson",
+  "nav.subscriptions": "Претплате",
+  "nav.toggle": "Укључивање навигације",
+  "nav.user.description": "Трака корисничког профила",
+  "none.listelement.badge": "Ставка",
+  "orgunit.listelement.badge": "Организациона јединица",
+  "orgunit.listelement.no-title": "Без наслова",
+  "orgunit.page.city": "Град",
+  "orgunit.page.country": "Држава",
+  "orgunit.page.dateestablished": "Датум постављања",
+  "orgunit.page.description": "Опис",
+  "orgunit.page.edit": "Изменити ову ставку",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Организациона јединица:",
+  "pagination.options.description": "Опције страничења",
+  "pagination.results-per-page": "Резултати по страници",
+  "pagination.showing.detail": "{{ range }} од {{ total }}",
+  "pagination.showing.label": "Приказује се ",
+  "pagination.sort-direction": "Опције сортирања",
+  "person.listelement.badge": "Особа",
+  "person.listelement.no-title": "Име није пронађено",
+  "person.page.birthdate": "Датум рођења",
+  "person.page.edit": "Изменити ову ставку",
+  "person.page.email": "Емаил адреса",
+  "person.page.firstname": "Име",
+  "person.page.jobtitle": "Звање",
+  "person.page.lastname": "Презиме",
+  "person.page.name": "Име",
+  "person.page.link.full": "Прикажи све метаподатке",
+  "person.page.orcid": "ORCID",
+  "person.page.staffid": "ID запослених",
+  "person.page.titleprefix": "Особа:",
+  "person.search.results.head": "Резултати претраге особа",
+  "person-relationships.search.results.head": "Резултати претраге особа",
+  "person.search.title": "Претрага особа",
+  "process.new.select-parameters": "Параметри",
+  "process.new.cancel": "Отказати",
+  "process.new.submit": "Сачувати",
+  "process.new.select-script": "Скрипта",
+  "process.new.select-script.placeholder": "Изаберите скрипту...",
+  "process.new.select-script.required": "Скрипта је обавезна",
+  "process.new.parameter.file.upload-button": "Изаберите фајл...",
+  "process.new.parameter.file.required": "Молимо изаберите фајл",
+  "process.new.parameter.string.required": "Вредност параметра је обавезна",
+  "process.new.parameter.type.value": "вредност",
+  "process.new.parameter.type.file": "фајл",
+  "process.new.parameter.required.missing": "Следећи параметри су обавезни, али још увек недостају:",
+  "process.new.notification.success.title": "Успех",
+  "process.new.notification.success.content": "Процес је успешно креиран",
+  "process.new.notification.error.title": "Грешка",
+  "process.new.notification.error.content": "Дошло је до грешке при креирању овог процеса",
+  "process.new.notification.error.max-upload.content": "Фајл превазилази максималну величину за отпремање",
+  "process.new.header": "Креирајте нови процес",
+  "process.new.title": "Креирајте нови процес",
+  "process.new.breadcrumbs": "Креирајте нови процес",
+  "process.detail.arguments": "Аргументи",
+  "process.detail.arguments.empty": "Овај процес не садржи аргументе",
+  "process.detail.back": "Назад",
+  "process.detail.output": "Излаз процеса",
+  "process.detail.logs.button": "Преузмите излаз процеса",
+  "process.detail.logs.loading": "Преузимање",
+  "process.detail.logs.none": "Овај процес нема излаз",
+  "process.detail.output-files": "Излазни фајлови",
+  "process.detail.output-files.empty": "Овај процес не садржи излазне фајлове",
+  "process.detail.script": "Скрипта",
+  "process.detail.title": "Процес: {{ id }} - {{ name }}",
+  "process.detail.start-time": "Време почетка",
+  "process.detail.end-time": "Време завршетка",
+  "process.detail.status": "Статус",
+  "process.detail.create": "Направите сличан процес",
+  "process.detail.actions": "Акције",
+  "process.detail.delete.button": "Избришите процес",
+  "process.detail.delete.header": "Избришите процес",
+  "process.detail.delete.body": "Да ли сте сигурни да желите да избришете тренутни процес?",
+  "process.detail.delete.cancel": "Поништити, отказати",
+  "process.detail.delete.confirm": "Избришите процес",
+  "process.detail.delete.success": "Процес је успешно обрисан.",
+  "process.detail.delete.error": "Нешто је пошло наопако приликом брисања процеса",
+  "process.overview.table.finish": "Време завршетка (UTC)",
+  "process.overview.table.id": "ID процеса",
+  "process.overview.table.name": "Име",
+  "process.overview.table.start": "Време почетка (UTC)",
+  "process.overview.table.status": "Статус",
+  "process.overview.table.user": "Корисник",
+  "process.overview.title": "Преглед процеса",
+  "process.overview.breadcrumbs": "Преглед процеса",
+  "process.overview.new": "Ново",
+  "process.overview.table.actions": "Акције",
+  "process.overview.delete": "Избришите {{count}} процеса",
+  "process.overview.delete.clear": "Очистите избор за брисање",
+  "process.overview.delete.processing": "Бришу се процеси ({{count}}). Сачекајте да се брисање у потпуности заврши. Имајте на уму да ово може потрајати.",
+  "process.overview.delete.body": "Да ли сте сигурни да желите да избришете {{count}} процес(е)?",
+  "process.overview.delete.header": "Избришите процесе",
+  "process.bulk.delete.error.head": "Грешка у процесу брисања",
+  "process.bulk.delete.error.body": "Није могуће избрисати процес са ID-ом {{processId}}. Преостали процеси ће наставити да се бришу.",
+  "process.bulk.delete.success": "Процеси ({{count}}) су успешно избрисани",
+  "profile.breadcrumbs": "Ажурирање профила",
+  "profile.card.identify": "Идентитет",
+  "profile.card.security": "Безбедност",
+  "profile.form.submit": "Сачувати",
+  "profile.groups.head": "Групе овлашћења којима припадате",
+  "profile.special.groups.head": "Ауторизација посебних група којима припадате",
+  "profile.head": "Ажурирање профил",
+  "profile.metadata.form.error.firstname.required": "Име је обавезно",
+  "profile.metadata.form.error.lastname.required": "Презиме је обавезно",
+  "profile.metadata.form.label.email": "Емаил адреса",
+  "profile.metadata.form.label.firstname": "Име",
+  "profile.metadata.form.label.language": "Језик",
+  "profile.metadata.form.label.lastname": "Презиме",
+  "profile.metadata.form.label.phone": "Контакт телефон",
+  "profile.metadata.form.notifications.success.content": "Ваше промене на профилу су сачуване.",
+  "profile.metadata.form.notifications.success.title": "Профил је сачуван",
+  "profile.notifications.warning.no-changes.content": "Нису направљене никакве промене на профилу.",
+  "profile.notifications.warning.no-changes.title": "Без промене",
+  "profile.security.form.error.matching-passwords": "Лозинке се не поклапају.",
+  "profile.security.form.info": "Опционо, можете да унесете нову лозинку у поље испод и потврдите је тако што ћете је поново укуцати у друго поље.",
+  "profile.security.form.label.password": "Лозинка",
+  "profile.security.form.label.passwordrepeat": "Поново откуцајте да бисте потврдили",
+  "profile.security.form.label.current-password": "Тренутна лозинка",
+  "profile.security.form.notifications.success.content": "Ваше промене лозинке су сачуване.",
+  "profile.security.form.notifications.success.title": "Лозинка је сачувана",
+  "profile.security.form.notifications.error.title": "Грешка при промени лозинки",
+  "profile.security.form.notifications.error.change-failed": "Дошло је до грешке при покушају промене лозинке. Проверите да ли је тренутна лозинка тачна.",
+  "profile.security.form.notifications.error.not-same": "Наведене лозинке нису исте.",
+  "profile.security.form.notifications.error.general": "Попуните обавезна поља безбедносног обрасца.",
+  "profile.title": "Ажурирање профила",
+  "profile.card.researcher": "Профил истраживача",
+  "project.listelement.badge": "Истраживачки пројекат",
+  "project.page.contributor": "Сарадници",
+  "project.page.description": "Опис",
+  "project.page.edit": "Уредите ову ставку",
+  "project.page.expectedcompletion": "Очекивани завршетак",
+  "project.page.funder": "финансијери",
+  "project.page.id": "ID",
+  "project.page.keyword": "Кључне речи",
+  "project.page.status": "Статус",
+  "project.page.titleprefix": "Истраживачки пројекат:",
+  "project.search.results.head": "Резултати претраге пројекта",
+  "project-relationships.search.results.head": "Резултати претраге пројекта",
+  "publication.listelement.badge": "Публикација",
+  "publication.page.description": "Опис",
+  "publication.page.edit": "Уредите ову ставку",
+  "publication.page.journal-issn": "Часопис ISSN",
+  "publication.page.journal-title": "Наслов часописа",
+  "publication.page.publisher": "Издавач",
+  "publication.page.titleprefix": "Публикација:",
+  "publication.page.volume-title": "Наслов свеске",
+  "publication.search.results.head": "Резултати претраге публикације",
+  "publication-relationships.search.results.head": "Резултати претраге публикације",
+  "publication.search.title": "Претрага публикација",
+  "media-viewer.next": "Следеће",
+  "media-viewer.previous": "Претходно",
+  "media-viewer.playlist": "Плаy листа",
+  "register-email.title": "Регистрација новог корисника",
+  "register-page.create-profile.header": "Направите профил",
+  "register-page.create-profile.identification.header": "Идентификовати",
+  "register-page.create-profile.identification.email": "Емаил адреса",
+  "register-page.create-profile.identification.first-name": "Име *",
+  "register-page.create-profile.identification.first-name.error": "Молимо унесите име",
+  "register-page.create-profile.identification.last-name": "Презиме *",
+  "register-page.create-profile.identification.last-name.error": "Молимо унесите презиме",
+  "register-page.create-profile.identification.contact": "Контакт телефон",
+  "register-page.create-profile.identification.language": "Језик",
+  "register-page.create-profile.security.header": "Безбедност",
+  "register-page.create-profile.security.info": "Молимо унесите лозинку у поље испод и потврдите је тако што ћете је поново унети у друго поље.",
+  "register-page.create-profile.security.label.password": "Лозинка *",
+  "register-page.create-profile.security.label.passwordrepeat": "Унесите поново да потврдите *",
+  "register-page.create-profile.security.error.empty-password": "Молимо унесите лозинку у поље испод.",
+  "register-page.create-profile.security.error.matching-passwords": "Лозинке се не поклапају.",
+  "register-page.create-profile.submit": "Завршите регистрацију",
+  "register-page.create-profile.submit.error.content": "Нешто није у реду приликом регистрације новог корисника.",
+  "register-page.create-profile.submit.error.head": "Неуспешна регистрација",
+  "register-page.create-profile.submit.success.content": "Регистрација је успешна. Пријављени сте као креирани корисник.",
+  "register-page.create-profile.submit.success.head": "Регистрација је завршена",
+  "register-page.registration.header": "Регистрација новог корисника",
+  "register-page.registration.info": "Региструјте налог да бисте се претплатили на колекције за ажурирања путем емаил-а и пошаљите нове ставке на DSpace.",
+  "register-page.registration.email": "Емаил адреса *",
+  "register-page.registration.email.error.required": "Молимо унесите емаил адресу",
+  "register-page.registration.email.error.not-email-form": "Молимо унесите важећу емаил адресу.",
+  "register-page.registration.email.error.not-valid-domain": "Користите емаил са дозвољеним доменима: {{ domains }}",
+  "register-page.registration.email.hint": "Ова адреса ће бити верификована и коришћена као ваше корисничко име.",
+  "register-page.registration.submit": "Регистровати",
+  "register-page.registration.success.head": "Верификациони емаил је послат",
+  "register-page.registration.success.content": "Емаил је послат на {{ email }} који садржи посебан URL и даља упутства.",
+  "register-page.registration.error.head": "Грешка при покушају регистрације емаил-а",
+  "register-page.registration.error.content": "Дошло је до грешке при регистрацији следеће емаил адресе: {{ email }}",
+  "register-page.registration.error.recaptcha": "Грешка при покушају аутентификације помоћу recaptcha",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Да бисте се регистровали, морате прихватити колачиће за <b>регистрацију и враћање лозинке</b> (Google reCaptcha).",
+  "register-page.registration.error.maildomain": "Ова емаил адреса није на листи домена који се могу регистровати. Дозвољени домени су {{ domains }}",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Отворите подешавања колачића",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Дошло је до грешке током reCaptcha верификације",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Верификација је истекла. Молимо потврдите поново.",
+  "register-page.registration.info.maildomain": "Налози се могу регистровати за емаил адресе домена",
+  "relationships.add.error.relationship-type.content": "Није пронађено одговарајуће подударање за тип везе {{ type }} између две ставке",
+  "relationships.add.error.server.content": "Сервер је вратио грешку",
+  "relationships.add.error.title": "Није могуће додати везу",
+  "relationships.isAuthorOf": "Аутори",
+  "relationships.isAuthorOf.Person": "Аутори (особа)",
+  "relationships.isAuthorOf.OrgUnit": "Аутори (организационе јединице)",
+  "relationships.isIssueOf": "Издања часописа",
+  "relationships.isJournalIssueOf": "Издања часопса",
+  "relationships.isJournalOf": "Часописи",
+  "relationships.isOrgUnitOf": "Организационе јединице",
+  "relationships.isPersonOf": "Аутори",
+  "relationships.isProjectOf": "Истраживачки пројекти",
+  "relationships.isPublicationOf": "Издања",
+  "relationships.isPublicationOfJournalIssue": "Чланци",
+  "relationships.isSingleJournalOf": "Часопис",
+  "relationships.isSingleVolumeOf": "Свеска часописа",
+  "relationships.isVolumeOf": "Свеске часописа",
+  "relationships.isContributorOf": "Сарадници",
+  "relationships.isContributorOf.OrgUnit": "Сарадник (Организациона јединица)",
+  "relationships.isContributorOf.Person": "Сарадник",
+  "relationships.isFundingAgencyOf.OrgUnit": "Оснивач",
+  "repository.image.logo": "Лого репозиторијума",
+  "repository.title": "DSpace Репозиторијум",
+  "repository.title.prefix": "DSpace Репозиторијум ::",
+  "resource-policies.add.button": "Додати",
+  "resource-policies.add.for.": "Додајте нове смернице",
+  "resource-policies.add.for.bitstream": "Додајте нове битстрим смернице",
+  "resource-policies.add.for.bundle": "Додајте нове смернице пакета",
+  "resource-policies.add.for.item": "Додајте нове смернице ставки",
+  "resource-policies.add.for.community": "Додајте нове смернице заједнице",
+  "resource-policies.add.for.collection": "Додајте нове смернице колекција",
+  "resource-policies.create.page.heading": "Креирајте нове смернице ресурса за",
+  "resource-policies.create.page.failure.content": "Дошло је до грешке при креирању смерница ресурса.",
+  "resource-policies.create.page.success.content": "Операција успела",
+  "resource-policies.create.page.title": "Креирајте нове смернице ресурса",
+  "resource-policies.delete.btn": "Избришите изабрано",
+  "resource-policies.delete.btn.title": "Избришите изабране смернице ресурса",
+  "resource-policies.delete.failure.content": "Дошло је до грешке приликом брисања изабраних смерница ресурса.",
+  "resource-policies.delete.success.content": "Операција успела",
+  "resource-policies.edit.page.heading": "Измените смернице ресурса",
+  "resource-policies.edit.page.failure.content": "Дошло је до грешке приликом измене смерница ресурса.",
+  "resource-policies.edit.page.target-failure.content": "Дошло је до грешке приликом измене циља (EPerson или групе) смерница ресурса.",
+  "resource-policies.edit.page.other-failure.content": "Дошло је до грешке приликом измене смерница ресурса. Циљ (EPerson или група) је успешно ажуриран.",
+  "resource-policies.edit.page.success.content": "Операција успела",
+  "resource-policies.edit.page.title": "Измена смерница ресурса",
+  "resource-policies.form.action-type.label": "Изабрати врсту акције",
+  "resource-policies.form.action-type.required": "Морате да изаберете акцију полисе ресурса.",
+  "resource-policies.form.eperson-group-list.label": "EPerson или група која ће добити овлашћење",
+  "resource-policies.form.eperson-group-list.select.btn": "Изабрати",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Потражите EPerson",
+  "resource-policies.form.eperson-group-list.tab.group": "Потражите групу",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Поступак",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Име",
+  "resource-policies.form.eperson-group-list.modal.header": "Не може се променити тип",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Није могуће заменити EPerson са групом.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Није могуће заменити групу са EPerson.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Избришите тренутне полисе ресурса и креирајте нове са жељеним типом.",
+  "resource-policies.form.eperson-group-list.modal.close": "Ок",
+  "resource-policies.form.date.end.label": "Датум завршетка",
+  "resource-policies.form.date.start.label": "Датум почетка",
+  "resource-policies.form.description.label": "Опис",
+  "resource-policies.form.name.label": "Име",
+  "resource-policies.form.policy-type.label": "Изаберите тип полисе",
+  "resource-policies.form.policy-type.required": "Морате да изаберете тип полисе ресурса.",
+  "resource-policies.table.headers.action": "Поступак",
+  "resource-policies.table.headers.date.end": "Датум завршетка",
+  "resource-policies.table.headers.date.start": "Датум почетка",
+  "resource-policies.table.headers.edit": "Изменити",
+  "resource-policies.table.headers.edit.group": "Изменити групу",
+  "resource-policies.table.headers.edit.policy": "Изменити смернице",
+  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.group": "Група",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Име",
+  "resource-policies.table.headers.policyType": "тип",
+  "resource-policies.table.headers.title.for.bitstream": "Смернице за битстрим",
+  "resource-policies.table.headers.title.for.bundle": "Смернице за пакет",
+  "resource-policies.table.headers.title.for.item": "Смернице за ставку",
+  "resource-policies.table.headers.title.for.community": "Смернице за заједницу",
+  "resource-policies.table.headers.title.for.collection": "Смернице за колекцију",
+  "search.description": "",
+  "search.switch-configuration.title": "Прикажи",
+  "search.title": "Претрага",
+  "search.breadcrumbs": "Претрага",
+  "search.search-form.placeholder": "Претражите спремиште...",
+  "search.filters.applied.f.author": "Аутор",
+  "search.filters.applied.f.dateIssued.max": "Датум завршетка",
+  "search.filters.applied.f.dateIssued.min": "Датум почетка",
+  "search.filters.applied.f.dateSubmitted": "Датум прихватања",
+  "search.filters.applied.f.discoverable": "Није могуће открити",
+  "search.filters.applied.f.entityType": "Тип ставке",
+  "search.filters.applied.f.has_content_in_original_bundle": "Има фајлове",
+  "search.filters.applied.f.itemtype": "Тип",
+  "search.filters.applied.f.namedresourcetype": "Статус",
+  "search.filters.applied.f.subject": "Предмет",
+  "search.filters.applied.f.submitter": "Подносилац",
+  "search.filters.applied.f.jobTitle": "Звање",
+  "search.filters.applied.f.birthDate.max": "Рођење - крајњи датум",
+  "search.filters.applied.f.birthDate.min": "Рођење - почетни датум",
+  "search.filters.applied.f.supervisedBy": "Прегледао",
+  "search.filters.applied.f.withdrawn": "Повучен",
+  "search.filters.filter.author.head": "Аутор",
+  "search.filters.filter.author.placeholder": "Име аутора",
+  "search.filters.filter.author.label": "Претражите име аутора",
+  "search.filters.filter.birthDate.head": "Датум рођења",
+  "search.filters.filter.birthDate.placeholder": "Датум рођења",
+  "search.filters.filter.birthDate.label": "Претражите датум рођења",
+  "search.filters.filter.collapse": "Скупи филтер",
+  "search.filters.filter.creativeDatePublished.head": "Датум објављивања",
+  "search.filters.filter.creativeDatePublished.placeholder": "Датум објављивања",
+  "search.filters.filter.creativeDatePublished.label": "Претражите датум објављивања",
+  "search.filters.filter.creativeWorkEditor.head": "Едитор",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Едитор",
+  "search.filters.filter.creativeWorkEditor.label": "Претрага уредника",
+  "search.filters.filter.creativeWorkKeywords.head": "Предмет",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Предмет",
+  "search.filters.filter.creativeWorkKeywords.label": "Предмет претраге",
+  "search.filters.filter.creativeWorkPublisher.head": "Издавач",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Издавач",
+  "search.filters.filter.creativeWorkPublisher.label": "Претрага издавача",
+  "search.filters.filter.dateIssued.head": "Датум",
+  "search.filters.filter.dateIssued.max.placeholder": "Максимални датум",
+  "search.filters.filter.dateIssued.max.label": "Крај",
+  "search.filters.filter.dateIssued.min.placeholder": "Минимални датум",
+  "search.filters.filter.dateIssued.min.label": "Почетак",
+  "search.filters.filter.dateSubmitted.head": "Датум прихватања",
+  "search.filters.filter.dateSubmitted.placeholder": "Датум прихватања",
+  "search.filters.filter.dateSubmitted.label": "Претрага датума прихватања",
+  "search.filters.filter.discoverable.head": "Није могуће открити",
+  "search.filters.filter.withdrawn.head": "Повучен",
+  "search.filters.filter.entityType.head": "Тип ставке",
+  "search.filters.filter.entityType.placeholder": "Тип ставке",
+  "search.filters.filter.entityType.label": "Претражите тип ставке",
+  "search.filters.filter.expand": "Прошири филтер",
+  "search.filters.filter.has_content_in_original_bundle.head": "Има фајлове",
+  "search.filters.filter.itemtype.head": "Тип",
+  "search.filters.filter.itemtype.placeholder": "Тип",
+  "search.filters.filter.itemtype.label": "Тип претраге",
+  "search.filters.filter.jobTitle.head": "Звање",
+  "search.filters.filter.jobTitle.placeholder": "Звање",
+  "search.filters.filter.jobTitle.label": "Претрага звања",
+  "search.filters.filter.knowsLanguage.head": "Познати језик",
+  "search.filters.filter.knowsLanguage.placeholder": "Познати језик",
+  "search.filters.filter.knowsLanguage.label": "Претражите познати језик",
+  "search.filters.filter.namedresourcetype.head": "Статус",
+  "search.filters.filter.namedresourcetype.placeholder": "Статус",
+  "search.filters.filter.namedresourcetype.label": "Статус претраге",
+  "search.filters.filter.objectpeople.head": "Људи",
+  "search.filters.filter.objectpeople.placeholder": "Људи",
+  "search.filters.filter.objectpeople.label": "Претражите људе",
+  "search.filters.filter.organizationAddressCountry.head": "Држава",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Држава",
+  "search.filters.filter.organizationAddressCountry.label": "Претражите државу",
+  "search.filters.filter.organizationAddressLocality.head": "Град",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Град",
+  "search.filters.filter.organizationAddressLocality.label": "Претражите град",
+  "search.filters.filter.organizationFoundingDate.head": "Датум оснивања",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Датум оснивања",
+  "search.filters.filter.organizationFoundingDate.label": "Претражите датум оснивања",
+  "search.filters.filter.scope.head": "Опсег",
+  "search.filters.filter.scope.placeholder": "Филтер опсега",
+  "search.filters.filter.scope.label": "Претражите филтер опсега",
+  "search.filters.filter.show-less": "Скупити",
+  "search.filters.filter.show-more": "Прикажи више",
+  "search.filters.filter.subject.head": "Предмет",
+  "search.filters.filter.subject.placeholder": "Предмет",
+  "search.filters.filter.subject.label": "Предмет претраге",
+  "search.filters.filter.submitter.head": "Подносилац",
+  "search.filters.filter.submitter.placeholder": "Подносилац",
+  "search.filters.filter.submitter.label": "Подносилац претраге",
+  "search.filters.filter.show-tree": "Прегледајте стабло {{ name }}",
+  "search.filters.filter.supervisedBy.head": "Прегледао",
+  "search.filters.filter.supervisedBy.placeholder": "Прегледао",
+  "search.filters.filter.supervisedBy.label": "Претрагу надгледао",
+  "search.filters.entityType.JournalIssue": "Издања часописа",
+  "search.filters.entityType.JournalVolume": "Свеска часописа",
+  "search.filters.entityType.OrgUnit": "Организациона јединица",
+  "search.filters.has_content_in_original_bundle.true": "Да",
+  "search.filters.has_content_in_original_bundle.false": "Не",
+  "search.filters.discoverable.true": "Не",
+  "search.filters.discoverable.false": "Да",
+  "search.filters.namedresourcetype.Archived": "Архивирано",
+  "search.filters.namedresourcetype.Validation": "Исправност",
+  "search.filters.namedresourcetype.Waiting for Controller": "Чека се контролор",
+  "search.filters.namedresourcetype.Workflow": "Процес рада",
+  "search.filters.namedresourcetype.Workspace": "Радни простор",
+  "search.filters.withdrawn.true": "Да",
+  "search.filters.withdrawn.false": "Не",
+  "search.filters.head": "Филтери",
+  "search.filters.reset": "Ресетовање филтера",
+  "search.filters.search.submit": "Прихватите",
+  "search.form.search": "Претрага",
+  "search.form.search_dspace": "Сви репозиторијуми",
+  "search.form.scope.all": "Читав репозиторијум",
+  "search.results.head": "Резултати претраге",
+  "search.results.no-results": "Ваша претрага није дала резултате. Имате проблема са проналажењем онога што тражите? Покушајте да ставите",
+  "search.results.no-results-link": "наводнике око тога",
+  "search.results.empty": "Ваша претрага није дала резултате.",
+  "search.results.view-result": "Погледати",
+  "search.results.response.500": "Дошло је до грешке током извршавања упита, молимо покушајте поново касније",
+  "default.search.results.head": "Резултати претраге",
+  "default-relationships.search.results.head": "Резултати претраге",
+  "search.sidebar.close": "Повратак на резултате",
+  "search.sidebar.filters.title": "Филтери",
+  "search.sidebar.open": "Алати за претрагу",
+  "search.sidebar.results": "резултати",
+  "search.sidebar.settings.rpp": "Резултати по страни",
+  "search.sidebar.settings.sort-by": "Сортирати по",
+  "search.sidebar.settings.title": "Подешавања",
+  "search.view-switch.show-detail": "Приказати детаље",
+  "search.view-switch.show-grid": "Приказати као мрежу",
+  "search.view-switch.show-list": "Приказати као листу",
+  "sorting.ASC": "Растуће",
+  "sorting.DESC": "Опадајуће",
+  "sorting.dc.title.ASC": "Наслов растуће",
+  "sorting.dc.title.DESC": "Наслов опадајуће",
+  "sorting.score.ASC": "Најмање релевантно",
+  "sorting.score.DESC": "Најрелевантније",
+  "sorting.dc.date.issued.ASC": "Датум издања растуће",
+  "sorting.dc.date.issued.DESC": "Датум издања опадајуће",
+  "sorting.dc.date.accessioned.ASC": "Датум приступа растуће",
+  "sorting.dc.date.accessioned.DESC": "Датум приступа опадајуће",
+  "sorting.lastModified.ASC": "Последња измена растуће",
+  "sorting.lastModified.DESC": "Последња измена опадајуће",
+  "statistics.title": "Статистика",
+  "statistics.header": "Статистика за {{ scope }}",
+  "statistics.breadcrumbs": "Статистика",
+  "statistics.page.no-data": "Нема доступних података",
+  "statistics.table.no-data": "Нема доступних података",
+  "statistics.table.title.TotalVisits": "Укупно посета",
+  "statistics.table.title.TotalVisitsPerMonth": "Укупно посета месечно",
+  "statistics.table.title.TotalDownloads": "Посете фајловима",
+  "statistics.table.title.TopCountries": "Највише прегледа по државама",
+  "statistics.table.title.TopCities": "Највише прегледа по градовима",
+  "statistics.table.header.views": "Погледи",
+  "statistics.table.no-name": "(име објекта се не може учитати)",
+  "submission.edit.breadcrumbs": "Измена поднеска",
+  "submission.edit.title": "Измена поднеска",
+  "submission.general.cancel": "Отказати",
+  "submission.general.cannot_submit": "Немате дозволу да поднесете нову пријаву.",
+  "submission.general.deposit": "Депоновати",
+  "submission.general.discard.confirm.cancel": "Отказати",
+  "submission.general.discard.confirm.info": "Ова операција се не може опозвати. Да ли сте сигурни?",
+  "submission.general.discard.confirm.submit": "Да сигуран сам",
+  "submission.general.discard.confirm.title": "Одбаците поднесак",
+  "submission.general.discard.submit": "Одбацити",
+  "submission.general.info.saved": "Сачувано",
+  "submission.general.info.pending-changes": "Несачуване промене",
+  "submission.general.save": "Сачувати",
+  "submission.general.save-later": "Сачувати за касније",
+  "submission.import-external.page.title": "Увезите метаподатке из спољног извора",
+  "submission.import-external.title": "Увезите метаподатке из спољног извора",
+  "submission.import-external.title.Journal": "Увезите часопис из спољног извора",
+  "submission.import-external.title.JournalIssue": "Увезите издање часописа из спољног извора",
+  "submission.import-external.title.JournalVolume": "Увезите волуме часописа из спољног извора",
+  "submission.import-external.title.OrgUnit": "Увезите издавача из спољног извора",
+  "submission.import-external.title.Person": "Увезите особу из спољног извора",
+  "submission.import-external.title.Project": "Увезите пројекат из спољног извора",
+  "submission.import-external.title.Publication": "Увезите публикацију из спољног извора",
+  "submission.import-external.title.none": "Увезите метаподатке из спољног извора",
+  "submission.import-external.page.hint": "Унесите упит изнад да бисте пронашли ставке са веба за увоз у DSpace.",
+  "submission.import-external.back-to-my-dspace": "Назад на MyDSpace",
+  "submission.import-external.search.placeholder": "Претрага спољног извора",
+  "submission.import-external.search.button": "Претрага",
+  "submission.import-external.search.button.hint": "Напишите неколико речи за претрагу",
+  "submission.import-external.search.source.hint": "Изаберите спољни извор",
+  "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Научна мрежа",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.epo": "Европски завод за патенте (EPO)",
+  "submission.import-external.source.loading": "Учитавање...",
+  "submission.import-external.source.sherpaJournal": "SHERPA часописи",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA часописи од ISSN",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.lcname": "Библиотека Конгресних имена",
+  "submission.import-external.preview.title": "Преглед ставке",
+  "submission.import-external.preview.title.Publication": "Преглед публикације",
+  "submission.import-external.preview.title.none": "Преглед ставке",
+  "submission.import-external.preview.title.Journal": "Преглед часописа",
+  "submission.import-external.preview.title.OrgUnit": "Преглед организационе јединице",
+  "submission.import-external.preview.title.Person": "Преглед особе",
+  "submission.import-external.preview.title.Project": "Преглед пројекта",
+  "submission.import-external.preview.subtitle": "Метаподаци у наставку су увезени из спољног извора. Биће унапред попуњен када започнете прихватање.",
+  "submission.import-external.preview.button.import": "Почните са прихватањем",
+  "submission.import-external.preview.error.import.title": "Грешка при прихватању",
+  "submission.import-external.preview.error.import.body": "Дошло је до грешке током улазног процеса увоза спољашњег извора.",
+  "submission.sections.describe.relationship-lookup.close": "Затвори",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Успешно је додат локални улаз у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Увезите удаљеног аутора",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Увезите удаљени дневник",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Увезите удаљено издање часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Увезите удаљени опсег часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Увезите удаљену ставку",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Увезите удаљени догађај",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Увезите удаљени производ",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Увезите удаљену опрему",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Увезите удаљену организациону јединицу",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Увезите удаљени фонд",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Увезите удаљену особу",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Увезите удаљени патент",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Увезите удаљени пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Увезите удаљену публикацију",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Додат је нови ентитет!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Увези удаљеног аутора",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Локални аутор је успешно додат у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Спољашњи аутор је успешно увезен и додат у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Управа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Увезите као нови улаз локалне управе",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Поништити, отказати",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Изаберите колекцију у коју ћете увести нове улазе",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Ентитети",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Увезите као нови локални ентитет",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Увезите из LC имена",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Увезите из ORCID-а",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Увезите из часописа SHERPA",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Увезите из SHERPA издавача",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Увезите из PubMed-а",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Увезите из arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Увоз",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Увезите удаљени часопис",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Успешно додат локални часопис у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Успешно увезен и додат спољашњи часопис у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Увезите удаљено издање часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Успешно је додат локални број часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Успешно увезен и додат спољашњи број часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Увезите удаљени опсег часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Успешно је додат локални волумен часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Успешно увезен и додат спољашњи опсег часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Изаберите локално подударање:",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Поништите све",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Опозовите избор странице",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Учитавање...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Упит за претрагу",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Иди",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Претрага...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Изабери све",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Изаберите страницу",
+  "submission.sections.describe.relationship-lookup.selected": "Изабране ставке {{ size }}",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Локални аутори ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Локални часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Локални пројекти ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Локалне публикације ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Локални аутори ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Локалне организационе јединице ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Локални пакети података ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Локални фајлови података ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Локални часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Локална издања часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Локална издања часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Локални опсег часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Локални опсег часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "SHERPA часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "SHERPA издавачи({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC имена ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Потражите финансијере",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Потражите средства",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Потражите организационе јединице",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Пројекти",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Финансијер пројекта",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Публикација аутора",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Пројекат",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Пројекти",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Финансијер пројекта",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Претрага...",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Тренутни избор ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Издања часописа",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Издања часописа",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Свеске часописа",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Свеске часописа",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Часописи",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Аутори",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Финансијска агенција",
+  "submission.sections.describe.relationship-lookup.title.Project": "Пројекти",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Публикације",
+  "submission.sections.describe.relationship-lookup.title.Person": "Аутори",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Организационе јединице",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Пакети података",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Фајлови са подацима",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Финансијска агенција",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Финансирање",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Матична организациона јединица",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Публикација",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Укључите падајући мени",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Подешавања",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Ваш избор је тренутно празан.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Изабрани аутори",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Изабрани часописи",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Изабрана свеска часописа",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Изабрани пројекти",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Изабране публикације",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Изабрани аутори",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Изабране организационе јединице",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Изабрани пакети података",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Изабрани фајлови са подацима",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Изабрани часописи",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Изабрано издање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Изабрана свеска часописа",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Изабрана финансијска агенција",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Изабрано финансирање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Изабрано издање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Изабрана организациона јединица",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Да ли желите да сачувате \"{{ value }}\" као варијанту имена за ову особу да бисте ви и други могли да га поново користите за будуће слање? Ако то не урадите, и даље можете да га користите за овај поднесак.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Сачувајте нову варијанту имена",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Користи се само за овај поднесак",
+  "submission.sections.ccLicense.type": "Тип лиценце",
+  "submission.sections.ccLicense.select": "Изаберите тип лиценце…",
+  "submission.sections.ccLicense.change": "Промените тип лиценце…",
+  "submission.sections.ccLicense.none": "Нема доступних лиценци",
+  "submission.sections.ccLicense.option.select": "Изаберите опцију…",
+  "submission.sections.ccLicense.link": "Изабрали сте следећу лиценцу:",
+  "submission.sections.ccLicense.confirmation": "Додељујем лиценцу изнад",
+  "submission.sections.general.add-more": "Додајте још",
+  "submission.sections.general.cannot_deposit": "Пријава се не може довршити због грешака у обрасцу.<br>Попуните сва обавезна поља да бисте довршили пријаву.",
+  "submission.sections.general.collection": "Колекција",
+  "submission.sections.general.deposit_error_notice": "Дошло је до проблема приликом слања ставке, молимо покушајте поново касније.",
+  "submission.sections.general.deposit_success_notice": "Пријава је успешно поднета.",
+  "submission.sections.general.discard_error_notice": "Дошло је до проблема при одбацивању ставке, молимо покушајте поново касније.",
+  "submission.sections.general.discard_success_notice": "Слање је успешно одбачено.",
+  "submission.sections.general.metadata-extracted": "Нови метаподаци су издвојени и додати у одељак <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted-new-section": "Нови одељак <strong>{{sectionId}}</strong> је додат у пријаву.",
+  "submission.sections.general.no-collection": "Није пронађена колекција",
+  "submission.sections.general.no-sections": "Нема доступних опција",
+  "submission.sections.general.save_error_notice": "Дошло је до проблема приликом чувања ставке, молимо покушајте поново касније.",
+  "submission.sections.general.save_success_notice": "Пријава је успешно сачувана.",
+  "submission.sections.general.search-collection": "Потражите колекцију",
+  "submission.sections.general.sections_not_valid": "Постоје непотпуни одељци.",
+  "submission.sections.identifiers.info": "Следећи идентификатори ће бити креирани за вашу ставку:",
+  "submission.sections.identifiers.no_handle": "За ову ставку није везан Handle.",
+  "submission.sections.identifiers.no_doi": "Ниједан DOIs није везан за ову ставку.",
+  "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Остали идентификатори:",
+  "submission.sections.submit.progressbar.accessCondition": "Услови приступања ставки",
+  "submission.sections.submit.progressbar.CClicense": "Creative Commons лиценца",
+  "submission.sections.submit.progressbar.describe.recycle": "Рециклажа",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Описати",
+  "submission.sections.submit.progressbar.describe.stepone": "Описати",
+  "submission.sections.submit.progressbar.describe.steptwo": "Описати",
+  "submission.sections.submit.progressbar.detect-duplicate": "Потенцијални дупликати",
+  "submission.sections.submit.progressbar.identifiers": "Идентификатори",
+  "submission.sections.submit.progressbar.license": "Дозвола за депозит",
+  "submission.sections.submit.progressbar.sherpapolicy": "SHERPA прописи",
+  "submission.sections.submit.progressbar.upload": "Додај фајлове",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Информације о политици отвореног приступа издавача",
+  "submission.sections.sherpa-policy.title-empty": "Нема доступних информација о смерницама за издаваче. Ако ваш рад има придружени ISSN, унесите га изнад да бисте видели све повезане смернице отвореног приступа за издаваче.",
+  "submission.sections.status.errors.title": "Грешке",
+  "submission.sections.status.valid.title": "Важеће",
+  "submission.sections.status.warnings.title": "Упозорења",
+  "submission.sections.status.errors.aria": "Има грешке",
+  "submission.sections.status.valid.aria": "Важеће је",
+  "submission.sections.status.warnings.aria": "Има упозорења",
+  "submission.sections.status.info.title": "Додатне Информације",
+  "submission.sections.status.info.aria": "Додатне Информације",
+  "submission.sections.toggle.open": "Отвори одељак",
+  "submission.sections.toggle.close": "Затвори одељак",
+  "submission.sections.toggle.aria.open": "Проширите {{sectionHeader}} одељак",
+  "submission.sections.toggle.aria.close": "Скупите {{sectionHeader}} одељак",
+  "submission.sections.upload.delete.confirm.cancel": "Поништити, отказати",
+  "submission.sections.upload.delete.confirm.info": "Ова операција се не може опозвати. Јесте ли сигурни?",
+  "submission.sections.upload.delete.confirm.submit": "Да, сигуран сам",
+  "submission.sections.upload.delete.confirm.title": "Избришите битстрим",
+  "submission.sections.upload.delete.submit": "Избришите",
+  "submission.sections.upload.download.title": "Преузмите битстрим",
+  "submission.sections.upload.drop-message": "Спустите фајлове да бисте их приложили ставци",
+  "submission.sections.upload.edit.title": "Уредите битстрим",
+  "submission.sections.upload.form.access-condition-label": "Тип услова приступа",
+  "submission.sections.upload.form.access-condition-hint": "Изаберите услов приступа који ћете применити на битстрим када се ставка депонује",
+  "submission.sections.upload.form.date-required": "Датум је обавезан.",
+  "submission.sections.upload.form.date-required-from": "Обавезно одобрење приступа од датума.",
+  "submission.sections.upload.form.date-required-until": "Обавезно одобрење приступа до датума.",
+  "submission.sections.upload.form.from-label": "Одобрење приступа од",
+  "submission.sections.upload.form.from-hint": "Изаберите датум од кога се примењује одговарајући услов приступа",
+  "submission.sections.upload.form.from-placeholder": "Од",
+  "submission.sections.upload.form.group-label": "Група",
+  "submission.sections.upload.form.group-required": "Група је обавезна.",
+  "submission.sections.upload.form.until-label": "Одобрење приступа до",
+  "submission.sections.upload.form.until-hint": "Изаберите датум до којег се примењује одговарајући услов приступа",
+  "submission.sections.upload.form.until-placeholder": "Све док",
+  "submission.sections.upload.header.policy.default.nolist": "Отпремљени фајлови у колекцији {{collectionName}} биће доступне према следећим групама:",
+  "submission.sections.upload.header.policy.default.withlist": "Имајте на уму да ће отпремљени фајлови у колекцији {{collectionName}} бити доступни, поред онога што је изричито одлучено за један фајл, са следећим групама:",
+  "submission.sections.upload.info": "Овде ћете пронаћи све фајлове који се тренутно налазе у ставци. Можете да ажурирате метаподатке фајла и услове приступа или <strong> отпремите додатне фајлове тако што ћете их превући и отпустити било где на страници.</strong>",
+  "submission.sections.upload.no-entry": "Не",
+  "submission.sections.upload.no-file-uploaded": "Још увек није отпремљен ниједан фајл.",
+  "submission.sections.upload.save-metadata": "Сачувај метаподатке",
+  "submission.sections.upload.undo": "Поништити, отказати",
+  "submission.sections.upload.upload-failed": "Отпремање није успело",
+  "submission.sections.upload.upload-successful": "Отпремање је успешно",
+  "submission.sections.accesses.form.discoverable-description": "Када је означено, ова ставка ће бити видљива у претрази/прегледу. Када није означено, ставка ће бити доступна само преко директне везе и никада се неће појавити у претрази/прегледу.",
+  "submission.sections.accesses.form.discoverable-label": "Откривање",
+  "submission.sections.accesses.form.access-condition-label": "Тип услова приступа",
+  "submission.sections.accesses.form.access-condition-hint": "Изаберите услов приступа који ћете применити на ставку када се депонује",
+  "submission.sections.accesses.form.date-required": "Датум је обавезан.",
+  "submission.sections.accesses.form.date-required-from": "Обавезно одобрење приступа од датума.",
+  "submission.sections.accesses.form.date-required-until": "Обавезно одобрење приступа до датума.",
+  "submission.sections.accesses.form.from-label": "Одобрење приступа од",
+  "submission.sections.accesses.form.from-hint": "Изаберите датум од кога се примењује одговарајући услов приступа",
+  "submission.sections.accesses.form.from-placeholder": "Од",
+  "submission.sections.accesses.form.group-label": "Група",
+  "submission.sections.accesses.form.group-required": "Група је обавезна.",
+  "submission.sections.accesses.form.until-label": "Одобрење приступа до",
+  "submission.sections.accesses.form.until-hint": "Изаберите датум до којег се примењује одговарајући услов приступа",
+  "submission.sections.accesses.form.until-placeholder": "Све док",
+  "submission.sections.license.granted-label": "Потврђујем горе наведену лиценцу",
+  "submission.sections.license.required": "Морате прихватити лиценцу",
+  "submission.sections.license.notgranted": "Морате прихватити лиценцу",
+  "submission.sections.sherpa.publication.information": "Информације о публикацији",
+  "submission.sections.sherpa.publication.information.title": "Наслов",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-ови",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.publishers": "Издавач",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Пропис за издаваче",
+  "submission.sections.sherpa.publisher.policy.description": "Информације у наставку су пронађене преко SherpaRomea. На основу смерница вашег издавача, он пружа савете о томе да ли је ембарго можда неопходан и/или које датотеке можете да отпремите. Ако имате питања, контактирајте свог администратора сајта путем обрасца за повратне информације у подножју.",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Путеви отвореног приступа дозвољени политиком овог часописа наведени су у наставку према верзији чланка. Кликните на путању за детаљнији приказ",
+  "submission.sections.sherpa.publisher.policy.more.information": "За више информација погледајте следеће линкове:",
+  "submission.sections.sherpa.publisher.policy.version": "Верзија",
+  "submission.sections.sherpa.publisher.policy.embargo": "Ембарго",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Нема ембарга",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Ниједан",
+  "submission.sections.sherpa.publisher.policy.license": "Лиценца",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Предуслови",
+  "submission.sections.sherpa.publisher.policy.location": "Локација",
+  "submission.sections.sherpa.publisher.policy.conditions": "Услови",
+  "submission.sections.sherpa.publisher.policy.refresh": "Освежите",
+  "submission.sections.sherpa.record.information": "Запишите информацију",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.date.created": "Датум креирања",
+  "submission.sections.sherpa.record.information.date.modified": "Последња измена",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.error.message": "Дошло је до грешке при преузимању SHERPA информација",
+  "submission.submit.breadcrumbs": "Нови поднесак",
+  "submission.submit.title": "Нови поднесак",
+  "submission.workflow.generic.delete": "Избришите",
+  "submission.workflow.generic.delete-help": "Изаберите ову опцију да бисте одбацили ову ставку. Затим ће бити затражено да то потврдите.",
+  "submission.workflow.generic.edit": "Уредите",
+  "submission.workflow.generic.edit-help": "Изаберите ову опцију да бисте променили метаподатке ставке.",
+  "submission.workflow.generic.view": "Погледајте",
+  "submission.workflow.generic.view-help": "Изаберите ову опцију да бисте видели метаподатке ставке.",
+  "submission.workflow.generic.submit_select_reviewer": "Изаберите рецензента",
+  "submission.workflow.generic.submit_select_reviewer-help": "изаберите помоћ рецензента",
+  "submission.workflow.generic.submit_score": "Оцена",
+  "submission.workflow.generic.submit_score-help": "резултат-помоћ",
+  "submission.workflow.tasks.claimed.approve": "Одобрити",
+  "submission.workflow.tasks.claimed.approve_help": "Ако сте прегледали ставку и ако је погодна за придруживање колекцији, изаберите \"Одобрити\".",
+  "submission.workflow.tasks.claimed.edit": "Изменити",
+  "submission.workflow.tasks.claimed.edit_help": "Изаберите ову опцију да бисте променили метаподатке ставке.",
+  "submission.workflow.tasks.claimed.decline": "Одбити",
+  "submission.workflow.tasks.claimed.decline_help": "одбити помоћ",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Унесите разлог за одбијање пријаве у поље испод, наводећи да ли подносилац може да реши проблем и поново пошаље.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Опишите разлог одбијања",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Одбаците ставку",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Разлог",
+  "submission.workflow.tasks.claimed.reject.submit": "Одбити",
+  "submission.workflow.tasks.claimed.reject_help": "Ако сте прегледали ставку и утврдили да <strong>није</strong> прикладна за придруживање колекцији, изаберите \"Одбиј\". Од вас ће се затим тражити да унесете поруку која наводи зашто је ставка неприкладна и да ли подносилац треба нешто да промени и поново пошаље.",
+  "submission.workflow.tasks.claimed.return": "Повратак у групу",
+  "submission.workflow.tasks.claimed.return_help": "Вратите задатак у групу тако да други корисник може да изврши задатак.",
+  "submission.workflow.tasks.generic.error": "Дошло је до грешке у раду...",
+  "submission.workflow.tasks.generic.processing": "Обрада...",
+  "submission.workflow.tasks.generic.submitter": "Подносилац",
+  "submission.workflow.tasks.generic.success": "Операција успела",
+  "submission.workflow.tasks.pool.claim": "Потраживање",
+  "submission.workflow.tasks.pool.claim_help": "Доделите овај задатак себи.",
+  "submission.workflow.tasks.pool.hide-detail": "Сакрити детаље",
+  "submission.workflow.tasks.pool.show-detail": "Приказати детаље",
+  "submission.workspace.generic.view": "Погледати",
+  "submission.workspace.generic.view-help": "Изаберите ову опцију да бисте видели метаподатке ставке.",
+  "submitter.empty": "N/A",
+  "subscriptions.title": "Претплате",
+  "subscriptions.item": "Претплате на ставке",
+  "subscriptions.collection": "Претплате на колекције",
+  "subscriptions.community": "Претплате за заједнице",
+  "subscriptions.subscription_type": "Врста претплате",
+  "subscriptions.frequency": "Учесталост претплате",
+  "subscriptions.frequency.D": "Дневно",
+  "subscriptions.frequency.M": "Месечно",
+  "subscriptions.frequency.W": "Недељно",
+  "subscriptions.tooltip": "Претплатити се",
+  "subscriptions.modal.title": "Претплате",
+  "subscriptions.modal.type-frequency": "Врста и учесталост",
+  "subscriptions.modal.close": "Затворити",
+  "subscriptions.modal.delete-info": "Да бисте уклонили ову претплату, молимо посетите страницу \"Претплате\" испод вашег корисничког профила",
+  "subscriptions.modal.new-subscription-form.type.content": "Садржај",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Дневно",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Недељно",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Месечно",
+  "subscriptions.modal.new-subscription-form.submit": "Поднеси",
+  "subscriptions.modal.new-subscription-form.processing": "Обрада...",
+  "subscriptions.modal.create.success": "Успешно сте претплаћени на {{ type }}.",
+  "subscriptions.modal.delete.success": "Претплата је успешно избрисана",
+  "subscriptions.modal.update.success": "Претплата на {{ type }} је успешно ажурирана",
+  "subscriptions.modal.create.error": "Дошло је до грешке током креирања претплате",
+  "subscriptions.modal.delete.error": "Дошло је до грешке током брисања претплате",
+  "subscriptions.modal.update.error": "Дошло је до грешке током ажурирања претплате",
+  "subscriptions.table.dso": "Предмет",
+  "subscriptions.table.subscription_type": "Врста претплате",
+  "subscriptions.table.subscription_frequency": "Учесталост претплате",
+  "subscriptions.table.action": "Поступак",
+  "subscriptions.table.edit": "Изменити",
+  "subscriptions.table.delete": "Избрисати",
+  "subscriptions.table.not-available": "Није доступно",
+  "subscriptions.table.not-available-message": "Претплаћена ставка је избрисана или тренутно немате дозволу да је видите",
+  "subscriptions.table.empty.message": "Тренутно немате ниједну претплату. Да бисте се претплатили на ажурирања путем емаил-а за заједницу или колекцију, користите дугме за претплату на страници објекта.",
+  "thumbnail.default.alt": "Умањена слика",
+  "thumbnail.default.placeholder": "Нема доступних умањених слика",
+  "thumbnail.project.alt": "Лого пројекта",
+  "thumbnail.project.placeholder": "Слика референта пројекта",
+  "thumbnail.orgunit.alt": "Лого организационе јединице",
+  "thumbnail.orgunit.placeholder": "Слика референта организационе јединице",
+  "thumbnail.person.alt": "Профилна слика",
+  "thumbnail.person.placeholder": "Слика профила није доступна",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Приказ хијерархијског стабла",
+  "vocabulary-treeview.load-more": "Учитати још",
+  "vocabulary-treeview.search.form.reset": "Ресетовати",
+  "vocabulary-treeview.search.form.search": "Претрага",
+  "vocabulary-treeview.search.no-result": "Није било ставки за приказ",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.srsc": "Категорије предмета истраживања",
+  "vocabulary-treeview.info": "Изаберите тему коју желите да додате као филтер за претрагу",
+  "uploader.browse": "претражи",
+  "uploader.drag-message": "Превуците и ставите своје фајлове овде",
+  "uploader.delete.btn-title": "Обриши",
+  "uploader.or": ", или",
+  "uploader.processing": "Обрада отпремљених фајлова... (сада је безбедно затворити ову страницу)",
+  "uploader.queue-length": "Дужина реда",
+  "virtual-metadata.delete-item.info": "Изаберите типове за које желите да сачувате виртуелне метаподатке као стварне метаподатке",
+  "virtual-metadata.delete-item.modal-head": "Виртуелни метаподаци ове релације",
+  "virtual-metadata.delete-relationship.modal-head": "Изаберите ставке за које желите да сачувате виртуелне метаподатке као стварне метаподатке",
+  "supervisedWorkspace.search.results.head": "Надзиране ставке",
+  "workspace.search.results.head": "Ваши поднесци",
+  "workflowAdmin.search.results.head": "Управљање радним процесом",
+  "workflow.search.results.head": "Радни задаци",
+  "supervision.search.results.head": "Задаци радног процеса и радног простора",
+  "workflow-item.edit.breadcrumbs": "Измена ставке радног процеса",
+  "workflow-item.edit.title": "Измена ставке радног процеса",
+  "workflow-item.delete.notification.success.title": "Избрисано",
+  "workflow-item.delete.notification.success.content": "Ова ставка радног процеса је успешно избрисана",
+  "workflow-item.delete.notification.error.title": "Нешто није у реду",
+  "workflow-item.delete.notification.error.content": "Није могуће избрисати ставку процеса рада",
+  "workflow-item.delete.title": "Избришите ставку радног процеса",
+  "workflow-item.delete.header": "Избришите ставку радног процеса",
+  "workflow-item.delete.button.cancel": "Поништити, отказати",
+  "workflow-item.delete.button.confirm": "Избришите",
+  "workflow-item.send-back.notification.success.title": "Враћено подносиоцу",
+  "workflow-item.send-back.notification.success.content": "Ова ставка радног процеса је успешно враћена подносиоцу",
+  "workflow-item.send-back.notification.error.title": "Нешто није у реду",
+  "workflow-item.send-back.notification.error.content": "Ставка радног процеса није могла да се врати подносиоцу",
+  "workflow-item.send-back.title": "Вратите ставку радног процеса подносиоцу",
+  "workflow-item.send-back.header": "Вратите ставку радног процеса подносиоцу",
+  "workflow-item.send-back.button.cancel": "Поништити, отказати",
+  "workflow-item.send-back.button.confirm": "Вратити",
+  "workflow-item.view.breadcrumbs": "Приказ радног процеса",
+  "workspace-item.view.breadcrumbs": "Приказ радног простора",
+  "workspace-item.view.title": "Приказ радног простора",
+  "workspace-item.delete.breadcrumbs": "Избришите радни простор",
+  "workspace-item.delete.header": "Избришите ставку радног простора",
+  "workspace-item.delete.button.confirm": "Избришите",
+  "workspace-item.delete.button.cancel": "Поништити, отказати",
+  "workspace-item.delete.notification.success.title": "Избрисан",
+  "workspace-item.delete.title": "Ова ставка радног простора је успешно избрисана",
+  "workspace-item.delete.notification.error.title": "Нешто није у реду",
+  "workspace-item.delete.notification.error.content": "Није могуће избрисати ставку радног простора",
+  "workflow-item.advanced.title": "Напредни радни процес",
+  "workflow-item.selectrevieweraction.notification.success.title": "Изабрани рецензент",
+  "workflow-item.selectrevieweraction.notification.success.content": "Рецензент за ову ставку радног процеса је успешно изабран",
+  "workflow-item.selectrevieweraction.notification.error.title": "Нешто није у реду",
+  "workflow-item.selectrevieweraction.notification.error.content": "Није могуће изабрати рецензента за ову ставку радног процеса",
+  "workflow-item.selectrevieweraction.title": "Изаберите рецензента",
+  "workflow-item.selectrevieweraction.header": "Изаберите рецензента",
+  "workflow-item.selectrevieweraction.button.cancel": "Поништити, отказати",
+  "workflow-item.selectrevieweraction.button.confirm": "Потврдите",
+  "workflow-item.scorereviewaction.notification.success.title": "Оцена прегледа",
+  "workflow-item.scorereviewaction.notification.success.content": "Оцена за ову ставку радног процеса је успешно послата",
+  "workflow-item.scorereviewaction.notification.error.title": "Нешто није у реду",
+  "workflow-item.scorereviewaction.notification.error.content": "Није могуће оценити ову ставку",
+  "workflow-item.scorereviewaction.title": "Оцените ову ставку",
+  "workflow-item.scorereviewaction.header": "Оцените ову ставку",
+  "workflow-item.scorereviewaction.button.cancel": "Поништити, отказати",
+  "workflow-item.scorereviewaction.button.confirm": "Потврдите",
+  "idle-modal.header": "Сесија ускоро истиче",
+  "idle-modal.info": "Из безбедносних разлога, корисничке сесије истичу после {{ timeToExpire }} минута неактивности. Ваша сесија ускоро истиче. Да ли желите да продужите или да се одјавите?",
+  "idle-modal.log-out": "Одјавити се",
+  "idle-modal.extend-session": "Продужите сесију",
+  "researcher.profile.action.processing": "Обрада...",
+  "researcher.profile.associated": "Повезани профил истраживача",
+  "researcher.profile.change-visibility.fail": "Дошло је до неочекиване грешке приликом промене видљивости профила",
+  "researcher.profile.create.new": "Креирај нови",
+  "researcher.profile.create.success": "Профил истраживача је успешно креиран",
+  "researcher.profile.create.fail": "Дошло је до грешке током креирања профила истраживача",
+  "researcher.profile.delete": "Избришите",
+  "researcher.profile.expose": "Излагање",
+  "researcher.profile.hide": "Сакријте",
+  "researcher.profile.not.associated": "Профил истраживача још није повезан",
+  "researcher.profile.view": "Поглед",
+  "researcher.profile.private.visibility": "ПРИВАТНО",
+  "researcher.profile.public.visibility": "ЈАВНО",
+  "researcher.profile.status": "Статус:",
+  "researcherprofile.claim.not-authorized": "Нисте овлашћени да потврдите ову ставку. За више детаља контактирајте администратора(е).",
+  "researcherprofile.error.claim.body": "Дошло је до грешке при потврђивању профила, молимо вас покушајте поново касније",
+  "researcherprofile.error.claim.title": "Грешка",
+  "researcherprofile.success.claim.body": "Профил је успешно потврђен",
+  "researcherprofile.success.claim.title": "Успешно",
+  "person.page.orcid.create": "Креирајте ORCID ID",
+  "person.page.orcid.granted-authorizations": "Одобрена овлашћења",
+  "person.page.orcid.grant-authorizations": "Одобрите овлашћења",
+  "person.page.orcid.link": "Повежите се на ORCID ID",
+  "person.page.orcid.link.processing": "Повезивање профила са ORCID-ом...",
+  "person.page.orcid.link.error.message": "Нешто је пошло наопако при повезивању профила са ORCID-ом. Ако се проблем и даље јавља, контактирајте администратора.",
+  "person.page.orcid.orcid-not-linked-message": "ORCID ID овог профила ({{ orcid }}) још увек није повезан са налогом у ORCID регистру или је веза истекла.",
+  "person.page.orcid.unlink": "Прекините везу са ORCID-ом",
+  "person.page.orcid.unlink.processing": "Обрада...",
+  "person.page.orcid.missing-authorizations": "Недостају овлашћења",
+  "person.page.orcid.missing-authorizations-message": "Недостају следећа овлашћења:",
+  "person.page.orcid.no-missing-authorizations-message": "Дивно! Ово поље је празно, тако да сте одобрили сва права приступа за коришћење свих функција које нуди ваша институција.",
+  "person.page.orcid.no-orcid-message": "Још увек није повезан ORCID ID. Кликом на дугме испод могуће је повезати овај профил са ORCID налогом.",
+  "person.page.orcid.profile-preferences": "Приоритети профила",
+  "person.page.orcid.funding-preferences": "Приоритети финансирања",
+  "person.page.orcid.publications-preferences": "Приоритети публикације",
+  "person.page.orcid.remove-orcid-message": "Ако треба да уклоните свој ORCID, контактирајте администратора репозиторијума",
+  "person.page.orcid.save.preference.changes": "Подешавања ажурирања",
+  "person.page.orcid.sync-profile.affiliation": "Припадност",
+  "person.page.orcid.sync-profile.biographical": "Биографски подаци",
+  "person.page.orcid.sync-profile.education": "Образовање",
+  "person.page.orcid.sync-profile.identifiers": "Идентификатори",
+  "person.page.orcid.sync-fundings.all": "Сва средства",
+  "person.page.orcid.sync-fundings.mine": "Моја средства",
+  "person.page.orcid.sync-fundings.my_selected": "Одабрана средства",
+  "person.page.orcid.sync-fundings.disabled": "Онемогућено",
+  "person.page.orcid.sync-publications.all": "Све публикације",
+  "person.page.orcid.sync-publications.mine": "Моје публикације",
+  "person.page.orcid.sync-publications.my_selected": "Изабране публикације",
+  "person.page.orcid.sync-publications.disabled": "Онемогућено",
+  "person.page.orcid.sync-queue.discard": "Одбаците промену и немојте да се синхронизујете са ORCID регистром",
+  "person.page.orcid.sync-queue.discard.error": "Одбацивање записа ORCID реда није успело",
+  "person.page.orcid.sync-queue.discard.success": "Запис ORCID реда је успешно одбачен",
+  "person.page.orcid.sync-queue.empty-message": "Запис ORCID регистра је празан",
+  "person.page.orcid.sync-queue.table.header.type": "Тип",
+  "person.page.orcid.sync-queue.table.header.description": "Опис",
+  "person.page.orcid.sync-queue.table.header.action": "Поступак",
+  "person.page.orcid.sync-queue.description.affiliation": "Припадности",
+  "person.page.orcid.sync-queue.description.country": "Држава",
+  "person.page.orcid.sync-queue.description.education": "Образовања",
+  "person.page.orcid.sync-queue.description.external_ids": "Спољашњи ID",
+  "person.page.orcid.sync-queue.description.other_names": "Друга имена",
+  "person.page.orcid.sync-queue.description.qualification": "Квалификације",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL-ови истраживача",
+  "person.page.orcid.sync-queue.description.keywords": "Кључне речи",
+  "person.page.orcid.sync-queue.tooltip.insert": "Додајте нови унос у ORCID регистар",
+  "person.page.orcid.sync-queue.tooltip.update": "Ажурирајте овај унос у ORCID регистру",
+  "person.page.orcid.sync-queue.tooltip.delete": "Уклоните овај унос из ORCID регистра",
+  "person.page.orcid.sync-queue.tooltip.publication": "Публикација",
+  "person.page.orcid.sync-queue.tooltip.project": "Пројекат",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Припадност",
+  "person.page.orcid.sync-queue.tooltip.education": "Образовање",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Квалификација",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Друго име",
+  "person.page.orcid.sync-queue.tooltip.country": "Држава",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Кључна реч",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Спољашњи идентификатор",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL истраживача",
+  "person.page.orcid.sync-queue.send": "Синхронизација са ORCID регистром",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Приступање ORCID-у није успело због недостајућих овлашћења.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Кликните <a href='{{orcid}}'>овде</a> да поново доделите потребне дозволе. Ако се проблем настави, контактирајте администратора",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Слање ORCID-у није успело јер ресурс послат у ORCID регистар није важећи",
+  "person.page.orcid.sync-queue.send.error": "Слање ORCID-у није успело",
+  "person.page.orcid.sync-queue.send.conflict-error": "Слање ORCID-у није успело јер се ресурс већ налази у ORCID регистру",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Ресурс се више не налази у ORCID регистру.",
+  "person.page.orcid.sync-queue.send.success": "Слање ORCID-у је успешно завршено",
+  "person.page.orcid.sync-queue.send.validation-error": "Подаци које желите да синхронизујете са ORCID-ом нису исправни",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Валута је обавезна",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Ресурс који се шаље захтева најмање један идентификатор",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Наслов је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Датум почетка је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Финансијер је неопходан",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Неважеће 2 цифре ISO 3166 земља",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Потребна је организација",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Назив организације је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Датум објављивања мора бити годину дана после 1900. године",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Организација захтева адресу",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Адреса организације која се шаље захтева град",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Адреса организације која се шаље захтева важеће 2 цифре ISO 3166 земље",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Потребан је идентификатор за недвосмисленост организација. Подржани ID-ови су GRID, Ringgold, Legal Entity identifiers (LEIs) и Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Идентификатори организације захтевају вредност",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Идентификаторима организације је потребан извор",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Извор једног од идентификатора организације је неважећи. Подржани извори су RINGGOLD, GRID, LEI и FUNDREF",
+  "person.page.orcid.synchronization-mode": "Начин синхронизације",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.label": "Начин синхронизације",
+  "person.page.orcid.synchronization-mode-message": "Молимо изаберите како желите да се синхронизација са ORCID-ом одвија. Опције укључују \"Manual\" (морате ручно да пошаљете своје податке ORCID-у) или \"Batch\" (систем ће послати ваше податке ORCID-у преко планиране скрипте).",
+  "person.page.orcid.synchronization-mode-funding-message": "Изаберите да ли желите да пошаљете ваше повезане ентитете пројекта на листу информација о финансирању вашег ORCID записа.",
+  "person.page.orcid.synchronization-mode-publication-message": "Изаберите да ли желите да пошаљете ваше повезане ентитете публикације на листу радова вашег ORCID записа.",
+  "person.page.orcid.synchronization-mode-profile-message": "Изаберите да ли желите да пошаљете ваше биографске податке или личне идентификаторе у ваш ORCID запис.",
+  "person.page.orcid.synchronization-settings-update.success": "Подешавања синхронизације су успешно ажурирана",
+  "person.page.orcid.synchronization-settings-update.error": "Ажурирање подешавања синхронизације није успело",
+  "person.page.orcid.synchronization-mode.manual": "Упутство",
+  "person.page.orcid.scope.authenticate": "Преузмите свој ORCID ID",
+  "person.page.orcid.scope.read-limited": "Читајте своје информације уз видљивост подешену на Поуздане стране",
+  "person.page.orcid.scope.activities-update": "Додајте/ажурирајте ваше истраживачке активности",
+  "person.page.orcid.scope.person-update": "Додајте/ажурирајте друге информације о себи",
+  "person.page.orcid.unlink.success": "Прекид везе између профила и ORCID регистра је био успешан",
+  "person.page.orcid.unlink.error": "Дошло је до грешке приликом прекида везе између профила и ORCID регистра. Покушајте поново",
+  "person.orcid.sync.setting": "ORCID подешавања синхронизације",
+  "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.auth": "ORCID овлашћења",
+  "home.recent-submissions.head": "Недавни поднесци",
+  "listable-notification-object.default-message": "Није могуће преузети овај објекат",
+  "system-wide-alert-banner.retrieval.error": "Нешто није у реду при преузимању банера системског упозорења",
+  "system-wide-alert-banner.countdown.prefix": "У",
+  "system-wide-alert-banner.countdown.days": "{{days}} дан(и),",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} сат(и) и",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} минут(и):",
+  "menu.section.system-wide-alert": "Системско упозорење",
+  "system-wide-alert.form.header": "Системско упозорење",
+  "system-wide-alert-form.retrieval.error": "Нешто није у реду при преузимању системског упозорења",
+  "system-wide-alert.form.cancel": "Отказати",
+  "system-wide-alert.form.save": "Сачувати",
+  "system-wide-alert.form.label.active": "АКТИВНО",
+  "system-wide-alert.form.label.inactive": "НЕАКТИВНО",
+  "system-wide-alert.form.error.message": "Системско упозорење мора садржати поруку",
+  "system-wide-alert.form.label.message": "Порука упозорења",
+  "system-wide-alert.form.label.countdownTo.enable": "Укључите временско одбројавање",
+  "system-wide-alert.form.label.countdownTo.hint": "Савет: Подесите тајмер за одбројавање. Када је укључен, датум се може подесити у будућности и банер системског упозорења ће извршити одбројавање до постављеног датума. Када тајмер заврши, нестаће из упозорења. Сервер НЕЋЕ бити аутоматски заустављен.",
+  "system-wide-alert.form.label.preview": "Преглед системског упозорења",
+  "system-wide-alert.form.update.success": "Системско упозорење је успешно ажурирано",
+  "system-wide-alert.form.update.error": "Нешто није у реду са ажурирањем системског упозорења",
+  "system-wide-alert.form.create.success": "Системско упозорење је успешно креирано",
+  "system-wide-alert.form.create.error": "Нешто није у реду са креирањем системског упозорења",
+  "admin.system-wide-alert.breadcrumbs": "Системска упозорења",
+  "admin.system-wide-alert.title": "Системска упозорења",
+  "item-access-control-title": "Овај образац вам омогућава да извршите промене услова приступа метаподацима ставке или њеним битстрим-овима.",
+  "collection-access-control-title": "Овај образац вам омогућава да извршите измене услова приступа свим ставкама ове колекције. Промене могу да се изврше или на свим метаподацима ставке или на целом садржају (битстрим-ова).",
+  "community-access-control-title": "Овај образац вам омогућава да извршите промене услова приступа свим ставкама било које колекције у овој заједници. Промене могу да се изврше или на свим метаподацима ставке или на целом садржају (битстрим-ова).",
+  "access-control-item-header-toggle": "Метаподаци ставке",
+  "access-control-bitstream-header-toggle": "битстрим-ови",
+  "access-control-mode": "Начин",
+  "access-control-access-conditions": "Услови приступа",
+  "access-control-no-access-conditions-warning-message": "Тренутно нису наведени услови приступа испод. Ако се изврши, то ће заменити тренутне услове приступа подразумеваним условима приступа наслеђеним из власничке колекције.",
+  "access-control-replace-all": "Замена услова приступа",
+  "access-control-add-to-existing": "Додати постојећим",
+  "access-control-limit-to-specific": "Ограничите промене на одређене битстрим-ове",
+  "access-control-process-all-bitstreams": "Ажурирајте све битстрим-ове у ставци",
+  "access-control-bitstreams-selected": "изабрани битстрим-ови",
+  "access-control-cancel": "Отказати",
+  "access-control-execute": "Извршити",
+  "access-control-add-more": "Додати још",
+  "access-control-select-bitstreams-modal.title": "Изаберите битстрим-ове",
+  "access-control-select-bitstreams-modal.no-items": "Нема ставки за приказ.",
+  "access-control-select-bitstreams-modal.close": "Затворити",
+  "access-control-option-label": "Врста услова приступа",
+  "access-control-option-note": "Изаберите услов приступа који ћете применити на изабране објекте.",
+  "access-control-option-start-date": "Приступ одобрен од",
+  "access-control-option-start-date-note": "Изаберите датум од којег се примењује одговарајући услов приступа",
+  "access-control-option-end-date": "Приступ одобрен до",
+  "access-control-option-end-date-note": "Изаберите датум до којег се примењује одговарајући услов приступа",
+}
diff --git a/src/assets/i18n/sr-lat.json5 b/src/assets/i18n/sr-lat.json5
new file mode 100644
index 0000000000..ebcc8aeb9a
--- /dev/null
+++ b/src/assets/i18n/sr-lat.json5
@@ -0,0 +1,2616 @@
+{
+  // Initial version provided by University of Kragujevac, Serbia 2023.
+  "401.help": "Niste ovlašćeni da pristupite ovoj stranici. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "401.link.home-page": "Odvedi me na početnu stranicu",
+  "401.unauthorized": "Neovlašćen pristup",
+  "403.help": "Nemate dozvolu da pristupite ovoj stranici. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "403.link.home-page": "Odvedi me na početnu stranicu",
+  "403.forbidden": "Zabranjen pristup",
+  "500.page-internal-server-error": "Usluga nije dostupna",
+  "500.help": "Server privremeno nije u mogućnosti da servisira vaš zahtev zbog zastoja u održavanju ili problema sa kapacitetom. Pokušajte ponovo kasnije.",
+  "500.link.home-page": "Odvedi me na početnu stranicu",
+  "404.help": "Ne možemo da pronađemo stranicu koju tražite. Stranica je možda premeštena ili izbrisana. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "404.link.home-page": "Odvedi me na početnu stranicu",
+  "404.page-not-found": "Stranica nije pronađena",
+  "error-page.description.401": "Neovlašćen pristup",
+  "error-page.description.403": "Zabranjen pristup",
+  "error-page.description.500": "Usluga nije dostupna",
+  "error-page.description.404": "Stranica nije pronađena",
+  "error-page.orcid.generic-error": "Došlo je do greške prilikom prijavljivanja preko ORCID-a. Uverite se da ste podelili imejl adresu svog ORCID naloga sa DSpace-om. Ako greška i dalje postoji, kontaktirajte administratora",
+  "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.metadata.only.listelement.badge": "Samo metapodaci",
+  "access-status.open.access.listelement.badge": "Otvoren pristup",
+  "access-status.restricted.listelement.badge": "Ograničen pristup",
+  "access-status.unknown.listelement.badge": "Nepoznato",
+  "admin.curation-tasks.breadcrumbs": "Zadaci kuriranja sistema",
+  "admin.curation-tasks.title": "Zadaci kuriranja sistema",
+  "admin.curation-tasks.header": "Zadaci kuriranja sistema",
+  "admin.registries.bitstream-formats.breadcrumbs": "Formatirajte registar",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Format bitstream-a",
+  "admin.registries.bitstream-formats.create.failure.content": "Došlo je do greške pri kreiranju novog formata bitstream-a.",
+  "admin.registries.bitstream-formats.create.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.create.head": "Kreirajte format bitstream-a",
+  "admin.registries.bitstream-formats.create.new": "Dodajte novi format bitstream-a",
+  "admin.registries.bitstream-formats.create.success.content": "Novi format bitstrim-a je uspešno kreiran.",
+  "admin.registries.bitstream-formats.create.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Uklanjanje {{ amount }} formata nije uspelo",
+  "admin.registries.bitstream-formats.delete.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.delete.success.amount": "Uspešno uklonjen {{ amount }} format",
+  "admin.registries.bitstream-formats.delete.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.description": "Ova lista formata bitstream-a pruža informacije o poznatim formatima i nivou njihove podrške.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Format bitstream-a",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.label": "Opis",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Ekstenzije su ekstenzije fajlova koje se koriste za automatsku identifikaciju formata otpremljenih fajlova. Možete da unesete nekoliko ekstenzija za svaki format.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Ekstenzije fajlova",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Unesite ekstenziju fajla bez tačke",
+  "admin.registries.bitstream-formats.edit.failure.content": "Došlo je do greške pri uređivanju formata bitstream-a",
+  "admin.registries.bitstream-formats.edit.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.edit.head": "Format bitstream-a: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Formati označeni kao interni su skriveni od korisnika i koriste se u administrativne svrhe.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Unutrašnje",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "MIME tip povezan sa ovim formatom ne mora biti jedinstven.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME tip",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Jedinstveno ime za ovaj format, (npr. Microsoft Word XP ili Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Ime",
+  "admin.registries.bitstream-formats.edit.success.content": "Format bitstream-a je uspešno izmenjen.",
+  "admin.registries.bitstream-formats.edit.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Nivo podrške koju vaša institucija obećava za ovaj format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivo podrške",
+  "admin.registries.bitstream-formats.head": "Registar formata bitstream-a",
+  "admin.registries.bitstream-formats.no-items": "Nema formata bitova za prikaz.",
+  "admin.registries.bitstream-formats.table.delete": "Izbriši izabrano",
+  "admin.registries.bitstream-formats.table.deselect-all": "Poništite sve",
+  "admin.registries.bitstream-formats.table.internal": "Unutrašnje",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME tip",
+  "admin.registries.bitstream-formats.table.name": "Ime",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.return": "Nazad",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Poznato",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Podržano",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Nepoznato",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Nivo podrške",
+  "admin.registries.bitstream-formats.title": "Registar formata bitstream-a",
+  "admin.registries.metadata.breadcrumbs": "Registar metapodataka",
+  "admin.registries.metadata.description": "Registar metapodataka održava listu svih polja metapodataka dostupnih u spremištu. Ova polja mogu biti podeljena na više šema. Međutim, DSpace zahteva kvalifikovanu Dublin Core šemu",
+  "admin.registries.metadata.form.create": "Kreirajte šemu metapodataka",
+  "admin.registries.metadata.form.edit": "Uredite šemu metapodataka",
+  "admin.registries.metadata.form.name": "Ime",
+  "admin.registries.metadata.form.namespace": "Prostor imena",
+  "admin.registries.metadata.head": "Registar metapodataka",
+  "admin.registries.metadata.schemas.no-items": "Nema šema metapodataka za prikaz.",
+  "admin.registries.metadata.schemas.table.delete": "Izbriši izabrano",
+  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.name": "Ime",
+  "admin.registries.metadata.schemas.table.namespace": "Prostor imena",
+  "admin.registries.metadata.title": "Registar metapodataka",
+  "admin.registries.schema.breadcrumbs": "Šema metapodataka",
+  "admin.registries.schema.description": "Ovo je šema metapodataka za \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Polja metapodataka šeme",
+  "admin.registries.schema.fields.no-items": "Nema polja metapodataka za prikaz.",
+  "admin.registries.schema.fields.table.delete": "Izbriši izabrano",
+  "admin.registries.schema.fields.table.field": "Polje",
+  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.scopenote": "Scope napomena",
+  "admin.registries.schema.form.create": "Kreirajte polje za metapodatke",
+  "admin.registries.schema.form.edit": "Izmenite polje za metapodatke",
+  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.qualifier": "Kvalifikator",
+  "admin.registries.schema.form.scopenote": "Scope napomena",
+  "admin.registries.schema.head": "Šema metapodataka",
+  "admin.registries.schema.notification.created": "Uspešno kreirana šema metapodataka \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Neuspešno brisanje {{amount}} šema metapodataka",
+  "admin.registries.schema.notification.deleted.success": "Uspešno izbrisane {{amount}} šeme metapodataka",
+  "admin.registries.schema.notification.edited": "Uspešno izmenjena šema metapodataka \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Greška",
+  "admin.registries.schema.notification.field.created": "Uspešno kreirano polje metapodataka \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Neuspešno brisanje {{amount}} polja metapodataka ",
+  "admin.registries.schema.notification.field.deleted.success": "Uspešno izbrisana {{amount}} polja metapodataka",
+  "admin.registries.schema.notification.field.edited": "Uspešno izmenjeno polje metapodataka \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Uspešno",
+  "admin.registries.schema.return": "Nazad",
+  "admin.registries.schema.title": "Registar šeme metapodataka",
+  "admin.access-control.bulk-access.breadcrumbs": "Upravljanje masovnim pristupom",
+  "administrativeBulkAccess.search.results.head": "Rezultati pretrage",
+  "admin.access-control.bulk-access": "Upravljanje masovnim pristupom",
+  "admin.access-control.bulk-access.title": "Upravljanje masovnim pristupom",
+  "admin.access-control.bulk-access-browse.header": "Korak 1: Izaberite objekte",
+  "admin.access-control.bulk-access-browse.search.header": "Pretraga",
+  "admin.access-control.bulk-access-browse.selected.header": "Trenutni izbor ({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Korak 2: Operacija koju treba izvršiti",
+  "admin.access-control.epeople.actions.delete": "Izbrišite EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Oponašati EPerson",
+  "admin.access-control.epeople.actions.reset": "Resetujte šifru",
+  "admin.access-control.epeople.actions.stop-impersonating": "Zaustavi predstavljanje kao EPerson",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.search.head": "Pretraga",
+  "admin.access-control.epeople.button.see-all": "Pregledajte sve",
+  "admin.access-control.epeople.search.scope.metadata": "Metapodaci",
+  "admin.access-control.epeople.search.scope.email": "E-mail (tačno)",
+  "admin.access-control.epeople.search.button": "Pretraga",
+  "admin.access-control.epeople.search.placeholder": "Pretražite ljude...",
+  "admin.access-control.epeople.button.add": "Dodajte EPerson",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Ime",
+  "admin.access-control.epeople.table.email": "E-mail (tačno)",
+  "admin.access-control.epeople.table.edit": "Izmena",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Izmenite \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Niste ovlašćeni za uređivanje ove grupe",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Izbrišite \"{{name}}\"",
+  "admin.access-control.epeople.no-items": "Nema EPeople za prikaz.",
+  "admin.access-control.epeople.form.create": "Kreirajte EPerson",
+  "admin.access-control.epeople.form.edit": "Izmenite EPerson",
+  "admin.access-control.epeople.form.firstName": "Ime",
+  "admin.access-control.epeople.form.lastName": "Prezime",
+  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.emailHint": "Mora biti važeća e-mail adresa",
+  "admin.access-control.epeople.form.canLogIn": "Može se prijaviti",
+  "admin.access-control.epeople.form.requireCertificate": "Potreban je sertifikat",
+  "admin.access-control.epeople.form.return": "Nazad",
+  "admin.access-control.epeople.form.notification.created.success": "Uspešno kreiran EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Neuspešno kreiranje EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Neuspešno kreiranje EPerson \"{{name}}\", email \"{{email}}\" se već koristi.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Neuspešna izmena EPerson \"{{name}}\", email \"{{email}}\" se već koristi.",
+  "admin.access-control.epeople.form.notification.edited.success": "Uspešno izmenjen EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Neuspešna izmena EPerson \"{{name}}\" ",
+  "admin.access-control.epeople.form.notification.deleted.success": "Uspešno izbrisan EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Neuspešno brisanje EPerson \"{{name}}\" ",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Član ovih grupa:",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Ime",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Ovaj EPerson nije član nijedne grupe",
+  "admin.access-control.epeople.form.goToGroups": "Dodajte grupama",
+  "admin.access-control.epeople.notification.deleted.failure": "Neuspešno brisanje EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Uspešno izbrisan EPerson: \"{{name}}\"",
+  "admin.access-control.groups.title": "Grupe",
+  "admin.access-control.groups.breadcrumbs": "Grupe",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Izmenite grupu",
+  "admin.access-control.groups.title.singleGroup": "Izmenite grupu",
+  "admin.access-control.groups.title.addGroup": "Nova grupa",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nova grupa",
+  "admin.access-control.groups.head": "Grupe",
+  "admin.access-control.groups.button.add": "Dodajte grupu",
+  "admin.access-control.groups.search.head": "Pretraga grupa",
+  "admin.access-control.groups.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.search.button": "Pretraga",
+  "admin.access-control.groups.search.placeholder": "Pretražite grupe...",
+  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.name": "Ime",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.groups.table.members": "Članovi",
+  "admin.access-control.groups.table.edit": "Izmeniti",
+  "admin.access-control.groups.table.edit.buttons.edit": "Izmenite \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Izbrišite \"{{name}}\"",
+  "admin.access-control.groups.no-items": "Nije pronađena nijedna grupa sa ovim u svom imenu ili ovim kao UUID",
+  "admin.access-control.groups.notification.deleted.success": "Uspešno izbrisana grupa \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Neuspešno brisanje grupe \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Uzrok: \"{{cause}}\"",
+  "admin.access-control.groups.form.alert.permanent": "Ova grupa je trajna, tako da se ne može menjati ili brisati. I dalje možete da dodajete i uklanjate članove grupe koristeći ovu stranicu.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Ova grupa se ne može izmeniti ili izbrisati jer odgovara ulozi u procesu slanja i toka posla u \"{{name}}\" {{comcol}}. Možete je izbrisati sa kartice <a href='{{comcolEditRolesRoute}}'>\"dodeli uloge\"</a> na stranici za uređivanje {{comcol}}. I dalje možete da dodajete i uklanjate članove grupe koristeći ovu stranicu.",
+  "admin.access-control.groups.form.head.create": "Kreiraj grupu",
+  "admin.access-control.groups.form.head.edit": "Izmeni grupu",
+  "admin.access-control.groups.form.groupName": "Naziv grupe",
+  "admin.access-control.groups.form.groupCommunity": "Zajednica ili kolekcija",
+  "admin.access-control.groups.form.groupDescription": "Opis",
+  "admin.access-control.groups.form.notification.created.success": "Uspešno kreirana Grupa \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Neuspešno kreiranje Grupe \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Neuspešno kreiranje Grupe sa imenom: \"{{name}}\", proverite da ime nije već upotrebljeno.",
+  "admin.access-control.groups.form.notification.edited.failure": "Neuspešna izmena Grupe \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Naziv \"{{name}}\" se već koristi!",
+  "admin.access-control.groups.form.notification.edited.success": "Grupa \"{{name}}\" je uspešno izmenjena",
+  "admin.access-control.groups.form.actions.delete": "Izbrišite grupu",
+  "admin.access-control.groups.form.delete-group.modal.header": "Izbrišite grupu \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Da li ste sigurni da želite da izbrišete grupu \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Poništiti, otkazati",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Izbrišite",
+  "admin.access-control.groups.form.notification.deleted.success": "Grupa \"{{ name }}\" je uspešno obrisana",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Brisanje grupe \"{{ name }}\" nije uspelo",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Uzrok: \"{{ cause }}\"",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Dodajte EPeople",
+  "admin.access-control.groups.form.members-list.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.form.members-list.headMembers": "Trenutni članovi",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metapodatak",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (tačno)",
+  "admin.access-control.groups.form.members-list.search.button": "Pretraga",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.name": "Ime",
+  "admin.access-control.groups.form.members-list.table.identity": "Identitet",
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.edit": "Ukloni / Dodaj",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Uklonite člana sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Član je uspešno dodat: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Dodavanje člana nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Uspešno obrisan član: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Brisanje člana nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Dodaj člana sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Nema trenutno aktivne grupe, prvo pošaljite ime.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Još nema članova u grupi, pretražite i dodajte.",
+  "admin.access-control.groups.form.members-list.no-items": "Nijedan EPeople nije pronađen u toj pretrazi",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Nešto nije u redu: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.head": "Grupe",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Dodajte podgrupu",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Trenutne podgrupe",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Pretraga",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Ime",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Ukloni / Dodaj",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Uklonite podgrupu sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Dodajte podgrupu sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Trenutna grupa",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Podgrupa je uspešno dodata: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Dodavanje podgrupe nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Uspešno obrisana podgrupa: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Brisanje podgrupe nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Nema trenutno aktivne grupe, prvo pošaljite ime.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Ovo je trenutna grupa, ne može se dodati.",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nije pronađena nijedna grupa sa ovim u svom imenu ili ovim kao UUID",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Još nema podgrupa u grupi.",
+  "admin.access-control.groups.form.return": "Nazad",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na ovoj stranici možete da menjate svojstva i članove grupe. U gornjem odeljku možete da izmenite ime i opis grupe, osim ako je ovo administratorska grupa za kolekciju ili zajednicu, u kom slučaju se ime i opis grupe automatski generišu i ne mogu se menjati. U sledećim odeljcima možete da menjate članstvo u grupi. Pogledajte [viki](https://viki.lirasis.org/displai/DSDOC7k/Create+or+manage+a+user+group) za više detalja.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Da biste dodali ili uklonili Eperson u/iz ove grupe, ili kliknite na dugme 'Pregledaj sve' ili koristite traku za pretragu ispod da biste pretražili korisnike (koristite padajući meni sa leve strane trake za pretragu da biste izabrali da li ćete pretraživati prema metapodacima ili prema e-mailu). Zatim kliknite na ikonu plus za svakog korisnika kojeg želite da dodate na listu ispod ili na ikonu korpe za smeće za svakog korisnika kojeg želite da uklonite. Lista u nastavku može imati nekoliko stranica: koristite kontrole stranice ispod liste da biste prešli na sledeće stranice. Kada budete spremni, sačuvajte promene klikom na dugme \"Sačuvaj\" u gornjem delu.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Da biste dodali ili uklonili podgrupu u/iz ove grupe, kliknite na dugme 'Pregledaj sve' ili koristite traku za pretragu ispod da biste pretražili korisnike. Zatim kliknite na ikonu plus za svakog korisnika kojeg želite da dodate na listu ispod ili na ikonu korpe za smeće za svakog korisnika kojeg želite da uklonite. Lista u nastavku može imati nekoliko stranica: koristite kontrole stranice ispod liste da biste prešli na sledeće stranice. Kada budete spremni, sačuvajte promene klikom na dugme \"Sačuvaj\" u gornjem delu.",
+  "admin.search.breadcrumbs": "Administrativna pretraga",
+  "admin.search.collection.edit": "Uredite",
+  "admin.search.community.edit": "Uredite",
+  "admin.search.item.delete": "Izbrišite",
+  "admin.search.item.edit": "Uredite",
+  "admin.search.item.make-private": "Učinite nevidljivim",
+  "admin.search.item.make-public": "Učinite vidljivim",
+  "admin.search.item.move": "Pomerite",
+  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.withdraw": "Odustati",
+  "admin.search.title": "Administrativna pretraga",
+  "administrativeView.search.results.head": "Administrativna pretraga",
+  "admin.workflow.breadcrumbs": "Administriranje radnog procesa",
+  "admin.workflow.title": "Administriranje radnog procesa",
+  "admin.workflow.item.workflow": "Proces rada",
+  "admin.workflow.item.workspace": "Radni prostor",
+  "admin.workflow.item.delete": "Izbrišite",
+  "admin.workflow.item.send-back": "Vratite",
+  "admin.workflow.item.policies": "Politike",
+  "admin.workflow.item.supervision": "Nadzor",
+  "admin.metadata-import.breadcrumbs": "Uvezi metapodatke",
+  "admin.batch-import.breadcrumbs": "Uvezi Batch",
+  "admin.metadata-import.title": "Uvezi metapodatke",
+  "admin.batch-import.title": "Uvezi Batch",
+  "admin.metadata-import.page.header": "Uvezite metapodatke",
+  "admin.batch-import.page.header": "Uvezi Batch",
+  "admin.metadata-import.page.help": "Ovde možete da prevučete ili pregledate CSV fajlove koji sadrže batch operacije metapodataka za fajlove",
+  "admin.batch-import.page.help": "Izaberite kolekciju u koju želite da uvezete. Zatim prevucite ili potražite zip fajl jednostavnog arhivskog formata (SAF) koja uključuje stavke za uvoz",
+  "admin.batch-import.page.toggle.help": "Moguće je izvršiti uvoz bilo sa otpremanjem fajla ili preko URL-a, koristite gornji prekidač da biste podesili izvor unosa",
+  "admin.metadata-import.page.dropMsg": "Prevucite CSV sa metapodacima za uvoz",
+  "admin.batch-import.page.dropMsg": "Prevucite batch ZIP za uvoz",
+  "admin.metadata-import.page.dropMsgReplace": "Prevucite da zamenite CSV sa metapodacima za uvoz",
+  "admin.batch-import.page.dropMsgReplace": "Prevucite da zamenite batch ZIP za uvoz",
+  "admin.metadata-import.page.button.return": "Nazad",
+  "admin.metadata-import.page.button.proceed": "Nastavite",
+  "admin.metadata-import.page.button.select-collection": "Izaberite kolekciju",
+  "admin.metadata-import.page.error.addFile": "Prvo izaberite fajl!",
+  "admin.metadata-import.page.error.addFileUrl": "Prvo unesite url fajl!",
+  "admin.batch-import.page.error.addFile": "Prvo izaberite Zip fajl!",
+  "admin.metadata-import.page.toggle.upload": "Otpremite",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Umetnite batch ZIP URL za uvoz",
+  "admin.metadata-import.page.validateOnly": "Samo validiraj",
+  "admin.metadata-import.page.validateOnly.hint": "Kada se izabere, otpremljeni CSV će biti potvrđen. Dobićete izveštaj o utvrđenim promenama, ali promene neće biti sačuvane.",
+  "advanced-workflow-action.rating.form.rating.label": "Ocena",
+  "advanced-workflow-action.rating.form.rating.error": "Morate oceniti stavku",
+  "advanced-workflow-action.rating.form.review.label": "Pregled",
+  "advanced-workflow-action.rating.form.review.error": "Morate uneti recenziju da biste poslali ovu ocenu",
+  "advanced-workflow-action.rating.description": "Molimo izaberite ocenu ispod",
+  "advanced-workflow-action.rating.description-requiredDescription": "Molimo izaberite ocenu ispod i dodajte recenziju",
+  "advanced-workflow-action.select-reviewer.description-single": "Molimo izaberite jednog recenzenta ispod pre slanja",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Molimo izaberite jednog ili više recenzenata ispod pre slanja",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Dodajte EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Pregledajte sve",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Trenutni članovi",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metapodaci",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (tačno)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Pretraga",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Ime",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitet",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Uklonite / Dodajte",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Uklonite člana sa imenom \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Uspešno dodat član: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Neuspešno dodavanje člana: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Uspešno izbrisan član: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Neuspešno brisanje člana: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Dodajte člana sa imenom \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Trenutno nema aktivne grupe, prvo unesite ime.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Još nema članova u grupi, pretražite i dodajte.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nijedan EPeople nije pronađen u toj pretrazi",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nije izabran recenzent.",
+  "admin.batch-import.page.validateOnly.hint": "Kada se izabere, otpremljeni ZIP će biti potvrđen. Dobićete izveštaj o utvrđenim promenama, ali promene neće biti sačuvane.",
+  "admin.batch-import.page.remove": "ukloniti",
+  "auth.errors.invalid-user": "Pogrešna e-mail adresa ili lozinka.",
+  "auth.messages.expired": "Vaša sesija je istekla. Molimo prijavite se ponovo.",
+  "auth.messages.token-refresh-failed": "Osvežavanje tokena sesije nije uspelo. Molimo prijavite se ponovo.",
+  "bitstream.download.page": "Trenutno se preuzima {{bitstream}}...",
+  "bitstream.download.page.back": "Nazad",
+  "bitstream.edit.authorizations.link": "Izmenite polise bitstream-a",
+  "bitstream.edit.authorizations.title": "Izmenite polise bitstream-a",
+  "bitstream.edit.return": "Nazad",
+  "bitstream.edit.bitstream": "Bitstream:",
+  "bitstream.edit.form.description.hint": "Opciono, navedite kratak opis fajla, na primer \"<i>Glavni članak</i>\" ili \"<i>Očitavanja podataka eksperimenta</i>\".",
+  "bitstream.edit.form.description.label": "Opis",
+  "bitstream.edit.form.embargo.hint": "Prvi dan od kojeg je pristup dozvoljen. <b>Ovaj datum se ne može izmeniti u ovom obrascu.</b> Da biste postavili datum zabrane za bitstream, idite na karticu <i>Status stavke</i>, kliknite na <i>Ovlašćenja...</i >, kreirajte ili izmenite politiku bitstream-ova<i>PROČITAJTE</i> i postavite <i>Datum početka</i> po želji.",
+  "bitstream.edit.form.embargo.label": "Zabrana do određenog datuma",
+  "bitstream.edit.form.fileName.hint": "Promenite ime fajla za bitstream. Imajte na umu da će se ovim promeniti prikazani bitstream URL, ali će se stari linkovi i dalje razrešiti sve dok se ID sekvence ne promeni.",
+  "bitstream.edit.form.fileName.label": "Ime fajla",
+  "bitstream.edit.form.newFormat.label": "Opišite novi format",
+  "bitstream.edit.form.newFormat.hint": "Aplikacija koju ste koristili za kreiranje fajla, i broj verzije (na primer, \"<i>ACMESoft SuperApp verzija 1.5</i>\").",
+  "bitstream.edit.form.primaryBitstream.label": "Primarni bitstream",
+  "bitstream.edit.form.selectedFormat.hint": "Ako format nije na gornjoj listi, <b>izaberite \"format nije na listi\" iznad</b> i opišite ga pod \"Opišite novi format\".",
+  "bitstream.edit.form.selectedFormat.label": "Izabrani format",
+  "bitstream.edit.form.selectedFormat.unknown": "Format nije na listi",
+  "bitstream.edit.notifications.error.format.title": "Došlo je do greške prilikom čuvanja bitstream formata",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Došlo je do greške prilikom čuvanja primarnog bitstream-a",
+  "bitstream.edit.form.iiifLabel.label": "IIIF oznaka",
+  "bitstream.edit.form.iiifLabel.hint": "Oznaka canvas-a za ovu sliku. Ako nije data, koristiće se podrazumevana oznaka.",
+  "bitstream.edit.form.iiifToc.label": "IIIF Pregled sadržaja",
+  "bitstream.edit.form.iiifToc.hint": "Dodavanje teksta ovde, čini ovo mesto početkom novog opsega sadržaja.",
+  "bitstream.edit.form.iiifWidth.label": "IIIF širina platna",
+  "bitstream.edit.form.iiifWidth.hint": "Širina canvas-a obično treba da odgovara širini slike.",
+  "bitstream.edit.form.iiifHeight.label": "IIIF visina platna",
+  "bitstream.edit.form.iiifHeight.hint": "Visina canvas-a obično treba da odgovara visini slike.",
+  "bitstream.edit.notifications.saved.content": "Vaše promene u ovom bitstream-u su sačuvane.",
+  "bitstream.edit.notifications.saved.title": "Bitstream je sačuvan",
+  "bitstream.edit.title": "Izmenite bitstream",
+  "bitstream-request-a-copy.alert.canDownload1": "Već imate pristup ovom fajlu. Ako želite da preuzmete fajl, kliknite",
+  "bitstream-request-a-copy.alert.canDownload2": "ovde",
+  "bitstream-request-a-copy.header": "Zatražite kopiju fajla",
+  "bitstream-request-a-copy.intro": "Unesite sledeće informacije da biste zatražili kopiju sledeće stavke:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Zahteva se sledeći fajl:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Zahtevaju se svi fajlovi.",
+  "bitstream-request-a-copy.name.label": "ime *",
+  "bitstream-request-a-copy.name.error": "Ime je obavezno",
+  "bitstream-request-a-copy.email.label": "Vaša email adresa *",
+  "bitstream-request-a-copy.email.hint": "Ova e-mail adresa se koristi za slanje fajla.",
+  "bitstream-request-a-copy.email.error": "Molim Vas unesite ispravnu e-mail adresu.",
+  "bitstream-request-a-copy.allfiles.label": "Fajlovi",
+  "bitstream-request-a-copy.files-all-false.label": "Samo traženi fajl",
+  "bitstream-request-a-copy.files-all-true.label": "Sve fajlovi (ove stavke) u ograničenom pristupu",
+  "bitstream-request-a-copy.message.label": "Poruka",
+  "bitstream-request-a-copy.return": "Nazad",
+  "bitstream-request-a-copy.submit": "Zahtevaj kopiju",
+  "bitstream-request-a-copy.submit.success": "Zahtev za stavku je uspešno dostavljen.",
+  "bitstream-request-a-copy.submit.error": "Nešto nije u redu sa slanjem zahteva za stavku.",
+  "browse.back.all-results": "Svi rezultati pregleda",
+  "browse.comcol.by.author": "Po autoru",
+  "browse.comcol.by.dateissued": "Po datumu izdanja",
+  "browse.comcol.by.subject": "Po predmetu",
+  "browse.comcol.by.srsc": "Po kategoriji predmeta",
+  "browse.comcol.by.title": "Po naslovu",
+  "browse.comcol.head": "Pregledajte",
+  "browse.empty": "Nema stavki za prikaz.",
+  "browse.metadata.author": "Autoru",
+  "browse.metadata.dateissued": "Datumu izdanja",
+  "browse.metadata.subject": "Predmetu",
+  "browse.metadata.title": "Naslovu",
+  "browse.metadata.author.breadcrumbs": "Pregled po autoru",
+  "browse.metadata.dateissued.breadcrumbs": "Pregled po datumu",
+  "browse.metadata.subject.breadcrumbs": "Pregled po predmetu",
+  "browse.metadata.srsc.breadcrumbs": "Pregled po kategoriji predmeta",
+  "browse.metadata.title.breadcrumbs": "Pregled po naslovu",
+  "pagination.next.button": "Sledeće",
+  "pagination.previous.button": "Prethodno",
+  "pagination.next.button.disabled.tooltip": "Nema više stranica sa rezultatima",
+  "browse.startsWith": ", počevši od {{ startsWith }}",
+  "browse.startsWith.choose_start": "(Izaberite početak)",
+  "browse.startsWith.choose_year": "(Izaberite godinu)",
+  "browse.startsWith.choose_year.label": "Izaberite godinu izdanja",
+  "browse.startsWith.jump": "Filtrirajte rezultate po godini ili mesecu",
+  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.august": "Avgust",
+  "browse.startsWith.months.december": "Decembar",
+  "browse.startsWith.months.february": "Februar",
+  "browse.startsWith.months.january": "Januar",
+  "browse.startsWith.months.july": "Jul",
+  "browse.startsWith.months.june": "Jun",
+  "browse.startsWith.months.march": "Mart",
+  "browse.startsWith.months.may": "Maj ",
+  "browse.startsWith.months.none": "(Izaberite mesec)",
+  "browse.startsWith.months.none.label": "Izaberite mesec izdanja",
+  "browse.startsWith.months.november": "Novembar",
+  "browse.startsWith.months.october": "Oktobar",
+  "browse.startsWith.months.september": "Septembar",
+  "browse.startsWith.submit": "Pregledaj",
+  "browse.startsWith.type_date": "Filtrirajte rezultate po datumu",
+  "browse.startsWith.type_date.label": "Ili unesite datum (godina-mesec) i kliknite na dugme Pregledaj",
+  "browse.startsWith.type_text": "Filtrirajte rezultate upisivanjem prvih nekoliko slova",
+  "browse.startsWith.input": "Filter",
+  "browse.taxonomy.button": "Pregledaj",
+  "browse.title": "Pregledanje {{ collection }} prema {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Pregledanje {{ collection }} prema {{ field }} {{ value }}",
+  "search.browse.item-back": "Nazad na rezultate",
+  "chips.remove": "Uklonite čip",
+  "claimed-approved-search-result-list-element.title": "Odobreno",
+  "claimed-declined-search-result-list-element.title": "Odbijeno, vraćeno podnosiocu",
+  "claimed-declined-task-search-result-list-element.title": "Odbijeno, vraćeno menadžeru za pregled",
+  "collection.create.head": "Napravite kolekciju",
+  "collection.create.notifications.success": "Kolekcija je uspešno napravljena",
+  "collection.create.sub-head": "Napravite kolekciju za zajednicu {{ parent }}",
+  "collection.curate.header": "Sačuvaj kolekciju: {{collection}}",
+  "collection.delete.cancel": "Poništiti, otkazati",
+  "collection.delete.confirm": "Potvrdi",
+  "collection.delete.processing": "Brisanje",
+  "collection.delete.head": "Izbrišite kolekciju",
+  "collection.delete.notification.fail": "Kolekcija se ne može izbrisati",
+  "collection.delete.notification.success": "Kolekcija je uspešno izbrisana",
+  "collection.delete.text": "Da li ste sigurni da želite da izbrišete kolekciju \"{{ dso }}\"",
+  "collection.edit.delete": "Izbrišite ovu kolekciju",
+  "collection.edit.head": "Uredite kolekciju",
+  "collection.edit.breadcrumbs": "Uredite kolekciju",
+  "collection.edit.tabs.mapper.head": "Mapiranje stavki",
+  "collection.edit.tabs.item-mapper.title": "Uređivanje kolekcije - mapiranje stavki",
+  "collection.edit.item-mapper.cancel": "Poništiti, otkazati",
+  "collection.edit.item-mapper.collection": "Kolekcija: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Mapirajte izabrane stavke",
+  "collection.edit.item-mapper.description": "Ovo je alatka za mapiranje stavki koja omogućava administratorima kolekcije da mapiraju stavke iz drugih kolekcija u ovu kolekciju. Možete tražiti stavke iz drugih kolekcija i mapirati ih ili pregledati listu trenutno mapiranih stavki.",
+  "collection.edit.item-mapper.head": "Mapiranje stavki - mapa stavki iz drugih kolekcija",
+  "collection.edit.item-mapper.no-search": "Unesite upit za pretragu",
+  "collection.edit.item-mapper.notifications.map.error.content": "Došlo je do grešaka za mapiranje {{amount}} stavki.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Greške u mapiranju",
+  "collection.edit.item-mapper.notifications.map.success.content": "Uspešno mapirane {{amount}} stavke.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapiranje je završeno",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Došlo je do grešaka pri uklanjanju mapiranja stavki {{amount}}.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Uklonite greške mapiranja",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Uspešno su uklonjena mapiranja {{amount}} stavki.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Uklanjanje mapiranja je završeno",
+  "collection.edit.item-mapper.remove": "Uklanjanje mapiranja izabranih stavki",
+  "collection.edit.item-mapper.search-form.placeholder": "Pretraži stavke...",
+  "collection.edit.item-mapper.tabs.browse": "Pregledajte mapirane stavke",
+  "collection.edit.item-mapper.tabs.map": "Mapirajte nove stavke",
+  "collection.edit.logo.delete.title": "Izbrišite logo",
+  "collection.edit.logo.delete-undo.title": "Opozovi brisanje",
+  "collection.edit.logo.label": "Logo kolekcije",
+  "collection.edit.logo.notifications.add.error": "Otpremanje loga kolekcije nije uspelo. Proverite sadržaj pre ponovnog pokušaja.",
+  "collection.edit.logo.notifications.add.success": "Otpremanje loga kolekcije je uspešno.",
+  "collection.edit.logo.notifications.delete.success.title": "Logo je izbrisan",
+  "collection.edit.logo.notifications.delete.success.content": "Uspešno je obrisan logo kolekcije",
+  "collection.edit.logo.notifications.delete.error.title": "Greška pri brisanju loga",
+  "collection.edit.logo.upload": "Prevucite logotip kolekcije za otpremanje",
+  "collection.edit.notifications.success": "Uspešno uređena kolekcija",
+  "collection.edit.return": "Nazad",
+  "collection.edit.tabs.access-control.head": "Kontrola pristupa",
+  "collection.edit.tabs.access-control.title": "Uređivanje kolekcije - Kontrola pristupa",
+  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.title": "Uređivanje kolekcije - Curate",
+  "collection.edit.tabs.authorizations.head": "Ovlašćenja",
+  "collection.edit.tabs.authorizations.title": "Uređivanje kolekcije - ovlašćenja",
+  "collection.edit.item.authorizations.load-bundle-button": "Učitajte još paketa",
+  "collection.edit.item.authorizations.load-more-button": "Učitaj više",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Prikaži bitstream smernice za paket",
+  "collection.edit.tabs.metadata.head": "Uredi metapodatke",
+  "collection.edit.tabs.metadata.title": "Uređivanje kolekcije - Metapodaci",
+  "collection.edit.tabs.roles.head": "Dodeli uloge",
+  "collection.edit.tabs.roles.title": "Uređivanje kolekcije - Uloge",
+  "collection.edit.tabs.source.external": "Ova kolekcija prikuplja svoj sadržaj iz spoljašnjeg izvora",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Morate da obezbedite set ID ciljne kolekcije.",
+  "collection.edit.tabs.source.form.harvestType": "Sadržaj se prikuplja",
+  "collection.edit.tabs.source.form.head": "Konfigurišite spoljni izvor",
+  "collection.edit.tabs.source.form.metadataConfigId": "Format metapodataka",
+  "collection.edit.tabs.source.form.oaiSetId": "ID specifičnog skupa za OAI",
+  "collection.edit.tabs.source.form.oaiSource": "OAI provajder",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Sakupite metapodatke i bitstream-ove (zahteva ORE podršku)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Sakupite metapodatke i reference na bitstream-ove (zahteva ORE podršku)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Samo prikupljeni metapodaci",
+  "collection.edit.tabs.source.head": "Izvor sadržaja",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše promene su odbačene. Da biste ponovo postavili svoje promene, kliknite na dugme \"Opozovi\".",
+  "collection.edit.tabs.source.notifications.discarded.title": "Promene su odbačene",
+  "collection.edit.tabs.source.notifications.invalid.content": "Vaše promene nisu sačuvane. Proverite da li su sva polja ispravna pre nego što sačuvate.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metapodaci su nevažeći",
+  "collection.edit.tabs.source.notifications.saved.content": "Vaše promene izvora sadržaja ove kolekcije su sačuvane.",
+  "collection.edit.tabs.source.notifications.saved.title": "Izvor sadržaja je sačuvan",
+  "collection.edit.tabs.source.title": "Uređivanje kolekcije – Izvor sadržaja",
+  "collection.edit.template.add-button": "Dodati",
+  "collection.edit.template.breadcrumbs": "Šablon stavke",
+  "collection.edit.template.cancel": "Otkazati",
+  "collection.edit.template.delete-button": "Izbrišite",
+  "collection.edit.template.edit-button": "Izmenite",
+  "collection.edit.template.error": "Došlo je do greške pri preuzimanju stavke šablona",
+  "collection.edit.template.head": "Izmenite stavku šablona za kolekciju \"{{ collection }}\"",
+  "collection.edit.template.label": "Stavka šablona",
+  "collection.edit.template.loading": "Učitava se stavka šablona...",
+  "collection.edit.template.notifications.delete.error": "Neuspešno brisanje šablona stavke",
+  "collection.edit.template.notifications.delete.success": "Uspešno obrisan šablon stavke",
+  "collection.edit.template.title": "Izmenite stavku šablona",
+  "collection.form.abstract": "Kratak opis",
+  "collection.form.description": "Uvodni tekst (HTML)",
+  "collection.form.errors.title.required": "Molimo unesite ime kolekcije",
+  "collection.form.license": "Licenca",
+  "collection.form.provenance": "Poreklo",
+  "collection.form.rights": "Autorski tekst (HTML)",
+  "collection.form.tableofcontents": "Vesti (HTML)",
+  "collection.form.title": "Ime",
+  "collection.form.entityType": "Tip entiteta",
+  "collection.listelement.badge": "Kolekcija",
+  "collection.page.browse.recent.head": "Nedavni podnesci",
+  "collection.page.browse.recent.empty": "Nema stavki za prikaz",
+  "collection.page.edit": "Izmenite ovu kolekciju",
+  "collection.page.handle": "Trajni URI za ovu kolekciju",
+  "collection.page.license": "Licenca",
+  "collection.page.news": "Vesti",
+  "collection.select.confirm": "Potvrdite izabrano",
+  "collection.select.empty": "Nema kolekcija za prikaz",
+  "collection.select.table.title": "Naslov",
+  "collection.source.controls.head": "Kontrola prikupljanja",
+  "collection.source.controls.test.submit.error": "Nešto nije u redu sa pokretanjem testiranja podešavanja",
+  "collection.source.controls.test.failed": "Skripta za testiranje podešavanja nije uspela",
+  "collection.source.controls.test.completed": "Skripta za testiranje podešavanja je uspešno završena",
+  "collection.source.controls.test.submit": "Testna konfiguracija",
+  "collection.source.controls.test.running": "Testiranje konfiguracije...",
+  "collection.source.controls.import.submit.success": "Uvoz je uspešno pokrenut",
+  "collection.source.controls.import.submit.error": "Nešto nije u redu sa pokretanjem uvoza",
+  "collection.source.controls.import.submit": "Uvezite sada",
+  "collection.source.controls.import.running": "Uvoz...",
+  "collection.source.controls.import.failed": "Došlo je do greške tokom uvoza",
+  "collection.source.controls.import.completed": "Uvoz je završen",
+  "collection.source.controls.reset.submit.success": "Resetovanje i ponovni uvoz su uspešno pokrenuti",
+  "collection.source.controls.reset.submit.error": "Nešto nije u redu sa pokretanjem resetovanja i ponovnog uvoza",
+  "collection.source.controls.reset.failed": "Došlo je do greške tokom resetovanja i ponovnog uvoza",
+  "collection.source.controls.reset.completed": "Resetovanje i ponovni uvoz su završeni",
+  "collection.source.controls.reset.submit": "Resetujte i ponovo uvezite",
+  "collection.source.controls.reset.running": "Resetovanje i ponovni uvoz...",
+  "collection.source.controls.harvest.status": "Status prikupljaanja:",
+  "collection.source.controls.harvest.start": "Vreme početka prikupljanja:",
+  "collection.source.controls.harvest.last": "Vreme početka prikupljanja:",
+  "collection.source.controls.harvest.message": "Informacije o prikupljanju:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.update.notifications.error.content": "Navedena podešavanja su testirana i nisu funkcionisala.",
+  "collection.source.update.notifications.error.title": "Greška na serveru",
+  "communityList.breadcrumbs": "Lista zajednice",
+  "communityList.tabTitle": "List zajednice",
+  "communityList.title": "Lista zajednica",
+  "communityList.showMore": "Prikaži više",
+  "community.create.head": "Kreirajte zajednicu",
+  "community.create.notifications.success": "Zajednica je uspešno kreirana",
+  "community.create.sub-head": "Kreirajte podzajednicu za zajednicu {{ parent }}",
+  "community.curate.header": "Urednik zajednice: {{community}}",
+  "community.delete.cancel": "Otkazati",
+  "community.delete.confirm": "Potvrdite",
+  "community.delete.processing": "Brisanje...",
+  "community.delete.head": "Izbrišite zajednicu",
+  "community.delete.notification.fail": "Nije moguće izbrisati zajednicu",
+  "community.delete.notification.success": "Uspešno izbrisana zajednica",
+  "community.delete.text": "Da li ste sigurni da želite da izbrišete zajednicu \"{{ dso }}\"",
+  "community.edit.delete": "Izbrišite ovu zajednicu",
+  "community.edit.head": "Izmenite zajednicu",
+  "community.edit.breadcrumbs": "Izmenite zajednicu",
+  "community.edit.logo.delete.title": "Izbrišite logo",
+  "community.edit.logo.delete-undo.title": "Poništite brisanje",
+  "community.edit.logo.label": "Logo zajednice",
+  "community.edit.logo.notifications.add.error": "Otpremanje logoa zajednice nije uspelo. Molimo proverite sadržaj pre ponovnog pokušaja.",
+  "community.edit.logo.notifications.add.success": "Uspešno otpremanje logoa zajednice.",
+  "community.edit.logo.notifications.delete.success.title": "Logo je izbrisan",
+  "community.edit.logo.notifications.delete.success.content": "Uspešno izbrisan logo zajednice",
+  "community.edit.logo.notifications.delete.error.title": "Greška pri brisanju logoa",
+  "community.edit.logo.upload": "Unesite logo zajednice da biste ga otpremili",
+  "community.edit.notifications.success": "Uspešno je izmenjena zajednica",
+  "community.edit.notifications.unauthorized": "Nemate ovlašćenje da izvršite ovu promenu",
+  "community.edit.notifications.error": "Došlo je do greške pri uređivanju zajednice",
+  "community.edit.return": "Nazad",
+  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.title": "Uređivanje zajednice - Curate",
+  "community.edit.tabs.access-control.head": "Kontrola pristupa",
+  "community.edit.tabs.access-control.title": "Uređivanje zajednice - Kontrola pristupa",
+  "community.edit.tabs.metadata.head": "Uredi metapodatke",
+  "community.edit.tabs.metadata.title": "Uređivanje zajednice – Metapodaci",
+  "community.edit.tabs.roles.head": "Dodeli uloge",
+  "community.edit.tabs.roles.title": "Uređivanje zajednice - Uloge",
+  "community.edit.tabs.authorizations.head": "Ovlašćenja",
+  "community.edit.tabs.authorizations.title": "Uređivanje zajednice - ovlašćenja",
+  "community.listelement.badge": "Zajednica",
+  "comcol-role.edit.no-group": "Nijedan",
+  "comcol-role.edit.create": "Kreirajte",
+  "comcol-role.edit.create.error.title": "Pravljenje grupe za ulogu \"{{ role }}\" nije uspelo",
+  "comcol-role.edit.restrict": "Ograničiti",
+  "comcol-role.edit.delete": "Izbrišite",
+  "comcol-role.edit.delete.error.title": "Brisanje grupe uloga \"{{ role }}\" nije uspelo",
+  "comcol-role.edit.community-admin.name": "Administratori",
+  "comcol-role.edit.collection-admin.name": "Administratori",
+  "comcol-role.edit.community-admin.description": "Administratori zajednice mogu da kreiraju podzajednice ili kolekcije i da upravljaju tim podzajednicama ili zbirkama ili da im dodeljuju upravljanje. Pored toga, oni odlučuju ko može da podnese stavke u bilo koju podzbirku, uređuju metapodatke stavki (nakon podnošenja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija (predmet ovlašćenja).",
+  "comcol-role.edit.collection-admin.description": "Administratori kolekcije odlučuju ko može da šalje stavke u kolekciju, uređuju metapodatke stavki (nakon slanja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija u ovu kolekciju (predmet ovlašćenja za tu kolekciju).",
+  "comcol-role.edit.submitters.name": "Podnosioci",
+  "comcol-role.edit.submitters.description": "E-ljudi i grupe koje imaju dozvolu da podnose nove stavke u ovu kolekciju.",
+  "comcol-role.edit.item_read.name": "Podrazumevani pristup za čitanje stavke",
+  "comcol-role.edit.item_read.description": "E-Ljudi i grupe koje mogu da čitaju nove stavke poslate u ovu kolekciju. Promene ove uloge nisu retroaktivne. Postojeće stavke u sistemu će i dalje moći da vide oni koji su imali pristup za čitanje u vreme njihovog dodavanja.",
+  "comcol-role.edit.item_read.anonymous-group": "Podrazumevano čitanje za dolazne stavke je trenutno postavljeno na Anonimno.",
+  "comcol-role.edit.bitstream_read.name": "Podrazumevani pristup za čitanje bitstreamova",
+  "comcol-role.edit.bitstream_read.description": "Administratori zajednice mogu da kreiraju podzajednice ili kolekcije i da upravljaju tim podzajednicama ili zbirkama ili da im dodeljuju upravljanje. Pored toga, oni odlučuju ko može da podnese stavke u bilo koju podzbirku, uređuju metapodatke stavki (nakon podnošenja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija (predmet ovlašćenja).",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Podrazumevano čitanje za dolazne bitstreamove je trenutno podešeno na Anonimno.",
+  "comcol-role.edit.editor.name": "Urednici",
+  "comcol-role.edit.editor.description": "Urednici mogu da uređuju metapodatke dolaznih podnesaka, a zatim da ih prihvate ili odbiju.",
+  "comcol-role.edit.finaleditor.name": "Konačni urednici",
+  "comcol-role.edit.finaleditor.description": "Konačni urednici mogu da uređuju metapodatke dolaznih podnesaka, ali neće moći da ih odbiju.",
+  "comcol-role.edit.reviewer.name": "Recenzenti",
+  "comcol-role.edit.reviewer.description": "Recenzenti mogu da prihvate ili odbiju dolazne podneske. Međutim, oni ne mogu da uređuju metapodatke podneska.",
+  "comcol-role.edit.scorereviewers.name": "Rezultat recenzenata",
+  "comcol-role.edit.scorereviewers.description": "Recenzenti mogu da daju ocenu dolaznim podnescima, što će definisati da li će podnesak biti odbijen ili ne.",
+  "community.form.abstract": "Kratak opis",
+  "community.form.description": "Uvodni tekst (HTML)",
+  "community.form.errors.title.required": "Unesite naziv zajednice",
+  "community.form.rights": "Tekst autorskih prava (HTML)",
+  "community.form.tableofcontents": "Vesti (HTML)",
+  "community.form.title": "Ime",
+  "community.page.edit": "Uredite ovu zajednicu",
+  "community.page.handle": "Stalni URI za ovu zajednicu",
+  "community.page.license": "Licenca",
+  "community.page.news": "Vesti",
+  "community.all-lists.head": "Podzajednice i kolekcije",
+  "community.sub-collection-list.head": "Kolekcije u ovoj zajednici",
+  "community.sub-community-list.head": "Zajednice u ovoj zajednici",
+  "cookies.consent.accept-all": "Prihvatite sve",
+  "cookies.consent.accept-selected": "Prihvatite izabrano",
+  "cookies.consent.app.opt-out.description": "Ova aplikacija se podrazumevano učitava (ali možete da odustanete)",
+  "cookies.consent.app.opt-out.title": "(odustati)",
+  "cookies.consent.app.purpose": "Svrha",
+  "cookies.consent.app.required.description": "Ova aplikacija je uvek potrebna",
+  "cookies.consent.app.required.title": "(uvek potrebno)",
+  "cookies.consent.app.disable-all.description": "Koristite ovaj prekidač da omogućite ili onemogućite sve usluge.",
+  "cookies.consent.app.disable-all.title": "Omogućite ili onemogućite sve usluge",
+  "cookies.consent.update": "Bilo je promena od vaše poslednje posete, ažurirajte svoju saglasnost.",
+  "cookies.consent.close": "Zatvoriti",
+  "cookies.consent.decline": "Odbiti",
+  "cookies.consent.ok": "To je u redu",
+  "cookies.consent.save": "sačuvati",
+  "cookies.consent.content-notice.title": "Saglasnost za kolačiće",
+  "cookies.consent.content-notice.description": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>. <br/> Da biste saznali više, pročitajte našu {privacyPolicy}.",
+  "cookies.consent.content-notice.description.no-privacy": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>.",
+  "cookies.consent.content-notice.learnMore": "Prilagoditi",
+  "cookies.consent.content-modal.description": "Ovde možete videti i prilagoditi informacije koje prikupljamo o vama.",
+  "cookies.consent.content-modal.privacy-policy.name": "Pravila o privatnosti",
+  "cookies.consent.content-modal.privacy-policy.text": "Da saznate više, pročitajte našu {privacyPolicy}.",
+  "cookies.consent.content-modal.title": "Informacije koje prikupljamo",
+  "cookies.consent.content-modal.services": "Usluge",
+  "cookies.consent.content-modal.service": "Usluga",
+  "cookies.consent.app.title.authentication": "Provera",
+  "cookies.consent.app.description.authentication": "Potrebno za prijavljivanje",
+  "cookies.consent.app.title.preferences": "Podešavanja",
+  "cookies.consent.app.description.preferences": "Potrebno za čuvanje vaših podešavanja",
+  "cookies.consent.app.title.acknowledgement": "Potvrda",
+  "cookies.consent.app.description.acknowledgement": "Potrebno za čuvanje vaših potvrda i saglasnosti",
+  "cookies.consent.app.title.google-analytics": "Google analitike",
+  "cookies.consent.app.description.google-analytics": "Omogućava nam da pratimo statističke podatke",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.description.google-recaptcha": "Koristimo Google reCAPTCHA uslugu tokom registracije i oporavka lozinke",
+  "cookies.consent.purpose.functional": "Funkcionalni",
+  "cookies.consent.purpose.statistical": "Statistički",
+  "cookies.consent.purpose.registration-password-recovery": "Registracija i oporavak lozinke",
+  "cookies.consent.purpose.sharing": "Deljenje",
+  "curation-task.task.citationpage.label": "Generišite stranicu sa citatima",
+  "curation-task.task.checklinks.label": "Proverite veze u metapodacima",
+  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.profileformats.label": "Profil Bitstrim formati",
+  "curation-task.task.requiredmetadata.label": "Proverite potrebne metapodatke",
+  "curation-task.task.translate.label": "Microsoft prevodilac",
+  "curation-task.task.vscan.label": "Pretraga virusa",
+  "curation-task.task.register-doi.label": "Registrujte DOI",
+  "curation.form.task-select.label": "Zadatak:",
+  "curation.form.submit": "Početak",
+  "curation.form.submit.success.head": "Zadato kuriranje je uspešno pokrenuto",
+  "curation.form.submit.success.content": "Bićete preusmereni na odgovarajuću stranicu procesa.",
+  "curation.form.submit.error.head": "Neuspešno pokretanje zadatog kuriranja",
+  "curation.form.submit.error.content": "Došlo je do greške pri pokušaju pokretanja zadatog kuriranja.",
+  "curation.form.submit.error.invalid-handle": "Nije moguće odrediti ručicu za ovaj objekat",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.hint": "Savet: Unesite [your-handle-prefix]/0 da biste pokrenuli zadatak na celom sajtu (ovu mogućnost ne podržavaju svi zadaci)",
+  "deny-request-copy.email.message": "Poštovani {{ recipientName }}, \n Kao odgovor na vaš zahtev, sa žaljenjem vas obaveštavam da nije moguće poslati kopiju fajla koju ste tražili, u vezi sa dokumentom: \"{{ itemUrl }}\" ({{ itemName }}), čiji sam autor. \n Srdačan pozdrav, \n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Zatražite kopiju dokumenta",
+  "deny-request-copy.error": "Došlo je do greške",
+  "deny-request-copy.header": "Odbijen zahtev za kopiranje dokumenta",
+  "deny-request-copy.intro": "Ova poruka biće poslata podnosiocu zahteva",
+  "deny-request-copy.success": "Zahtev za stavku je odbijen uspešno",
+  "dso.name.untitled": "Bez naslova",
+  "dso.name.unnamed": "Bez imena",
+  "dso-selector.create.collection.head": "Nova kolekcija",
+  "dso-selector.create.collection.sub-level": "Kreirajte novu kolekciju u",
+  "dso-selector.create.community.head": "Nova zajednica",
+  "dso-selector.create.community.or-divider": "ili",
+  "dso-selector.create.community.sub-level": "Kreirajte novu zajednicu u",
+  "dso-selector.create.community.top-level": "Kreirajte novu zajednicu najvišeg nivoa",
+  "dso-selector.create.item.head": "Nova stavka",
+  "dso-selector.create.item.sub-level": "Kreirajte novu stavku u",
+  "dso-selector.create.submission.head": "Novi podnesak",
+  "dso-selector.edit.collection.head": "Izmenite kolekciju",
+  "dso-selector.edit.community.head": "Izmenite zajednicu",
+  "dso-selector.edit.item.head": "Izmenite stavku",
+  "dso-selector.error.title": "Došlo je do greške pri pretrazi {{ type }}",
+  "dso-selector.export-metadata.dspaceobject.head": "Izvezite metapodatke iz",
+  "dso-selector.export-batch.dspaceobject.head": "Izvezite paket (ZIP) iz",
+  "dso-selector.import-batch.dspaceobject.head": "Uvezite paket iz",
+  "dso-selector.no-results": "Nije pronađen {{ type }}",
+  "dso-selector.placeholder": "Pretražite {{ type }}",
+  "dso-selector.select.collection.head": "Izaberite kolekciju",
+  "dso-selector.set-scope.community.head": "Izaberite opseg pretrage",
+  "dso-selector.set-scope.community.button": "Pretražite čitav repozitorijum",
+  "dso-selector.set-scope.community.or-divider": "ili",
+  "dso-selector.set-scope.community.input-header": "Pretražite zajednicu ili kolekciju",
+  "dso-selector.claim.item.head": "Smernice za profil",
+  "dso-selector.claim.item.body": "Ovo su postojeći profili koji se možda odnose na Vas. Ako se prepoznate u jednom od ovih profila, izaberite ga i na stranici sa detaljima, među opcijama, izaberite da ga zatražite. U suprotnom, možete kreirati novi profil od nule koristeći dugme ispod.",
+  "dso-selector.claim.item.not-mine-label": "Nijedan od ovih nije moj",
+  "dso-selector.claim.item.create-from-scratch": "Kreirajte novi",
+  "dso-selector.results-could-not-be-retrieved": "Nešto nije u redu, molimo osvežite ponovo ↻",
+  "supervision-group-selector.header": "Selektor grupe za nadzor",
+  "supervision-group-selector.select.type-of-order.label": "Izaberite tip naloga",
+  "supervision-group-selector.select.type-of-order.option.none": "NIJEDAN",
+  "supervision-group-selector.select.type-of-order.option.editor": "UREDNIK",
+  "supervision-group-selector.select.type-of-order.option.observer": "POSMATRAČ",
+  "supervision-group-selector.select.group.label": "Izaberite grupu",
+  "supervision-group-selector.button.cancel": "Otkazati",
+  "supervision-group-selector.button.save": "Sačuvati",
+  "supervision-group-selector.select.type-of-order.error": "Molimo izaberite tip naloga",
+  "supervision-group-selector.select.group.error": "Molimo izaberite grupu",
+  "supervision-group-selector.notification.create.success.title": "Uspešno je kreiran nalog nadzora za grupu {{ name }}",
+  "supervision-group-selector.notification.create.failure.title": "Greška",
+  "supervision-group-selector.notification.create.already-existing": "Već postoji nalog za nadzor za ovu stavku izabrane grupe",
+  "confirmation-modal.export-metadata.header": "Izvoz metapodataka za {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Da li ste sigurni da želite da izvezete metapodatke za {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Otkazati",
+  "confirmation-modal.export-metadata.confirm": "Izvoz",
+  "confirmation-modal.export-batch.header": "Izvezite paket (ZIP) za {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Da li ste sigurni da želite da izvezete paket (ZIP) za {{ dsoName }}",
+  "confirmation-modal.export-batch.cancel": "Otkazati",
+  "confirmation-modal.export-batch.confirm": "Izvoz",
+  "confirmation-modal.delete-eperson.header": "Izbrišite Eperson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Da li ste sigurni da želite da izbrišete Eperson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.cancel": "Otkazati",
+  "confirmation-modal.delete-eperson.confirm": "Izbrisati",
+  "confirmation-modal.delete-profile.header": "Izbrišite profil",
+  "confirmation-modal.delete-profile.info": "Da li ste sigurni da želite da izbrišete svoj profil",
+  "confirmation-modal.delete-profile.cancel": "Otkazati",
+  "confirmation-modal.delete-profile.confirm": "Izbrisati",
+  "confirmation-modal.delete-subscription.header": "Ukloniti pretplatu",
+  "confirmation-modal.delete-subscription.info": "Da li ste sigurni da želite da izbrišete pretplatu za \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Otkazati",
+  "confirmation-modal.delete-subscription.confirm": "Izbrisati",
+  "error.bitstream": "Greška pri preuzimanju bitstream-a",
+  "error.browse-by": "Greška pri preuzimanju stavki",
+  "error.collection": "Greška pri preuzimanju kolekcije",
+  "error.collections": "Greška pri preuzimanju kolekcija",
+  "error.community": "Greška pri preuzimanju zajednice",
+  "error.identifier": "Nije pronađena nijedna stavka za identifikator",
+  "error.default": "Greška",
+  "error.item": "Greška pri preuzimanju stavke",
+  "error.items": "Greška pri preuzimanju stavki",
+  "error.objects": "Greška pri preuzimanju objekata",
+  "error.recent-submissions": "Greška pri preuzimanju nedavnih podnesaka",
+  "error.search-results": "Greška pri preuzimanju rezultata pretrage",
+  "error.invalid-search-query": "Upit za pretragu nije ispravan. Proverite najbolja rešenja za <a href=\"https://solr.apache.org/guide/kueri-sintak-and-parsing.html\" target=\"_blank\">Solr sintaksu upita</a> za dodatne informacije o ovoj grešci .",
+  "error.sub-collections": "Greška pri preuzimanju podkolekcija",
+  "error.sub-communities": "Greška pri preuzimanju podzajednica",
+  "error.submission.sections.init-form-error": "Došlo je do greške tokom inicijalizacije odeljka, molimo proverite konfiguraciju obrasca za unos. Detalji su ispod: <br> <br>",
+  "error.top-level-communities": "Greška pri preuzimanju zajednica najvišeg nivoa",
+  "error.validation.license.notgranted": "Morate dodeliti ovu licencu da biste dovršili svoj podnesak. Ako u ovom trenutku niste u mogućnosti da dodelite ovu licencu, možete da sačuvate svoj rad i vratite se kasnije ili uklonite podnesak.",
+  "error.validation.pattern": "Ovaj unos je ograničen trenutnim obrascem: {{ pattern }}.",
+  "error.validation.filerequired": "Otpremanje fajla je obavezno",
+  "error.validation.required": "Ovo polje je obavezno",
+  "error.validation.NotValidEmail": "Ovaj e-mail nije važeći e-mail",
+  "error.validation.emailTaken": "Ova e-mail adresa je već zauzeta",
+  "error.validation.groupExists": "Ova grupa već postoji",
+  "error.validation.metadata.name.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake. Umesto toga, koristite polja Element i kvalifikator",
+  "error.validation.metadata.name.max-length": "Ovo polje ne sme da sadrži više od 32 znaka",
+  "error.validation.metadata.namespace.max-length": "Ovo polje ne sme da sadrži više od 256 znakova",
+  "error.validation.metadata.element.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake. Umesto toga, koristite polje Kvalifikator",
+  "error.validation.metadata.element.max-length": "Ovo polje ne sme da sadrži više od 64 znaka",
+  "error.validation.metadata.qualifier.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake",
+  "error.validation.metadata.qualifier.max-length": "Ovo polje ne sme da sadrži više od 64 znaka",
+  "feed.description": "Syndication feed",
+  "file-section.error.header": "Greška pri pribavljanju fajlova za ovu stavku",
+  "footer.copyright": "autorska prava © 2002-{{ year }}",
+  "footer.link.dspace": "DSpace softver",
+  "footer.link.lyrasis": "LIRASIS",
+  "footer.link.cookies": "Podešavanja kolačića",
+  "footer.link.privacy-policy": "Pravila o privatnosti",
+  "footer.link.end-user-agreement": "Ugovor sa krajnjim korisnikom",
+  "footer.link.feedback": "Pošalji povratne informacije",
+  "forgot-email.form.header": "Zaboravili ste lozinku",
+  "forgot-email.form.info": "Unesite e-mail adresu povezanu sa nalogom.",
+  "forgot-email.form.email": "E-mail adresa *",
+  "forgot-email.form.email.error.required": "Unesite e-mail adresu",
+  "forgot-email.form.email.error.not-email-form": "Unesite važeću e-mail adresu",
+  "forgot-email.form.email.hint": "E-mail sa daljim uputstvima biće poslat na ovu adresu ",
+  "forgot-email.form.submit": "Resetujte lozinku",
+  "forgot-email.form.success.head": "Poslat je e-mail za resetovanje lozinke",
+  "forgot-email.form.success.content": "E-mail koji sadrži posebnu URL adresu i dalja uputstva biće poslat na {{ email }} ",
+  "forgot-email.form.error.head": "Greška pri pokušaju resetovanja lozinke",
+  "forgot-email.form.error.content": "Došlo je do greške pri pokušaju resetovanja lozinke za nalog povezan sa sledećom adresom e-pošte: {{ email }}",
+  "forgot-password.title": "Zaboravili ste lozinku",
+  "forgot-password.form.head": "Zaboravili ste lozinku",
+  "forgot-password.form.info": "Unesite novu lozinku u polje ispod i potvrdite je tako što ćete je ponovo ukucati u drugo polje.",
+  "forgot-password.form.card.security": "Bezbednost",
+  "forgot-password.form.identification.header": "Identifikovati",
+  "forgot-password.form.identification.email": "E-mail adresa:",
+  "forgot-password.form.label.password": "Lozinka",
+  "forgot-password.form.label.passwordrepeat": "Ponovo otkucajte da biste potvrdili",
+  "forgot-password.form.error.empty-password": "Unesite lozinku u polje ispod.",
+  "forgot-password.form.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "forgot-password.form.notification.error.title": "Greška pri pokušaju slanja nove lozinke",
+  "forgot-password.form.notification.success.content": "Resetovanje lozinke je bilo uspešno. Prijavljeni ste kao kreirani korisnik.",
+  "forgot-password.form.notification.success.title": "Resetovanje lozinke je završeno",
+  "forgot-password.form.submit": "Pošalji lozinku",
+  "form.add": "Dodaj još",
+  "form.add-help": "Kliknite ovde da dodate trenutni unos i da dodate još jedan",
+  "form.cancel": "Poništiti, otkazati",
+  "form.clear": "Jasno",
+  "form.clear-help": "Kliknite ovde da biste uklonili izabranu vrednost",
+  "form.discard": "Odbacite",
+  "form.drag": "Prevucite",
+  "form.edit": "Uredite",
+  "form.edit-help": "Kliknite ovde da biste izmenili izabranu vrednost",
+  "form.first-name": "Ime",
+  "form.group-collapse": "Skupi",
+  "form.group-collapse-help": "Kliknite ovde za skupljanje",
+  "form.group-expand": "Proširiti",
+  "form.group-expand-help": "Kliknite ovde da biste proširili i dodali još elemenata",
+  "form.last-name": "Prezime",
+  "form.loading": "Učitavanje...",
+  "form.lookup": "Potražite",
+  "form.lookup-help": "Kliknite ovde da biste potražili postojeću vezu",
+  "form.no-results": "Nisu pronađeni rezultati",
+  "form.no-value": "Nije uneta vrednost",
+  "form.other-information.email": "E-mail",
+  "form.other-information.first-name": "Ime",
+  "form.other-information.insolr": "U Solr indeksu",
+  "form.other-information.institution": "Institucija",
+  "form.other-information.last-name": "Prezime",
+  "form.other-information.orcid": "ORCID",
+  "form.remove": "Uklonite",
+  "form.save": "Sačuvajte",
+  "form.save-help": "Sačuvajte izmene",
+  "form.search": "Pretraga",
+  "form.search-help": "Kliknite ovde da biste potražili postojeću prepisku",
+  "form.submit": "Sačuvajte",
+  "form.create": "Kreirajte",
+  "form.repeatable.sort.tip": "Spustite stavku na novu poziciju",
+  "grant-deny-request-copy.deny": "Ne šalji kopiju",
+  "grant-deny-request-copy.email.back": "Nazad",
+  "grant-deny-request-copy.email.message": "Opciona dodatna poruka",
+  "grant-deny-request-copy.email.message.empty": "Unesite poruku",
+  "grant-deny-request-copy.email.permissions.info": "Možete iskoristiti ovu priliku da ponovo razmotrite ograničenja pristupa dokumentu, kako biste izbegli da odgovorite na ove zahteve. Ako želite da zamolite administratore spremišta da uklone ova ograničenja, označite polje ispod.",
+  "grant-deny-request-copy.email.permissions.label": "Promenite u otvoreni pristup",
+  "grant-deny-request-copy.email.send": "Pošaljite",
+  "grant-deny-request-copy.email.subject": "Predmet",
+  "grant-deny-request-copy.email.subject.empty": "Unesite temu",
+  "grant-deny-request-copy.grant": "Pošaljite kopiju",
+  "grant-deny-request-copy.header": "Zahtev za kopiju dokumenta",
+  "grant-deny-request-copy.home-page": "Vrati me na početnu stranicu",
+  "grant-deny-request-copy.intro1": "Ako ste jedan od autora dokumenta <a href='{{ url }}'>{{ name }}</a>, onda koristite jednu od opcija u nastavku da odgovorite na zahtev korisnika.",
+  "grant-deny-request-copy.intro2": "Nakon što odaberete opciju, biće vam predstavljen predloženi odgovor e-maila koji možete da izmenite.",
+  "grant-deny-request-copy.processed": "Ovaj zahtev je već obrađen. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "grant-request-copy.email.subject": "Zatražite kopiju dokumenta",
+  "grant-request-copy.error": "Došlo je do greške",
+  "grant-request-copy.header": "Odobrite zahtev za kopiju dokumenta",
+  "grant-request-copy.intro": "Podnosiocu zahteva će biti poslata poruka. Traženi dokument(i) će biti priložen.",
+  "grant-request-copy.success": "Zahtev za stavku je uspešno odobren",
+  "health.breadcrumbs": "Zdravlje",
+  "health-page.heading": "Zdravlje",
+  "health-page.info-tab": "Informacije",
+  "health-page.status-tab": "Status",
+  "health-page.error.msg": "Usluga provere zdravlja je privremeno nedostupna",
+  "health-page.property.status": "Statusni kod",
+  "health-page.section.db.title": "Baza podataka",
+  "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section-info.app.title": "Backend aplikacije",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Status",
+  "health-page.status.ok.info": "Operativni",
+  "health-page.status.error.info": "Otkriveni su problemi",
+  "health-page.status.warning.info": "Otkriveni su mogući problemi",
+  "health-page.title": "Zdravlje",
+  "health-page.section.no-issues": "Nisu otkriveni problemi",
+  "home.description": "",
+  "home.breadcrumbs": "Home",
+  "home.search-form.placeholder": "Pretražite repozitorijum...",
+  "home.title": "Home",
+  "home.top-level-communities.head": "Zajednice u DSpace-u",
+  "home.top-level-communities.help": "Izaberite zajednicu da biste pregledali njene kolekcije.",
+  "info.end-user-agreement.accept": "Pročitao sam i prihvatam Ugovorom sa krajnjim korisnikom",
+  "info.end-user-agreement.accept.error": "Došlo je do greške pri prihvatanju Ugovora sa krajnjim korisnikom",
+  "info.end-user-agreement.accept.success": "Uspešno ažuriran Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.breadcrumbs": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.buttons.cancel": "Otkazati",
+  "info.end-user-agreement.buttons.save": "Sačuvati",
+  "info.end-user-agreement.head": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.title": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.hosting-country": "Sjedinjene Države",
+  "info.privacy.breadcrumbs": "Izjava o zaštiti privatnosti",
+  "info.privacy.head": "Izjava o zaštiti privatnosti",
+  "info.privacy.title": "Izjava o zaštiti privatnosti",
+  "info.feedback.breadcrumbs": "Povratna informacija",
+  "info.feedback.head": "Povratna informacija",
+  "info.feedback.title": "Povratna informacija",
+  "info.feedback.info": "Hvala Vam što ste podelili povratne informacije o DSpace sistemu. Cenimo Vaše komentare!",
+  "info.feedback.email_help": "Ova adresa će biti korišćena za praćenje vaših povratnih informacija.",
+  "info.feedback.send": "Pošaljite povratne informacije",
+  "info.feedback.comments": "Komentari",
+  "info.feedback.email-label": "Vaš Email",
+  "info.feedback.create.success": "Povratne informacije su uspešno poslate!",
+  "info.feedback.error.email.required": "Potrebna je važeća e-mail adresa",
+  "info.feedback.error.message.required": "Komentar je obavezan",
+  "info.feedback.page-label": "Strana",
+  "info.feedback.page_help": "Stranica je u vezi sa Vašim povratnim informacijama",
+  "item.alerts.private": "Ova stavka se ne može otkriti",
+  "item.alerts.withdrawn": "Ova stavka je povučena",
+  "item.edit.authorizations.heading": "Pomoću ovog editora možete da pregledate i menjate opcije stavke, kao i da menjate opcije pojedinačnih komponenti stavke: pakete i bitstream-ove. Ukratko, stavka je kontejner paketa, a paketi su kontejneri bitstream-ova. Kontejneri obično imaju opcije DODAVANJE/BRISANJE/ČITANJE/PISANJE, dok bitstream-ovi imaju samo opcije ČITANJE/PISANJE.",
+  "item.edit.authorizations.title": "Izmenite opcije stavke",
+  "item.badge.private": "Nevidljiv",
+  "item.badge.withdrawn": "Povučeno",
+  "item.bitstreams.upload.bundle": "Paket",
+  "item.bitstreams.upload.bundle.placeholder": "Izaberite paket ili unesite novo ime paketa",
+  "item.bitstreams.upload.bundle.new": "Kreirajte paket",
+  "item.bitstreams.upload.bundles.empty": "Ova stavka ne sadrži pakete za otpremanje bitstream-ova.",
+  "item.bitstreams.upload.cancel": "Otkazati",
+  "item.bitstreams.upload.drop-message": "Unesite datoteku za otpremanje",
+  "item.bitstreams.upload.item": "Stavka:",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Uspešno kreiran novi paket.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Kreirani paket",
+  "item.bitstreams.upload.notifications.upload.failed": "Otpremanje neuspešno. Molimo Vas proverite sadržaj pre ponovnog pokušaja.",
+  "item.bitstreams.upload.title": "Otpremanje bitstream-a",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Otpremiti",
+  "item.edit.bitstreams.bundle.displaying": "Trenutno se prikazuje {{ amount }} bitstream-ova od {{ total }}.",
+  "item.edit.bitstreams.bundle.load.all": "Učitajte sve ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Učitajte još",
+  "item.edit.bitstreams.bundle.name": "PAKET: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Odbaciti",
+  "item.edit.bitstreams.edit.buttons.download": "Preuzimanje",
+  "item.edit.bitstreams.edit.buttons.drag": "Prevucite",
+  "item.edit.bitstreams.edit.buttons.edit": "Izmeniti",
+  "item.edit.bitstreams.edit.buttons.remove": "Ukloniti",
+  "item.edit.bitstreams.edit.buttons.undo": "Poništiti promene",
+  "item.edit.bitstreams.empty": "Ova stavka ne sadrži bitstream-ove. Kliknite na dugme za otpremanje da biste ga kreirali.",
+  "item.edit.bitstreams.headers.actions": "Radnje",
+  "item.edit.bitstreams.headers.bundle": "Paket",
+  "item.edit.bitstreams.headers.description": "Opis",
+  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.name": "Ime",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše promene su odbačene. Da biste ponovo postavili svoje promene, kliknite na dugme \"Opozovi\".",
+  "item.edit.bitstreams.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.bitstreams.notifications.move.failed.title": "Greška pri pokretanju bitstream-ova",
+  "item.edit.bitstreams.notifications.move.saved.content": "Promene koje ste pokrenuli u bitstream-ovima i paketima ove stavke su sačuvane.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Pokrenute promene su sačuvane",
+  "item.edit.bitstreams.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "item.edit.bitstreams.notifications.outdated.title": "Zastarele promene",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Greška pri brisanju bitstream-a",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Vaše izmene u vezi sa uklanjanjem bitstream-ova ove stavke su sačuvane.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Promene uklanjanja su sačuvane",
+  "item.edit.bitstreams.reinstate-button": "Poništiti",
+  "item.edit.bitstreams.save-button": "Sačuvati",
+  "item.edit.bitstreams.upload-button": "Otpremiti",
+  "item.edit.delete.cancel": "Otkazati",
+  "item.edit.delete.confirm": "Izbrisati",
+  "item.edit.delete.description": "Da li ste sigurni da ovu stavku treba potpuno izbrisati? Oprez: Trenutno ne bi ostao nijedan obrisani zapis.",
+  "item.edit.delete.error": "Došlo je do greške prilikom brisanja stavke",
+  "item.edit.delete.header": "Izbrišite stavku: {{ id }}",
+  "item.edit.delete.success": "Stavka je izbrisana",
+  "item.edit.head": "Uredite stavku",
+  "item.edit.breadcrumbs": "Uredite stavku",
+  "item.edit.tabs.disabled.tooltip": "Niste ovlašćeni da pristupite ovoj kartici",
+  "item.edit.tabs.mapper.head": "Mapiranje kolekcije",
+  "item.edit.tabs.item-mapper.title": "Uređivanje stavke - mapiranje kolekcije",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Nepoznato",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Na čekanju za registraciju",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Na čekanju za rezervaciju",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrovano",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Rezervisano",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Rezervisano (na čekanju za ažuriranje)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrovano (na čekanju za ažuriranje)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Na čekanju za ažuriranje i registraciju",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Na čekanju za brisanje",
+  "item.edit.identifiers.doi.status.DELETED": "Izbrisano",
+  "item.edit.identifiers.doi.status.PENDING": "Na čekanju (nije registrovano)",
+  "item.edit.identifiers.doi.status.MINTED": "Minted (nije registrovano)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrujte novi ili DOI na čekanju",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrujte DOI...",
+  "item.edit.register-doi.header": "Registrujte novi ili DOI na čekanju",
+  "item.edit.register-doi.description": "Pregledajte sve identifikatore i stavke metapodataka na čekanju ispod i kliknite na Potvrdi da biste nastavili sa DOI registracijom, ili Otkaži da biste se povukli",
+  "item.edit.register-doi.confirm": "Potvrditi",
+  "item.edit.register-doi.cancel": "Poništiti, otkazati",
+  "item.edit.register-doi.success": "DOI na čekanju za registraciju uspešno.",
+  "item.edit.register-doi.error": "Greška pri registraciji DOI",
+  "item.edit.register-doi.to-update": "Sledeći DOI je već minted i biće na čekanju za registraciju na mreži",
+  "item.edit.item-mapper.buttons.add": "Mapirajte stavku u izabrane kolekcije",
+  "item.edit.item-mapper.buttons.remove": "Uklonite mapiranje stavke za izabrane kolekcije",
+  "item.edit.item-mapper.cancel": "Poništiti, otkazati",
+  "item.edit.item-mapper.description": "Ovo je alatka za mapiranje stavki koja omogućava administratorima da mapiraju ovu stavku u druge kolekcije. Možete pretražiti kolekcije i mapirati ih ili pregledati listu kolekcija na koje je stavka trenutno mapirana.",
+  "item.edit.item-mapper.head": "Mapiranje stavke – mapirajte stavku u kolekcije",
+  "item.edit.item-mapper.item": "Stavka: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Unesite upit za pretragu",
+  "item.edit.item-mapper.notifications.add.error.content": "Došlo je do grešaka pri mapiranju stavke u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.add.error.head": "Greške u mapiranju",
+  "item.edit.item-mapper.notifications.add.success.content": "Stavka je uspešno mapirana u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapiranje je završeno",
+  "item.edit.item-mapper.notifications.remove.error.content": "Došlo je do grešaka pri uklanjanju mapiranja na {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Uklanjanje grešaka u mapiranju",
+  "item.edit.item-mapper.notifications.remove.success.content": "Uspešno je uklonjeno mapiranje stavke u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Uklanjanje mapiranja je završeno",
+  "item.edit.item-mapper.search-form.placeholder": "Pretraži kolekcije...",
+  "item.edit.item-mapper.tabs.browse": "Pregledajte mapirane kolekcije",
+  "item.edit.item-mapper.tabs.map": "Mapirajte nove kolekcije",
+  "item.edit.metadata.add-button": "Dodati",
+  "item.edit.metadata.discard-button": "Odbaciti",
+  "item.edit.metadata.edit.buttons.confirm": "Potvrditi",
+  "item.edit.metadata.edit.buttons.drag": "Prevucite da biste promenili redosled",
+  "item.edit.metadata.edit.buttons.edit": "Urediti",
+  "item.edit.metadata.edit.buttons.remove": "Ukloniti",
+  "item.edit.metadata.edit.buttons.undo": "Poništiti promene",
+  "item.edit.metadata.edit.buttons.unedit": "Zaustaviti uređivanje",
+  "item.edit.metadata.edit.buttons.virtual": "Ovo je virtuelna vrednost metapodataka, odnosno vrednost nasleđena od povezanog entiteta. Ne može se direktno menjati. Dodajte ili uklonite odgovarajući odnos na kartici \"Odnosi\".",
+  "item.edit.metadata.empty": "Stavka trenutno ne sadrži nikakve metapodatke. Kliknite na Dodaj da biste počeli da dodajete vrednost metapodataka.",
+  "item.edit.metadata.headers.edit": "Urediti",
+  "item.edit.metadata.headers.field": "Polje",
+  "item.edit.metadata.headers.language": "Jezik",
+  "item.edit.metadata.headers.value": "Vrednost",
+  "item.edit.metadata.metadatafield.error": "Došlo je do greške pri proveri polja metapodataka",
+  "item.edit.metadata.metadatafield.invalid": "Izaberite važeće polje za metapodatke",
+  "item.edit.metadata.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništi\".",
+  "item.edit.metadata.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.metadata.notifications.error.title": "Došlo je do greške",
+  "item.edit.metadata.notifications.invalid.content": "Vaše promene nisu sačuvane. Uverite se da su sva polja važeća pre nego što sačuvate.",
+  "item.edit.metadata.notifications.invalid.title": "Metapodaci su nevažeći",
+  "item.edit.metadata.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "item.edit.metadata.notifications.outdated.title": "Promene su zastarele",
+  "item.edit.metadata.notifications.saved.content": "Vaše promene metapodataka ove stavke su sačuvane.",
+  "item.edit.metadata.notifications.saved.title": "Metapodaci su sačuvani",
+  "item.edit.metadata.reinstate-button": "Poništiti",
+  "item.edit.metadata.reset-order-button": "Poništite promenu redosleda",
+  "item.edit.metadata.save-button": "Sačuvati",
+  "item.edit.modify.overview.field": "Polje",
+  "item.edit.modify.overview.language": "Jezik",
+  "item.edit.modify.overview.value": "Vrednost",
+  "item.edit.move.cancel": "Nazad",
+  "item.edit.move.save-button": "Sačuvati",
+  "item.edit.move.discard-button": "Odbaciti",
+  "item.edit.move.description": "Izaberite kolekciju u koju želite da premestite ovu stavku. Da biste suzili listu prikazanih kolekcija, možete da unesete upit za pretragu u okvir.",
+  "item.edit.move.error": "Došlo je do greške pri pokušaju premeštanja stavke",
+  "item.edit.move.head": "Premestite stavku: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Smernice nasleđivanja",
+  "item.edit.move.inheritpolicies.description": "Nasledite podrazumevane smernice odredišne kolekcije",
+  "item.edit.move.move": "Premestite",
+  "item.edit.move.processing": "Premeštanje...",
+  "item.edit.move.search.placeholder": "Unesite upit za pretragu da biste potražili kolekcije",
+  "item.edit.move.success": "Stavka je uspešno premeštena",
+  "item.edit.move.title": "Premestite stavku",
+  "item.edit.private.cancel": "Poništiti, otkazati",
+  "item.edit.private.confirm": "Učinite nepristupačnim",
+  "item.edit.private.description": "Da li ste sigurni da ova stavka treba da bude nepristupačna u arhivi?",
+  "item.edit.private.error": "Došlo je do greške pri postavljanju nepristupačne stavke",
+  "item.edit.private.header": "Učinite stavku nepristupačnom: {{ id }}",
+  "item.edit.private.success": "Stavka je sada nepristupačna",
+  "item.edit.public.cancel": "Poništiti, otkazati",
+  "item.edit.public.confirm": "Učinite pristupačnim",
+  "item.edit.public.description": "Da li ste sigurni da ova stavka treba da bude pristupačna u arhivi?",
+  "item.edit.public.error": "Došlo je do greške pri omogućavanju vidljivosti stavke",
+  "item.edit.public.header": "Učinite stavku vidljivom: {{ id }}",
+  "item.edit.public.success": "Stavka je sada vidljiva",
+  "item.edit.reinstate.cancel": "Otkazati",
+  "item.edit.reinstate.confirm": "Obnoviti",
+  "item.edit.reinstate.description": "Da li ste sigurni da ovu stavku treba vratiti u arhivu?",
+  "item.edit.reinstate.error": "Došlo je do greške pri vraćanju stavke",
+  "item.edit.reinstate.header": "Vratite stavku: {{ id }}",
+  "item.edit.reinstate.success": "Stavka je uspešno vraćena",
+  "item.edit.relationships.discard-button": "Odbaciti",
+  "item.edit.relationships.edit.buttons.add": "Dodati",
+  "item.edit.relationships.edit.buttons.remove": "Ukloniti",
+  "item.edit.relationships.edit.buttons.undo": "Poništiti promene",
+  "item.edit.relationships.no-relationships": "Nema relacija",
+  "item.edit.relationships.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništiti\".",
+  "item.edit.relationships.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.relationships.notifications.failed.title": "Greška pri izmeni relacija",
+  "item.edit.relationships.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene su odbačene da bi se sprečili konflikti",
+  "item.edit.relationships.notifications.outdated.title": "Zastarele promene",
+  "item.edit.relationships.notifications.saved.content": "Vaše promene u relacijama ove stavke su sačuvane.",
+  "item.edit.relationships.notifications.saved.title": "Relacije su sačuvane",
+  "item.edit.relationships.reinstate-button": "Poništi",
+  "item.edit.relationships.save-button": "Sačuvati",
+  "item.edit.relationships.no-entity-type": "Dodajte metapodatke \"dspace.entity.type\" da biste omogućili relacije za ovu stavku",
+  "item.edit.return": "Nazad",
+  "item.edit.tabs.bitstreams.head": "Bitstream-ovi",
+  "item.edit.tabs.bitstreams.title": "Izmena stavke - Bitstream-ovi",
+  "item.edit.tabs.curate.head": "Kuriranje",
+  "item.edit.tabs.curate.title": "Izmena stavke - Kuriranje",
+  "item.edit.curate.title": "Kuriranje stavke: {{item}}",
+  "item.edit.tabs.access-control.head": "Kontrola pristupa",
+  "item.edit.tabs.access-control.title": "Izmena stavke - Kontrola pristupa",
+  "item.edit.tabs.metadata.head": "Metapodaci",
+  "item.edit.tabs.metadata.title": "Izmena stavke – Metapodaci",
+  "item.edit.tabs.relationships.head": "Relacije",
+  "item.edit.tabs.relationships.title": "Izmena stavke - Relacije",
+  "item.edit.tabs.status.buttons.authorizations.button": "Ovlašćenja...",
+  "item.edit.tabs.status.buttons.authorizations.label": "Izmenite smernice ovlašćenja stavke",
+  "item.edit.tabs.status.buttons.delete.button": "Trajno izbrisati",
+  "item.edit.tabs.status.buttons.delete.label": "Potpuno izbrisati stavku",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapirane kolekcije",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Upravljajte mapiranim kolekcijama",
+  "item.edit.tabs.status.buttons.move.button": "Premesti ovu stavku u drugu kolekciju",
+  "item.edit.tabs.status.buttons.move.label": "Premesti stavku u drugu kolekciju",
+  "item.edit.tabs.status.buttons.private.button": "Postavite da bude nevidljivo...",
+  "item.edit.tabs.status.buttons.private.label": "Postavite stavku da bude nevidljiva",
+  "item.edit.tabs.status.buttons.public.button": "Postavite da bude vidljivo...",
+  "item.edit.tabs.status.buttons.public.label": "Postavite stavku da bude vidljiva",
+  "item.edit.tabs.status.buttons.reinstate.button": "Ponovo postavite...",
+  "item.edit.tabs.status.buttons.reinstate.label": "Vratite stavku u repozitorijum",
+  "item.edit.tabs.status.buttons.unauthorized": "Niste ovlašćeni da izvršite ovu radnju",
+  "item.edit.tabs.status.buttons.withdraw.button": "Povucite ovu stavku",
+  "item.edit.tabs.status.buttons.withdraw.label": "Povucite stavku iz repozitorijuma",
+  "item.edit.tabs.status.description": "Dobrodošli na stranicu za upravljanje stavkama. Odavde možete povući, vratiti, premestiti ili izbrisati stavku. Takođe možete ažurirati ili dodati nove metapodatke / bitstream-ove na drugim karticama.",
+  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.id": "Interni ID stavke",
+  "item.edit.tabs.status.labels.itemPage": "Stranica stavke",
+  "item.edit.tabs.status.labels.lastModified": "Poslednja izmena",
+  "item.edit.tabs.status.title": "Izmena stavke - Status",
+  "item.edit.tabs.versionhistory.head": "Istorija verzija",
+  "item.edit.tabs.versionhistory.title": "Izmena stavke - Istorija verzija",
+  "item.edit.tabs.versionhistory.under-construction": "Izmena ili dodavanje novih verzija još uvek nije moguće u ovom korisničkom interfejsu.",
+  "item.edit.tabs.view.head": "Prikaži stavku",
+  "item.edit.tabs.view.title": "Izmeni stavku - Prikaži",
+  "item.edit.withdraw.cancel": "Otkazati",
+  "item.edit.withdraw.confirm": "Povucite",
+  "item.edit.withdraw.description": "Da li ste sigurni da ovu stavku treba povući iz arhive?",
+  "item.edit.withdraw.error": "Došlo je do greške pri povlačenju stavke",
+  "item.edit.withdraw.header": "Povucite stavku: {{ id }}",
+  "item.edit.withdraw.success": "Stavka je uspešno povučena",
+  "item.orcid.return": "Nazad",
+  "item.listelement.badge": "Stavka",
+  "item.page.description": "Opis",
+  "item.page.journal-issn": "ISSN časopisa",
+  "item.page.journal-title": "Naslov časopisa",
+  "item.page.publisher": "Izdavač",
+  "item.page.titleprefix": "Stavka:",
+  "item.page.volume-title": "Naslov sveske",
+  "item.search.results.head": "Rezultati pretrage stavki",
+  "item.search.title": "Pretraga stavke",
+  "item.truncatable-part.show-more": "Prikažite još",
+  "item.truncatable-part.show-less": "Skupiti",
+  "workflow-item.search.result.delete-supervision.modal.header": "Izbrišite nalog za nadzor",
+  "workflow-item.search.result.delete-supervision.modal.info": "Da li ste sigurni da želite da izbrišete nalog za nadzor",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Otkazati",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Izbrisati",
+  "workflow-item.search.result.notification.deleted.success": "Uspešno je izbrisan nalog za nadzor \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Neuspešno brisanje naloga za nadzor \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Pregledao:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Ukloniti grupu za nadzor",
+  "item.page.abstract": "Sažetak",
+  "item.page.author": "Autori",
+  "item.page.citation": "Citat",
+  "item.page.collections": "Kolekcije",
+  "item.page.collections.loading": "Učitavanje...",
+  "item.page.collections.load-more": "Učitajte još",
+  "item.page.date": "Datum",
+  "item.page.edit": "Izmenite ovu stavku",
+  "item.page.files": "Fajlovi",
+  "item.page.filesection.description": "Opis:",
+  "item.page.filesection.download": "Preuzimanje",
+  "item.page.filesection.format": "Format:",
+  "item.page.filesection.name": "ime:",
+  "item.page.filesection.size": "Veličina:",
+  "item.page.journal.search.title": "Članci u ovom časopisu",
+  "item.page.link.full": "Pun zapis stavke",
+  "item.page.link.simple": "Jednostavan zapis stavke",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Otvorite stranicu za podešavanje ORCID-a",
+  "item.page.person.search.title": "Članci ovog autora",
+  "item.page.related-items.view-more": "Prikaži još {{ amount}}",
+  "item.page.related-items.view-less": "Sakrij poslednji {{ amount}}",
+  "item.page.relationships.isAuthorOfPublication": "Publikacije",
+  "item.page.relationships.isJournalOfPublication": "Publikacije",
+  "item.page.relationships.isOrgUnitOfPerson": "Autori",
+  "item.page.relationships.isOrgUnitOfProject": "Istraživački projekti",
+  "item.page.subject": "Ključne reči",
+  "item.page.uri": "URI",
+  "item.page.bitstreams.view-more": "Prikaži više",
+  "item.page.bitstreams.collapse": "Skupiti",
+  "item.page.filesection.original.bundle": "Originalni paket",
+  "item.page.filesection.license.bundle": "Licencni paket",
+  "item.page.return": "Nazad",
+  "item.page.version.create": "Kreirajte novu verziju",
+  "item.page.version.hasDraft": "Nova verzija se ne može kreirati zato što je u toku podnošenje",
+  "item.page.claim.button": "Potvrda",
+  "item.page.claim.tooltip": "Potvrdi ovu stavku kao profil",
+  "item.preview.dc.identifier.uri": "Identifikator:",
+  "item.preview.dc.contributor.author": "Autori:",
+  "item.preview.dc.date.issued": "Datum objavljivanja:",
+  "item.preview.dc.description.abstract": "Sažetak:",
+  "item.preview.dc.identifier.other": "Drugi identifikator:",
+  "item.preview.dc.language.iso": "Jezik:",
+  "item.preview.dc.subject": "Predmeti:",
+  "item.preview.dc.title": "Naslov:",
+  "item.preview.dc.type": "Tip:",
+  "item.preview.oaire.citation.issue": "Izdanje",
+  "item.preview.oaire.citation.volume": "Opseg",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier": "Identifikator:",
+  "item.preview.dc.relation.ispartof": "Časopis ili serija",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.publisher": "Izdavač:",
+  "item.preview.person.familyName": "prezime:",
+  "item.preview.person.givenName": "Ime:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.name": "Finansijer:",
+  "item.preview.project.funder.identifier": "Identifikator finansijera:",
+  "item.preview.oaire.awardNumber": "ID finansiranja:",
+  "item.preview.dc.title.alternative": "Akronim:",
+  "item.preview.dc.coverage.spatial": "Jurisdikcija:",
+  "item.preview.oaire.fundingStream": "Tok finansiranja:",
+  "item.select.confirm": "Potvrdite izabrano",
+  "item.select.empty": "Nema stavki za prikaz",
+  "item.select.table.author": "Autor",
+  "item.select.table.collection": "Kolekcija",
+  "item.select.table.title": "Naslov",
+  "item.version.history.empty": "Još uvek nema drugih verzija za ovu stavku.",
+  "item.version.history.head": "Istorija verzija",
+  "item.version.history.return": "Nazad",
+  "item.version.history.selected": "Izabrana verzija",
+  "item.version.history.selected.alert": "Trenutno gledate verziju {{version}} stavke.",
+  "item.version.history.table.version": "Verzija",
+  "item.version.history.table.item": "Stavka",
+  "item.version.history.table.editor": "Urednik",
+  "item.version.history.table.date": "Datum",
+  "item.version.history.table.summary": "Rezime",
+  "item.version.history.table.workspaceItem": "Stavka radnog prostora",
+  "item.version.history.table.workflowItem": "Stavka procesa rada",
+  "item.version.history.table.actions": "Postupak",
+  "item.version.history.table.action.editWorkspaceItem": "Uredite stavku radnog prostora",
+  "item.version.history.table.action.editSummary": "Uredite rezime",
+  "item.version.history.table.action.saveSummary": "Sačuvajte izmene rezimea",
+  "item.version.history.table.action.discardSummary": "Odbacite izmene rezimea",
+  "item.version.history.table.action.newVersion": "Kreirajte novu verziju od ovog",
+  "item.version.history.table.action.deleteVersion": "Izbrišite verziju",
+  "item.version.history.table.action.hasDraft": "Nova verzija se ne može kreirati zato što je u toku prihvat u istoriji verzija",
+  "item.version.notice": "Ovo nije najnovija verzija ove stavke. Najnoviju verziju možete pronaći <a href='{{destination}}'>ovde</a>.",
+  "item.version.create.modal.header": "Nova verzija",
+  "item.version.create.modal.text": "Napravite novu verziju za ovu stavku",
+  "item.version.create.modal.text.startingFrom": "počevši od verzije {{version}}",
+  "item.version.create.modal.button.confirm": "Kreirajte",
+  "item.version.create.modal.button.confirm.tooltip": "Kreirajte novu verziju",
+  "item.version.create.modal.button.cancel": "Poništiti, otkazati",
+  "item.version.create.modal.button.cancel.tooltip": "Ne kreirajte novu verziju",
+  "item.version.create.modal.form.summary.label": "Rezime",
+  "item.version.create.modal.form.summary.placeholder": "Ubacite rezime za novu verziju",
+  "item.version.create.modal.submitted.header": "Kreiranje nove verzije...",
+  "item.version.create.modal.submitted.text": "Nova verzija je u izradi. Ovo može potrajati neko vreme ako stavka ima mnogo veza.",
+  "item.version.create.notification.success": "Nova verzija je napravljena sa brojem verzije {{version}}",
+  "item.version.create.notification.failure": "Nova verzija nije kreirana",
+  "item.version.create.notification.inProgress": "Nova verzija se ne može kreirati zato što je u toku prihvat u istoriji verzija",
+  "item.version.delete.modal.header": "Izbrišite verziju",
+  "item.version.delete.modal.text": "Da li želite da izbrišete verziju {{version}}?",
+  "item.version.delete.modal.button.confirm": "Izbrišite",
+  "item.version.delete.modal.button.confirm.tooltip": "Izbrišite ovu verziju",
+  "item.version.delete.modal.button.cancel": "Poništiti, otkazati",
+  "item.version.delete.modal.button.cancel.tooltip": "Nemojte brisati ovu verziju",
+  "item.version.delete.notification.success": "Verzija broj {{version}} je izbrisana",
+  "item.version.delete.notification.failure": "Verzija broj {{version}} nije izbrisana",
+  "item.version.edit.notification.success": "Sažetak verzije broj {{version}} je promenjen",
+  "item.version.edit.notification.failure": "Sažetak verzije broj {{version}} nije promenjen",
+  "itemtemplate.edit.metadata.add-button": "Dodati",
+  "itemtemplate.edit.metadata.discard-button": "Odbaciti",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Potvrditi",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Prevucite da biste promenili redosled",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Izmeniti",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Ukloniti",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Poništiti promene",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Zaustavite izmene",
+  "itemtemplate.edit.metadata.empty": "Šablon stavke trenutno ne sadrži nikakve metapodatke. Kliknite na Dodaj da biste započeli dodavanje vrednosti metapodataka.",
+  "itemtemplate.edit.metadata.headers.edit": "Izmeniti",
+  "itemtemplate.edit.metadata.headers.field": "Polje",
+  "itemtemplate.edit.metadata.headers.language": "Jezik",
+  "itemtemplate.edit.metadata.headers.value": "Vrednost",
+  "itemtemplate.edit.metadata.metadatafield.error": "Došlo je do greške prilikom provere polja metapodataka",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Molimo izaberite važeće polje metapodataka",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništi\".",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Promene su odbačene",
+  "itemtemplate.edit.metadata.notifications.error.title": "Došlo je do greške",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše promene nisu sačuvane. Molimo proverite da li su sva polja ispravna pre nego što sačuvate.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metapodaci su nevažeći",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Drugi korisnik je promenio šablon stavke na kome trenutno radite. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Promene su zastarele",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Vaše promene metapodataka ovog šablona stavke su sačuvane.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metapodaci su sačuvani",
+  "itemtemplate.edit.metadata.reinstate-button": "Poništiti",
+  "itemtemplate.edit.metadata.reset-order-button": "Poništiti promenu redosleda",
+  "itemtemplate.edit.metadata.save-button": "Sačuvati",
+  "journal.listelement.badge": "Časopis",
+  "journal.page.description": "Opis",
+  "journal.page.edit": "Uredite ovu stavku",
+  "journal.page.editor": "Glavni urednik",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Izdavač",
+  "journal.page.titleprefix": "Časopis:",
+  "journal.search.results.head": "Rezultati pretrage časopisa",
+  "journal-relationships.search.results.head": "Rezultati pretrage časopisa",
+  "journal.search.title": "Pretraga časopisa",
+  "journalissue.listelement.badge": "Izdanje časopisa",
+  "journalissue.page.description": "Opis",
+  "journalissue.page.edit": "Izmenite ovu stavku",
+  "journalissue.page.issuedate": "Datum izdanja",
+  "journalissue.page.journal-issn": "Časopis ISSN",
+  "journalissue.page.journal-title": "Naslov časopisa",
+  "journalissue.page.keyword": "Ključne reči",
+  "journalissue.page.number": "Broj",
+  "journalissue.page.titleprefix": "Izdanje časopisa:",
+  "journalvolume.listelement.badge": "Sveska časopisa",
+  "journalvolume.page.description": "Opis",
+  "journalvolume.page.edit": "Izmenite ovu stavku",
+  "journalvolume.page.issuedate": "Datum izdanja",
+  "journalvolume.page.titleprefix": "Sveska časopisa:",
+  "journalvolume.page.volume": "Sveska",
+  "iiifsearchable.listelement.badge": "Spisak medija",
+  "iiifsearchable.page.titleprefix": "Dokument:",
+  "iiifsearchable.page.doi": "Trajna veza:",
+  "iiifsearchable.page.issue": "Izdanje:",
+  "iiifsearchable.page.description": "Opis:",
+  "iiifviewer.fullscreen.notice": "Koristite ceo ekran da bolje vidite.",
+  "iiif.listelement.badge": "Image Media",
+  "iiif.page.titleprefix": "Slika:",
+  "iiif.page.doi": "Trajna veza:",
+  "iiif.page.issue": "Izdanje:",
+  "iiif.page.description": "Opis:",
+  "loading.bitstream": "Učitavanje bitstream-a...",
+  "loading.bitstreams": "Učitavanje bitstream-ova...",
+  "loading.browse-by": "Učitavanje stavki...",
+  "loading.browse-by-page": "Učitavanje stranice...",
+  "loading.collection": "Učitavanje kolekcije...",
+  "loading.collections": "Učitavanje kolekcija...",
+  "loading.content-source": "Učitavanje izvora sadržaja...",
+  "loading.community": "Učitavanje zajednice...",
+  "loading.default": "Učitavanje...",
+  "loading.item": "Učitavanje stavke...",
+  "loading.items": "Učitavanje stavki...",
+  "loading.mydspace-results": "Učitavanje stavki...",
+  "loading.objects": "Učitavanje...",
+  "loading.recent-submissions": "Učitavanje nedavnih podnesaka...",
+  "loading.search-results": "Učitavanje rezultata pretrage...",
+  "loading.sub-collections": "Učitavanje potkolekcija...",
+  "loading.sub-communities": "Učitavanje podzajednica...",
+  "loading.top-level-communities": "Učitavanje zajednica najvišeg nivoa...",
+  "login.form.email": "Email adresa",
+  "login.form.forgot-password": "Zaboravili ste lozinku?",
+  "login.form.header": "Molimo prijavite se na DSpace",
+  "login.form.new-user": "Novi korisnik? Kliknite ovde da se registrujete.",
+  "login.form.or-divider": "ili",
+  "login.form.oidc": "Prijavite se sa OIDC",
+  "login.form.orcid": "Prijavite se sa ORCID-om",
+  "login.form.password": "Lozinka",
+  "login.form.shibboleth": "Prijavite se sa Shibboleth",
+  "login.form.submit": "Prijavite se",
+  "login.title": "Prijavite se",
+  "login.breadcrumbs": "Prijavite se",
+  "logout.form.header": "Odjavite se sa DSpace-a",
+  "logout.form.submit": "Odjavite se",
+  "logout.title": "Odjavite se",
+  "menu.header.admin": "Menadžment",
+  "menu.header.image.logo": "Logo repozitorijuma",
+  "menu.header.admin.description": "Menadžment meni",
+  "menu.section.access_control": "Kontrola pristupa",
+  "menu.section.access_control_authorizations": "Ovlašćenja",
+  "menu.section.access_control_bulk": "Upravljanje masovnim pristupom",
+  "menu.section.access_control_groups": "Grupe",
+  "menu.section.access_control_people": "Ljudi",
+  "menu.section.admin_search": "Admin pretraga",
+  "menu.section.browse_community": "Ova zajednica",
+  "menu.section.browse_community_by_author": "Po autoru",
+  "menu.section.browse_community_by_issue_date": "Po datumu izdanja",
+  "menu.section.browse_community_by_title": "Po naslovu",
+  "menu.section.browse_global": "Čitav repozitorijum",
+  "menu.section.browse_global_by_author": "Po autoru",
+  "menu.section.browse_global_by_dateissued": "Po datumu izdanja",
+  "menu.section.browse_global_by_subject": "Po predmetu",
+  "menu.section.browse_global_by_srsc": "Po kategoriji predmeta",
+  "menu.section.browse_global_by_title": "Po naslovu",
+  "menu.section.browse_global_communities_and_collections": "Zajednice i kolekcije",
+  "menu.section.control_panel": "Kontrolna tabla",
+  "menu.section.curation_task": "Kurativni zadatak",
+  "menu.section.edit": "Urediti",
+  "menu.section.edit_collection": "Kolekcija",
+  "menu.section.edit_community": "Zajednica",
+  "menu.section.edit_item": "Stavka",
+  "menu.section.export": "Izvoz",
+  "menu.section.export_collection": "Kolekcija",
+  "menu.section.export_community": "Zajednica",
+  "menu.section.export_item": "Stavka",
+  "menu.section.export_metadata": "Metapodaci",
+  "menu.section.export_batch": "Grupni izvoz (ZIP)",
+  "menu.section.icon.access_control": "Odeljak menija Kontrola pristupa",
+  "menu.section.icon.admin_search": "Odeljak menija za admin pretragu",
+  "menu.section.icon.control_panel": "Odeljak menija kontrolne table",
+  "menu.section.icon.curation_tasks": "Odeljak menija Zadatak kuriranja",
+  "menu.section.icon.edit": "Uredite odeljak menija",
+  "menu.section.icon.export": "Izvezite odeljak menija",
+  "menu.section.icon.find": "Pronađite odeljak menija",
+  "menu.section.icon.health": "Odeljak menija za zdravstvenu proveru",
+  "menu.section.icon.import": "Uvezite odeljak menija",
+  "menu.section.icon.new": "Novi odeljak menija",
+  "menu.section.icon.pin": "Zakačite bočnu traku",
+  "menu.section.icon.processes": "Procesi provere zdravlja",
+  "menu.section.icon.registries": "Odeljak menija Registri",
+  "menu.section.icon.statistics_task": "Odeljak menija Statistički zadatak",
+  "menu.section.icon.workflow": "Odeljak menija Administracija procesa rada",
+  "menu.section.icon.unpin": "Otkačite bočnu traku",
+  "menu.section.import": "Uvoz",
+  "menu.section.import_batch": "Grupni uvoz (ZIP)",
+  "menu.section.import_metadata": "Metapodaci",
+  "menu.section.new": "Novo",
+  "menu.section.new_collection": "Kolekcija",
+  "menu.section.new_community": "Zajednica",
+  "menu.section.new_item": "Stavka",
+  "menu.section.new_item_version": "Verzija stavke",
+  "menu.section.new_process": "Proces",
+  "menu.section.pin": "Zakačite bočnu traku",
+  "menu.section.unpin": "Otkačite bočnu traku",
+  "menu.section.processes": "Procesi",
+  "menu.section.health": "Zdravlje",
+  "menu.section.registries": "Registri",
+  "menu.section.registries_format": "Format",
+  "menu.section.registries_metadata": "Metapodaci",
+  "menu.section.statistics": "Statistika",
+  "menu.section.statistics_task": "Statistički zadatak",
+  "menu.section.toggle.access_control": "Uključite odeljak Kontrola pristupa",
+  "menu.section.toggle.control_panel": "Uključite odeljak Kontrolna tabla",
+  "menu.section.toggle.curation_task": "Uključi/isključi odeljak Zadatak kuriranja",
+  "menu.section.toggle.edit": "Uključite odeljak Uredi",
+  "menu.section.toggle.export": "Uključite odeljak Izvezi",
+  "menu.section.toggle.find": "Uključi odeljak Pronađi",
+  "menu.section.toggle.import": "Uključite odeljak Uvezi",
+  "menu.section.toggle.new": "Uključite novi odeljak",
+  "menu.section.toggle.registries": "Uključite odeljak Registri",
+  "menu.section.toggle.statistics_task": "Uključi/isključi odeljak statistički zadatak",
+  "menu.section.workflow": "Administracija procesa rada",
+  "metadata-export-search.tooltip": "Izvezite rezultate pretrage kao CSV",
+  "metadata-export-search.submit.success": "Izvoz je uspešno započet",
+  "metadata-export-search.submit.error": "Pokretanje izvoza nije uspelo",
+  "mydspace.breadcrumbs": "Moj DSpace",
+  "mydspace.description": "",
+  "mydspace.messages.controller-help": "Izaberite ovu opciju da biste poslali poruku podnosiocu stavke.",
+  "mydspace.messages.description-placeholder": "Unesite svoju poruku ovde...",
+  "mydspace.messages.hide-msg": "Sakrijte poruku",
+  "mydspace.messages.mark-as-read": "Označite kao pročitano",
+  "mydspace.messages.mark-as-unread": "Označite kao nepročitanu",
+  "mydspace.messages.no-content": "Bez sadržaja.",
+  "mydspace.messages.no-messages": "Još nema poruka.",
+  "mydspace.messages.send-btn": "Pošalji",
+  "mydspace.messages.show-msg": "Prikaži poruku",
+  "mydspace.messages.subject-placeholder": "Predmet...",
+  "mydspace.messages.submitter-help": "Izaberite ovu opciju da biste poslali poruku kontroloru.",
+  "mydspace.messages.title": "Poruke",
+  "mydspace.messages.to": "Do",
+  "mydspace.new-submission": "Novi podnesak",
+  "mydspace.new-submission-external": "Uvezite metapodatke iz spoljnog izvora",
+  "mydspace.new-submission-external-short": "Uvezite metapodatke",
+  "mydspace.results.head": "Vaši podnesci",
+  "mydspace.results.no-abstract": "Nema sažetka",
+  "mydspace.results.no-authors": "Nema autora",
+  "mydspace.results.no-collections": "Nema kolekcija",
+  "mydspace.results.no-date": "Nema datuma",
+  "mydspace.results.no-files": "Nema fajlova",
+  "mydspace.results.no-results": "Nema stavki za prikaz",
+  "mydspace.results.no-title": "Bez naslova",
+  "mydspace.results.no-uri": "Nema URI",
+  "mydspace.search-form.placeholder": "Pretraga u mydspace...",
+  "mydspace.show.workflow": "Radni zadaci",
+  "mydspace.show.workspace": "Vaši podnesci",
+  "mydspace.show.supervisedWorkspace": "Nadzirane stavke",
+  "mydspace.status.mydspaceArchived": "Arhivirano",
+  "mydspace.status.mydspaceValidation": "Validacija",
+  "mydspace.status.mydspaceWaitingController": "Čeka se kontroler",
+  "mydspace.status.mydspaceWorkflow": "Radni proces",
+  "mydspace.status.mydspaceWorkspace": "Radni prostor",
+  "mydspace.title": "MyDSpace",
+  "mydspace.upload.upload-failed": "Greška pri kreiranju novog radnog prostora. Molimo proverite otpremljeni sadržaj pre nego što pokušate ponovo.",
+  "mydspace.upload.upload-failed-manyentries": "Neobrađen fajl. Otkriveno je previše unosa, ali je dozvoljen samo za jedan fajl.",
+  "mydspace.upload.upload-failed-moreonefile": "Neobrađen zahtev. Dozvoljen je samo jedan fajl.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} novih stavki radnog prostora je kreirano.",
+  "mydspace.view-btn": "Pogled",
+  "nav.browse.header": "Čitav repozitorijum",
+  "nav.community-browse.header": "Od zajednice",
+  "nav.context-help-toggle": "Uključite dodatnu pomoć",
+  "nav.language": "Promena jezika",
+  "nav.login": "Prijavi se",
+  "nav.user-profile-menu-and-logout": "Meni korisničkog profila i odjava",
+  "nav.logout": "Odjaviti se",
+  "nav.main.description": "Glavna navigaciona traka",
+  "nav.mydspace": "MyDSpace",
+  "nav.profile": "Profil",
+  "nav.search": "Pretraga",
+  "nav.search.button": "Pošaljite pretragu",
+  "nav.statistics.header": "Statistika",
+  "nav.stop-impersonating": "Prestanite da se predstavljate kao Eperson",
+  "nav.subscriptions": "Pretplate",
+  "nav.toggle": "Uključivanje navigacije",
+  "nav.user.description": "Traka korisničkog profila",
+  "none.listelement.badge": "Stavka",
+  "orgunit.listelement.badge": "Organizaciona jedinica",
+  "orgunit.listelement.no-title": "Bez naslova",
+  "orgunit.page.city": "Grad",
+  "orgunit.page.country": "Država",
+  "orgunit.page.dateestablished": "Datum postavljanja",
+  "orgunit.page.description": "Opis",
+  "orgunit.page.edit": "Izmeniti ovu stavku",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Organizaciona jedinica:",
+  "pagination.options.description": "Opcije straničenja",
+  "pagination.results-per-page": "Rezultati po stranici",
+  "pagination.showing.detail": "{{ range }} od {{ total }}",
+  "pagination.showing.label": "Prikazuje se ",
+  "pagination.sort-direction": "Opcije sortiranja",
+  "person.listelement.badge": "Osoba",
+  "person.listelement.no-title": "Ime nije pronađeno",
+  "person.page.birthdate": "Datum rođenja",
+  "person.page.edit": "Izmeniti ovu stavku",
+  "person.page.email": "Email adresa",
+  "person.page.firstname": "Ime",
+  "person.page.jobtitle": "Zvanje",
+  "person.page.lastname": "Prezime",
+  "person.page.name": "Ime",
+  "person.page.link.full": "Prikaži sve metapodatke",
+  "person.page.orcid": "ORCID",
+  "person.page.staffid": "ID zaposlenih",
+  "person.page.titleprefix": "Osoba:",
+  "person.search.results.head": "Rezultati pretrage osoba",
+  "person-relationships.search.results.head": "Rezultati pretrage osoba",
+  "person.search.title": "Pretraga osoba",
+  "process.new.select-parameters": "Parametri",
+  "process.new.cancel": "Otkazati",
+  "process.new.submit": "Sačuvati",
+  "process.new.select-script": "Skripta",
+  "process.new.select-script.placeholder": "Izaberite skriptu...",
+  "process.new.select-script.required": "Skripta je obavezna",
+  "process.new.parameter.file.upload-button": "Izaberite fajl...",
+  "process.new.parameter.file.required": "Molimo izaberite fajl",
+  "process.new.parameter.string.required": "Vrednost parametra je obavezna",
+  "process.new.parameter.type.value": "vrednost",
+  "process.new.parameter.type.file": "fajl",
+  "process.new.parameter.required.missing": "Sledeći parametri su obavezni, ali još uvek nedostaju:",
+  "process.new.notification.success.title": "Uspeh",
+  "process.new.notification.success.content": "Proces je uspešno kreiran",
+  "process.new.notification.error.title": "Greška",
+  "process.new.notification.error.content": "Došlo je do greške pri kreiranju ovog procesa",
+  "process.new.notification.error.max-upload.content": "Fajl prevazilazi maksimalnu veličinu za otpremanje",
+  "process.new.header": "Kreirajte novi proces",
+  "process.new.title": "Kreirajte novi proces",
+  "process.new.breadcrumbs": "Kreirajte novi proces",
+  "process.detail.arguments": "Argumenti",
+  "process.detail.arguments.empty": "Ovaj proces ne sadrži argumente",
+  "process.detail.back": "Nazad",
+  "process.detail.output": "Izlaz procesa",
+  "process.detail.logs.button": "Preuzmite izlaz procesa",
+  "process.detail.logs.loading": "Preuzimanje",
+  "process.detail.logs.none": "Ovaj proces nema izlaz",
+  "process.detail.output-files": "Izlazni fajlovi",
+  "process.detail.output-files.empty": "Ovaj proces ne sadrži izlazne fajlove",
+  "process.detail.script": "Skripta",
+  "process.detail.title": "Proces: {{ id }} - {{ name }}",
+  "process.detail.start-time": "Vreme početka",
+  "process.detail.end-time": "Vreme završetka",
+  "process.detail.status": "Status",
+  "process.detail.create": "Napravite sličan proces",
+  "process.detail.actions": "Akcije",
+  "process.detail.delete.button": "Izbrišite proces",
+  "process.detail.delete.header": "Izbrišite proces",
+  "process.detail.delete.body": "Da li ste sigurni da želite da izbrišete trenutni proces?",
+  "process.detail.delete.cancel": "Poništiti, otkazati",
+  "process.detail.delete.confirm": "Izbrišite proces",
+  "process.detail.delete.success": "Proces je uspešno obrisan.",
+  "process.detail.delete.error": "Nešto je pošlo naopako prilikom brisanja procesa",
+  "process.overview.table.finish": "Vreme završetka (UTC)",
+  "process.overview.table.id": "ID procesa",
+  "process.overview.table.name": "Ime",
+  "process.overview.table.start": "Vreme početka (UTC)",
+  "process.overview.table.status": "Status",
+  "process.overview.table.user": "Korisnik",
+  "process.overview.title": "Pregled procesa",
+  "process.overview.breadcrumbs": "Pregled procesa",
+  "process.overview.new": "Novo",
+  "process.overview.table.actions": "Akcije",
+  "process.overview.delete": "Izbrišite {{count}} procesa",
+  "process.overview.delete.clear": "Očistite izbor za brisanje",
+  "process.overview.delete.processing": "Brišu se procesi ({{count}}). Sačekajte da se brisanje u potpunosti završi. Imajte na umu da ovo može potrajati.",
+  "process.overview.delete.body": "Da li ste sigurni da želite da izbrišete {{count}} proces(e)?",
+  "process.overview.delete.header": "Izbrišite procese",
+  "process.bulk.delete.error.head": "Greška u procesu brisanja",
+  "process.bulk.delete.error.body": "Nije moguće izbrisati proces sa ID-om {{processId}}. Preostali procesi će nastaviti da se brišu.",
+  "process.bulk.delete.success": "Procesi ({{count}}) su uspešno izbrisani",
+  "profile.breadcrumbs": "Ažuriranje profila",
+  "profile.card.identify": "Identitet",
+  "profile.card.security": "Bezbednost",
+  "profile.form.submit": "Sačuvati",
+  "profile.groups.head": "Grupe ovlašćenja kojima pripadate",
+  "profile.special.groups.head": "Autorizacija posebnih grupa kojima pripadate",
+  "profile.head": "Ažuriranje profil",
+  "profile.metadata.form.error.firstname.required": "Ime je obavezno",
+  "profile.metadata.form.error.lastname.required": "Prezime je obavezno",
+  "profile.metadata.form.label.email": "Email adresa",
+  "profile.metadata.form.label.firstname": "Ime",
+  "profile.metadata.form.label.language": "Jezik",
+  "profile.metadata.form.label.lastname": "Prezime",
+  "profile.metadata.form.label.phone": "Kontakt telefon",
+  "profile.metadata.form.notifications.success.content": "Vaše promene na profilu su sačuvane.",
+  "profile.metadata.form.notifications.success.title": "Profil je sačuvan",
+  "profile.notifications.warning.no-changes.content": "Nisu napravljene nikakve promene na profilu.",
+  "profile.notifications.warning.no-changes.title": "Bez promene",
+  "profile.security.form.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "profile.security.form.info": "Opciono, možete da unesete novu lozinku u polje ispod i potvrdite je tako što ćete je ponovo ukucati u drugo polje.",
+  "profile.security.form.label.password": "Lozinka",
+  "profile.security.form.label.passwordrepeat": "Ponovo otkucajte da biste potvrdili",
+  "profile.security.form.label.current-password": "Trenutna lozinka",
+  "profile.security.form.notifications.success.content": "Vaše promene lozinke su sačuvane.",
+  "profile.security.form.notifications.success.title": "Lozinka je sačuvana",
+  "profile.security.form.notifications.error.title": "Greška pri promeni lozinki",
+  "profile.security.form.notifications.error.change-failed": "Došlo je do greške pri pokušaju promene lozinke. Proverite da li je trenutna lozinka tačna.",
+  "profile.security.form.notifications.error.not-same": "Navedene lozinke nisu iste.",
+  "profile.security.form.notifications.error.general": "Popunite obavezna polja bezbednosnog obrasca.",
+  "profile.title": "Ažuriranje profila",
+  "profile.card.researcher": "Profil istraživača",
+  "project.listelement.badge": "Istraživački projekat",
+  "project.page.contributor": "Saradnici",
+  "project.page.description": "Opis",
+  "project.page.edit": "Uredite ovu stavku",
+  "project.page.expectedcompletion": "Očekivani završetak",
+  "project.page.funder": "finansijeri",
+  "project.page.id": "ID",
+  "project.page.keyword": "Ključne reči",
+  "project.page.status": "Status",
+  "project.page.titleprefix": "Istraživački projekat:",
+  "project.search.results.head": "Rezultati pretrage projekta",
+  "project-relationships.search.results.head": "Rezultati pretrage projekta",
+  "publication.listelement.badge": "Publikacija",
+  "publication.page.description": "Opis",
+  "publication.page.edit": "Uredite ovu stavku",
+  "publication.page.journal-issn": "Časopis ISSN",
+  "publication.page.journal-title": "Naslov časopisa",
+  "publication.page.publisher": "Izdavač",
+  "publication.page.titleprefix": "Publikacija:",
+  "publication.page.volume-title": "Naslov sveske",
+  "publication.search.results.head": "Rezultati pretrage publikacije",
+  "publication-relationships.search.results.head": "Rezultati pretrage publikacije",
+  "publication.search.title": "Pretraga publikacija",
+  "media-viewer.next": "Sledeće",
+  "media-viewer.previous": "Prethodno",
+  "media-viewer.playlist": "Play lista",
+  "register-email.title": "Registracija novog korisnika",
+  "register-page.create-profile.header": "Napravite profil",
+  "register-page.create-profile.identification.header": "Identifikovati",
+  "register-page.create-profile.identification.email": "Email adresa",
+  "register-page.create-profile.identification.first-name": "Ime *",
+  "register-page.create-profile.identification.first-name.error": "Molimo unesite ime",
+  "register-page.create-profile.identification.last-name": "Prezime *",
+  "register-page.create-profile.identification.last-name.error": "Molimo unesite prezime",
+  "register-page.create-profile.identification.contact": "Kontakt telefon",
+  "register-page.create-profile.identification.language": "Jezik",
+  "register-page.create-profile.security.header": "Bezbednost",
+  "register-page.create-profile.security.info": "Molimo unesite lozinku u polje ispod i potvrdite je tako što ćete je ponovo uneti u drugo polje.",
+  "register-page.create-profile.security.label.password": "Lozinka *",
+  "register-page.create-profile.security.label.passwordrepeat": "Unesite ponovo da potvrdite *",
+  "register-page.create-profile.security.error.empty-password": "Molimo unesite lozinku u polje ispod.",
+  "register-page.create-profile.security.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "register-page.create-profile.submit": "Završite registraciju",
+  "register-page.create-profile.submit.error.content": "Nešto nije u redu prilikom registracije novog korisnika.",
+  "register-page.create-profile.submit.error.head": "Neuspešna registracija",
+  "register-page.create-profile.submit.success.content": "Registracija je uspešna. Prijavljeni ste kao kreirani korisnik.",
+  "register-page.create-profile.submit.success.head": "Registracija je završena",
+  "register-page.registration.header": "Registracija novog korisnika",
+  "register-page.registration.info": "Registrujte nalog da biste se pretplatili na kolekcije za ažuriranja putem email-a i pošaljite nove stavke na DSpace.",
+  "register-page.registration.email": "Email adresa *",
+  "register-page.registration.email.error.required": "Molimo unesite email adresu",
+  "register-page.registration.email.error.not-email-form": "Molimo unesite važeću email adresu.",
+  "register-page.registration.email.error.not-valid-domain": "Koristite email sa dozvoljenim domenima: {{ domains }}",
+  "register-page.registration.email.hint": "Ova adresa će biti verifikovana i korišćena kao vaše korisničko ime.",
+  "register-page.registration.submit": "Registrovati",
+  "register-page.registration.success.head": "Verifikacioni email je poslat",
+  "register-page.registration.success.content": "Email je poslat na {{ email }} koji sadrži poseban URL i dalja uputstva.",
+  "register-page.registration.error.head": "Greška pri pokušaju registracije email-a",
+  "register-page.registration.error.content": "Došlo je do greške pri registraciji sledeće email adrese: {{ email }}",
+  "register-page.registration.error.recaptcha": "Greška pri pokušaju autentifikacije pomoću recaptcha",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Da biste se registrovali, morate prihvatiti kolačiće za <b>registraciju i vraćanje lozinke</b> (Google reCaptcha).",
+  "register-page.registration.error.maildomain": "Ova email adresa nije na listi domena koji se mogu registrovati. Dozvoljeni domeni su {{ domains }}",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Otvorite podešavanja kolačića",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Došlo je do greške tokom reCaptcha verifikacije",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verifikacija je istekla. Molimo potvrdite ponovo.",
+  "register-page.registration.info.maildomain": "Nalozi se mogu registrovati za email adrese domena",
+  "relationships.add.error.relationship-type.content": "Nije pronađeno odgovarajuće podudaranje za tip veze {{ type }} između dve stavke",
+  "relationships.add.error.server.content": "Server je vratio grešku",
+  "relationships.add.error.title": "Nije moguće dodati vezu",
+  "relationships.isAuthorOf": "Autori",
+  "relationships.isAuthorOf.Person": "Autori (osoba)",
+  "relationships.isAuthorOf.OrgUnit": "Autori (organizacione jedinice)",
+  "relationships.isIssueOf": "Izdanja časopisa",
+  "relationships.isJournalIssueOf": "Izdanja časopsa",
+  "relationships.isJournalOf": "Časopisi",
+  "relationships.isOrgUnitOf": "Organizacione jedinice",
+  "relationships.isPersonOf": "Autori",
+  "relationships.isProjectOf": "Istraživački projekti",
+  "relationships.isPublicationOf": "Izdanja",
+  "relationships.isPublicationOfJournalIssue": "Članci",
+  "relationships.isSingleJournalOf": "Časopis",
+  "relationships.isSingleVolumeOf": "Sveska časopisa",
+  "relationships.isVolumeOf": "Sveske časopisa",
+  "relationships.isContributorOf": "Saradnici",
+  "relationships.isContributorOf.OrgUnit": "Saradnik (Organizaciona jedinica)",
+  "relationships.isContributorOf.Person": "Saradnik",
+  "relationships.isFundingAgencyOf.OrgUnit": "Osnivač",
+  "repository.image.logo": "Logo repozitorijuma",
+  "repository.title": "DSpace Repozitorijum",
+  "repository.title.prefix": "DSpace Repozitorijum ::",
+  "resource-policies.add.button": "Dodati",
+  "resource-policies.add.for.": "Dodajte nove smernice",
+  "resource-policies.add.for.bitstream": "Dodajte nove bitstream smernice",
+  "resource-policies.add.for.bundle": "Dodajte nove smernice paketa",
+  "resource-policies.add.for.item": "Dodajte nove smernice stavki",
+  "resource-policies.add.for.community": "Dodajte nove smernice zajednice",
+  "resource-policies.add.for.collection": "Dodajte nove smernice kolekcija",
+  "resource-policies.create.page.heading": "Kreirajte nove smernice resursa za",
+  "resource-policies.create.page.failure.content": "Došlo je do greške pri kreiranju smernica resursa.",
+  "resource-policies.create.page.success.content": "Operacija uspela",
+  "resource-policies.create.page.title": "Kreirajte nove smernice resursa",
+  "resource-policies.delete.btn": "Izbrišite izabrano",
+  "resource-policies.delete.btn.title": "Izbrišite izabrane smernice resursa",
+  "resource-policies.delete.failure.content": "Došlo je do greške prilikom brisanja izabranih smernica resursa.",
+  "resource-policies.delete.success.content": "Operacija uspela",
+  "resource-policies.edit.page.heading": "Izmenite smernice resursa",
+  "resource-policies.edit.page.failure.content": "Došlo je do greške prilikom izmene smernica resursa.",
+  "resource-policies.edit.page.target-failure.content": "Došlo je do greške prilikom izmene cilja (ePerson ili grupe) smernica resursa.",
+  "resource-policies.edit.page.other-failure.content": "Došlo je do greške prilikom izmene smernica resursa. Cilj (ePerson ili grupa) je uspešno ažuriran.",
+  "resource-policies.edit.page.success.content": "Operacija uspela",
+  "resource-policies.edit.page.title": "Izmena smernica resursa",
+  "resource-policies.form.action-type.label": "Izabrati vrstu akcije",
+  "resource-policies.form.action-type.required": "Morate da izaberete akciju polise resursa.",
+  "resource-policies.form.eperson-group-list.label": "Eperson ili grupa koja će dobiti ovlašćenje",
+  "resource-policies.form.eperson-group-list.select.btn": "Izabrati",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Potražite ePerson",
+  "resource-policies.form.eperson-group-list.tab.group": "Potražite grupu",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Postupak",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Ime",
+  "resource-policies.form.eperson-group-list.modal.header": "Ne može se promeniti tip",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Nije moguće zameniti ePerson sa grupom.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Nije moguće zameniti grupu sa ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Izbrišite trenutne polise resursa i kreirajte nove sa željenim tipom.",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.date.end.label": "Datum završetka",
+  "resource-policies.form.date.start.label": "Datum početka",
+  "resource-policies.form.description.label": "Opis",
+  "resource-policies.form.name.label": "Ime",
+  "resource-policies.form.policy-type.label": "Izaberite tip polise",
+  "resource-policies.form.policy-type.required": "Morate da izaberete tip polise resursa.",
+  "resource-policies.table.headers.action": "Postupak",
+  "resource-policies.table.headers.date.end": "Datum završetka",
+  "resource-policies.table.headers.date.start": "Datum početka",
+  "resource-policies.table.headers.edit": "Izmeniti",
+  "resource-policies.table.headers.edit.group": "Izmeniti grupu",
+  "resource-policies.table.headers.edit.policy": "Izmeniti smernice",
+  "resource-policies.table.headers.eperson": "Eperson",
+  "resource-policies.table.headers.group": "Grupa",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Ime",
+  "resource-policies.table.headers.policyType": "tip",
+  "resource-policies.table.headers.title.for.bitstream": "Smernice za bitstream",
+  "resource-policies.table.headers.title.for.bundle": "Smernice za paket",
+  "resource-policies.table.headers.title.for.item": "Smernice za stavku",
+  "resource-policies.table.headers.title.for.community": "Smernice za zajednicu",
+  "resource-policies.table.headers.title.for.collection": "Smernice za kolekciju",
+  "search.description": "",
+  "search.switch-configuration.title": "Prikaži",
+  "search.title": "Pretraga",
+  "search.breadcrumbs": "Pretraga",
+  "search.search-form.placeholder": "Pretražite spremište...",
+  "search.filters.applied.f.author": "Autor",
+  "search.filters.applied.f.dateIssued.max": "Datum završetka",
+  "search.filters.applied.f.dateIssued.min": "Datum početka",
+  "search.filters.applied.f.dateSubmitted": "Datum prihvatanja",
+  "search.filters.applied.f.discoverable": "Nije moguće otkriti",
+  "search.filters.applied.f.entityType": "Tip stavke",
+  "search.filters.applied.f.has_content_in_original_bundle": "Ima fajlove",
+  "search.filters.applied.f.itemtype": "Tip",
+  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.subject": "Predmet",
+  "search.filters.applied.f.submitter": "Podnosilac",
+  "search.filters.applied.f.jobTitle": "Zvanje",
+  "search.filters.applied.f.birthDate.max": "Rođenje - krajnji datum",
+  "search.filters.applied.f.birthDate.min": "Rođenje - početni datum",
+  "search.filters.applied.f.supervisedBy": "Pregledao",
+  "search.filters.applied.f.withdrawn": "Povučen",
+  "search.filters.filter.author.head": "Autor",
+  "search.filters.filter.author.placeholder": "Ime autora",
+  "search.filters.filter.author.label": "Pretražite ime autora",
+  "search.filters.filter.birthDate.head": "Datum rođenja",
+  "search.filters.filter.birthDate.placeholder": "Datum rođenja",
+  "search.filters.filter.birthDate.label": "Pretražite datum rođenja",
+  "search.filters.filter.collapse": "Skupi filter",
+  "search.filters.filter.creativeDatePublished.head": "Datum objavljivanja",
+  "search.filters.filter.creativeDatePublished.placeholder": "Datum objavljivanja",
+  "search.filters.filter.creativeDatePublished.label": "Pretražite datum objavljivanja",
+  "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.label": "Pretraga urednika",
+  "search.filters.filter.creativeWorkKeywords.head": "Predmet",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Predmet",
+  "search.filters.filter.creativeWorkKeywords.label": "Predmet pretrage",
+  "search.filters.filter.creativeWorkPublisher.head": "Izdavač",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Izdavač",
+  "search.filters.filter.creativeWorkPublisher.label": "Pretraga izdavača",
+  "search.filters.filter.dateIssued.head": "Datum",
+  "search.filters.filter.dateIssued.max.placeholder": "Maksimalni datum",
+  "search.filters.filter.dateIssued.max.label": "Kraj",
+  "search.filters.filter.dateIssued.min.placeholder": "Minimalni datum",
+  "search.filters.filter.dateIssued.min.label": "Početak",
+  "search.filters.filter.dateSubmitted.head": "Datum prihvatanja",
+  "search.filters.filter.dateSubmitted.placeholder": "Datum prihvatanja",
+  "search.filters.filter.dateSubmitted.label": "Pretraga datuma prihvatanja",
+  "search.filters.filter.discoverable.head": "Nije moguće otkriti",
+  "search.filters.filter.withdrawn.head": "Povučen",
+  "search.filters.filter.entityType.head": "Tip stavke",
+  "search.filters.filter.entityType.placeholder": "Tip stavke",
+  "search.filters.filter.entityType.label": "Pretražite tip stavke",
+  "search.filters.filter.expand": "Proširi filter",
+  "search.filters.filter.has_content_in_original_bundle.head": "Ima fajlove",
+  "search.filters.filter.itemtype.head": "Tip",
+  "search.filters.filter.itemtype.placeholder": "Tip",
+  "search.filters.filter.itemtype.label": "Tip pretrage",
+  "search.filters.filter.jobTitle.head": "Zvanje",
+  "search.filters.filter.jobTitle.placeholder": "Zvanje",
+  "search.filters.filter.jobTitle.label": "Pretraga zvanja",
+  "search.filters.filter.knowsLanguage.head": "Poznati jezik",
+  "search.filters.filter.knowsLanguage.placeholder": "Poznati jezik",
+  "search.filters.filter.knowsLanguage.label": "Pretražite poznati jezik",
+  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.label": "Status pretrage",
+  "search.filters.filter.objectpeople.head": "Ljudi",
+  "search.filters.filter.objectpeople.placeholder": "Ljudi",
+  "search.filters.filter.objectpeople.label": "Pretražite ljude",
+  "search.filters.filter.organizationAddressCountry.head": "Država",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Država",
+  "search.filters.filter.organizationAddressCountry.label": "Pretražite državu",
+  "search.filters.filter.organizationAddressLocality.head": "Grad",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Grad",
+  "search.filters.filter.organizationAddressLocality.label": "Pretražite grad",
+  "search.filters.filter.organizationFoundingDate.head": "Datum osnivanja",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Datum osnivanja",
+  "search.filters.filter.organizationFoundingDate.label": "Pretražite datum osnivanja",
+  "search.filters.filter.scope.head": "Opseg",
+  "search.filters.filter.scope.placeholder": "Filter opsega",
+  "search.filters.filter.scope.label": "Pretražite filter opsega",
+  "search.filters.filter.show-less": "Skupiti",
+  "search.filters.filter.show-more": "Prikaži više",
+  "search.filters.filter.subject.head": "Predmet",
+  "search.filters.filter.subject.placeholder": "Predmet",
+  "search.filters.filter.subject.label": "Predmet pretrage",
+  "search.filters.filter.submitter.head": "Podnosilac",
+  "search.filters.filter.submitter.placeholder": "Podnosilac",
+  "search.filters.filter.submitter.label": "Podnosilac pretrage",
+  "search.filters.filter.show-tree": "Pregledajte stablo {{ name }}",
+  "search.filters.filter.supervisedBy.head": "Pregledao",
+  "search.filters.filter.supervisedBy.placeholder": "Pregledao",
+  "search.filters.filter.supervisedBy.label": "Pretragu nadgledao",
+  "search.filters.entityType.JournalIssue": "Izdanja časopisa",
+  "search.filters.entityType.JournalVolume": "Sveska časopisa",
+  "search.filters.entityType.OrgUnit": "Organizaciona jedinica",
+  "search.filters.has_content_in_original_bundle.true": "Da",
+  "search.filters.has_content_in_original_bundle.false": "Ne",
+  "search.filters.discoverable.true": "Ne",
+  "search.filters.discoverable.false": "Da",
+  "search.filters.namedresourcetype.Archived": "Arhivirano",
+  "search.filters.namedresourcetype.Validation": "Ispravnost",
+  "search.filters.namedresourcetype.Waiting for Controller": "Čeka se kontrolor",
+  "search.filters.namedresourcetype.Workflow": "Proces rada",
+  "search.filters.namedresourcetype.Workspace": "Radni prostor",
+  "search.filters.withdrawn.true": "Da",
+  "search.filters.withdrawn.false": "Ne",
+  "search.filters.head": "Filteri",
+  "search.filters.reset": "Resetovanje filtera",
+  "search.filters.search.submit": "Prihvatite",
+  "search.form.search": "Pretraga",
+  "search.form.search_dspace": "Svi repozitorijumi",
+  "search.form.scope.all": "Čitav repozitorijum",
+  "search.results.head": "Rezultati pretrage",
+  "search.results.no-results": "Vaša pretraga nije dala rezultate. Imate problema sa pronalaženjem onoga što tražite? Pokušajte da stavite",
+  "search.results.no-results-link": "navodnike oko toga",
+  "search.results.empty": "Vaša pretraga nije dala rezultate.",
+  "search.results.view-result": "Pogledati",
+  "search.results.response.500": "Došlo je do greške tokom izvršavanja upita, molimo pokušajte ponovo kasnije",
+  "default.search.results.head": "Rezultati pretrage",
+  "default-relationships.search.results.head": "Rezultati pretrage",
+  "search.sidebar.close": "Povratak na rezultate",
+  "search.sidebar.filters.title": "Filteri",
+  "search.sidebar.open": "Alati za pretragu",
+  "search.sidebar.results": "rezultati",
+  "search.sidebar.settings.rpp": "Rezultati po strani",
+  "search.sidebar.settings.sort-by": "Sortirati po",
+  "search.sidebar.settings.title": "Podešavanja",
+  "search.view-switch.show-detail": "Prikazati detalje",
+  "search.view-switch.show-grid": "Prikazati kao mrežu",
+  "search.view-switch.show-list": "Prikazati kao listu",
+  "sorting.ASC": "Rastuće",
+  "sorting.DESC": "Opadajuće",
+  "sorting.dc.title.ASC": "Naslov rastuće",
+  "sorting.dc.title.DESC": "Naslov opadajuće",
+  "sorting.score.ASC": "Najmanje relevantno",
+  "sorting.score.DESC": "Najrelevantnije",
+  "sorting.dc.date.issued.ASC": "Datum izdanja rastuće",
+  "sorting.dc.date.issued.DESC": "Datum izdanja opadajuće",
+  "sorting.dc.date.accessioned.ASC": "Datum pristupa rastuće",
+  "sorting.dc.date.accessioned.DESC": "Datum pristupa opadajuće",
+  "sorting.lastModified.ASC": "Poslednja izmena rastuće",
+  "sorting.lastModified.DESC": "Poslednja izmena opadajuće",
+  "statistics.title": "Statistika",
+  "statistics.header": "Statistika za {{ scope }}",
+  "statistics.breadcrumbs": "Statistika",
+  "statistics.page.no-data": "Nema dostupnih podataka",
+  "statistics.table.no-data": "Nema dostupnih podataka",
+  "statistics.table.title.TotalVisits": "Ukupno poseta",
+  "statistics.table.title.TotalVisitsPerMonth": "Ukupno poseta mesečno",
+  "statistics.table.title.TotalDownloads": "Posete fajlovima",
+  "statistics.table.title.TopCountries": "Najviše pregleda po državama",
+  "statistics.table.title.TopCities": "Najviše pregleda po gradovima",
+  "statistics.table.header.views": "Pogledi",
+  "statistics.table.no-name": "(ime objekta se ne može učitati)",
+  "submission.edit.breadcrumbs": "Izmena podneska",
+  "submission.edit.title": "Izmena podneska",
+  "submission.general.cancel": "Otkazati",
+  "submission.general.cannot_submit": "Nemate dozvolu da podnesete novu prijavu.",
+  "submission.general.deposit": "Deponovati",
+  "submission.general.discard.confirm.cancel": "Otkazati",
+  "submission.general.discard.confirm.info": "Ova operacija se ne može opozvati. Da li ste sigurni?",
+  "submission.general.discard.confirm.submit": "Da siguran sam",
+  "submission.general.discard.confirm.title": "Odbacite podnesak",
+  "submission.general.discard.submit": "Odbaciti",
+  "submission.general.info.saved": "Sačuvano",
+  "submission.general.info.pending-changes": "Nesačuvane promene",
+  "submission.general.save": "Sačuvati",
+  "submission.general.save-later": "Sačuvati za kasnije",
+  "submission.import-external.page.title": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.title": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.title.Journal": "Uvezite časopis iz spoljnog izvora",
+  "submission.import-external.title.JournalIssue": "Uvezite izdanje časopisa iz spoljnog izvora",
+  "submission.import-external.title.JournalVolume": "Uvezite volume časopisa iz spoljnog izvora",
+  "submission.import-external.title.OrgUnit": "Uvezite izdavača iz spoljnog izvora",
+  "submission.import-external.title.Person": "Uvezite osobu iz spoljnog izvora",
+  "submission.import-external.title.Project": "Uvezite projekat iz spoljnog izvora",
+  "submission.import-external.title.Publication": "Uvezite publikaciju iz spoljnog izvora",
+  "submission.import-external.title.none": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.page.hint": "Unesite upit iznad da biste pronašli stavke sa veba za uvoz u DSpace.",
+  "submission.import-external.back-to-my-dspace": "Nazad na MyDSpace",
+  "submission.import-external.search.placeholder": "Pretraga spoljnog izvora",
+  "submission.import-external.search.button": "Pretraga",
+  "submission.import-external.search.button.hint": "Napišite nekoliko reči za pretragu",
+  "submission.import-external.search.source.hint": "Izaberite spoljni izvor",
+  "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Naučna mreža",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.epo": "Evropski zavod za patente (EPO)",
+  "submission.import-external.source.loading": "Učitavanje...",
+  "submission.import-external.source.sherpaJournal": "SHERPA časopisi",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA časopisi od ISSN",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.lcname": "Biblioteka Kongresnih imena",
+  "submission.import-external.preview.title": "Pregled stavke",
+  "submission.import-external.preview.title.Publication": "Pregled publikacije",
+  "submission.import-external.preview.title.none": "Pregled stavke",
+  "submission.import-external.preview.title.Journal": "Pregled časopisa",
+  "submission.import-external.preview.title.OrgUnit": "Pregled organizacione jedinice",
+  "submission.import-external.preview.title.Person": "Pregled osobe",
+  "submission.import-external.preview.title.Project": "Pregled projekta",
+  "submission.import-external.preview.subtitle": "Metapodaci u nastavku su uvezeni iz spoljnog izvora. Biće unapred popunjen kada započnete prihvatanje.",
+  "submission.import-external.preview.button.import": "Počnite sa prihvatanjem",
+  "submission.import-external.preview.error.import.title": "Greška pri prihvatanju",
+  "submission.import-external.preview.error.import.body": "Došlo je do greške tokom ulaznog procesa uvoza spoljašnjeg izvora.",
+  "submission.sections.describe.relationship-lookup.close": "Zatvori",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Uspešno je dodat lokalni ulaz u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Uvezite udaljenog autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Uvezite udaljeni dnevnik",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Uvezite udaljeno izdanje časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Uvezite udaljeni opseg časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Uvezite udaljenu stavku",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Uvezite udaljeni događaj",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Uvezite udaljeni proizvod",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Uvezite udaljenu opremu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Uvezite udaljenu organizacionu jedinicu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Uvezite udaljeni fond",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Uvezite udaljenu osobu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Uvezite udaljeni patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Uvezite udaljeni projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Uvezite udaljenu publikaciju",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Dodat je novi entitet!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Uvezi udaljenog autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Lokalni autor je uspešno dodat u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Spoljašnji autor je uspešno uvezen i dodat u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Uprava",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Uvezite kao novi ulaz lokalne uprave",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Poništiti, otkazati",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Izaberite kolekciju u koju ćete uvesti nove ulaze",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entiteti",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Uvezite kao novi lokalni entitet",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Uvezite iz LC imena",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Uvezite iz ORCID-a",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Uvezite iz časopisa Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Uvezite iz Sherpa izdavača",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Uvezite iz PubMed-a",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Uvezite iz arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Uvoz",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Uvezite udaljeni časopis",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Uspešno dodat lokalni časopis u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Uspešno uvezen i dodat spoljašnji časopis u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Uvezite udaljeno izdanje časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Uspešno je dodat lokalni broj časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Uspešno uvezen i dodat spoljašnji broj časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Uvezite udaljeni opseg časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Uspešno je dodat lokalni volumen časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Uspešno uvezen i dodat spoljašnji opseg časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Izaberite lokalno podudaranje:",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Poništite sve",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Opozovite izbor stranice",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Učitavanje...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Upit za pretragu",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Idi",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pretraga...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Izaberi sve",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Izaberite stranicu",
+  "submission.sections.describe.relationship-lookup.selected": "Izabrane stavke {{ size }}",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Lokalni autori ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Lokalni časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Lokalni projekti ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Lokalne publikacije ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Lokalni autori ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokalne organizacione jedinice ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokalni paketi podataka ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokalni fajlovi podataka ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokalni časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokalna izdanja časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Lokalna izdanja časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Lokalni opseg časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Lokalni opseg časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa izdavači({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC imena ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Potražite finansijere",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Potražite sredstva",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Potražite organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projekti",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finansijer projekta",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikacija autora",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekat",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projekti",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Finansijer projekta",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pretraga...",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Trenutni izbor ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Izdanja časopisa",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Izdanja časopisa",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Sveske časopisa",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Sveske časopisa",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Časopisi",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autori",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Finansijska agencija",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projekti",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publikacije",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autori",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paketi podataka",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Fajlovi sa podacima",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Finansijska agencija",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansiranje",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Matična organizaciona jedinica",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikacija",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Uključite padajući meni",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Podešavanja",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Vaš izbor je trenutno prazan.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Izabrani autori",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Izabrani časopisi",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Izabrana sveska časopisa",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Izabrani projekti",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Izabrane publikacije",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Izabrani autori",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Izabrane organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Izabrani paketi podataka",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Izabrani fajlovi sa podacima",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Izabrani časopisi",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Izabrano izdanje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Izabrana sveska časopisa",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Izabrana finansijska agencija",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Izabrano finansiranje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Izabrano izdanje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Izabrana organizaciona jedinica",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Da li želite da sačuvate \"{{ value }}\" kao varijantu imena za ovu osobu da biste vi i drugi mogli da ga ponovo koristite za buduće slanje? Ako to ne uradite, i dalje možete da ga koristite za ovaj podnesak.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Sačuvajte novu varijantu imena",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Koristi se samo za ovaj podnesak",
+  "submission.sections.ccLicense.type": "Tip licence",
+  "submission.sections.ccLicense.select": "Izaberite tip licence…",
+  "submission.sections.ccLicense.change": "Promenite tip licence…",
+  "submission.sections.ccLicense.none": "Nema dostupnih licenci",
+  "submission.sections.ccLicense.option.select": "Izaberite opciju…",
+  "submission.sections.ccLicense.link": "Izabrali ste sledeću licencu:",
+  "submission.sections.ccLicense.confirmation": "Dodeljujem licencu iznad",
+  "submission.sections.general.add-more": "Dodajte još",
+  "submission.sections.general.cannot_deposit": "Prijava se ne može dovršiti zbog grešaka u obrascu.<br>Popunite sva obavezna polja da biste dovršili prijavu.",
+  "submission.sections.general.collection": "Kolekcija",
+  "submission.sections.general.deposit_error_notice": "Došlo je do problema prilikom slanja stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.deposit_success_notice": "Prijava je uspešno podneta.",
+  "submission.sections.general.discard_error_notice": "Došlo je do problema pri odbacivanju stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.discard_success_notice": "Slanje je uspešno odbačeno.",
+  "submission.sections.general.metadata-extracted": "Novi metapodaci su izdvojeni i dodati u odeljak <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted-new-section": "Novi odeljak <strong>{{sectionId}}</strong> je dodat u prijavu.",
+  "submission.sections.general.no-collection": "Nije pronađena kolekcija",
+  "submission.sections.general.no-sections": "Nema dostupnih opcija",
+  "submission.sections.general.save_error_notice": "Došlo je do problema prilikom čuvanja stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.save_success_notice": "Prijava je uspešno sačuvana.",
+  "submission.sections.general.search-collection": "Potražite kolekciju",
+  "submission.sections.general.sections_not_valid": "Postoje nepotpuni odeljci.",
+  "submission.sections.identifiers.info": "Sledeći identifikatori će biti kreirani za vašu stavku:",
+  "submission.sections.identifiers.no_handle": "Za ovu stavku nije vezan handle.",
+  "submission.sections.identifiers.no_doi": "Nijedan DOIs nije vezan za ovu stavku.",
+  "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Ostali identifikatori:",
+  "submission.sections.submit.progressbar.accessCondition": "Uslovi pristupanja stavki",
+  "submission.sections.submit.progressbar.CClicense": "Creative Commons licenca",
+  "submission.sections.submit.progressbar.describe.recycle": "Reciklaža",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Opisati",
+  "submission.sections.submit.progressbar.describe.stepone": "Opisati",
+  "submission.sections.submit.progressbar.describe.steptwo": "Opisati",
+  "submission.sections.submit.progressbar.detect-duplicate": "Potencijalni duplikati",
+  "submission.sections.submit.progressbar.identifiers": "Identifikatori",
+  "submission.sections.submit.progressbar.license": "Dozvola za depozit",
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa propisi",
+  "submission.sections.submit.progressbar.upload": "Dodaj fajlove",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informacije o politici otvorenog pristupa izdavača",
+  "submission.sections.sherpa-policy.title-empty": "Nema dostupnih informacija o smernicama za izdavače. Ako vaš rad ima pridruženi ISSN, unesite ga iznad da biste videli sve povezane smernice otvorenog pristupa za izdavače.",
+  "submission.sections.status.errors.title": "Greške",
+  "submission.sections.status.valid.title": "Važeće",
+  "submission.sections.status.warnings.title": "Upozorenja",
+  "submission.sections.status.errors.aria": "Ima greške",
+  "submission.sections.status.valid.aria": "Važeće je",
+  "submission.sections.status.warnings.aria": "Ima upozorenja",
+  "submission.sections.status.info.title": "Dodatne Informacije",
+  "submission.sections.status.info.aria": "Dodatne Informacije",
+  "submission.sections.toggle.open": "Otvori odeljak",
+  "submission.sections.toggle.close": "Zatvori odeljak",
+  "submission.sections.toggle.aria.open": "Proširite {{sectionHeader}} odeljak",
+  "submission.sections.toggle.aria.close": "Skupite {{sectionHeader}} odeljak",
+  "submission.sections.upload.delete.confirm.cancel": "Poništiti, otkazati",
+  "submission.sections.upload.delete.confirm.info": "Ova operacija se ne može opozvati. Jeste li sigurni?",
+  "submission.sections.upload.delete.confirm.submit": "Da, siguran sam",
+  "submission.sections.upload.delete.confirm.title": "Izbrišite bitstream",
+  "submission.sections.upload.delete.submit": "Izbrišite",
+  "submission.sections.upload.download.title": "Preuzmite bitstream",
+  "submission.sections.upload.drop-message": "Spustite fajlove da biste ih priložili stavci",
+  "submission.sections.upload.edit.title": "Uredite bitstream",
+  "submission.sections.upload.form.access-condition-label": "Tip uslova pristupa",
+  "submission.sections.upload.form.access-condition-hint": "Izaberite uslov pristupa koji ćete primeniti na bitstream kada se stavka deponuje",
+  "submission.sections.upload.form.date-required": "Datum je obavezan.",
+  "submission.sections.upload.form.date-required-from": "Obavezno odobrenje pristupa od datuma.",
+  "submission.sections.upload.form.date-required-until": "Obavezno odobrenje pristupa do datuma.",
+  "submission.sections.upload.form.from-label": "Odobrenje pristupa od",
+  "submission.sections.upload.form.from-hint": "Izaberite datum od koga se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.upload.form.from-placeholder": "Od",
+  "submission.sections.upload.form.group-label": "Grupa",
+  "submission.sections.upload.form.group-required": "Grupa je obavezna.",
+  "submission.sections.upload.form.until-label": "Odobrenje pristupa do",
+  "submission.sections.upload.form.until-hint": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.upload.form.until-placeholder": "Sve dok",
+  "submission.sections.upload.header.policy.default.nolist": "Otpremljeni fajlovi u kolekciji {{collectionName}} biće dostupne prema sledećim grupama:",
+  "submission.sections.upload.header.policy.default.withlist": "Imajte na umu da će otpremljeni fajlovi u kolekciji {{collectionName}} biti dostupni, pored onoga što je izričito odlučeno za jedan fajl, sa sledećim grupama:",
+  "submission.sections.upload.info": "Ovde ćete pronaći sve fajlove koji se trenutno nalaze u stavci. Možete da ažurirate metapodatke fajla i uslove pristupa ili <strong> otpremite dodatne fajlove tako što ćete ih prevući i otpustiti bilo gde na stranici.</strong>",
+  "submission.sections.upload.no-entry": "Ne",
+  "submission.sections.upload.no-file-uploaded": "Još uvek nije otpremljen nijedan fajl.",
+  "submission.sections.upload.save-metadata": "Sačuvaj metapodatke",
+  "submission.sections.upload.undo": "Poništiti, otkazati",
+  "submission.sections.upload.upload-failed": "Otpremanje nije uspelo",
+  "submission.sections.upload.upload-successful": "Otpremanje je uspešno",
+  "submission.sections.accesses.form.discoverable-description": "Kada je označeno, ova stavka će biti vidljiva u pretrazi/pregledu. Kada nije označeno, stavka će biti dostupna samo preko direktne veze i nikada se neće pojaviti u pretrazi/pregledu.",
+  "submission.sections.accesses.form.discoverable-label": "Otkrivanje",
+  "submission.sections.accesses.form.access-condition-label": "Tip uslova pristupa",
+  "submission.sections.accesses.form.access-condition-hint": "Izaberite uslov pristupa koji ćete primeniti na stavku kada se deponuje",
+  "submission.sections.accesses.form.date-required": "Datum je obavezan.",
+  "submission.sections.accesses.form.date-required-from": "Obavezno odobrenje pristupa od datuma.",
+  "submission.sections.accesses.form.date-required-until": "Obavezno odobrenje pristupa do datuma.",
+  "submission.sections.accesses.form.from-label": "Odobrenje pristupa od",
+  "submission.sections.accesses.form.from-hint": "Izaberite datum od koga se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.accesses.form.from-placeholder": "Od",
+  "submission.sections.accesses.form.group-label": "Grupa",
+  "submission.sections.accesses.form.group-required": "Grupa je obavezna.",
+  "submission.sections.accesses.form.until-label": "Odobrenje pristupa do",
+  "submission.sections.accesses.form.until-hint": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.accesses.form.until-placeholder": "Sve dok",
+  "submission.sections.license.granted-label": "Potvrđujem gore navedenu licencu",
+  "submission.sections.license.required": "Morate prihvatiti licencu",
+  "submission.sections.license.notgranted": "Morate prihvatiti licencu",
+  "submission.sections.sherpa.publication.information": "Informacije o publikaciji",
+  "submission.sections.sherpa.publication.information.title": "Naslov",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-ovi",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.publishers": "Izdavač",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Propis za izdavače",
+  "submission.sections.sherpa.publisher.policy.description": "Informacije u nastavku su pronađene preko SherpaRomea. Na osnovu smernica vašeg izdavača, on pruža savete o tome da li je embargo možda neophodan i/ili koje datoteke možete da otpremite. Ako imate pitanja, kontaktirajte svog administratora sajta putem obrasca za povratne informacije u podnožju.",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Putevi otvorenog pristupa dozvoljeni politikom ovog časopisa navedeni su u nastavku prema verziji članka. Kliknite na putanju za detaljniji prikaz",
+  "submission.sections.sherpa.publisher.policy.more.information": "Za više informacija pogledajte sledeće linkove:",
+  "submission.sections.sherpa.publisher.policy.version": "Verzija",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Nema embarga",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nijedan",
+  "submission.sections.sherpa.publisher.policy.license": "Licenca",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Preduslovi",
+  "submission.sections.sherpa.publisher.policy.location": "Lokacija",
+  "submission.sections.sherpa.publisher.policy.conditions": "Uslovi",
+  "submission.sections.sherpa.publisher.policy.refresh": "Osvežite",
+  "submission.sections.sherpa.record.information": "Zapišite informaciju",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.date.created": "Datum kreiranja",
+  "submission.sections.sherpa.record.information.date.modified": "Poslednja izmena",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.error.message": "Došlo je do greške pri preuzimanju Sherpa informacija",
+  "submission.submit.breadcrumbs": "Novi podnesak",
+  "submission.submit.title": "Novi podnesak",
+  "submission.workflow.generic.delete": "Izbrišite",
+  "submission.workflow.generic.delete-help": "Izaberite ovu opciju da biste odbacili ovu stavku. Zatim će biti zatraženo da to potvrdite.",
+  "submission.workflow.generic.edit": "Uredite",
+  "submission.workflow.generic.edit-help": "Izaberite ovu opciju da biste promenili metapodatke stavke.",
+  "submission.workflow.generic.view": "Pogledajte",
+  "submission.workflow.generic.view-help": "Izaberite ovu opciju da biste videli metapodatke stavke.",
+  "submission.workflow.generic.submit_select_reviewer": "Izaberite recenzenta",
+  "submission.workflow.generic.submit_select_reviewer-help": "izaberite pomoć recenzenta",
+  "submission.workflow.generic.submit_score": "Ocena",
+  "submission.workflow.generic.submit_score-help": "rezultat-pomoć",
+  "submission.workflow.tasks.claimed.approve": "Odobriti",
+  "submission.workflow.tasks.claimed.approve_help": "Ako ste pregledali stavku i ako je pogodna za pridruživanje kolekciji, izaberite \"Odobriti\".",
+  "submission.workflow.tasks.claimed.edit": "Izmeniti",
+  "submission.workflow.tasks.claimed.edit_help": "Izaberite ovu opciju da biste promenili metapodatke stavke.",
+  "submission.workflow.tasks.claimed.decline": "Odbiti",
+  "submission.workflow.tasks.claimed.decline_help": "odbiti pomoć",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Unesite razlog za odbijanje prijave u polje ispod, navodeći da li podnosilac može da reši problem i ponovo pošalje.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Opišite razlog odbijanja",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Odbacite stavku",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Razlog",
+  "submission.workflow.tasks.claimed.reject.submit": "Odbiti",
+  "submission.workflow.tasks.claimed.reject_help": "Ako ste pregledali stavku i utvrdili da <strong>nije</strong> prikladna za pridruživanje kolekciji, izaberite \"Odbij\". Od vas će se zatim tražiti da unesete poruku koja navodi zašto je stavka neprikladna i da li podnosilac treba nešto da promeni i ponovo pošalje.",
+  "submission.workflow.tasks.claimed.return": "Povratak u grupu",
+  "submission.workflow.tasks.claimed.return_help": "Vratite zadatak u grupu tako da drugi korisnik može da izvrši zadatak.",
+  "submission.workflow.tasks.generic.error": "Došlo je do greške u radu...",
+  "submission.workflow.tasks.generic.processing": "Obrada...",
+  "submission.workflow.tasks.generic.submitter": "Podnosilac",
+  "submission.workflow.tasks.generic.success": "Operacija uspela",
+  "submission.workflow.tasks.pool.claim": "Potraživanje",
+  "submission.workflow.tasks.pool.claim_help": "Dodelite ovaj zadatak sebi.",
+  "submission.workflow.tasks.pool.hide-detail": "Sakriti detalje",
+  "submission.workflow.tasks.pool.show-detail": "Prikazati detalje",
+  "submission.workspace.generic.view": "Pogledati",
+  "submission.workspace.generic.view-help": "Izaberite ovu opciju da biste videli metapodatke stavke.",
+  "submitter.empty": "N/A",
+  "subscriptions.title": "Pretplate",
+  "subscriptions.item": "Pretplate na stavke",
+  "subscriptions.collection": "Pretplate na kolekcije",
+  "subscriptions.community": "Pretplate za zajednice",
+  "subscriptions.subscription_type": "Vrsta pretplate",
+  "subscriptions.frequency": "Učestalost pretplate",
+  "subscriptions.frequency.D": "Dnevno",
+  "subscriptions.frequency.M": "Mesečno",
+  "subscriptions.frequency.W": "Nedeljno",
+  "subscriptions.tooltip": "Pretplatiti se",
+  "subscriptions.modal.title": "Pretplate",
+  "subscriptions.modal.type-frequency": "Vrsta i učestalost",
+  "subscriptions.modal.close": "Zatvoriti",
+  "subscriptions.modal.delete-info": "Da biste uklonili ovu pretplatu, molimo posetite stranicu \"Pretplate\" ispod vašeg korisničkog profila",
+  "subscriptions.modal.new-subscription-form.type.content": "Sadržaj",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Dnevno",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Nedeljno",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mesečno",
+  "subscriptions.modal.new-subscription-form.submit": "Podnesi",
+  "subscriptions.modal.new-subscription-form.processing": "Obrada...",
+  "subscriptions.modal.create.success": "Uspešno ste pretplaćeni na {{ type }}.",
+  "subscriptions.modal.delete.success": "Pretplata je uspešno izbrisana",
+  "subscriptions.modal.update.success": "Pretplata na {{ type }} je uspešno ažurirana",
+  "subscriptions.modal.create.error": "Došlo je do greške tokom kreiranja pretplate",
+  "subscriptions.modal.delete.error": "Došlo je do greške tokom brisanja pretplate",
+  "subscriptions.modal.update.error": "Došlo je do greške tokom ažuriranja pretplate",
+  "subscriptions.table.dso": "Predmet",
+  "subscriptions.table.subscription_type": "Vrsta pretplate",
+  "subscriptions.table.subscription_frequency": "Učestalost pretplate",
+  "subscriptions.table.action": "Postupak",
+  "subscriptions.table.edit": "Izmeniti",
+  "subscriptions.table.delete": "Izbrisati",
+  "subscriptions.table.not-available": "Nije dostupno",
+  "subscriptions.table.not-available-message": "Pretplaćena stavka je izbrisana ili trenutno nemate dozvolu da je vidite",
+  "subscriptions.table.empty.message": "Trenutno nemate nijednu pretplatu. Da biste se pretplatili na ažuriranja putem email-a za zajednicu ili kolekciju, koristite dugme za pretplatu na stranici objekta.",
+  "thumbnail.default.alt": "Umanjena slika",
+  "thumbnail.default.placeholder": "Nema dostupnih umanjenih slika",
+  "thumbnail.project.alt": "Logo projekta",
+  "thumbnail.project.placeholder": "Slika referenta projekta",
+  "thumbnail.orgunit.alt": "Logo organizacione jedinice",
+  "thumbnail.orgunit.placeholder": "Slika referenta organizacione jedinice",
+  "thumbnail.person.alt": "Profilna slika",
+  "thumbnail.person.placeholder": "Slika profila nije dostupna",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Prikaz hijerarhijskog stabla",
+  "vocabulary-treeview.load-more": "Učitati još",
+  "vocabulary-treeview.search.form.reset": "Resetovati",
+  "vocabulary-treeview.search.form.search": "Pretraga",
+  "vocabulary-treeview.search.no-result": "Nije bilo stavki za prikaz",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.srsc": "Kategorije predmeta istraživanja",
+  "vocabulary-treeview.info": "Izaberite temu koju želite da dodate kao filter za pretragu",
+  "uploader.browse": "pretraži",
+  "uploader.drag-message": "Prevucite i stavite svoje fajlove ovde",
+  "uploader.delete.btn-title": "Obriši",
+  "uploader.or": ", ili",
+  "uploader.processing": "Obrada otpremljenih fajlova... (sada je bezbedno zatvoriti ovu stranicu)",
+  "uploader.queue-length": "Dužina reda",
+  "virtual-metadata.delete-item.info": "Izaberite tipove za koje želite da sačuvate virtuelne metapodatke kao stvarne metapodatke",
+  "virtual-metadata.delete-item.modal-head": "Virtuelni metapodaci ove relacije",
+  "virtual-metadata.delete-relationship.modal-head": "Izaberite stavke za koje želite da sačuvate virtuelne metapodatke kao stvarne metapodatke",
+  "supervisedWorkspace.search.results.head": "Nadzirane stavke",
+  "workspace.search.results.head": "Vaši podnesci",
+  "workflowAdmin.search.results.head": "Upravljanje radnim procesom",
+  "workflow.search.results.head": "Radni zadaci",
+  "supervision.search.results.head": "Zadaci radnog procesa i radnog prostora",
+  "workflow-item.edit.breadcrumbs": "Izmena stavke radnog procesa",
+  "workflow-item.edit.title": "Izmena stavke radnog procesa",
+  "workflow-item.delete.notification.success.title": "Izbrisano",
+  "workflow-item.delete.notification.success.content": "Ova stavka radnog procesa je uspešno izbrisana",
+  "workflow-item.delete.notification.error.title": "Nešto nije u redu",
+  "workflow-item.delete.notification.error.content": "Nije moguće izbrisati stavku procesa rada",
+  "workflow-item.delete.title": "Izbrišite stavku radnog procesa",
+  "workflow-item.delete.header": "Izbrišite stavku radnog procesa",
+  "workflow-item.delete.button.cancel": "Poništiti, otkazati",
+  "workflow-item.delete.button.confirm": "Izbrišite",
+  "workflow-item.send-back.notification.success.title": "Vraćeno podnosiocu",
+  "workflow-item.send-back.notification.success.content": "Ova stavka radnog procesa je uspešno vraćena podnosiocu",
+  "workflow-item.send-back.notification.error.title": "Nešto nije u redu",
+  "workflow-item.send-back.notification.error.content": "Stavka radnog procesa nije mogla da se vrati podnosiocu",
+  "workflow-item.send-back.title": "Vratite stavku radnog procesa podnosiocu",
+  "workflow-item.send-back.header": "Vratite stavku radnog procesa podnosiocu",
+  "workflow-item.send-back.button.cancel": "Poništiti, otkazati",
+  "workflow-item.send-back.button.confirm": "Vratiti",
+  "workflow-item.view.breadcrumbs": "Prikaz radnog procesa",
+  "workspace-item.view.breadcrumbs": "Prikaz radnog prostora",
+  "workspace-item.view.title": "Prikaz radnog prostora",
+  "workspace-item.delete.breadcrumbs": "Izbrišite radni prostor",
+  "workspace-item.delete.header": "Izbrišite stavku radnog prostora",
+  "workspace-item.delete.button.confirm": "Izbrišite",
+  "workspace-item.delete.button.cancel": "Poništiti, otkazati",
+  "workspace-item.delete.notification.success.title": "Izbrisan",
+  "workspace-item.delete.title": "Ova stavka radnog prostora je uspešno izbrisana",
+  "workspace-item.delete.notification.error.title": "Nešto nije u redu",
+  "workspace-item.delete.notification.error.content": "Nije moguće izbrisati stavku radnog prostora",
+  "workflow-item.advanced.title": "Napredni radni proces",
+  "workflow-item.selectrevieweraction.notification.success.title": "Izabrani recenzent",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent za ovu stavku radnog procesa je uspešno izabran",
+  "workflow-item.selectrevieweraction.notification.error.title": "Nešto nije u redu",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nije moguće izabrati recenzenta za ovu stavku radnog procesa",
+  "workflow-item.selectrevieweraction.title": "Izaberite recenzenta",
+  "workflow-item.selectrevieweraction.header": "Izaberite recenzenta",
+  "workflow-item.selectrevieweraction.button.cancel": "Poništiti, otkazati",
+  "workflow-item.selectrevieweraction.button.confirm": "Potvrdite",
+  "workflow-item.scorereviewaction.notification.success.title": "Ocena pregleda",
+  "workflow-item.scorereviewaction.notification.success.content": "Ocena za ovu stavku radnog procesa je uspešno poslata",
+  "workflow-item.scorereviewaction.notification.error.title": "Nešto nije u redu",
+  "workflow-item.scorereviewaction.notification.error.content": "Nije moguće oceniti ovu stavku",
+  "workflow-item.scorereviewaction.title": "Ocenite ovu stavku",
+  "workflow-item.scorereviewaction.header": "Ocenite ovu stavku",
+  "workflow-item.scorereviewaction.button.cancel": "Poništiti, otkazati",
+  "workflow-item.scorereviewaction.button.confirm": "Potvrdite",
+  "idle-modal.header": "Sesija uskoro ističe",
+  "idle-modal.info": "Iz bezbednosnih razloga, korisničke sesije ističu posle {{ timeToExpire }} minuta neaktivnosti. Vaša sesija uskoro ističe. Da li želite da produžite ili da se odjavite?",
+  "idle-modal.log-out": "Odjaviti se",
+  "idle-modal.extend-session": "Produžite sesiju",
+  "researcher.profile.action.processing": "Obrada...",
+  "researcher.profile.associated": "Povezani profil istraživača",
+  "researcher.profile.change-visibility.fail": "Došlo je do neočekivane greške prilikom promene vidljivosti profila",
+  "researcher.profile.create.new": "Kreiraj novi",
+  "researcher.profile.create.success": "Profil istraživača je uspešno kreiran",
+  "researcher.profile.create.fail": "Došlo je do greške tokom kreiranja profila istraživača",
+  "researcher.profile.delete": "Izbrišite",
+  "researcher.profile.expose": "Izlaganje",
+  "researcher.profile.hide": "Sakrijte",
+  "researcher.profile.not.associated": "Profil istraživača još nije povezan",
+  "researcher.profile.view": "Pogled",
+  "researcher.profile.private.visibility": "PRIVATNO",
+  "researcher.profile.public.visibility": "JAVNO",
+  "researcher.profile.status": "Status:",
+  "researcherprofile.claim.not-authorized": "Niste ovlašćeni da potvrdite ovu stavku. Za više detalja kontaktirajte administratora(e).",
+  "researcherprofile.error.claim.body": "Došlo je do greške pri potvrđivanju profila, molimo vas pokušajte ponovo kasnije",
+  "researcherprofile.error.claim.title": "Greška",
+  "researcherprofile.success.claim.body": "Profil je uspešno potvrđen",
+  "researcherprofile.success.claim.title": "Uspešno",
+  "person.page.orcid.create": "Kreirajte ORCID ID",
+  "person.page.orcid.granted-authorizations": "Odobrena ovlašćenja",
+  "person.page.orcid.grant-authorizations": "Odobrite ovlašćenja",
+  "person.page.orcid.link": "Povežite se na ORCID ID",
+  "person.page.orcid.link.processing": "Povezivanje profila sa ORCID-om...",
+  "person.page.orcid.link.error.message": "Nešto je pošlo naopako pri povezivanju profila sa ORCID-om. Ako se problem i dalje javlja, kontaktirajte administratora.",
+  "person.page.orcid.orcid-not-linked-message": "ORCID ID ovog profila ({{ orcid }}) još uvek nije povezan sa nalogom u ORCID registru ili je veza istekla.",
+  "person.page.orcid.unlink": "Prekinite vezu sa ORCID-om",
+  "person.page.orcid.unlink.processing": "Obrada...",
+  "person.page.orcid.missing-authorizations": "Nedostaju ovlašćenja",
+  "person.page.orcid.missing-authorizations-message": "Nedostaju sledeća ovlašćenja:",
+  "person.page.orcid.no-missing-authorizations-message": "Divno! Ovo polje je prazno, tako da ste odobrili sva prava pristupa za korišćenje svih funkcija koje nudi vaša institucija.",
+  "person.page.orcid.no-orcid-message": "Još uvek nije povezan ORCID ID. Klikom na dugme ispod moguće je povezati ovaj profil sa ORCID nalogom.",
+  "person.page.orcid.profile-preferences": "Prioriteti profila",
+  "person.page.orcid.funding-preferences": "Prioriteti finansiranja",
+  "person.page.orcid.publications-preferences": "Prioriteti publikacije",
+  "person.page.orcid.remove-orcid-message": "Ako treba da uklonite svoj ORCID, kontaktirajte administratora repozitorijuma",
+  "person.page.orcid.save.preference.changes": "Podešavanja ažuriranja",
+  "person.page.orcid.sync-profile.affiliation": "Pripadnost",
+  "person.page.orcid.sync-profile.biographical": "Biografski podaci",
+  "person.page.orcid.sync-profile.education": "Obrazovanje",
+  "person.page.orcid.sync-profile.identifiers": "Identifikatori",
+  "person.page.orcid.sync-fundings.all": "Sva sredstva",
+  "person.page.orcid.sync-fundings.mine": "Moja sredstva",
+  "person.page.orcid.sync-fundings.my_selected": "Odabrana sredstva",
+  "person.page.orcid.sync-fundings.disabled": "Onemogućeno",
+  "person.page.orcid.sync-publications.all": "Sve publikacije",
+  "person.page.orcid.sync-publications.mine": "Moje publikacije",
+  "person.page.orcid.sync-publications.my_selected": "Izabrane publikacije",
+  "person.page.orcid.sync-publications.disabled": "Onemogućeno",
+  "person.page.orcid.sync-queue.discard": "Odbacite promenu i nemojte da se sinhronizujete sa ORCID registrom",
+  "person.page.orcid.sync-queue.discard.error": "Odbacivanje zapisa ORCID reda nije uspelo",
+  "person.page.orcid.sync-queue.discard.success": "Zapis ORCID reda je uspešno odbačen",
+  "person.page.orcid.sync-queue.empty-message": "Zapis ORCID registra je prazan",
+  "person.page.orcid.sync-queue.table.header.type": "Tip",
+  "person.page.orcid.sync-queue.table.header.description": "Opis",
+  "person.page.orcid.sync-queue.table.header.action": "Postupak",
+  "person.page.orcid.sync-queue.description.affiliation": "Pripadnosti",
+  "person.page.orcid.sync-queue.description.country": "Država",
+  "person.page.orcid.sync-queue.description.education": "Obrazovanja",
+  "person.page.orcid.sync-queue.description.external_ids": "Spoljašnji id",
+  "person.page.orcid.sync-queue.description.other_names": "Druga imena",
+  "person.page.orcid.sync-queue.description.qualification": "Kvalifikacije",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL-ovi istraživača",
+  "person.page.orcid.sync-queue.description.keywords": "Ključne reči",
+  "person.page.orcid.sync-queue.tooltip.insert": "Dodajte novi unos u ORCID registar",
+  "person.page.orcid.sync-queue.tooltip.update": "Ažurirajte ovaj unos u ORCID registru",
+  "person.page.orcid.sync-queue.tooltip.delete": "Uklonite ovaj unos iz ORCID registra",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publikacija",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekat",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Pripadnost",
+  "person.page.orcid.sync-queue.tooltip.education": "Оbrazovanje",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Kvalifikacija",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Drugo ime",
+  "person.page.orcid.sync-queue.tooltip.country": "Država",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Ključna reč",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Spoljašnji identifikator",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL istraživača",
+  "person.page.orcid.sync-queue.send": "Sinhronizacija sa ORCID registrom",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Pristupanje ORCID-u nije uspelo zbog nedostajućih ovlašćenja.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Kliknite <a href='{{orcid}}'>ovde</a> da ponovo dodelite potrebne dozvole. Ako se problem nastavi, kontaktirajte administratora",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Slanje ORCID-u nije uspelo jer resurs poslat u ORCID registar nije važeći",
+  "person.page.orcid.sync-queue.send.error": "Slanje ORCID-u nije uspelo",
+  "person.page.orcid.sync-queue.send.conflict-error": "Slanje ORCID-u nije uspelo jer se resurs već nalazi u ORCID registru",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Resurs se više ne nalazi u ORCID registru.",
+  "person.page.orcid.sync-queue.send.success": "Slanje ORCID-u je uspešno završeno",
+  "person.page.orcid.sync-queue.send.validation-error": "Podaci koje želite da sinhronizujete sa ORCID-om nisu ispravni",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Valuta je obavezna",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Resurs koji se šalje zahteva najmanje jedan identifikator",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Naslov je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Dc.type je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Datum početka je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Finansijer je neophodan",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Nevažeće 2 cifre ISO 3166 zemlja",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Potrebna je organizacija",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Naziv organizacije je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Datum objavljivanja mora biti godinu dana posle 1900. godine",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Organizacija zahteva adresu",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Adresa organizacije koja se šalje zahteva grad",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Adresa organizacije koja se šalje zahteva važeće 2 cifre ISO 3166 zemlje",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Potreban je identifikator za nedvosmislenost organizacija. Podržani ID-ovi su GRID, Ringgold, Legal Entity identifiers (LEIs) i Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Identifikatori organizacije zahtevaju vrednost",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Identifikatorima organizacije je potreban izvor",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Izvor jednog od identifikatora organizacije je nevažeći. Podržani izvori su RINGGOLD, GRID, LEI i FUNDREF",
+  "person.page.orcid.synchronization-mode": "Način sinhronizacije",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.label": "Način sinhronizacije",
+  "person.page.orcid.synchronization-mode-message": "Molimo izaberite kako želite da se sinhronizacija sa ORCID-om odvija. Opcije uključuju \"Manual\" (morate ručno da pošaljete svoje podatke ORCID-u) ili \"Batch\" (sistem će poslati vaše podatke ORCID-u preko planirane skripte).",
+  "person.page.orcid.synchronization-mode-funding-message": "Izaberite da li želite da pošaljete vaše povezane entitete projekta na listu informacija o finansiranju vašeg ORCID zapisa.",
+  "person.page.orcid.synchronization-mode-publication-message": "Izaberite da li želite da pošaljete vaše povezane entitete publikacije na listu radova vašeg ORCID zapisa.",
+  "person.page.orcid.synchronization-mode-profile-message": "Izaberite da li želite da pošaljete vaše biografske podatke ili lične identifikatore u vaš ORCID zapis.",
+  "person.page.orcid.synchronization-settings-update.success": "Podešavanja sinhronizacije su uspešno ažurirana",
+  "person.page.orcid.synchronization-settings-update.error": "Ažuriranje podešavanja sinhronizacije nije uspelo",
+  "person.page.orcid.synchronization-mode.manual": "Uputstvo",
+  "person.page.orcid.scope.authenticate": "Preuzmite svoj ORCID iD",
+  "person.page.orcid.scope.read-limited": "Čitajte svoje informacije uz vidljivost podešenu na Pouzdane strane",
+  "person.page.orcid.scope.activities-update": "Dodajte/ažurirajte vaše istraživačke aktivnosti",
+  "person.page.orcid.scope.person-update": "Dodajte/ažurirajte druge informacije o sebi",
+  "person.page.orcid.unlink.success": "Prekid veze između profila i ORCID registra je bio uspešan",
+  "person.page.orcid.unlink.error": "Došlo je do greške prilikom prekida veze između profila i ORCID registra. Pokušajte ponovo",
+  "person.orcid.sync.setting": "ORCID podešavanja sinhronizacije",
+  "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.auth": "ORCID ovlašćenja",
+  "home.recent-submissions.head": "Nedavni podnesci",
+  "listable-notification-object.default-message": "Nije moguće preuzeti ovaj objekat",
+  "system-wide-alert-banner.retrieval.error": "Nešto nije u redu pri preuzimanju banera sistemskog upozorenja",
+  "system-wide-alert-banner.countdown.prefix": "U",
+  "system-wide-alert-banner.countdown.days": "{{days}} dan(i),",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} sat(i) i",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut(i):",
+  "menu.section.system-wide-alert": "Sistemsko upozorenje",
+  "system-wide-alert.form.header": "Sistemsko upozorenje",
+  "system-wide-alert-form.retrieval.error": "Nešto nije u redu pri preuzimanju sistemskog upozorenja",
+  "system-wide-alert.form.cancel": "Otkazati",
+  "system-wide-alert.form.save": "Sačuvati",
+  "system-wide-alert.form.label.active": "AKTIVNO",
+  "system-wide-alert.form.label.inactive": "NEAKTIVNO",
+  "system-wide-alert.form.error.message": "Sistemsko upozorenje mora sadržati poruku",
+  "system-wide-alert.form.label.message": "Poruka upozorenja",
+  "system-wide-alert.form.label.countdownTo.enable": "Uključite vremensko odbrojavanje",
+  "system-wide-alert.form.label.countdownTo.hint": "Savet: Podesite tajmer za odbrojavanje. Kada je uključen, datum se može podesiti u budućnosti i baner sistemskog upozorenja će izvršiti odbrojavanje do postavljenog datuma. Kada tajmer završi, nestaće iz upozorenja. Server NEĆE biti automatski zaustavljen.",
+  "system-wide-alert.form.label.preview": "Pregled sistemskog upozorenja",
+  "system-wide-alert.form.update.success": "Sistemsko upozorenje je uspešno ažurirano",
+  "system-wide-alert.form.update.error": "Nešto nije u redu sa ažuriranjem sistemskog upozorenja",
+  "system-wide-alert.form.create.success": "Sistemsko upozorenje je uspešno kreirano",
+  "system-wide-alert.form.create.error": "Nešto nije u redu sa kreiranjem sistemskog upozorenja",
+  "admin.system-wide-alert.breadcrumbs": "Sistemska upozorenja",
+  "admin.system-wide-alert.title": "Sistemska upozorenja",
+  "item-access-control-title": "Ovaj obrazac vam omogućava da izvršite promene uslova pristupa metapodacima stavke ili njenim bitstream-ovima.",
+  "collection-access-control-title": "Ovaj obrazac vam omogućava da izvršite izmene uslova pristupa svim stavkama ove kolekcije. Promene mogu da se izvrše ili na svim metapodacima stavke ili na celom sadržaju (bitstream-ova).",
+  "community-access-control-title": "Ovaj obrazac vam omogućava da izvršite promene uslova pristupa svim stavkama bilo koje kolekcije u ovoj zajednici. Promene mogu da se izvrše ili na svim metapodacima stavke ili na celom sadržaju (bitstream-ova).",
+  "access-control-item-header-toggle": "Metapodaci stavke",
+  "access-control-bitstream-header-toggle": "Bitstream-ovi",
+  "access-control-mode": "Način",
+  "access-control-access-conditions": "Uslovi pristupa",
+  "access-control-no-access-conditions-warning-message": "Trenutno nisu navedeni uslovi pristupa ispod. Ako se izvrši, to će zameniti trenutne uslove pristupa podrazumevanim uslovima pristupa nasleđenim iz vlasničke kolekcije.",
+  "access-control-replace-all": "Zamena uslova pristupa",
+  "access-control-add-to-existing": "Dodati postojećim",
+  "access-control-limit-to-specific": "Ograničite promene na određene bitstream-ove",
+  "access-control-process-all-bitstreams": "Ažurirajte sve bitstream-ove u stavci",
+  "access-control-bitstreams-selected": "izabrani bitstream-ovi",
+  "access-control-cancel": "Otkazati",
+  "access-control-execute": "Izvršiti",
+  "access-control-add-more": "Dodati još",
+  "access-control-select-bitstreams-modal.title": "Izaberite bitstream-ove",
+  "access-control-select-bitstreams-modal.no-items": "Nema stavki za prikaz.",
+  "access-control-select-bitstreams-modal.close": "Zatvoriti",
+  "access-control-option-label": "Vrsta uslova pristupa",
+  "access-control-option-note": "Izaberite uslov pristupa koji ćete primeniti na izabrane objekte.",
+  "access-control-option-start-date": "Pristup odobren od",
+  "access-control-option-start-date-note": "Izaberite datum od kojeg se primenjuje odgovarajući uslov pristupa",
+  "access-control-option-end-date": "Pristup odobren do",
+  "access-control-option-end-date-note": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+}
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index c988577c92..8c3482764f 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -721,6 +721,410 @@
   "admin.access-control.groups.form.return": "Tillbaka",
 
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Admin sökning",
@@ -3618,6 +4022,18 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "EPersoner",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
 
 
   // "menu.section.admin_search": "Admin Search",
@@ -3699,6 +4115,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Åtkomstkontroll - meny",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Admin sök - meny",
 
@@ -3805,6 +4225,9 @@
   "menu.section.statistics_task": "Statistik uppgift",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Växla till åtkomstkontroll",
@@ -3934,20 +4357,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Dina registreringar",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "I arkivet",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "I arkivet",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validering",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validering",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Väntar på kontrollant",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Väntar på kontrollant",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Arbetsflöde",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Arbetsflöde",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "I arbetsflödet",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "I arbetsflödet",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mitt DSpace",
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index 47253dea9f..13a1f07b70 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -878,7 +878,408 @@
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   // TODO New key - Add a translation
@@ -3878,6 +4279,18 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
@@ -3980,6 +4393,10 @@
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
@@ -4113,6 +4530,9 @@
   "menu.section.statistics_task": "Statistics Task",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
@@ -4276,25 +4696,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index e9869e0019..e23e58cdd9 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -663,6 +663,407 @@
   // "admin.access-control.groups.form.return": "Return to groups",
   "admin.access-control.groups.form.return": "Gruplara dön",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
 
 
   // "admin.search.breadcrumbs": "Administrative Search",
@@ -2950,7 +3351,17 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Kişiler",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Yönetici araması",
@@ -3031,6 +3442,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Erişim Kontrolü menüsü bölümü",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Yönetici arama menüsü bölümü",
 
@@ -3134,6 +3549,9 @@
   "menu.section.statistics_task": "İstatistiksel Görev",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Erişim kontrolü bölümünü aç/kapat",
@@ -3257,20 +3675,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Gönderimleriniz",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arşivlendi",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arşivlendi",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Doğrulama",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Doğrulama",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Kontrolör bekleniyor",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Kontrolör bekleniyor",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "İş akışı",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "İş akışı",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Çalışma alanı",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Çalışma alanı",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
index 5cbb480179..63377d8e51 100644
--- a/src/assets/i18n/uk.json5
+++ b/src/assets/i18n/uk.json5
@@ -699,6 +699,407 @@
 
 
 
+  // "admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+
+  // "admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Пошук адміністратора",
 
@@ -3072,6 +3473,18 @@
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Пошук адміністратора",
 
@@ -3151,6 +3564,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Меню контролю доступу",
 
+  // "menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Меню пошуку адміна",
 
@@ -3260,6 +3677,10 @@
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Переключити розділ контролю доступу",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Переключити панель контролю доступу",
 
@@ -3383,20 +3804,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Ваші надіслані документи ",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Заархівовані",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Заархівовані",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Перевірка",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Перевірка",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Чекаємо контролера",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Чекаємо контролера",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Робочий процес",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Робочий процес",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Робоче середовище",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Робоче середовище",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Моє середовище",
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
index 7627818978..f9fb33ebcb 100644
--- a/src/assets/i18n/vi.json5
+++ b/src/assets/i18n/vi.json5
@@ -671,7 +671,7 @@
   "curation-task.task.citationpage.label": "Tạo trang trích dẫn",
   "curation-task.task.noop.label": "NOOP",
   "curation-task.task.profileformats.label": "Định dạng tệp tin",
-  "curation-task.task.register-doi.label": "Đăng ký DOI",
+  "curation-task.task.registerdoi.label": "Đăng ký DOI",
   "curation-task.task.requiredmetadata.label": "Kiểm tra các trường dữ liệu bắt buộc",
   "curation-task.task.translate.label": "Bộ dịch của Microsoft",
   "curation-task.task.vscan.label": "Quét Virus",
@@ -1449,11 +1449,11 @@
   "mydspace.search-form.placeholder": "Tìm kiếm trong trang cá nhân của tôi...",
   "mydspace.show.workflow": "Tất cả nhiệm vụ",
   "mydspace.show.workspace": "Tài liệu của tôi",
-  "mydspace.status.archived": "Đã lưu trữ",
-  "mydspace.status.validation": "Đang kiểm tra",
-  "mydspace.status.waiting-for-controller": "Đợi nhận nhiệm vụ",
-  "mydspace.status.workflow": "Đang kiểm duyệt",
-  "mydspace.status.workspace": "Đang biên mục",
+  "mydspace.status.mydspaceArchived": "Đã lưu trữ",
+  "mydspace.status.mydspaceValidation": "Đang kiểm tra",
+  "mydspace.status.mydspaceWaitingController": "Đợi nhận nhiệm vụ",
+  "mydspace.status.mydspaceWorkflow": "Đang kiểm duyệt",
+  "mydspace.status.mydspaceWorkspace": "Đang biên mục",
   "mydspace.title": "Trang cá nhân",
   "mydspace.upload.upload-failed": "Có lỗi xảy ra khi tạo tài liệu mới. Vui lòng xác minh nội dung đã tải lên trước khi thử lại.",
   "mydspace.upload.upload-failed-manyentries": "Không thể xử lý tệp tin. Có quá nhiều mục trong khi hệ thống chỉ cho phép một mục trong tệp tin.",
diff --git a/src/assets/images/n-coar.png b/src/assets/images/n-coar.png
new file mode 100644
index 0000000000..5c4c741572
Binary files /dev/null and b/src/assets/images/n-coar.png differ
diff --git a/src/assets/images/qa-DSpaceUsers-logo.png b/src/assets/images/qa-DSpaceUsers-logo.png
new file mode 100644
index 0000000000..40b59feeaa
Binary files /dev/null and b/src/assets/images/qa-DSpaceUsers-logo.png differ
diff --git a/src/assets/images/qa-coar-notify-logo.png b/src/assets/images/qa-coar-notify-logo.png
new file mode 100644
index 0000000000..0ba021dfd2
Binary files /dev/null and b/src/assets/images/qa-coar-notify-logo.png differ
diff --git a/src/assets/images/qa-openaire-logo.png b/src/assets/images/qa-openaire-logo.png
new file mode 100644
index 0000000000..359fd73b84
Binary files /dev/null and b/src/assets/images/qa-openaire-logo.png differ
diff --git a/src/assets/images/ror-icon.svg b/src/assets/images/ror-icon.svg
new file mode 100644
index 0000000000..24735df519
--- /dev/null
+++ b/src/assets/images/ror-icon.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg height="100%" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" version="1.1"
+     viewBox="0 0 156 111" width="100%"
+     xml:space="preserve" xmlns="http://www.w3.org/2000/svg"
+>
+    <g transform="matrix(1,0,0,1,-4.945,-4.16)">
+        <path d="M68.65,4.16L56.52,22.74L44.38,4.16L68.65,4.16Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M119.41,4.16L107.28,22.74L95.14,4.16L119.41,4.16Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M44.38,115.47L56.52,96.88L68.65,115.47L44.38,115.47Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M95.14,115.47L107.28,96.88L119.41,115.47L95.14,115.47Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path
+        d="M145.53,63.71C149.83,62.91 153.1,61 155.33,57.99C157.57,54.98 158.68,51.32 158.68,47.03C158.68,43.47 158.06,40.51 156.83,38.13C155.6,35.75 153.93,33.86 151.84,32.45C149.75,31.05 147.31,30.04 144.53,29.44C141.75,28.84 138.81,28.54 135.72,28.54L112.16,28.54L112.16,47.37C111.97,46.82 111.77,46.28 111.55,45.74C109.92,41.79 107.64,38.42 104.71,35.64C101.78,32.86 98.32,30.72 94.3,29.23C90.29,27.74 85.9,26.99 81.14,26.99C76.38,26.99 72,27.74 67.98,29.23C63.97,30.72 60.5,32.86 57.57,35.64C54.95,38.13 52.85,41.1 51.27,44.54C51.04,42.07 50.46,39.93 49.53,38.13C48.3,35.75 46.63,33.86 44.54,32.45C42.45,31.05 40.01,30.04 37.23,29.44C34.45,28.84 31.51,28.54 28.42,28.54L4.87,28.54L4.87,89.42L18.28,89.42L18.28,65.08L24.9,65.08L37.63,89.42L53.71,89.42L38.24,63.71C42.54,62.91 45.81,61 48.04,57.99C48.14,57.85 48.23,57.7 48.33,57.56C48.31,58.03 48.3,58.5 48.3,58.98C48.3,63.85 49.12,68.27 50.75,72.22C52.38,76.17 54.66,79.54 57.59,82.32C60.51,85.1 63.98,87.24 68,88.73C72.01,90.22 76.4,90.97 81.16,90.97C85.92,90.97 90.3,90.22 94.32,88.73C98.33,87.24 101.8,85.1 104.73,82.32C107.65,79.54 109.93,76.17 111.57,72.22C111.79,71.69 111.99,71.14 112.18,70.59L112.18,89.42L125.59,89.42L125.59,65.08L132.21,65.08L144.94,89.42L161.02,89.42L145.53,63.71ZM36.39,50.81C35.67,51.73 34.77,52.4 33.68,52.83C32.59,53.26 31.37,53.52 30.03,53.6C28.68,53.69 27.41,53.73 26.2,53.73L18.29,53.73L18.29,39.89L27.06,39.89C28.26,39.89 29.5,39.98 30.76,40.15C32.02,40.32 33.14,40.65 34.11,41.14C35.08,41.63 35.89,42.33 36.52,43.25C37.15,44.17 37.47,45.4 37.47,46.95C37.47,48.6 37.11,49.89 36.39,50.81ZM98.74,66.85C97.85,69.23 96.58,71.29 94.91,73.04C93.25,74.79 91.26,76.15 88.93,77.13C86.61,78.11 84.01,78.59 81.15,78.59C78.28,78.59 75.69,78.1 73.37,77.13C71.05,76.16 69.06,74.79 67.39,73.04C65.73,71.29 64.45,69.23 63.56,66.85C62.67,64.47 62.23,61.85 62.23,58.98C62.23,56.17 62.67,53.56 63.56,51.15C64.45,48.74 65.72,46.67 67.39,44.92C69.05,43.17 71.04,41.81 73.37,40.83C75.69,39.86 78.28,39.37 81.15,39.37C84.02,39.37 86.61,39.86 88.93,40.83C91.25,41.8 93.24,43.17 94.91,44.92C96.57,46.67 97.85,48.75 98.74,51.15C99.63,53.56 100.07,56.17 100.07,58.98C100.07,61.85 99.63,64.47 98.74,66.85ZM143.68,50.81C142.96,51.73 142.06,52.4 140.97,52.83C139.88,53.26 138.66,53.52 137.32,53.6C135.97,53.69 134.7,53.73 133.49,53.73L125.58,53.73L125.58,39.89L134.35,39.89C135.55,39.89 136.79,39.98 138.05,40.15C139.31,40.32 140.43,40.65 141.4,41.14C142.37,41.63 143.18,42.33 143.81,43.25C144.44,44.17 144.76,45.4 144.76,46.95C144.76,48.6 144.4,49.89 143.68,50.81Z"
+        style="fill:rgb(32,40,38);fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/src/backend/api.ts b/src/backend/api.ts
index a2ef39711a..b84f06a960 100644
--- a/src/backend/api.ts
+++ b/src/backend/api.ts
@@ -1,16 +1,15 @@
+// Our API for demos only
+import { fakeDemoRedisCache } from './cache';
+import BITSTREAMS from './data/bitstreams.json';
+import BUNDLES from './data/bundles.json';
+import COLLECTIONS from './data/collections.json';
+import COMMUNITIES from './data/communities.json';
+import ITEMS from './data/items.json';
+import { fakeDataBase } from './db';
+
 const { Router } = require('express');
 const util = require('util');
 
-// Our API for demos only
-import { fakeDataBase } from './db';
-import { fakeDemoRedisCache } from './cache';
-
-import COMMUNITIES from './data/communities.json';
-import COLLECTIONS from './data/collections.json';
-import ITEMS from './data/items.json';
-import BUNDLES from './data/bundles.json';
-import BITSTREAMS from './data/bitstreams.json';
-
 // you would use cookies/token etc
 const USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example
 
@@ -36,12 +35,12 @@ function toHALResponse(req, data, included?) {
   const result = {
     _embedded: data,
     _links: {
-      self: req.protocol + '://' + req.get('host') + req.originalUrl
-    }
+      self: req.protocol + '://' + req.get('host') + req.originalUrl,
+    },
   };
   if (included && Array.isArray(included) && included.length > 0) {
     Object.assign(result, {
-      included: included
+      included: included,
     });
   }
   return result;
diff --git a/src/backend/cache.ts b/src/backend/cache.ts
index 8e5570f0a2..db82ff75ae 100644
--- a/src/backend/cache.ts
+++ b/src/backend/cache.ts
@@ -11,5 +11,5 @@ export const fakeDemoRedisCache = {
     return cache;
   },
   set: (key, data) => fakeDemoRedisCache._cache[key] = data,
-  clear: () => fakeDemoRedisCache._cache = {}
+  clear: () => fakeDemoRedisCache._cache = {},
 };
diff --git a/src/backend/db.ts b/src/backend/db.ts
index ec8557f1b7..6bb2e2c08c 100644
--- a/src/backend/db.ts
+++ b/src/backend/db.ts
@@ -3,5 +3,5 @@ export const fakeDataBase = {
   get() {
     const res = { data: 'This fake data came from the db on the server.' };
     return Promise.resolve(res);
-  }
+  },
 };
diff --git a/src/config/advance-search-config.interface.ts b/src/config/advance-search-config.interface.ts
new file mode 100644
index 0000000000..092dc008fc
--- /dev/null
+++ b/src/config/advance-search-config.interface.ts
@@ -0,0 +1,4 @@
+export interface AdvancedSearchConfig {
+    enabled: boolean;
+    filter: string[];
+}
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 84a30549a7..8d565d75ba 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -1,27 +1,33 @@
 import { InjectionToken } from '@angular/core';
 import { makeStateKey } from '@angular/platform-browser';
-import { Config } from './config.interface';
-import { ServerConfig } from './server-config.interface';
-import { CacheConfig } from './cache-config.interface';
-import { INotificationBoardOptions } from './notifications-config.interfaces';
-import { SubmissionConfig } from './submission-config.interface';
-import { FormConfig } from './form-config.interfaces';
-import { LangConfig } from './lang-config.interface';
-import { ItemConfig } from './item-config.interface';
-import { CollectionPageConfig } from './collection-page-config.interface';
-import { ThemeConfig } from './theme.model';
+
+import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { ActuatorsConfig } from './actuators.config';
 import { AuthConfig } from './auth-config.interfaces';
-import { UIServerConfig } from './ui-server-config.interface';
-import { MediaViewerConfig } from './media-viewer-config.interface';
 import { BrowseByConfig } from './browse-by-config.interface';
 import { BundleConfig } from './bundle-config.interface';
-import { ActuatorsConfig } from './actuators.config';
-import { InfoConfig } from './info-config.interface';
+import { CacheConfig } from './cache-config.interface';
+import { CollectionPageConfig } from './collection-page-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
-import { HomeConfig } from './homepage-config.interface';
-import { MarkdownConfig } from './markdown-config.interface';
-import { FilterVocabularyConfig } from './filter-vocabulary-config';
+import { CommunityPageConfig } from './community-page-config.interface';
+import { Config } from './config.interface';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
+import { FormConfig } from './form-config.interfaces';
+import { HomeConfig } from './homepage-config.interface';
+import { InfoConfig } from './info-config.interface';
+import { ItemConfig } from './item-config.interface';
+import { LangConfig } from './lang-config.interface';
+import { MarkdownConfig } from './markdown-config.interface';
+import { MediaViewerConfig } from './media-viewer-config.interface';
+import { INotificationBoardOptions } from './notifications-config.interfaces';
+import { QualityAssuranceConfig } from './quality-assurance.config';
+import { SearchConfig } from './search-page-config.interface';
+import { ServerConfig } from './server-config.interface';
+import { SubmissionConfig } from './submission-config.interface';
+import { SuggestionConfig } from './suggestion-config.interfaces';
+import { ThemeConfig } from './theme.config';
+import { UIServerConfig } from './ui-server-config.interface';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -39,15 +45,20 @@ interface AppConfig extends Config {
   communityList: CommunityListConfig;
   homePage: HomeConfig;
   item: ItemConfig;
+  community: CommunityPageConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
   mediaViewer: MediaViewerConfig;
+  suggestion: SuggestionConfig[];
   bundle: BundleConfig;
   actuators: ActuatorsConfig
   info: InfoConfig;
   markdown: MarkdownConfig;
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
+  qualityAssuranceConfig: QualityAssuranceConfig;
+  search: SearchConfig;
+  notifyMetrics: AdminNotifyMetricsRow[];
 }
 
 /**
@@ -59,7 +70,7 @@ const APP_CONFIG = new InjectionToken<AppConfig>('APP_CONFIG');
 const APP_CONFIG_STATE = makeStateKey<AppConfig>('APP_CONFIG_STATE');
 
 export {
-  AppConfig,
   APP_CONFIG,
-  APP_CONFIG_STATE
+  APP_CONFIG_STATE,
+  AppConfig,
 };
diff --git a/src/config/cache-config.interface.ts b/src/config/cache-config.interface.ts
index 73520c95ea..9d3fc168cb 100644
--- a/src/config/cache-config.interface.ts
+++ b/src/config/cache-config.interface.ts
@@ -1,5 +1,5 @@
-import { Config } from './config.interface';
 import { AutoSyncConfig } from './auto-sync-config.interface';
+import { Config } from './config.interface';
 
 export interface CacheConfig extends Config {
   msToLive: {
diff --git a/src/config/collection-page-config.interface.ts b/src/config/collection-page-config.interface.ts
index c056df66ed..6b8352e686 100644
--- a/src/config/collection-page-config.interface.ts
+++ b/src/config/collection-page-config.interface.ts
@@ -1,7 +1,18 @@
 import { Config } from './config.interface';
 
+/**
+ * Collection Page Config
+ */
 export interface CollectionPageConfig extends Config {
+  searchSection: CollectionSearchSectionConfig;
   edit: {
     undoTimeout: number;
   };
 }
+
+/**
+ * Config related to the collection's search tab
+ */
+export interface CollectionSearchSectionConfig {
+  showSidebar: boolean;
+}
diff --git a/src/config/community-page-config.interface.ts b/src/config/community-page-config.interface.ts
new file mode 100644
index 0000000000..268f4d6a5e
--- /dev/null
+++ b/src/config/community-page-config.interface.ts
@@ -0,0 +1,15 @@
+import { Config } from './config.interface';
+
+/**
+ * Community Page Config
+ */
+export interface CommunityPageConfig extends Config {
+  searchSection: CommunitySearchSectionConfig;
+}
+
+/**
+ * Config related to the community's search tab
+ */
+export interface CommunitySearchSectionConfig {
+  showSidebar: boolean;
+}
diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 65daede0a8..69825b6409 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -1,14 +1,23 @@
-import { red, blue, green, bold } from 'colors';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import {
+  blue,
+  bold,
+  green,
+  red,
+} from 'colors';
+import {
+  existsSync,
+  readFileSync,
+  writeFileSync,
+} from 'fs';
 import { load } from 'js-yaml';
 import { join } from 'path';
 
+import { isNotEmpty } from '../app/shared/empty.util';
 import { AppConfig } from './app-config.interface';
 import { Config } from './config.interface';
+import { mergeConfig } from './config.util';
 import { DefaultAppConfig } from './default-app-config';
 import { ServerConfig } from './server-config.interface';
-import { mergeConfig } from './config.util';
-import { isNotEmpty } from '../app/shared/empty.util';
 
 const CONFIG_PATH = join(process.cwd(), 'config');
 
@@ -155,7 +164,7 @@ const buildBaseUrl = (config: ServerConfig): void => {
     config.ssl ? 'https://' : 'http://',
     config.host,
     config.port && config.port !== 80 && config.port !== 443 ? `:${config.port}` : '',
-    config.nameSpace && config.nameSpace.startsWith('/') ? config.nameSpace : `/${config.nameSpace}`
+    config.nameSpace && config.nameSpace.startsWith('/') ? config.nameSpace : `/${config.nameSpace}`,
   ].join('');
 };
 
diff --git a/src/config/config.util.spec.ts b/src/config/config.util.spec.ts
index 2d1d8e1be7..dad16048c0 100644
--- a/src/config/config.util.spec.ts
+++ b/src/config/config.util.spec.ts
@@ -1,7 +1,7 @@
 import { environment } from '../environments/environment.production';
 import { extendEnvironmentWithAppConfig } from './config.util';
 import { DefaultAppConfig } from './default-app-config';
-import { HandleThemeConfig } from './theme.model';
+import { HandleThemeConfig } from './theme.config';
 
 describe('Config Util', () => {
   describe('extendEnvironmentWithAppConfig', () => {
@@ -13,6 +13,7 @@ describe('Config Util', () => {
       expect(appConfig.ui.useProxies).toEqual(true);
 
       expect(appConfig.submission.autosave.metadata).toEqual([]);
+      expect(appConfig.submission.duplicateDetection.alwaysShowSection).toEqual(false);
 
       expect(appConfig.themes.length).toEqual(1);
       expect(appConfig.themes[0].name).toEqual('dspace');
@@ -22,7 +23,7 @@ describe('Config Util', () => {
 
       const rateLimiter = {
         windowMs: 5 * 50 * 1000, // 5 minutes
-        max: 1000
+        max: 1000,
       };
       appConfig.ui.rateLimiter = rateLimiter;
 
@@ -30,14 +31,14 @@ describe('Config Util', () => {
 
       const autoSaveMetadata = [
         'dc.author',
-        'dc.title'
+        'dc.title',
       ];
 
       appConfig.submission.autosave.metadata = autoSaveMetadata;
 
       const customTheme: HandleThemeConfig = {
         name: 'custom',
-        handle: '10673/1233'
+        handle: '10673/1233',
       };
 
       appConfig.themes.push(customTheme);
diff --git a/src/config/config.util.ts b/src/config/config.util.ts
index 3d152d4563..005606e70f 100644
--- a/src/config/config.util.ts
+++ b/src/config/config.util.ts
@@ -1,11 +1,13 @@
 import { all } from 'deepmerge';
 
-import { environment } from '../environments/environment';
-
 import { hasNoValue } from '../app/shared/empty.util';
-
+import { BASE_THEME_NAME } from '../app/shared/theme-support/theme.constants';
+import { environment } from '../environments/environment';
 import { AppConfig } from './app-config.interface';
-import { ThemeConfig } from './theme.model';
+import {
+  NamedThemeConfig,
+  ThemeConfig,
+} from './theme.config';
 
 /**
  * Extend Angular environment with app config.
@@ -26,11 +28,11 @@ const extendEnvironmentWithAppConfig = (env: any, appConfig: AppConfig): void =>
  */
 const mergeConfig = (destinationConfig: any, sourceConfig: AppConfig): void => {
   const mergeOptions = {
-    arrayMerge: (destinationArray, sourceArray, options) => sourceArray
+    arrayMerge: (destinationArray, sourceArray, options) => sourceArray,
   };
   Object.assign(destinationConfig, all([
     destinationConfig,
-    sourceConfig
+    sourceConfig,
   ], mergeOptions));
 };
 
@@ -43,12 +45,14 @@ const getDefaultThemeConfig = (): ThemeConfig => {
   return environment.themes.find((themeConfig: any) =>
     hasNoValue(themeConfig.regex) &&
     hasNoValue(themeConfig.handle) &&
-    hasNoValue(themeConfig.uuid)
-  );
+    hasNoValue(themeConfig.uuid),
+  ) ?? {
+    name: BASE_THEME_NAME,
+  } as NamedThemeConfig;
 };
 
 export {
   extendEnvironmentWithAppConfig,
+  getDefaultThemeConfig,
   mergeConfig,
-  getDefaultThemeConfig
 };
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index a6e9e092e4..d148dee148 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -1,27 +1,32 @@
+import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
+import { ActuatorsConfig } from './actuators.config';
 import { AppConfig } from './app-config.interface';
 import { AuthConfig } from './auth-config.interfaces';
 import { BrowseByConfig } from './browse-by-config.interface';
+import { BundleConfig } from './bundle-config.interface';
 import { CacheConfig } from './cache-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
+import { CommunityListConfig } from './community-list-config.interface';
+import { CommunityPageConfig } from './community-page-config.interface';
+import { DiscoverySortConfig } from './discovery-sort.config';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { FormConfig } from './form-config.interfaces';
+import { HomeConfig } from './homepage-config.interface';
+import { InfoConfig } from './info-config.interface';
 import { ItemConfig } from './item-config.interface';
 import { LangConfig } from './lang-config.interface';
+import { MarkdownConfig } from './markdown-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
 import { INotificationBoardOptions } from './notifications-config.interfaces';
+import { QualityAssuranceConfig } from './quality-assurance.config';
+import { SearchConfig } from './search-page-config.interface';
 import { ServerConfig } from './server-config.interface';
 import { SubmissionConfig } from './submission-config.interface';
-import { ThemeConfig } from './theme.model';
+import { SuggestionConfig } from './suggestion-config.interfaces';
+import { ThemeConfig } from './theme.config';
 import { UIServerConfig } from './ui-server-config.interface';
-import { BundleConfig } from './bundle-config.interface';
-import { ActuatorsConfig } from './actuators.config';
-import { InfoConfig } from './info-config.interface';
-import { CommunityListConfig } from './community-list-config.interface';
-import { HomeConfig } from './homepage-config.interface';
-import { MarkdownConfig } from './markdown-config.interface';
-import { FilterVocabularyConfig } from './filter-vocabulary-config';
-import { DiscoverySortConfig } from './discovery-sort.config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -41,7 +46,7 @@ export class DefaultAppConfig implements AppConfig {
     // The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
-      max: 500 // limit each IP to 500 requests per windowMs
+      max: 500, // limit each IP to 500 requests per windowMs
     },
 
     // Trust X-FORWARDED-* headers from proxies
@@ -59,21 +64,21 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   actuators: ActuatorsConfig = {
-    endpointPath: '/actuator/health'
+    endpointPath: '/actuator/health',
   };
 
   // Caching settings
   cache: CacheConfig = {
     // NOTE: how long should objects be cached for by default
     msToLive: {
-      default: 15 * 60 * 1000 // 15 minutes
+      default: 15 * 60 * 1000, // 15 minutes
     },
     // Cache-Control HTTP Header
     control: 'max-age=604800', // revalidate browser
     autoSync: {
       defaultTime: 0,
       maxBufferSize: 100,
-      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
+      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any, // time in seconds
     },
     // In-memory cache of server-side rendered content
     serverSide: {
@@ -97,8 +102,8 @@ export class DefaultAppConfig implements AppConfig {
         // Amount of time after which cached pages are considered stale (in ms)
         timeToLive: 10 * 1000, // 10 seconds
         allowStale: true,
-      }
-    }
+      },
+    },
   };
 
   // Authentication settings
@@ -108,14 +113,14 @@ export class DefaultAppConfig implements AppConfig {
       // the amount of time before the idle warning is shown
       timeUntilIdle: 15 * 60 * 1000, // 15 minutes
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
-      idleGracePeriod: 5 * 60 * 1000 // 5 minutes
+      idleGracePeriod: 5 * 60 * 1000, // 5 minutes
     },
     // Authentication REST settings
     rest: {
       // If the rest token expires in less than this amount of time, it will be refreshed automatically.
       // This is independent from the idle warning.
-      timeLeftBeforeTokenRefresh: 2 * 60 * 1000 // 2 minutes
-    }
+      timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
+    },
   };
 
   // Form settings
@@ -124,8 +129,8 @@ export class DefaultAppConfig implements AppConfig {
     // NOTE: Map server-side validators to comparative Angular form validators
     validatorMap: {
       required: 'required',
-      regex: 'pattern'
-    }
+      regex: 'pattern',
+    },
   };
 
   // Notifications
@@ -137,7 +142,7 @@ export class DefaultAppConfig implements AppConfig {
     timeOut: 5000, // 5 second
     clickToClose: true,
     // NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
-    animate: NotificationAnimationsType.Scale
+    animate: NotificationAnimationsType.Scale,
   };
 
   // Submission settings
@@ -149,10 +154,13 @@ export class DefaultAppConfig implements AppConfig {
        * NOTE: after how many time (milliseconds) submission is saved automatically
        * eg. timer: 5 * (1000 * 60); // 5 minutes
        */
-      timer: 0
+      timer: 0,
+    },
+    duplicateDetection: {
+      alwaysShowSection: false,
     },
     typeBind: {
-      field: 'dc.type'
+      field: 'dc.type',
     },
     icons: {
       metadata: [
@@ -161,19 +169,19 @@ export class DefaultAppConfig implements AppConfig {
          * {
          *    // NOTE: metadata name
          *    name: 'dc.author',
-         *    // NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+         *    // NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
          *    style: 'fa-user'
          * }
          */
         {
           name: 'dc.author',
-          style: 'fas fa-user'
+          style: 'fas fa-user',
         },
         // default configuration
         {
           name: 'default',
-          style: ''
-        }
+          style: '',
+        },
       ],
       authority: {
         confidence: [
@@ -181,32 +189,64 @@ export class DefaultAppConfig implements AppConfig {
            * NOTE: example of configuration
            * {
            *    // NOTE: confidence value
-           *    value: 'dc.author',
-           *    // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used
-           *    style: 'fa-user'
+           *    value: 100,
+           *    // NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
+           *    style: 'text-success',
+           *    icon: 'fa-circle-check'
+           *    // NOTE: the class configured in property style is used by default, the icon property could be used in component
+           *    //      configured to use a 'icon mode' display (mainly in edit-item page)
            * }
            */
           {
             value: 600,
-            style: 'text-success'
+            style: 'text-success',
+            icon: 'fa-circle-check',
           },
           {
             value: 500,
-            style: 'text-info'
+            style: 'text-info',
+            icon: 'fa-gear',
           },
           {
             value: 400,
-            style: 'text-warning'
+            style: 'text-warning',
+            icon: 'fa-circle-question',
+          },
+          {
+            value: 300,
+            style: 'text-muted',
+            icon: 'fa-circle-question',
+          },
+          {
+            value: 200,
+            style: 'text-muted',
+            icon: 'fa-circle-exclamation',
+          },
+          {
+            value: 100,
+            style: 'text-muted',
+            icon: 'fa-circle-stop',
+          },
+          {
+            value: 0,
+            style: 'text-muted',
+            icon: 'fa-ban',
+          },
+          {
+            value: -1,
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
           },
           // default configuration
           {
             value: 'default',
-            style: 'text-muted'
-          }
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
+          },
 
-        ]
-      }
-    }
+        ],
+      },
+    },
   };
 
   // Default Language in which the UI will be rendered if the user's browser language is not an active language
@@ -229,15 +269,17 @@ export class DefaultAppConfig implements AppConfig {
     { code: 'pl', label: 'Polski', active: true },
     { code: 'pt-PT', label: 'Português', active: true },
     { code: 'pt-BR', label: 'Português do Brasil', active: true },
+    { code: 'sr-lat', label: 'Srpski (lat)', active: true },
     { code: 'fi', label: 'Suomi', active: true },
     { code: 'sv', label: 'Svenska', active: true },
     { code: 'tr', label: 'Türkçe', active: true },
     { code: 'vi', label: 'Tiếng Việt', active: true },
     { code: 'kk', label: 'Қазақ', active: true },
     { code: 'bn', label: 'বাংলা', active: true },
-    { code: 'hi', label: 'हिंदी', active: true},
+    { code: 'hi', label: 'हिंदी', active: true },
     { code: 'el', label: 'Ελληνικά', active: true },
-    { code: 'uk', label: 'Yкраї́нська', active: true}
+    { code: 'sr-cyr', label: 'Српски', active: true },
+    { code: 'uk', label: 'Yкраї́нська', active: true },
   ];
 
   // Browse-By Pages
@@ -253,11 +295,11 @@ export class DefaultAppConfig implements AppConfig {
     // The number of entries in a paginated browse results list.
     // Rounded to the nearest size in the list of selectable sizes on the
     // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
-    pageSize: 20
+    pageSize: 20,
   };
 
   communityList: CommunityListConfig = {
-    pageSize: 20
+    pageSize: 20,
   };
 
   homePage: HomeConfig = {
@@ -268,14 +310,15 @@ export class DefaultAppConfig implements AppConfig {
       sortField: 'dc.date.accessioned',
     },
     topLevelCommunityList: {
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+    showDiscoverFilters: false,
   };
 
   // Item Config
   item: ItemConfig = {
     edit: {
-      undoTimeout: 10000 // 10 seconds
+      undoTimeout: 10000, // 10 seconds
     },
     // Show the item access status label in items lists
     showAccessStatuses: false,
@@ -283,17 +326,38 @@ export class DefaultAppConfig implements AppConfig {
       // Number of entries in the bitstream list in the item view page.
       // Rounded to the nearest size in the list of selectable sizes on the
       // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+  };
+
+  // Community Page Config
+  community: CommunityPageConfig = {
+    searchSection: {
+      showSidebar: true,
+    },
   };
 
   // Collection Page Config
   collection: CollectionPageConfig = {
+    searchSection: {
+      showSidebar: true,
+    },
     edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
+      undoTimeout: 10000, // 10 seconds
+    },
   };
 
+  suggestion: SuggestionConfig[] = [
+    // {
+    //   // Use this configuration to map a suggestion import to a specific collection based on the suggestion type.
+    //   source: 'suggestionSource',
+    //   collectionId: 'collectionUUID'
+    // }
+    // This is used as a default fallback in case there aren't collections where to import the suggestion
+    // If not mapped the user will be allowed to import the suggestions only in the provided options, shown clicking the button "Approve and import"
+    // If not mapped and no options available for import the user won't be able to import the suggestions.
+  ];
+
   // Theme Config
   themes: ThemeConfig[] = [
     // Add additional themes here. In the case where multiple themes match a route, the first one
@@ -354,7 +418,7 @@ export class DefaultAppConfig implements AppConfig {
             'rel': 'icon',
             'href': 'assets/dspace/images/favicons/favicon.ico',
             'sizes': 'any',
-          }
+          },
         },
         {
           // Insert <link rel="icon" href="assets/dspace/images/favicons/favicon.svg" type="image/svg+xml"/> into the <head> of the page.
@@ -363,7 +427,7 @@ export class DefaultAppConfig implements AppConfig {
             'rel': 'icon',
             'href': 'assets/dspace/images/favicons/favicon.svg',
             'type': 'image/svg+xml',
-          }
+          },
         },
         {
           // Insert <link rel="apple-touch-icon" href="assets/dspace/images/favicons/apple-touch-icon.png"/> into the <head> of the page.
@@ -371,7 +435,7 @@ export class DefaultAppConfig implements AppConfig {
           attributes: {
             'rel': 'apple-touch-icon',
             'href': 'assets/dspace/images/favicons/apple-touch-icon.png',
-          }
+          },
         },
         {
           // Insert <link rel="manifest" href="assets/dspace/images/favicons/manifest.webmanifest"/> into the <head> of the page.
@@ -379,22 +443,22 @@ export class DefaultAppConfig implements AppConfig {
           attributes: {
             'rel': 'manifest',
             'href': 'assets/dspace/images/favicons/manifest.webmanifest',
-          }
+          },
         },
-      ]
+      ],
     },
   ];
   // The default bundles that should always be displayed when you edit or add a bundle even when no bundle has been
   // added to the item yet.
   bundle: BundleConfig = {
-    standardBundles: ['ORIGINAL', 'THUMBNAIL', 'LICENSE']
+    standardBundles: ['ORIGINAL', 'THUMBNAIL', 'LICENSE'],
   };
   // Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").
   // For images, this enables a gallery viewer where you can zoom or page through images.
   // For videos, this enables embedded video streaming
   mediaViewer: MediaViewerConfig = {
     image: false,
-    video: false
+    video: false,
   };
   // Whether the end-user-agreement and privacy policy feature should be enabled or not.
   // Disabling the end user agreement feature will result in:
@@ -406,7 +470,7 @@ export class DefaultAppConfig implements AppConfig {
   // - All mentions of the privacy policy being removed from the UI (e.g. in the footer)
   info: InfoConfig = {
     enableEndUserAgreement: true,
-    enablePrivacyStatement: true
+    enablePrivacyStatement: true,
   };
 
   // Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
@@ -423,13 +487,103 @@ export class DefaultAppConfig implements AppConfig {
     {
       filter: 'subject',
       vocabulary: 'srsc',
-      enabled: false
-    }
-    ];
+      enabled: false,
+    },
+  ];
 
   // Configuration that determines the metadata sorting of community and collection edition and creation when there are not a search query.
   comcolSelectionSort: DiscoverySortConfig = {
     sortField:'dc.title',
     sortDirection:'ASC',
   };
+
+  qualityAssuranceConfig: QualityAssuranceConfig = {
+    sourceUrlMapForProjectSearch: {
+      openaire: 'https://explore.openaire.eu/search/project?projectId=',
+    },
+    pageSize: 5,
+  };
+
+
+  search: SearchConfig = {
+    advancedFilters: {
+      enabled: false,
+      filter: ['title', 'author', 'subject', 'entityType'],
+    },
+  };
+
+  notifyMetrics: AdminNotifyMetricsRow[] = [
+    {
+      title: 'admin-notify-dashboard.received-ldn',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
+          config: 'NOTIFY.incoming.accepted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description',
+        },
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
+          config: 'NOTIFY.incoming.processed',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
+          config: 'NOTIFY.incoming.failure',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
+          config: 'NOTIFY.incoming.untrusted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.incoming.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description',
+        },
+      ],
+    },
+    {
+      title: 'admin-notify-dashboard.generated-ldn',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
+          config: 'NOTIFY.outgoing.delivered',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description',
+        },
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
+          config: 'NOTIFY.outgoing.queued',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description',
+        },
+        {
+          color: '#FDEEBB',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
+          config: 'NOTIFY.outgoing.queued_for_retry',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
+          config: 'NOTIFY.outgoing.failure',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.outgoing.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
+        },
+      ],
+    },
+  ];
 }
diff --git a/src/config/homepage-config.interface.ts b/src/config/homepage-config.interface.ts
index df5d29cfe0..48fd9077a9 100644
--- a/src/config/homepage-config.interface.ts
+++ b/src/config/homepage-config.interface.ts
@@ -1,7 +1,7 @@
 import { Config } from './config.interface';
 
 /**
- * Config that determines how the dropdown list of years are created for browse-by-date components
+ * Config that determines how the recentSubmissions list showing at home page
  */
 export interface HomeConfig extends Config {
   recentSubmissions: {
@@ -19,4 +19,8 @@ export interface HomeConfig extends Config {
   topLevelCommunityList: {
     pageSize: number;
   };
+  /*
+  * Enable or disable the Discover filters on the homepage
+  */
+  showDiscoverFilters: boolean;
 }
diff --git a/src/config/notifications-config.interfaces.ts b/src/config/notifications-config.interfaces.ts
index 49cdf277c3..e57907c1bf 100644
--- a/src/config/notifications-config.interfaces.ts
+++ b/src/config/notifications-config.interfaces.ts
@@ -1,5 +1,5 @@
-import { Config } from './config.interface';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
+import { Config } from './config.interface';
 
 export interface INotificationBoardOptions extends Config {
   rtl: boolean;
diff --git a/src/config/quality-assurance.config.ts b/src/config/quality-assurance.config.ts
new file mode 100644
index 0000000000..7b2723f9d9
--- /dev/null
+++ b/src/config/quality-assurance.config.ts
@@ -0,0 +1,17 @@
+import { Config } from './config.interface';
+
+/**
+ * Config that determines a metadata sorting config.
+ * It's created mainly to sort by metadata community and collection edition and creation
+ */
+export class QualityAssuranceConfig implements Config {
+
+  /**
+   * Url for project search on quality assurance resource
+   */
+  public sourceUrlMapForProjectSearch: {[key: string]: string};
+  /**
+   * default count of QA sources to load
+   */
+  public pageSize: number;
+}
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
new file mode 100644
index 0000000000..699e3fd61f
--- /dev/null
+++ b/src/config/search-page-config.interface.ts
@@ -0,0 +1,12 @@
+import { AdvancedSearchConfig } from './advance-search-config.interface';
+import { Config } from './config.interface';
+
+export interface SearchConfig extends Config {
+
+    /**
+     * List of standard filter to select in adding advanced Search
+     * Used by {@link UploadBitstreamComponent}.
+     */
+    advancedFilters: AdvancedSearchConfig;
+
+}
diff --git a/src/config/store/devtools.ts b/src/config/store/devtools.ts
index 5672efccd3..e71c2717ce 100644
--- a/src/config/store/devtools.ts
+++ b/src/config/store/devtools.ts
@@ -6,5 +6,5 @@ export const StoreDevModules = [
   StoreDevtoolsModule.instrument({
     maxAge: 1000,
     logOnly: false,
-  })
+  }),
 ];
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index a63af45e38..afc81a39e2 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -5,6 +5,10 @@ interface AutosaveConfig extends Config {
   timer: number;
 }
 
+interface DuplicateDetectionConfig extends Config {
+  alwaysShowSection: boolean;
+}
+
 interface TypeBindConfig extends Config {
   field: string;
 }
@@ -24,10 +28,12 @@ export interface MetadataIconConfig extends Config {
 export interface ConfidenceIconConfig extends Config {
   value: any;
   style: string;
+  icon: string;
 }
 
 export interface SubmissionConfig extends Config {
   autosave: AutosaveConfig;
+  duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
 }
diff --git a/src/config/suggestion-config.interfaces.ts b/src/config/suggestion-config.interfaces.ts
new file mode 100644
index 0000000000..afd3a38c58
--- /dev/null
+++ b/src/config/suggestion-config.interfaces.ts
@@ -0,0 +1,6 @@
+import { Config } from './config.interface';
+
+export interface SuggestionConfig extends Config {
+  source: string;
+  collectionId: string;
+}
diff --git a/src/config/theme.config.ts b/src/config/theme.config.ts
new file mode 100644
index 0000000000..7989dc3af9
--- /dev/null
+++ b/src/config/theme.config.ts
@@ -0,0 +1,51 @@
+import { Config } from './config.interface';
+
+export interface NamedThemeConfig extends Config {
+  name: string;
+
+  /**
+   * Specify another theme to build upon: whenever a themed component is not found in the current theme,
+   * its ancestor theme(s) will be checked recursively before falling back to the default theme.
+   */
+  extends?: string;
+
+  /**
+   * A list of HTML tags that should be added to the HEAD section of the document, whenever this theme is active.
+   */
+  headTags?: HeadTagConfig[];
+}
+
+/**
+ * Interface that represents a single theme-specific HTML tag in the HEAD section of the page.
+ */
+export interface HeadTagConfig extends Config {
+  /**
+   * The name of the HTML tag
+   */
+  tagName: string;
+
+  /**
+   * The attributes on the HTML tag
+   */
+  attributes?: {
+    [key: string]: string;
+  };
+}
+
+export interface RegExThemeConfig extends NamedThemeConfig {
+  regex: string;
+}
+
+export interface HandleThemeConfig extends NamedThemeConfig {
+  handle: string;
+}
+
+export interface UUIDThemeConfig extends NamedThemeConfig {
+  uuid: string;
+}
+
+export type ThemeConfig
+  = NamedThemeConfig
+  | RegExThemeConfig
+  | HandleThemeConfig
+  | UUIDThemeConfig;
diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts
index 79b5a1f32b..4c053bebb1 100644
--- a/src/config/theme.model.spec.ts
+++ b/src/config/theme.model.spec.ts
@@ -1,20 +1,29 @@
-import { HandleTheme, RegExTheme, Theme, UUIDTheme } from './theme.model';
+import { TestBed } from '@angular/core/testing';
+
+import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths';
 import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths';
+import { ConfigurationDataService } from '../app/core/data/configuration-data.service';
+import { Collection } from '../app/core/shared/collection.model';
+import { COLLECTION } from '../app/core/shared/collection.resource-type';
 import { Community } from '../app/core/shared/community.model';
 import { COMMUNITY } from '../app/core/shared/community.resource-type';
-import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths';
-import { COLLECTION } from '../app/core/shared/collection.resource-type';
-import { Collection } from '../app/core/shared/collection.model';
 import { Item } from '../app/core/shared/item.model';
 import { ITEM } from '../app/core/shared/item.resource-type';
 import { getItemModuleRoute } from '../app/item-page/item-page-routing-paths';
 import { HandleService } from '../app/shared/handle.service';
+import { ConfigurationDataServiceStub } from '../app/shared/testing/configuration-data.service.stub';
+import {
+  HandleTheme,
+  RegExTheme,
+  Theme,
+  UUIDTheme,
+} from '../app/shared/theme-support/theme.model';
 
 describe('Theme Models', () => {
   let theme: Theme;
 
   describe('RegExTheme', () => {
-    it('should return true when the regex matches the community\'s DSO route', () => {
+    it('should return true when the regex matches the community\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'community',
         regex: getCommunityModuleRoute() + '/.*',
@@ -23,10 +32,13 @@ describe('Theme Models', () => {
         type: COMMUNITY.value,
         uuid: 'community-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the collection\'s DSO route', () => {
+    it('should return true when the regex matches the collection\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'collection',
         regex: getCollectionModuleRoute() + '/.*',
@@ -35,10 +47,13 @@ describe('Theme Models', () => {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the item\'s DSO route', () => {
+    it('should return true when the regex matches the item\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'item',
         regex: getItemModuleRoute() + '/.*',
@@ -47,32 +62,51 @@ describe('Theme Models', () => {
         type: ITEM.value,
         uuid: 'item-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the url', () => {
+    it('should return true when the regex matches the url', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'url',
         regex: '.*partial.*',
       });
-      expect(theme.matches('theme/partial/url/match', null)).toEqual(true);
+      theme.matches('theme/partial/url/match', null).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return false when the regex matches neither the url, nor the DSO route', () => {
+    it('should return false when the regex matches neither the url, nor the DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'no-match',
         regex: '.*no/match.*',
       });
-      expect(theme.matches('theme/partial/url/match', null)).toEqual(false);
+      theme.matches('theme/partial/url/match', null).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 
   describe('HandleTheme', () => {
-    let handleService;
+    let handleService: HandleService;
+
+    let configurationService: ConfigurationDataServiceStub;
+
     beforeEach(() => {
-      handleService = new HandleService();
+      configurationService = new ConfigurationDataServiceStub();
+
+      TestBed.configureTestingModule({
+        providers: [
+          { provide: ConfigurationDataService, useValue: configurationService },
+        ],
       });
-    it('should return true when the DSO\'s handle matches the theme\'s handle', () => {
+      handleService = TestBed.inject(HandleService);
+    });
+    it('should return true when the DSO\'s handle matches the theme\'s handle', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'matching-handle',
         handle: '1234/5678',
@@ -82,9 +116,12 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/5678',
       }, handleService);
-      expect(theme.matches('', matchingDso)).toEqual(true);
+      theme.matches('', matchingDso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
-    it('should return false when the DSO\'s handle contains the theme\'s handle as a subpart', () => {
+    it('should return false when the DSO\'s handle contains the theme\'s handle as a subpart', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'matching-handle',
         handle: '1234/5678',
@@ -94,10 +131,13 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/567891011',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
 
-    it('should return false when the handles don\'t match', () => {
+    it('should return false when the handles don\'t match', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'no-matching-handle',
         handle: '1234/5678',
@@ -107,12 +147,15 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/6789',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 
   describe('UUIDTheme', () => {
-    it('should return true when the DSO\'s UUID matches the theme\'s UUID', () => {
+    it('should return true when the DSO\'s UUID matches the theme\'s UUID', (done: DoneFn) => {
       theme = new UUIDTheme({
         name: 'matching-uuid',
         uuid: 'item-uuid',
@@ -121,10 +164,13 @@ describe('Theme Models', () => {
         type: ITEM.value,
         uuid: 'item-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the UUIDs don\'t match', () => {
+    it('should return true when the UUIDs don\'t match', (done: DoneFn) => {
       theme = new UUIDTheme({
         name: 'matching-uuid',
         uuid: 'item-uuid',
@@ -133,7 +179,10 @@ describe('Theme Models', () => {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 });
diff --git a/src/config/theme.model.ts b/src/config/theme.model.ts
deleted file mode 100644
index 019540f18a..0000000000
--- a/src/config/theme.model.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/* eslint-disable max-classes-per-file */
-import { Config } from './config.interface';
-import { hasValue, hasNoValue, isNotEmpty } from '../app/shared/empty.util';
-import { DSpaceObject } from '../app/core/shared/dspace-object.model';
-import { getDSORoute } from '../app/app-routing-paths';
-import { HandleObject } from '../app/core/shared/handle-object.model';
-import { Injector } from '@angular/core';
-import { HandleService } from '../app/shared/handle.service';
-
-export interface NamedThemeConfig extends Config {
-  name: string;
-
-  /**
-   * Specify another theme to build upon: whenever a themed component is not found in the current theme,
-   * its ancestor theme(s) will be checked recursively before falling back to the default theme.
-   */
-  extends?: string;
-
-  /**
-   * A list of HTML tags that should be added to the HEAD section of the document, whenever this theme is active.
-   */
-  headTags?: HeadTagConfig[];
-}
-
-/**
- * Interface that represents a single theme-specific HTML tag in the HEAD section of the page.
- */
-export interface HeadTagConfig extends Config {
-  /**
-   * The name of the HTML tag
-   */
-  tagName: string;
-
-  /**
-   * The attributes on the HTML tag
-   */
-  attributes?: {
-    [key: string]: string;
-  };
-}
-
-export interface RegExThemeConfig extends NamedThemeConfig {
-  regex: string;
-}
-
-export interface HandleThemeConfig extends NamedThemeConfig {
-  handle: string;
-}
-
-export interface UUIDThemeConfig extends NamedThemeConfig {
-  uuid: string;
-}
-
-export class Theme {
-  constructor(public config: NamedThemeConfig) {
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    return true;
-  }
-}
-
-export class RegExTheme extends Theme {
-  regex: RegExp;
-
-  constructor(public config: RegExThemeConfig) {
-    super(config);
-    this.regex = new RegExp(this.config.regex);
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    let match;
-    const route = getDSORoute(dso);
-
-    if (isNotEmpty(route)) {
-      match = route.match(this.regex);
-    }
-
-    if (hasNoValue(match)) {
-      match = url.match(this.regex);
-    }
-
-    return hasValue(match);
-  }
-}
-
-export class HandleTheme extends Theme {
-
-  private normalizedHandle;
-
-  constructor(public config: HandleThemeConfig,
-              protected handleService: HandleService
-              ) {
-    super(config);
-    this.normalizedHandle = this.handleService.normalizeHandle(this.config.handle);
-
-  }
-
-  matches<T extends DSpaceObject & HandleObject>(url: string, dso: T): boolean {
-    return hasValue(dso) && hasValue(dso.handle)
-      && this.handleService.normalizeHandle(dso.handle) === this.normalizedHandle;
-  }
-}
-
-export class UUIDTheme extends Theme {
-  constructor(public config: UUIDThemeConfig) {
-    super(config);
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    return hasValue(dso) && dso.uuid === this.config.uuid;
-  }
-}
-
-export const themeFactory = (config: ThemeConfig, injector: Injector): Theme => {
-  if (hasValue((config as RegExThemeConfig).regex)) {
-    return new RegExTheme(config as RegExThemeConfig);
-  } else if (hasValue((config as HandleThemeConfig).handle)) {
-    return new HandleTheme(config as HandleThemeConfig, injector.get(HandleService));
-  } else if (hasValue((config as UUIDThemeConfig).uuid)) {
-    return new UUIDTheme(config as UUIDThemeConfig);
-  } else {
-    return new Theme(config as NamedThemeConfig);
-  }
-};
-
-export type ThemeConfig
-  = NamedThemeConfig
-  | RegExThemeConfig
-  | HandleThemeConfig
-  | UUIDThemeConfig;
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 09b5f19ade..e9028b2828 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -7,6 +7,6 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: true,
     async: true,
-    time: false
-  }
+    time: false,
+  },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index cb9d2c7130..0fc03f2a4c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -1,5 +1,6 @@
 // This configuration is only used for unit tests, end-to-end tests use environment.production.ts
 import { BuildConfig } from 'src/config/build-config.interface';
+
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
 
@@ -10,7 +11,7 @@ export const environment: BuildConfig = {
   universal: {
     preboot: true,
     async: true,
-    time: false
+    time: false,
   },
 
   // Angular Universal server settings.
@@ -24,7 +25,7 @@ export const environment: BuildConfig = {
     // The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
-      max: 500 // limit each IP to 500 requests per windowMs
+      max: 500, // limit each IP to 500 requests per windowMs
     },
     useProxies: true,
   },
@@ -36,11 +37,11 @@ export const environment: BuildConfig = {
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/api',
-    baseUrl: 'https://rest.com/api'
+    baseUrl: 'https://rest.com/api',
   },
 
   actuators: {
-    endpointPath: '/actuator/health'
+    endpointPath: '/actuator/health',
   },
 
   // Caching settings
@@ -54,7 +55,7 @@ export const environment: BuildConfig = {
     autoSync: {
       defaultTime: 0,
       maxBufferSize: 100,
-      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
+      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any, // time in seconds
     },
     // In-memory cache of server-side rendered pages. Disabled in test environment (max=0)
     serverSide: {
@@ -69,8 +70,8 @@ export const environment: BuildConfig = {
         max: 0,
         timeToLive: 10 * 1000, // 10 seconds
         allowStale: true,
-      }
-    }
+      },
+    },
   },
 
   // Authentication settings
@@ -97,8 +98,8 @@ export const environment: BuildConfig = {
     // NOTE: Map server-side validators to comparative Angular form validators
     validatorMap: {
       required: 'required',
-      regex: 'pattern'
-    }
+      regex: 'pattern',
+    },
   },
 
   // Notifications
@@ -110,7 +111,7 @@ export const environment: BuildConfig = {
     timeOut: 5000,
     clickToClose: true,
     // NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
-    animate: NotificationAnimationsType.Scale
+    animate: NotificationAnimationsType.Scale,
   },
 
   // Submission settings
@@ -119,51 +120,58 @@ export const environment: BuildConfig = {
       // NOTE: which metadata trigger an autosave
       metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv'],
       // NOTE: every how many minutes submission is saved automatically
-      timer: 5
+      timer: 5,
+    },
+    duplicateDetection: {
+      alwaysShowSection: false,
     },
     typeBind: {
-      field: 'dc.type'
+      field: 'dc.type',
     },
     icons: {
       metadata: [
         {
           name: 'mainField',
-          style: 'fas fa-user'
+          style: 'fas fa-user',
         },
         {
           name: 'relatedField',
-          style: 'fas fa-university'
+          style: 'fas fa-university',
         },
         {
           name: 'otherRelatedField',
-          style: 'fas fa-circle'
+          style: 'fas fa-circle',
         },
         {
           name: 'default',
-          style: ''
-        }
+          style: '',
+        },
       ],
       authority: {
         confidence: [
           {
             value: 600,
-            style: 'text-success'
+            style: 'text-success',
+            icon: 'fa-circle-check',
           },
           {
             value: 500,
-            style: 'text-info'
+            style: 'text-info',
+            icon: 'fa-gear',
           },
           {
             value: 400,
-            style: 'text-warning'
+            style: 'text-warning',
+            icon: 'fa-circle-question',
           },
           {
             value: 'default',
-            style: 'text-muted'
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
           },
-        ]
-      }
-    }
+        ],
+      },
+    },
   },
 
   // NOTE: will log all redux actions and transfers in console
@@ -232,7 +240,7 @@ export const environment: BuildConfig = {
     pageSize: 20,
   },
   communityList: {
-    pageSize: 20
+    pageSize: 20,
   },
   homePage: {
     recentSubmissions: {
@@ -241,12 +249,13 @@ export const environment: BuildConfig = {
       sortField: 'dc.date.accessioned',
     },
     topLevelCommunityList: {
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+    showDiscoverFilters: false,
   },
   item: {
     edit: {
-      undoTimeout: 10000 // 10 seconds
+      undoTimeout: 10000, // 10 seconds
     },
     // Show the item access status label in items lists
     showAccessStatuses: false,
@@ -254,34 +263,42 @@ export const environment: BuildConfig = {
       // Number of entries in the bitstream list in the item view page.
       // Rounded to the nearest size in the list of selectable sizes on the
       // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+  },
+  community: {
+    searchSection: {
+      showSidebar: true,
+    },
   },
   collection: {
+    searchSection: {
+      showSidebar: true,
+    },
     edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
+      undoTimeout: 10000, // 10 seconds
+    },
   },
   themes: [
     {
       name: 'full-item-page-theme',
-      regex: 'items/aa6c6c83-3a83-4953-95d1-2bc2e67854d2/full'
+      regex: 'items/aa6c6c83-3a83-4953-95d1-2bc2e67854d2/full',
     },
     {
       name: 'error-theme',
-      regex: 'collections/aaaa.*'
+      regex: 'collections/aaaa.*',
     },
     {
       name: 'handle-theme',
-      handle: '10673/1233'
+      handle: '10673/1233',
     },
     {
       name: 'regex-theme',
-      regex: 'collections\/e8043bc2.*'
+      regex: 'collections\/e8043bc2.*',
     },
     {
       name: 'uuid-theme',
-      uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
+      uuid: '0958c910-2037-42a9-81c7-dca80e3892b4',
     },
     {
       name: 'base',
@@ -292,7 +309,7 @@ export const environment: BuildConfig = {
   },
   mediaViewer: {
     image: true,
-    video: true
+    video: true,
   },
   info: {
     enableEndUserAgreement: true,
@@ -306,12 +323,102 @@ export const environment: BuildConfig = {
     sortField:'dc.title',
     sortDirection:'ASC',
   },
+  qualityAssuranceConfig: {
+    sourceUrlMapForProjectSearch: {
+      openaire: 'https://explore.openaire.eu/search/project?projectId=',
+    },
+    pageSize: 5,
+  },
 
   vocabularies: [
     {
       filter: 'subject',
       vocabulary: 'srsc',
-      enabled: true
-    }
-  ]
+      enabled: true,
+    },
+  ],
+
+  suggestion: [],
+
+  search: {
+    advancedFilters: {
+      enabled: false,
+      filter: ['title', 'author', 'subject', 'entityType'],
+    },
+  },
+
+  notifyMetrics: [
+    {
+      title: 'admin-notify-dashboard.received-ldn',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
+          config: 'NOTIFY.incoming.accepted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description',
+        },
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
+          config: 'NOTIFY.incoming.processed',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
+          config: 'NOTIFY.incoming.failure',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
+          config: 'NOTIFY.incoming.untrusted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.incoming.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description',
+        },
+      ],
+    },
+    {
+      title: 'admin-notify-dashboard.generated-ldn',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
+          config: 'NOTIFY.outgoing.delivered',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description',
+        },
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
+          config: 'NOTIFY.outgoing.queued',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description',
+        },
+        {
+          color: '#FDEEBB',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
+          config: 'NOTIFY.outgoing.queued_for_retry',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
+          config: 'NOTIFY.outgoing.failure',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.outgoing.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
+        },
+      ],
+    },
+  ],
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dc0e808be0..4aa175ebe6 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,8 +12,8 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: false,
     async: true,
-    time: false
-  }
+    time: false,
+  },
 };
 
 /*
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 43b2ffbaf4..09e535565e 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -2,14 +2,13 @@ import 'zone.js';
 import 'reflect-metadata';
 import 'core-js/es/reflect';
 
+import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { BrowserAppModule } from './modules/app/browser-app.module';
-
-import { environment } from './environments/environment';
 import { AppConfig } from './config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './config/config.util';
-import { enableProdMode } from '@angular/core';
+import { environment } from './environments/environment';
+import { BrowserAppModule } from './modules/app/browser-app.module';
 
 const bootstrap = () => platformBrowserDynamic()
   .bootstrapModule(BrowserAppModule, {});
diff --git a/src/main.server.ts b/src/main.server.ts
index 95747de6cc..422fcd8146 100644
--- a/src/main.server.ts
+++ b/src/main.server.ts
@@ -1,14 +1,14 @@
 import 'core-js/es/reflect';
 import 'zone.js';
 import 'reflect-metadata';
-
-import { enableProdMode } from '@angular/core';
 /******************************************************************
  * Load `$localize` - not used for i18n in this project, we use ngx-translate.
  * It's used for localization of dates, numbers, currencies, etc.
  */
 import '@angular/localize/init';
 
+import { enableProdMode } from '@angular/core';
+
 import { environment } from './environments/environment';
 
 if (environment.production) {
@@ -16,5 +16,5 @@ if (environment.production) {
 }
 
 export { ServerAppModule } from './modules/app/server-app.module';
-export { ngExpressEngine } from '@nguniversal/express-engine';
 export { renderModuleFactory } from '@angular/platform-server';
+export { ngExpressEngine } from '@nguniversal/express-engine';
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index d6295cf791..46e575b53c 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -1,38 +1,49 @@
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpClientModule,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { BrowserModule, BrowserTransferStateModule, makeStateKey, TransferState } from '@angular/platform-browser';
+import {
+  BrowserModule,
+  BrowserTransferStateModule,
+  makeStateKey,
+  TransferState,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { IdlePreloadModule } from 'angular-idle-preload';
+import {
+  Angulartics2GoogleTagManager,
+  Angulartics2RouterlessModule,
+} from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
-
 import { AppModule } from '../../app/app.module';
-import { ClientCookieService } from '../../app/core/services/client-cookie.service';
-import { CookieService } from '../../app/core/services/cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { Angulartics2GoogleTagManager, Angulartics2RouterlessModule } from 'angulartics2';
-import { SubmissionService } from '../../app/submission/submission.service';
-import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
-import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import { AuthRequestService } from '../../app/core/auth/auth-request.service';
+import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
 import {
   BrowserHardRedirectService,
   locationProvider,
-  LocationToken
+  LocationToken,
 } from '../../app/core/services/browser-hard-redirect.service';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
-import { AuthRequestService } from '../../app/core/auth/auth-request.service';
-import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
-import { BrowserInitService } from './browser-init.service';
+import { ClientCookieService } from '../../app/core/services/client-cookie.service';
+import { CookieService } from '../../app/core/services/cookie.service';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
-import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
+import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
+import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
+import { StatisticsModule } from '../../app/statistics/statistics.module';
+import { SubmissionService } from '../../app/submission/submission.service';
+import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
+import { BrowserInitService } from './browser-init.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
@@ -48,7 +59,7 @@ export function getRequest(transferState: TransferState): any {
   bootstrap: [AppComponent],
   imports: [
     BrowserModule.withServerTransition({
-      appId: 'dspace-angular'
+      appId: 'dspace-angular',
     }),
     HttpClientModule,
     // forRoot ensures the providers are only created once
@@ -61,37 +72,37 @@ export function getRequest(transferState: TransferState): any {
       loader: {
         provide: TranslateLoader,
         useFactory: (createTranslateLoader),
-        deps: [TransferState, HttpClient]
-      }
+        deps: [TransferState, HttpClient],
+      },
     }),
-    AppModule
+    AppModule,
   ],
   providers: [
     ...BrowserInitService.providers(),
     {
       provide: REQUEST,
       useFactory: getRequest,
-      deps: [TransferState]
+      deps: [TransferState],
     },
     {
       provide: AuthService,
-      useClass: AuthService
+      useClass: AuthService,
     },
     {
       provide: CookieService,
-      useClass: ClientCookieService
+      useClass: ClientCookieService,
     },
     {
       provide: KlaroService,
-      useClass: BrowserKlaroService
+      useClass: BrowserKlaroService,
     },
     {
       provide: SubmissionService,
-      useClass: SubmissionService
+      useClass: SubmissionService,
     },
     {
       provide: LocaleService,
-      useClass: LocaleService
+      useClass: LocaleService,
     },
     {
       provide: HardRedirectService,
@@ -103,7 +114,7 @@ export function getRequest(transferState: TransferState): any {
     },
     {
       provide: Angulartics2GoogleTagManager,
-      useClass: Angulartics2GoogleTagManager
+      useClass: Angulartics2GoogleTagManager,
     },
     {
       provide: AuthRequestService,
@@ -116,8 +127,8 @@ export function getRequest(transferState: TransferState): any {
     {
       provide: LocationToken,
       useFactory: locationProvider,
-    }
-  ]
+    },
+  ],
 })
 export class BrowserAppModule {
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 61d57f10f9..a4e907bbfb 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -5,33 +5,52 @@
  *
  * http://www.dspace.org/license/
  */
-import { InitService } from '../../app/init.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../app/app.reducer';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { TransferState } from '@angular/platform-browser';
-import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
-import { DefaultAppConfig } from '../../config/default-app-config';
-import { extendEnvironmentWithAppConfig } from '../../config/config.util';
-import { environment } from '../../environments/environment';
-import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
-import { Inject, Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  firstValueFrom,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
+import { logStartupMessage } from '../../../startup-message';
+import { AppState } from '../../app/app.reducer';
+import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
+import { AuthService } from '../../app/core/auth/auth.service';
+import { coreSelector } from '../../app/core/core.selectors';
+import { RootDataService } from '../../app/core/data/root-data.service';
 import { LocaleService } from '../../app/core/locale/locale.service';
+import { MetadataService } from '../../app/core/metadata/metadata.service';
+import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
+import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
+import { InitService } from '../../app/init.service';
+import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { isNotEmpty } from '../../app/shared/empty.util';
+import { MenuService } from '../../app/shared/menu/menu.service';
+import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
 import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
-import { MetadataService } from '../../app/core/metadata/metadata.service';
-import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
-import { AuthService } from '../../app/core/auth/auth.service';
-import { ThemeService } from '../../app/shared/theme-support/theme.service';
-import { StoreAction, StoreActionTypes } from '../../app/store.actions';
-import { coreSelector } from '../../app/core/core.selectors';
-import { filter, find, map } from 'rxjs/operators';
-import { isNotEmpty } from '../../app/shared/empty.util';
-import { logStartupMessage } from '../../../startup-message';
-import { MenuService } from '../../app/shared/menu/menu.service';
-import { RootDataService } from '../../app/core/data/root-data.service';
-import { firstValueFrom, Subscription } from 'rxjs';
+import {
+  StoreAction,
+  StoreActionTypes,
+} from '../../app/store.actions';
+import {
+  APP_CONFIG,
+  APP_CONFIG_STATE,
+  AppConfig,
+} from '../../config/app-config.interface';
+import { extendEnvironmentWithAppConfig } from '../../config/config.util';
+import { DefaultAppConfig } from '../../config/default-app-config';
+import { environment } from '../../environments/environment';
 
 /**
  * Performs client-side initialization.
@@ -56,7 +75,8 @@ export class BrowserInitService extends InitService {
     protected authService: AuthService,
     protected themeService: ThemeService,
     protected menuService: MenuService,
-    private rootDataService: RootDataService
+    private rootDataService: RootDataService,
+    protected serverCheckGuard: ServerCheckGuard,
   ) {
     super(
       store,
@@ -120,7 +140,7 @@ export class BrowserInitService extends InitService {
     this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
     return this.store.select(coreSelector).pipe(
       find((core: any) => isNotEmpty(core)),
-      map(() => true)
+      map(() => true),
     ).toPromise();
   }
 
@@ -150,12 +170,12 @@ export class BrowserInitService extends InitService {
   private externalAuthCheck() {
 
     this.sub = this.authService.isExternalAuthentication().pipe(
-        filter((externalAuth: boolean) => externalAuth)
-      ).subscribe(() => {
-        // Clear the transferState data.
-        this.rootDataService.invalidateRootCache();
-        this.authService.setExternalAuthStatus(false);
-      }
+      filter((externalAuth: boolean) => externalAuth),
+    ).subscribe(() => {
+      // Clear the transferState data.
+      this.rootDataService.invalidateRootCache();
+      this.authService.setExternalAuthStatus(false);
+    },
     );
 
     this.closeAuthCheckSubscription();
@@ -168,8 +188,17 @@ export class BrowserInitService extends InitService {
    */
   private closeAuthCheckSubscription() {
     firstValueFrom(this.authenticationReady$()).then(() => {
-        this.sub.unsubscribe();
-      });
+      this.sub.unsubscribe();
+    });
+  }
+
+  /**
+   * Start route-listening subscriptions
+   * @protected
+   */
+  protected initRouteListeners(): void {
+    super.initRouteListeners();
+    this.serverCheckGuard.listenForRouteChanges();
   }
 
 }
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index b3d718b0b2..89e2142461 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -1,42 +1,48 @@
+import { XhrFactory } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { BrowserModule, TransferState } from '@angular/platform-browser';
+import {
+  BrowserModule,
+  TransferState,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
+import {
+  ServerModule,
+  ServerTransferStateModule,
+} from '@angular/platform-server';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import {
   Angulartics2,
   Angulartics2GoogleAnalytics,
-  Angulartics2GoogleGlobalSiteTag
+  Angulartics2GoogleGlobalSiteTag,
 } from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
-
 import { AppModule } from '../../app/app.module';
-import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
-import { CookieService } from '../../app/core/services/cookie.service';
-import { ServerCookieService } from '../../app/core/services/server-cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { ServerAuthService } from '../../app/core/auth/server-auth.service';
-import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
-import { SubmissionService } from '../../app/submission/submission.service';
-import { ServerSubmissionService } from '../../app/submission/server-submission.service';
-import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
-import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
-import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
-import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
-import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
 import { AuthRequestService } from '../../app/core/auth/auth-request.service';
+import { ServerAuthService } from '../../app/core/auth/server-auth.service';
 import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service';
-import { ServerInitService } from './server-init.service';
-import { XhrFactory } from '@angular/common';
-import { ServerXhrService } from '../../app/core/services/server-xhr.service';
+import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
+import { CookieService } from '../../app/core/services/cookie.service';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
 import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
+import { ServerCookieService } from '../../app/core/services/server-cookie.service';
+import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
+import { ServerXhrService } from '../../app/core/services/server-xhr.service';
+import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
+import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
+import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
+import { ServerSubmissionService } from '../../app/submission/server-submission.service';
+import { SubmissionService } from '../../app/submission/submission.service';
+import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
+import { ServerInitService } from './server-init.service';
 
 export function createTranslateLoader(transferState: TransferState) {
   return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json');
@@ -46,7 +52,7 @@ export function createTranslateLoader(transferState: TransferState) {
   bootstrap: [AppComponent],
   imports: [
     BrowserModule.withServerTransition({
-      appId: 'dspace-angular'
+      appId: 'dspace-angular',
     }),
     NoopAnimationsModule,
     ServerTransferStateModule,
@@ -54,8 +60,8 @@ export function createTranslateLoader(transferState: TransferState) {
       loader: {
         provide: TranslateLoader,
         useFactory: (createTranslateLoader),
-        deps: [TransferState]
-      }
+        deps: [TransferState],
+      },
     }),
     AppModule,
     ServerModule,
@@ -64,31 +70,31 @@ export function createTranslateLoader(transferState: TransferState) {
     ...ServerInitService.providers(),
     {
       provide: Angulartics2,
-      useClass: Angulartics2Mock
+      useClass: Angulartics2Mock,
     },
     {
       provide: Angulartics2GoogleAnalytics,
-      useClass: AngularticsProviderMock
+      useClass: AngularticsProviderMock,
     },
     {
       provide: Angulartics2GoogleGlobalSiteTag,
-      useClass: AngularticsProviderMock
+      useClass: AngularticsProviderMock,
     },
     {
       provide: Angulartics2DSpace,
-      useClass: AngularticsProviderMock
+      useClass: AngularticsProviderMock,
     },
     {
       provide: AuthService,
-      useClass: ServerAuthService
+      useClass: ServerAuthService,
     },
     {
       provide: CookieService,
-      useClass: ServerCookieService
+      useClass: ServerCookieService,
     },
     {
       provide: SubmissionService,
-      useClass: ServerSubmissionService
+      useClass: ServerSubmissionService,
     },
     {
       provide: AuthRequestService,
@@ -96,13 +102,13 @@ export function createTranslateLoader(transferState: TransferState) {
     },
     {
       provide: LocaleService,
-      useClass: ServerLocaleService
+      useClass: ServerLocaleService,
     },
     // register ForwardClientIpInterceptor as HttpInterceptor
     {
       provide: HTTP_INTERCEPTORS,
       useClass: ForwardClientIpInterceptor,
-      multi: true
+      multi: true,
     },
     {
       provide: HardRedirectService,
@@ -116,7 +122,7 @@ export function createTranslateLoader(transferState: TransferState) {
       provide: ReferrerService,
       useClass: ServerReferrerService,
     },
-  ]
+  ],
 })
 export class ServerAppModule {
 }
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 715f872cd9..8849e8f00e 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -5,22 +5,30 @@
  *
  * http://www.dspace.org/license/
  */
-import { InitService } from '../../app/init.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../app/app.reducer';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { TransferState } from '@angular/platform-browser';
-import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
-import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
-import { environment } from '../../environments/environment';
-import { Inject, Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
-import { MetadataService } from '../../app/core/metadata/metadata.service';
-import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
+
+import { AppState } from '../../app/app.reducer';
+import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { MetadataService } from '../../app/core/metadata/metadata.service';
+import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
+import { InitService } from '../../app/init.service';
 import { MenuService } from '../../app/shared/menu/menu.service';
+import { ThemeService } from '../../app/shared/theme-support/theme.service';
+import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
+import {
+  APP_CONFIG,
+  APP_CONFIG_STATE,
+  AppConfig,
+} from '../../config/app-config.interface';
+import { environment } from '../../environments/environment';
 
 /**
  * Performs server-side initialization.
@@ -38,7 +46,7 @@ export class ServerInitService extends InitService {
     protected metadata: MetadataService,
     protected breadcrumbsService: BreadcrumbsService,
     protected themeService: ThemeService,
-    protected menuService: MenuService
+    protected menuService: MenuService,
   ) {
     super(
       store,
diff --git a/src/ngx-translate-loaders/translate-browser.loader.ts b/src/ngx-translate-loaders/translate-browser.loader.ts
index a6188c9f15..48ccbc466a 100644
--- a/src/ngx-translate-loaders/translate-browser.loader.ts
+++ b/src/ngx-translate-loaders/translate-browser.loader.ts
@@ -1,10 +1,18 @@
-import { TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { TransferState } from '@angular/platform-browser';
-import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
-import { hasValue } from '../app/shared/empty.util';
+import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { of as observableOf, Observable } from 'rxjs';
+
+import { hasValue } from '../app/shared/empty.util';
+import { environment } from '../environments/environment';
+import {
+  NGX_TRANSLATE_STATE,
+  NgxTranslateState,
+} from './ngx-translate-state';
 
 /**
  * A TranslateLoader for ngx-translate to retrieve i18n messages from the TransferState, or download
@@ -15,7 +23,7 @@ export class TranslateBrowserLoader implements TranslateLoader {
     protected transferState: TransferState,
     protected http: HttpClient,
     protected prefix?: string,
-    protected suffix?: string
+    protected suffix?: string,
   ) {
   }
 
@@ -33,10 +41,11 @@ export class TranslateBrowserLoader implements TranslateLoader {
     if (hasValue(messages)) {
       return observableOf(messages);
     } else {
+      const translationHash: string = environment.production ? `.${(process.env.languageHashes as any)[lang + '.json5']}` : '';
       // If they're not available on the transfer state (e.g. when running in dev mode), retrieve
       // them using HttpClient
-      return this.http.get('' + this.prefix + lang + this.suffix, { responseType: 'text' }).pipe(
-        map((json: any) => JSON.parse(json))
+      return this.http.get(`${this.prefix}${lang}${translationHash}${this.suffix}`, { responseType: 'text' }).pipe(
+        map((json: any) => JSON.parse(json)),
       );
     }
   }
diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts
index c09c71f049..d86251e008 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -1,8 +1,15 @@
-import { TranslateLoader } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { readFileSync } from 'fs';
 import { TransferState } from '@angular/platform-browser';
-import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
+import { TranslateLoader } from '@ngx-translate/core';
+import { readFileSync } from 'fs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  NGX_TRANSLATE_STATE,
+  NgxTranslateState,
+} from './ngx-translate-state';
 
 /**
  * A TranslateLoader for ngx-translate to parse json5 files server-side, and store them in the
@@ -13,7 +20,7 @@ export class TranslateServerLoader implements TranslateLoader {
   constructor(
     protected transferState: TransferState,
     protected prefix: string = 'dist/assets/i18n/',
-    protected suffix: string = '.json'
+    protected suffix: string = '.json',
   ) {
   }
 
@@ -23,8 +30,9 @@ export class TranslateServerLoader implements TranslateLoader {
    * @param lang the language code
    */
   public getTranslation(lang: string): Observable<any> {
+    const translationHash: string = (process.env.languageHashes as any)[lang + '.json5'];
     // Retrieve the file for the given language, and parse it
-    const messages = JSON.parse(readFileSync(`${this.prefix}${lang}${this.suffix}`, 'utf8'));
+    const messages = JSON.parse(readFileSync(`${this.prefix}${lang}.${translationHash}${this.suffix}`, 'utf8'));
     // Store the parsed messages in the transfer state so they'll be available immediately when the
     // app loads on the client
     this.storeInTransferState(lang, messages);
@@ -43,7 +51,7 @@ export class TranslateServerLoader implements TranslateLoader {
   protected storeInTransferState(lang: string, messages) {
     const prevState = this.transferState.get<NgxTranslateState>(NGX_TRANSLATE_STATE, {});
     const nextState = Object.assign({}, prevState, {
-      [lang]: messages
+      [lang]: messages,
     });
     this.transferState.set(NGX_TRANSLATE_STATE, nextState);
   }
diff --git a/src/polyfills.ts b/src/polyfills.ts
index e8ab71da80..9cde956bbb 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -48,11 +48,8 @@
 
 import 'core-js/es';
 import 'core-js/features/reflect';
-
 import 'zone.js';  // Included with Angular CLI.
-
 import 'reflect-metadata';
-
 /******************************************************************
  * Load `$localize` - not used for i18n in this project, we use ngx-translate.
  * It's used for localization of dates, numbers, currencies, etc.
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 5dfc03fbd3..c0da5ac020 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -1,60 +1,102 @@
-/** Help Variables **/
-$fa-fixed-width: 1.25rem !default;
-$icon-padding: 1rem !default;
-$collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)) !default;
-$sidebar-items-width: 250px !default;
-$total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width !default;
+// DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
+// variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
 
-/* Fonts */
-// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
-// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
-$fa-font-path: "^assets/fonts" !default;
-/* Images */
-$image-path: "../assets/images" !default;
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// If you want to change the 'dspace' or the 'custom' theme you should not edit this file, and you should edit
+// _theme_sass_variable_overrides.scss in the theme folder.
+
+// All SASS variables that are declared must have the '!default' flag, otherwise it won't be possible
+// to override them in custom themes.
+
+
+/*** FONT FAMILIES AND FONT SIZES ***/
+
+$font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
+$h1-font-size: $font-size-base * 2.125 !default;
+$h2-font-size: $font-size-base * 1.75 !default;
+$h3-font-size: $font-size-base * 1.5 !default;
+$h4-font-size: $font-size-base * 1.25 !default;
+$h5-font-size: $font-size-base * 1.125 !default;
+$h6-font-size: $font-size-base !default;
+
+
+/*** BOOTSTRAP OPTIONS ***/
 
 // enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
-$enable-responsive-font-sizes: true;
-
-/** Bootstrap Variables **/
-/* Colors */
-$gray-700: #495057 !default;  // Bootstrap $gray-700
-$gray-100: #f8f9fa !default;  //           $gray-100
-
-/* Reassign color vars to semantic color scheme */
-$blue:   #2B4E72 !default;
-$green:  #94BA65 !default;
-$cyan:   #006666 !default;
-$yellow: #ec9433 !default;
-$red:    #CF4444 !default;
-$dark:   darken($blue, 17%) !default;
+$enable-responsive-font-sizes: true !default;
+$enable-shadows: true !default;
 
 
+/*** SEMANTIC COLOR SCHEME ***/
 
-$theme-colors: (
-        primary: $blue,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
-/* Fonts */
-$link-color: map-get($theme-colors, info) !default;
+// Override semantic colors
+$primary:   #2b4e72 !default;               // Blue gray
+$secondary: #495057 !default;               // As Bootstrap $gray-700
+$success:   #94ba65 !default;               // Lime
+$info:      #006666 !default;               // Blue green
+$warning:   #ec9433 !default;               // Orange
+$danger:    #cf4444 !default;               // Red
+$light:     #f8f9fa !default;               // As Bootstrap $gray-100
+$dark:      darken(#2b4e72, 17%) !default;  // Blue gray (darker)
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+$link-color: #1F7293 !default;
+$link-hover-color: darken($link-color, 15%) !default;
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 165 !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
 $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-dark-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-light-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 
-$enable-shadows: true !default;
 
-$yiq-contrasted-threshold:  165 !default;
+/*** CUSTOM DSPACE VARIABLES ***/
 
-$primary-bg: #{lighten(map-get($theme-colors, primary), 30%)} !default;
-$secondary-bg: #{lighten(map-get($theme-colors, secondary), 30%)} !default;
-$success-bg: #{lighten(map-get($theme-colors, success), 30%)} !default;
-$info-bg: #{lighten(map-get($theme-colors, info), 30%)} !default;
-$warning-bg: #{lighten(map-get($theme-colors, warning), 30%)} !default;
-$danger-bg: #{lighten(map-get($theme-colors, danger), 30%)} !default;
+$ds-home-news-link-color: $link-color !default;
+$ds-home-news-link-hover-color: darken($ds-home-news-link-color, 15%) !default;
+$ds-breadcrumb-link-color: $link-color !default;
+
+$ds-header-navbar-border-top-color: #fff !default;
+$ds-header-navbar-border-bottom-color: #ced4da !default;
+
+$ds-header-bg: #fff !default;
+$ds-header-icon-color: $link-color !default;
+$ds-header-icon-color-hover: $link-hover-color !default;
+
+$ds-navbar-bg: #fff !default;
+$ds-navbar-dropdown-bg: #fff !default;
+$ds-expandable-navbar-bg: #fff !default;
+$ds-navbar-link-color: $link-color !default;
+$ds-navbar-link-color-hover: #{darken($ds-navbar-link-color, 15%)} !default;
+
+$ds-slider-color: darken(#94BA65, 17%) !default;
+$ds-slider-handle-color: darken(#2B4E72, 17%) !default;
+
+$ds-admin-sidebar-bg: darken(#2b4e72, 17%) !default;
+$ds-admin-sidebar-active-bg: darken($ds-admin-sidebar-bg, 3%) !default;
+$ds-admin-sidebar-fg: #47495d !default;
+$ds-admin-sidebar-fixed-element-width: 55px !default;
+$ds-admin-sidebar-collapsible-element-width: 250px !default;
+$ds-admin-sidebar-total-width: $ds-admin-sidebar-fixed-element-width + $ds-admin-sidebar-collapsible-element-width; // do not change/override
+
+$ds-primary-bg: #{lighten($primary, 30%)} !default;
+$ds-secondary-bg: #{lighten($secondary, 30%)} !default;
+$ds-success-bg: #{lighten($success, 30%)} !default;
+$ds-info-bg: #{lighten($info, 30%)} !default;
+$ds-warning-bg: #{lighten($warning, 30%)} !default;
+$ds-danger-bg: #{lighten($danger, 30%)} !default;
+
+
+/*** MISC ***/
+
+// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
+// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
+$fa-font-path: "^assets/fonts" !default;
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 16719f9919..5a64be7e2a 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -29,17 +29,11 @@
   --bs-teal: #{$teal};
   --bs-cyan: #{$cyan};
   --bs-primary: #{$primary};
-  --bs-primary-bg: #{$primary-bg};
   --bs-secondary: #{$secondary};
-  --bs-secondary-bg: #{$secondary-bg};
   --bs-success: #{$success};
-  --bs-success-bg: #{$success-bg};
   --bs-info: #{$info};
-  --bs-info-bg: #{$info-bg};
   --bs-warning: #{$warning};
-  --bs-warning-bg: #{$warning-bg};
   --bs-danger: #{$danger};
-  --bs-danger-bg: #{$danger-bg};
   --bs-light: #{$light};
   --bs-dark: #{$dark};
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index ddf490c7a7..0dd1fd8e97 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -1,5 +1,5 @@
 :root {
-  --ds-content-spacing: #{$spacer * 1.5};
+  --ds-content-spacing: #{$spacer}; // equivalent to Bootstrap spaces of size 3
 
   --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2)};
 
@@ -19,25 +19,57 @@
   --ds-footer-z-index: 0;
   --ds-sidebar-z-index: 20;
 
-  --ds-header-bg: #{$white};
-  --ds-header-logo-height: 50px;
-  --ds-header-logo-height-xs: 50px;
-  --ds-header-icon-color: #{$link-color};
-  --ds-header-icon-color-hover: #{$link-hover-color};
-  --ds-header-navbar-border-top-color: #{$white};
-  --ds-header-navbar-border-bottom-color: #{$gray-400};
-  --ds-navbar-link-color: #{$cyan};
-  --ds-navbar-link-color-hover: #{darken($cyan, 15%)};
+  --ds-header-bg: #{$ds-header-bg};
+  --ds-header-icon-color: #{$ds-header-icon-color};
+  --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
 
-  $admin-sidebar-bg: darken(#2B4E72, 17%);
-  $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
-  --ds-admin-sidebar-bg: #{$admin-sidebar-bg};
-  --ds-admin-sidebar-active-bg: #{$admin-sidebar-active-bg};
-  --ds-admin-sidebar-header-bg: #{darken($admin-sidebar-bg, 7%)};
+  --ds-navbar-bg: #{$ds-navbar-bg};
+  --ds-navbar-item-vertical-padding: 0;
+  --ds-navbar-item-horizontal-padding: 0.25rem;
+  --ds-navbar-dropdown-bg: #{$ds-navbar-dropdown-bg};
+  --ds-navbar-dropdown-item-vertical-padding: 0.5rem;
+  --ds-navbar-dropdown-item-horizontal-padding: 1rem;
+  --ds-navbar-link-color: #{$ds-navbar-link-color};
+  --ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
 
-  --ds-dark-scrollbar-bg: #{$admin-sidebar-active-bg};
-  --ds-dark-scrollbar-alt-bg: #{lighten($admin-sidebar-active-bg, 2%)};
-  --ds-dark-scrollbar-fg: #47495d;
+  --ds-header-navbar-border-top-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
+
+  --ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
+  --ds-expandable-navbar-link-color: #{$body-color};
+  --ds-expandable-navbar-link-color-hover: #{$body-color};
+  --ds-expandable-navbar-link-background-hover: #{$ds-navbar-link-color-hover};
+  --ds-expandable-navbar-item-vertical-padding: 0.25rem;
+
+  --ds-user-menu-item-vertical-padding: 0.25rem;
+  --ds-user-menu-dropdown-padding: 1rem;
+  --ds-user-menu-dropdown-link-color: #{$dark};
+  --ds-user-menu-dropdown-link-background-hover: #{$gray-200};
+
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 50px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+  }
+
+  --ds-admin-sidebar-bg: #{$ds-admin-sidebar-bg};
+  --ds-admin-sidebar-active-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-admin-sidebar-header-bg: #{darken($ds-admin-sidebar-bg, 7%)};
+  --ds-admin-sidebar-logo-height: 20px;
+  --ds-admin-sidebar-fixed-element-width: #{$ds-admin-sidebar-fixed-element-width};
+  --ds-admin-sidebar-fixed-element-z-index: 10;
+  --ds-admin-sidebar-collapsible-element-width: #{$ds-admin-sidebar-collapsible-element-width};
+  --ds-admin-sidebar-total-width: #{$ds-admin-sidebar-total-width};
+  --ds-admin-sidebar-link-color: #{$navbar-dark-color};
+  --ds-admin-sidebar-link-hover-color: #{$navbar-dark-hover-color};
+  --ds-admin-sidebar-item-padding: 1rem;
+  --ds-admin-sidebar-section-indent: .75rem;
+
+  --ds-dark-scrollbar-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-dark-scrollbar-alt-bg: #{lighten($ds-admin-sidebar-active-bg, 2%)};
+  --ds-dark-scrollbar-fg: #{$ds-admin-sidebar-fg};
+  --ds-dark-scrollbar-width: 8px;
 
   --ds-submission-sections-margin-bottom: .5rem;
 
@@ -58,31 +90,26 @@
   --ds-notification-bg-info: #{darken(adjust-hue($info, -10), 10%)};
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
 
-  --ds-fa-fixed-width: #{$fa-fixed-width};
-  --ds-icon-padding: #{$icon-padding};
-  --ds-collapsed-sidebar-width: #{$collapsed-sidebar-width};
-  --ds-sidebar-items-width: #{$sidebar-items-width};
-  --ds-total-sidebar-width: #{$total-sidebar-width};
-
   --ds-top-footer-bg: #{$gray-200};
   --ds-footer-bg: #{theme-color('primary')};
   --ds-footer-border: 1px solid var(--bs-gray-400);
   --ds-footer-padding: 0;
   --ds-footer-padding-bottom: 0;
   --ds-footer-logo-height: 50px;
+  --ds-footer-n-coar-height: 20px;
 
-  $home-news-link-color: $cyan;
-  --ds-home-news-link-color: #{$home-news-link-color};
-  --ds-home-news-link-hover-color: #{darken($home-news-link-color, 15%)};
+  --ds-home-news-link-color: #{$ds-home-news-link-color};
+  --ds-home-news-link-hover-color: #{darken($ds-home-news-link-color, 15%)};
   --ds-home-news-background-color: #{$gray-200};
 
   --ds-breadcrumb-bg: #{$gray-200} !important;
-  --ds-breadcrumb-link-color: #{$cyan};
-  --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
+  --ds-breadcrumb-link-color: #{$ds-breadcrumb-link-color};
+  --ds-breadcrumb-link-active-color: #{darken($ds-breadcrumb-link-color, 30%)};
   --ds-breadcrumb-max-length: 200px;
 
-  --ds-slider-color: #{$green};
+  --ds-slider-color: #{$ds-slider-color};
   --ds-slider-handle-width: 18px;
+  --ds-slider-handle-color: #{$ds-slider-handle-color};
 
   --ds-search-form-scope-max-width: 150px;
 
@@ -97,4 +124,26 @@
   --ds-dso-edit-lang-width: 90px;
   --ds-dso-edit-actions-width: 173px;
   --ds-dso-edit-virtual-tooltip-min-width: 300px;
+
+  --ds-comcol-logo-max-width: 500px;
+  --ds-comcol-logo-max-height: 500px;
+
+  --ds-primary-bg: #{$ds-primary-bg};
+  --ds-secondary-bg: #{$ds-secondary-bg};
+  --ds-success-bg: #{$ds-success-bg};
+  --ds-info-bg: #{$ds-info-bg};
+  --ds-warning-bg: #{$ds-warning-bg};
+  --ds-danger-bg: #{$ds-danger-bg};
+
+
+  --ds-item-page-img-field-default-inline-height: 24px;
+
+  --ds-qa-logo-width: 100px;
+
+  --ds-process-overview-table-nb-processes-badge-size: 0.5em;
+  --ds-process-overview-table-id-column-width: 120px;
+  --ds-process-overview-table-name-column-width: auto;
+  --ds-process-overview-table-user-column-width: 200px;
+  --ds-process-overview-table-info-column-width: 250px;
+  --ds-process-overview-table-actions-column-width: 80px;
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b714d399a0..47e7d27f69 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -23,11 +23,9 @@ body {
     position: relative;
 }
 
-.main-content {
+#main-content {
     z-index: var(--ds-main-z-index);
     flex: 1 1 100%;
-    margin-top: var(--ds-content-spacing);
-    margin-bottom: var(--ds-content-spacing);
 }
 
 .alert.hide {
@@ -35,11 +33,6 @@ body {
     margin: 0;
 }
 
-ds-admin-sidebar {
-    position: fixed;
-    z-index: var(--ds-sidebar-z-index);
-}
-
 .sticky-top {
     z-index: 0;
 }
@@ -222,48 +215,235 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-validation {
-  background-color: #{map-get($theme-colors, warning)};
+    background-color: #{map-get($theme-colors, warning)};
 }
 
 .badge-waiting-controller {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-workspace {
-  background-color: #{map-get($theme-colors, primary)};
+    background-color: #{map-get($theme-colors, primary)};
 }
 
 .badge-archived {
-  background-color: #{map-get($theme-colors, success)};
+    background-color: darken($green, 25);
 }
 
 .badge-workflow {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-item-type {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  padding: 0 !important;
-  margin: -1px !important;
-  overflow: hidden !important;
-  clip: rect(0, 0, 0, 0) !important;
-  white-space: nowrap !important;
-  border: 0 !important;
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    padding: 0 !important;
+    margin: -1px !important;
+    overflow: hidden !important;
+    clip: rect(0, 0, 0, 0) !important;
+    white-space: nowrap !important;
+    border: 0 !important;
 }
 
-ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
-  // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
-  padding: 0;
-  display: inline;
+ul.dso-edit-menu-dropdown>li .nav-item.nav-link {
+    // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
+    padding: 0;
+    display: inline;
 }
 
 .table th,
 .table td {
-  vertical-align: middle;
+    vertical-align: middle;
 }
+
+/* Flexbox gap */
+
+.gap-0 { gap: 0; }
+.gap-1 { gap: calc(#{$spacer} * .25); }
+.gap-2 { gap: calc(#{$spacer} * .5); }
+.gap-3 { gap: #{$spacer}; }
+.gap-4 { gap: calc(#{$spacer} * 1.5); }
+.gap-5 { gap: calc(#{$spacer} * 3); }
+
+.gapx-0 { column-gap: 0; }
+.gapx-1 { column-gap: calc(#{$spacer} * .25); }
+.gapx-2 { column-gap: calc(#{$spacer} * .5); }
+.gapx-3 { column-gap: #{$spacer}; }
+.gapx-4 { column-gap: calc(#{$spacer} * 1.5); }
+.gapx-5 { column-gap: calc(#{$spacer} * 3); }
+
+.gapy-0 { row-gap: 0; }
+.gapy-1 { row-gap: calc(#{$spacer} * .25); }
+.gapy-2 { row-gap: calc(#{$spacer} * .5); }
+.gapy-3 { row-gap: #{$spacer}; }
+.gapy-4 { row-gap: calc(#{$spacer} * 1.5); }
+.gapy-5 { row-gap: calc(#{$spacer} * 3); }
+
+
+.pt-0\.5 {
+    padding-top: 0.125rem !important;
+}
+
+.pr-0\.5 {
+    padding-right: 0.125rem !important;
+}
+
+.pb-0\.5 {
+    padding-bottom: 0.125rem !important;
+}
+
+.pl-0\.5 {
+    padding-left: 0.125rem !important;
+}
+
+.px-0\.5 {
+    padding-left: 0.125rem !important;
+    padding-right: 0.125rem !important;
+}
+
+.py-0\.5 {
+    padding-top: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
+}
+
+.btn {
+    &:focus {
+        outline-offset: 2px !important;
+        outline-style: solid !important;
+        outline-width: 2px !important;
+        box-shadow: none !important;
+    }
+    &:disabled {
+        opacity: 0.7;
+    }
+    &.btn-success {
+        background-color: darken($success, 20%);
+        border-color: darken($success, 20%);
+        &:hover {
+            background-color: darken($success, 30%);
+            border-color: darken($success, 30%);
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-outline-success {
+        border-color: darken($success, 20%);
+        color: darken($success, 20%);
+
+        &:hover {
+            background-color: darken($success, 30%);
+            color: $white;
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-warning {
+        background-color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+        }
+        &:disabled {
+            background-color: transparent;
+        }
+        &:focus {
+            outline-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-outline-warning {
+        border-color: darken($warning, 20%);
+        color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+            color: $white;
+        }
+        &:disabled {
+            background-color: transparent;
+
+            &:hover {
+                color: darken($warning, 20%);
+            }
+        }
+        :focus {
+            outline-color: darken($warning, 22%);
+        }
+        &:not(:disabled):hover {
+            background-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-secondary {
+        &:focus {
+            outline-color: darken($secondary, 20%);
+        }
+    }
+
+    &.btn-danger:focus, &.btn-outline-danger:focus {
+        outline-color: darken($danger, 20%);
+    }
+
+    &.btn-primary:focus, &.btn-outline-primary:focus {
+        outline-color: darken($primary, 5%);
+    }
+}
+
+dynamic-ng-bootstrap-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+    outline: 2px solid $gray-700 !important;
+    box-shadow: none !important;
+    outline-offset: 2px !important;
+}
+
+dynamic-ng-bootstrap-checkbox .custom-control-label::before {
+    border-color: $gray-700;
+}
+
+.text-warning {
+    color: darken($warning, 10%) !important;
+}
+
+.text-success {
+    color: darken($success, 11%) !important;
+}
+
+ngb-accordion {
+    a.close {
+        opacity: 0.75;
+    }
+    a.close:not(:disabled):not(.disabled):hover {
+        opacity: 0.9;
+    }
+}
+
+.form-control, .page-link {
+    &:disabled::placeholder {
+        color: lighten($gray-700, 10%);
+    }
+    &:focus {
+        box-shadow: none;
+        outline: 2px solid lighten($gray-700, 10%);
+        outline-offset: 2px !important;
+    }
+}
+
+.alert-success {
+    color: darken($success, 22%);
+}
+
+.alert-danger {
+    color: darken($danger, 22%);
+}
+
+// Margin utility classes based on DSpace content spacing
+.mt-cs { margin-top: var(--ds-content-spacing); }
+.mb-cs { margin-bottom: var(--ds-content-spacing); }
+.my-cs { margin-top: var(--ds-content-spacing); margin-bottom: var(--ds-content-spacing); }
+.mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
+.mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
+.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss
index ae9e6082f5..eb39b8c786 100644
--- a/src/styles/_mixins.scss
+++ b/src/styles/_mixins.scss
@@ -14,7 +14,7 @@
 
 @mixin dark-scrollbar() {
     &::-webkit-scrollbar {
-        width: 8px;
+        width: var(--ds-dark-scrollbar-width);
         height: 3px;
     }
     &::-webkit-scrollbar-button {
diff --git a/src/styles/_vendor.scss b/src/styles/_vendor.scss
index 9d9842b9b3..b2b94c2826 100644
--- a/src/styles/_vendor.scss
+++ b/src/styles/_vendor.scss
@@ -1,5 +1,5 @@
 // node_modules imports meant for all the themes
 
 @import '~node_modules/bootstrap/scss/bootstrap.scss';
-@import '~node_modules/nouislider/distribute/nouislider.min';
+@import '~node_modules/nouislider/dist/nouislider.min';
 @import '~node_modules/ngx-ui-switch/ui-switch.component.scss';
diff --git a/src/test.ts b/src/test.ts
index 2f07cf0d1d..0c1e301f46 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -1,19 +1,20 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/testing';
+
 import { getTestBed } from '@angular/core/testing';
-import { MockStore } from '@ngrx/store/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { MockStore } from '@ngrx/store/testing';
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
+  { teardown: { destroyAfterEach: false } },
 );
 
 jasmine.getEnv().afterEach(() => {
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
index 6485ad98e6..0de3948305 100644
--- a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin/admin-sidebar/admin-sidebar.component';
 
 /**
@@ -9,7 +10,7 @@ import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin
   // templateUrl: './admin-sidebar.component.html',
   templateUrl: '../../../../../app/admin/admin-sidebar/admin-sidebar.component.html',
   // styleUrls: ['./admin-sidebar.component.scss']
-  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss']
+  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss'],
 })
 export class AdminSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index f8ca14addb..353a46c16d 100644
--- a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,5 +1,9 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { EditBitstreamPageComponent as BaseComponent } from '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
@@ -7,7 +11,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
   styleUrls: ['../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss'],
   // templateUrl: './edit-bitstream-page.component.html',
   templateUrl: '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class EditBitstreamPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
index 32d00fc8b6..f446dbb6a8 100644
--- a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { BreadcrumbsComponent as BaseComponent } from '../../../../app/breadcrumbs/breadcrumbs.component';
 
 /**
@@ -9,7 +10,7 @@ import { BreadcrumbsComponent as BaseComponent } from '../../../../app/breadcrum
   // templateUrl: './breadcrumbs.component.html',
   templateUrl: '../../../../app/breadcrumbs/breadcrumbs.component.html',
   // styleUrls: ['./breadcrumbs.component.scss']
-  styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss']
+  styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss'],
 })
 export class BreadcrumbsComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
deleted file mode 100644
index 9fcf773350..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByDatePageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date-page/browse-by-date-page.component';
-
-@Component({
-  selector: 'ds-browse-by-date-page',
-  // styleUrls: ['./browse-by-date-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-date-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByDatePageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.html b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.scss b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
new file mode 100644
index 0000000000..b07a946b87
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-date',
+  // styleUrls: ['./browse-by-date.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-date.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom')
+export class BrowseByDateComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
deleted file mode 100644
index 9434ca936d..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByMetadataPageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-
-@Component({
-  selector: 'ds-browse-by-metadata-page',
-  // styleUrls: ['./browse-by-metadata-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-metadata-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByMetadataPageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
new file mode 100644
index 0000000000..70d7d00dad
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-metadata',
+  // styleUrls: ['./browse-by-metadata.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-metadata.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom')
+export class BrowseByMetadataComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
deleted file mode 100644
index e65997eaf4..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseBySwitcherComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component';
-
-@Component({
-  selector: 'ds-browse-by-switcher',
-  // styleUrls: ['./browse-by-switcher.component.scss'],
-  // templateUrl: './browse-by-switcher.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-export class BrowseBySwitcherComponent extends BaseComponent {}
-
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts
deleted file mode 100644
index 34d80a0cb8..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByTaxonomyPageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component';
-
-@Component({
-  selector: 'ds-browse-by-taxonomy-page',
-  // templateUrl: './browse-by-taxonomy-page.component.html',
-  templateUrl: '../../../../../app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html',
-  // styleUrls: ['./browse-by-taxonomy-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.scss'],
-})
-/**
- * Component for browsing items by metadata in a hierarchical controlled vocabulary
- */
-export class BrowseByTaxonomyPageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
new file mode 100644
index 0000000000..a33899f89e
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-taxonomy',
+  // templateUrl: './browse-by-taxonomy.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html',
+  // styleUrls: ['./browse-by-taxonomy.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss'],
+})
+@rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom')
+export class BrowseByTaxonomyComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
deleted file mode 100644
index ed96a81110..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByTitlePageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title-page/browse-by-title-page.component';
-
-@Component({
-  selector: 'ds-browse-by-title-page',
-  // styleUrls: ['./browse-by-title-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-title-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByTitlePageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.html b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.scss b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
new file mode 100644
index 0000000000..e6a14b0041
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-title',
+  // styleUrls: ['./browse-by-title.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-title.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom')
+export class BrowseByTitleComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts
index d91c7025d7..197cd23420 100644
--- a/src/themes/custom/app/collection-page/collection-page.component.ts
+++ b/src/themes/custom/app/collection-page/collection-page.component.ts
@@ -1,6 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CollectionPageComponent as BaseComponent} from '../../../../app/collection-page/collection-page.component';
-import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { CollectionPageComponent as BaseComponent } from '../../../../app/collection-page/collection-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../app/shared/animations/fade';
 
 
 @Component({
@@ -12,8 +19,8 @@ import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * This component represents a detail page for a single collection
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index ad9f515dcf..41e185629f 100644
--- a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  EditItemTemplatePageComponent as BaseComponent
-} from '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component';
+
+import { EditItemTemplatePageComponent as BaseComponent } from '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component';
 
 @Component({
   selector: 'ds-edit-item-template-page',
diff --git a/src/themes/custom/app/community-list-page/community-list-page.component.ts b/src/themes/custom/app/community-list-page/community-list-page.component.ts
index 1dbfa15b40..0aa7cbf88a 100644
--- a/src/themes/custom/app/community-list-page/community-list-page.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list-page.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { CommunityListPageComponent as BaseComponent } from '../../../../app/community-list-page/community-list-page.component';
 
 @Component({
   selector: 'ds-community-list-page',
   // styleUrls: ['./community-list-page.component.scss'],
   // templateUrl: './community-list-page.component.html'
-  templateUrl: '../../../../app/community-list-page/community-list-page.component.html'
+  templateUrl: '../../../../app/community-list-page/community-list-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
index 61b538d641..e9d0024631 100644
--- a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CommunityListComponent as BaseComponent } from '../../../../../app/community-list-page/community-list/community-list.component';
 
 /**
@@ -12,7 +13,7 @@ import { CommunityListComponent as BaseComponent } from '../../../../../app/comm
   selector: 'ds-community-list',
   // styleUrls: ['./community-list.component.scss'],
   // templateUrl: './community-list.component.html'
-  templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html'
+  templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html',
 })
 export class CommunityListComponent extends BaseComponent {}
 
diff --git a/src/themes/custom/app/community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts
index ce7d85dddc..9975544d8c 100644
--- a/src/themes/custom/app/community-page/community-page.component.ts
+++ b/src/themes/custom/app/community-page/community-page.component.ts
@@ -1,5 +1,9 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CommunityPageComponent as BaseComponent} from '../../../../app/community-page/community-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { CommunityPageComponent as BaseComponent } from '../../../../app/community-page/community-page.component';
 import { fadeInOut } from '../../../../app/shared/animations/fade';
 
 
@@ -10,7 +14,7 @@ import { fadeInOut } from '../../../../app/shared/animations/fade';
   // styleUrls: ['./community-page.component.scss']
   styleUrls: ['../../../../app/community-page/community-page.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 /**
  * This component represents a detail page for a single community
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
new file mode 100644
index 0000000000..0dee3d5a4d
--- /dev/null
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-collection-list',
+  // styleUrls: ['./community-page-sub-collection-list.component.scss'],
+  styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'],
+  // templateUrl: './community-page-sub-collection-list.component.html',
+  templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html',
+})
+export class CommunityPageSubCollectionListComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
new file mode 100644
index 0000000000..ca4fc71e16
--- /dev/null
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { CommunityPageSubCommunityListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-community-list',
+  // styleUrls: ['./community-page-sub-community-list.component.scss'],
+  styleUrls: ['../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss'],
+  // templateUrl: './community-page-sub-community-list.component.html',
+  templateUrl: '../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html',
+})
+export class CommunityPageSubCommunityListComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
deleted file mode 100644
index a228fe1071..0000000000
--- a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { CommunityPageSubCollectionListComponent as BaseComponent }
-  from '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component';
-
-@Component({
-  selector: 'ds-community-page-sub-collection-list',
-  // styleUrls: ['./community-page-sub-collection-list.component.scss'],
-  styleUrls: ['../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss'],
-  // templateUrl: './community-page-sub-collection-list.component.html',
-  templateUrl: '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.html'
-})
-export class CommunityPageSubCollectionListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
deleted file mode 100644
index 1db265a844..0000000000
--- a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { CommunityPageSubCommunityListComponent as BaseComponent }
-  from '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component';
-
-@Component({
-  selector: 'ds-community-page-sub-community-list',
-  // styleUrls: ['./community-page-sub-community-list.component.scss'],
-  styleUrls: ['../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.scss'],
-  // templateUrl: './community-page-sub-community-list.component.html',
-  templateUrl: '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.html'
-})
-export class CommunityPageSubCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index b1cd6d2b39..761d72c75f 100644
--- a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,6 +1,7 @@
-import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 import { Component } from '@angular/core';
 
+import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+
 @Component({
   selector: 'ds-dso-edit-metadata',
   // styleUrls: ['./dso-edit-metadata.component.scss'],
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index a9f23c25f6..e0e087601e 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,12 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import {
-  JournalIssueComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalIssueComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index 1a190dc2e8..255a438c82 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,12 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import {
-  JournalVolumeComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalVolumeComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 7b64c1a35d..1e3b89ef0f 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,12 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import {
-  JournalComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
new file mode 100644
index 0000000000..783a3d15c2
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { PersonComponent as BaseComponent } from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+
+@listableObjectComponent('Person', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-person',
+  // styleUrls: ['./person.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.scss'],
+  // templateUrl: './person.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html',
+})
+export class PersonComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/footer/footer.component.ts b/src/themes/custom/app/footer/footer.component.ts
index de80ceb311..59fecd4800 100644
--- a/src/themes/custom/app/footer/footer.component.ts
+++ b/src/themes/custom/app/footer/footer.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
+
 import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.component';
 
 @Component({
   selector: 'ds-footer',
-  // styleUrls: ['footer.component.scss'],
+  // styleUrls: ['./footer.component.scss'],
   styleUrls: ['../../../../app/footer/footer.component.scss'],
-  // templateUrl: 'footer.component.html'
-  templateUrl: '../../../../app/footer/footer.component.html'
+  // templateUrl: './footer.component.html'
+  templateUrl: '../../../../app/footer/footer.component.html',
 })
 export class FooterComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forbidden/forbidden.component.ts b/src/themes/custom/app/forbidden/forbidden.component.ts
index 915cf651cb..8220851202 100644
--- a/src/themes/custom/app/forbidden/forbidden.component.ts
+++ b/src/themes/custom/app/forbidden/forbidden.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForbiddenComponent as BaseComponent } from '../../../../app/forbidden/forbidden.component';
 
 
@@ -7,7 +8,7 @@ import { ForbiddenComponent as BaseComponent } from '../../../../app/forbidden/f
   // templateUrl: './forbidden.component.html',
   templateUrl: '../../../../app/forbidden/forbidden.component.html',
   // styleUrls: ['./forbidden.component.scss']
-  styleUrls: ['../../../../app/forbidden/forbidden.component.scss']
+  styleUrls: ['../../../../app/forbidden/forbidden.component.scss'],
 })
 /**
  * This component representing the `Forbidden` DSpace page.
diff --git a/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
index 8eaa2bb0fa..a65b219ae9 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForgotEmailComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-email/forgot-email.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ForgotEmailComponent as BaseComponent } from '../../../../../app/forgot
   // styleUrls: ['./forgot-email.component.scss'],
   styleUrls: ['../../../../../app/forgot-password/forgot-password-email/forgot-email.component.scss'],
   // templateUrl: './forgot-email.component.html'
-  templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html'
+  templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html',
 })
 /**
  * Component responsible the forgot password email step
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index d64d925f71..50241abf8c 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./forgot-password-form.component.scss'],
   styleUrls: ['../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.scss'],
   // templateUrl: './forgot-password-form.component.html'
-  templateUrl: '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.html'
+  templateUrl: '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.html',
 })
 /**
  * Component for a user to enter a new password for a forgot token.
diff --git a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 875b5f69b8..67e7dcfc8b 100644
--- a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
 
 /**
@@ -6,9 +7,9 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h
  */
 @Component({
   selector: 'ds-header-navbar-wrapper',
-  // styleUrls: ['header-navbar-wrapper.component.scss'],
+  // styleUrls: ['./header-navbar-wrapper.component.scss'],
   styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
-  // templateUrl: 'header-navbar-wrapper.component.html',
+  // templateUrl: './header-navbar-wrapper.component.html',
   templateUrl: '../../../../app/header-nav-wrapper/header-navbar-wrapper.component.html',
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/custom/app/header/header.component.ts b/src/themes/custom/app/header/header.component.ts
index 866072f3b6..92ac082b0d 100644
--- a/src/themes/custom/app/header/header.component.ts
+++ b/src/themes/custom/app/header/header.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
 
 /**
diff --git a/src/themes/custom/app/home-page/home-news/home-news.component.ts b/src/themes/custom/app/home-page/home-news/home-news.component.ts
index c9c070f6cf..8abc47f7b9 100644
--- a/src/themes/custom/app/home-page/home-news/home-news.component.ts
+++ b/src/themes/custom/app/home-page/home-news/home-news.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page
   // styleUrls: ['./home-news.component.scss'],
   styleUrls: ['../../../../../app/home-page/home-news/home-news.component.scss'],
   // templateUrl: './home-news.component.html'
-  templateUrl: '../../../../../app/home-page/home-news/home-news.component.html'
+  templateUrl: '../../../../../app/home-page/home-news/home-news.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts
index bf04216b14..fd8ec2faa5 100644
--- a/src/themes/custom/app/home-page/home-page.component.ts
+++ b/src/themes/custom/app/home-page/home-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HomePageComponent as BaseComponent } from '../../../../app/home-page/home-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { HomePageComponent as BaseComponent } from '../../../../app/home-page/ho
   // styleUrls: ['./home-page.component.scss'],
   styleUrls: ['../../../../app/home-page/home-page.component.scss'],
   // templateUrl: './home-page.component.html'
-  templateUrl: '../../../../app/home-page/home-page.component.html'
+  templateUrl: '../../../../app/home-page/home-page.component.html',
 })
 export class HomePageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
index b52cb1439c..589191b0bf 100644
--- a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { TopLevelCommunityListComponent as BaseComponent } from '../../../../../app/home-page/top-level-community-list/top-level-community-list.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { TopLevelCommunityListComponent as BaseComponent } from '../../../../../
   // styleUrls: ['./top-level-community-list.component.scss'],
   styleUrls: ['../../../../../app/home-page/top-level-community-list/top-level-community-list.component.scss'],
   // templateUrl: './top-level-community-list.component.html'
-  templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html'
+  templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html',
 })
 
 export class TopLevelCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index 50e196bfaf..7098a97ad6 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/i
   // styleUrls: ['./end-user-agreement.component.scss'],
   styleUrls: ['../../../../../app/info/end-user-agreement/end-user-agreement.component.scss'],
   // templateUrl: './end-user-agreement.component.html'
-  templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html'
+  templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index fb0041882e..172357cc11 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  FeedbackFormComponent as BaseComponent
-} from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+
+import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
 
 @Component({
   selector: 'ds-feedback-form',
diff --git a/src/themes/custom/app/info/feedback/feedback.component.ts b/src/themes/custom/app/info/feedback/feedback.component.ts
index a0d46fba66..61e57bc930 100644
--- a/src/themes/custom/app/info/feedback/feedback.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { FeedbackComponent as BaseComponent } from '../../../../../app/info/feedback/feedback.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { FeedbackComponent as BaseComponent } from '../../../../../app/info/feed
   // styleUrls: ['./feedback.component.scss'],
   styleUrls: ['../../../../../app/info/feedback/feedback.component.scss'],
   // templateUrl: './feedback.component.html'
-  templateUrl: '../../../../../app/info/feedback/feedback.component.html'
+  templateUrl: '../../../../../app/info/feedback/feedback.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/info/privacy/privacy.component.ts b/src/themes/custom/app/info/privacy/privacy.component.ts
index f261c64c14..0901b89fdc 100644
--- a/src/themes/custom/app/info/privacy/privacy.component.ts
+++ b/src/themes/custom/app/info/privacy/privacy.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { PrivacyComponent as BaseComponent } from '../../../../../app/info/privacy/privacy.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { PrivacyComponent as BaseComponent } from '../../../../../app/info/priva
   // styleUrls: ['./privacy.component.scss'],
   styleUrls: ['../../../../../app/info/privacy/privacy.component.scss'],
   // templateUrl: './privacy.component.html'
-  templateUrl: '../../../../../app/info/privacy/privacy.component.html'
+  templateUrl: '../../../../../app/info/privacy/privacy.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
index 25089112d6..b993055887 100644
--- a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
+++ b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ItemAlertsComponent as BaseComponent } from '../../../../../app/item-page/alerts/item-alerts.component';
 
 @Component({
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
index 95acec2275..bb911c5c91 100644
--- a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,6 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ItemStatusComponent as BaseComponent } from '../../../../../../app/item-page/edit-item-page/item-status/item-status.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../app/shared/animations/fade';
 
 @Component({
   selector: 'ds-item-status',
@@ -9,8 +16,8 @@ import { ItemStatusComponent as BaseComponent } from '../../../../../../app/item
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class ItemStatusComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
index 39c27b7350..b44d1ebc88 100644
--- a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  FullFileSectionComponent as BaseComponent
-} from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
+
+import { FullFileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
 
 @Component({
   selector: 'ds-item-page-full-file-section',
diff --git a/src/themes/custom/app/item-page/full/full-item-page.component.ts b/src/themes/custom/app/item-page/full/full-item-page.component.ts
index 6385a27400..12a6fa1f40 100644
--- a/src/themes/custom/app/item-page/full/full-item-page.component.ts
+++ b/src/themes/custom/app/item-page/full/full-item-page.component.ts
@@ -1,6 +1,10 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { fadeInOut } from '../../../../../app/shared/animations/fade';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-page/full/full-item-page.component';
+import { fadeInOut } from '../../../../../app/shared/animations/fade';
 
 /**
  * This component renders a full item page.
@@ -14,7 +18,7 @@ import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-
   // templateUrl: './full-item-page.component.html',
   templateUrl: '../../../../../app/item-page/full/full-item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class FullItemPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
index cf73a91f23..1be8ec8b03 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  MediaViewerImageComponent as BaseComponent
-} from '../../../../../../app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
+
+import { MediaViewerImageComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
 
 @Component({
   selector: 'ds-media-viewer-image',
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index c180f7dcb8..92a399214a 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  MediaViewerVideoComponent as BaseComponent
-} from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+
+import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
 
 @Component({
   selector: 'ds-media-viewer-video',
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
index 5804c7d2eb..c54d384e01 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  MediaViewerComponent as BaseComponent
-} from '../../../../../app/item-page/media-viewer/media-viewer.component';
+
+import { MediaViewerComponent as BaseComponent } from '../../../../../app/item-page/media-viewer/media-viewer.component';
 
 @Component({
   selector: 'ds-media-viewer',
diff --git a/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
index 7f36623b3a..d5c919a9b2 100644
--- a/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { slideSidebarPadding } from '../../../../../../../app/shared/animations/slide';
+
 import { FileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component';
+import { slideSidebarPadding } from '../../../../../../../app/shared/animations/slide';
 
 @Component({
-    selector: 'ds-item-page-file-section',
-    // templateUrl: './file-section.component.html',
-    templateUrl: '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component.html',
-    animations: [slideSidebarPadding],
+  selector: 'ds-item-page-file-section',
+  // templateUrl: './file-section.component.html',
+  templateUrl: '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component.html',
+  animations: [slideSidebarPadding],
 })
 export class FileSectionComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index a214926186..8805e195c4 100644
--- a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  ItemPageTitleFieldComponent as BaseComponent
-} from '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+
+import { ItemPageTitleFieldComponent as BaseComponent } from '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
 
 @Component({
   selector: 'ds-item-page-title-field',
diff --git a/src/themes/custom/app/item-page/simple/item-page.component.ts b/src/themes/custom/app/item-page/simple/item-page.component.ts
index b535a29ead..1ee4d99be5 100644
--- a/src/themes/custom/app/item-page/simple/item-page.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-page.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ItemPageComponent as BaseComponent } from '../../../../../app/item-page/simple/item-page.component';
 import { fadeInOut } from '../../../../../app/shared/animations/fade';
 
@@ -14,7 +18,7 @@ import { fadeInOut } from '../../../../../app/shared/animations/fade';
   // templateUrl: './item-page.component.html',
   templateUrl: '../../../../../app/item-page/simple/item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemPageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
index b07247731b..6844081472 100644
--- a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,8 +1,12 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
 import { PublicationComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/publication/publication.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 /**
  * Component that represents a publication Item page
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 1d1676e92f..8378183992 100644
--- a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,13 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { Context } from '../../../../../../../app/core/shared/context.model';
 import { Item } from '../../../../../../../app/core/shared/item.model';
 import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../../../app/core/shared/context.model';
-import {
-  UntypedItemComponent as BaseComponent
-} from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { UntypedItemComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 /**
  * Component that represents an untyped Item page
diff --git a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 8a6036a23b..01c6c6e6f9 100644
--- a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,10 +1,11 @@
-import { MetadataRepresentationListComponent as BaseComponent } from '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
 import { Component } from '@angular/core';
 
+import { MetadataRepresentationListComponent as BaseComponent } from '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
+
 @Component({
   selector: 'ds-metadata-representation-list',
   // templateUrl: './metadata-representation-list.component.html'
-  templateUrl: '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html'
+  templateUrl: '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html',
 })
 export class MetadataRepresentationListComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/login-page/login-page.component.html b/src/themes/custom/app/login-page/login-page.component.html
index 84059877f4..1a83892c24 100644
--- a/src/themes/custom/app/login-page/login-page.component.html
+++ b/src/themes/custom/app/login-page/login-page.component.html
@@ -3,8 +3,8 @@
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
       <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
+      <ds-themed-log-in
+      [isStandalonePage]="true"></ds-themed-log-in>
     </div>
   </div>
 </div>
diff --git a/src/themes/custom/app/login-page/login-page.component.ts b/src/themes/custom/app/login-page/login-page.component.ts
index 2eb98a288e..ac624f4253 100644
--- a/src/themes/custom/app/login-page/login-page.component.ts
+++ b/src/themes/custom/app/login-page/login-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/login-page.component';
 
 /**
@@ -9,7 +10,7 @@ import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/
   // styleUrls: ['./login-page.component.scss'],
   styleUrls: ['../../../../app/login-page/login-page.component.scss'],
   // templateUrl: './login-page.component.html'
-  templateUrl: '../../../../app/login-page/login-page.component.html'
+  templateUrl: '../../../../app/login-page/login-page.component.html',
 })
 export class LoginPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/logout-page/logout-page.component.ts b/src/themes/custom/app/logout-page/logout-page.component.ts
index 303abe9b2b..bcd53351e9 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.ts
+++ b/src/themes/custom/app/logout-page/logout-page.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { LogoutPageComponent as BaseComponent} from '../../../../app/logout-page/logout-page.component';
+
+import { LogoutPageComponent as BaseComponent } from '../../../../app/logout-page/logout-page.component';
 
 @Component({
   selector: 'ds-logout-page',
   // styleUrls: ['./logout-page.component.scss'],
   styleUrls: ['../../../../app/logout-page/logout-page.component.scss'],
   // templateUrl: './logout-page.component.html'
-  templateUrl: '../../../../app/logout-page/logout-page.component.html'
+  templateUrl: '../../../../app/logout-page/logout-page.component.html',
 })
 export class LogoutPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index 1fbe089bc4..a699b15cc5 100644
--- a/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component';
 
 @Component({
@@ -7,7 +11,7 @@ import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/loo
   styleUrls: ['../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.scss'],
   // templateUrl: './objectnotfound.component.html',
   templateUrl: '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 
 /**
diff --git a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
index 11b4ee38e1..0f6cbccf4e 100644
--- a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,14 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { pushInOut } from '../../../../app/shared/animations/push';
-import { MyDSpacePageComponent as BaseComponent, SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
+import {
+  MyDSpacePageComponent as BaseComponent,
+  SEARCH_CONFIG_SERVICE,
+} from '../../../../app/my-dspace-page/my-dspace-page.component';
+import { pushInOut } from '../../../../app/shared/animations/push';
 
 /**
  * This component represents the whole mydspace page
@@ -17,9 +24,9 @@ import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: MyDSpaceConfigurationService
-    }
-  ]
+      useClass: MyDSpaceConfigurationService,
+    },
+  ],
 })
 export class MyDSpacePageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 3e11271bf0..1ea08ee971 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
-import {
-  ExpandableNavbarSectionComponent as BaseComponent
-} from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+
+import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
-import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
 import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
 
 /**
  * Represents an expandable section in the navbar
@@ -15,7 +14,7 @@ import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
   templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
   // styleUrls: ['./expandable-navbar-section.component.scss'],
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
-  animations: [slide]
+  animations: [slide],
 })
 @rendersSectionForMenu(MenuID.PUBLIC, true)
 export class ExpandableNavbarSectionComponent extends BaseComponent {
diff --git a/src/themes/custom/app/navbar/navbar.component.ts b/src/themes/custom/app/navbar/navbar.component.ts
index e163f096e9..a4c2e4e41d 100644
--- a/src/themes/custom/app/navbar/navbar.component.ts
+++ b/src/themes/custom/app/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
@@ -11,7 +12,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['../../../../app/navbar/navbar.component.scss'],
   // templateUrl: './navbar.component.html',
   templateUrl: '../../../../app/navbar/navbar.component.html',
-  animations: [slideMobileNav]
+  animations: [slideMobileNav],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/pagenotfound/pagenotfound.component.ts b/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
index 71dc7332d4..cd65b088b4 100644
--- a/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
+++ b/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { PageNotFoundComponent as BaseComponent } from '../../../../app/pagenotfound/pagenotfound.component';
 
 @Component({
@@ -7,7 +11,7 @@ import { PageNotFoundComponent as BaseComponent } from '../../../../app/pagenotf
   styleUrls: ['../../../../app/pagenotfound/pagenotfound.component.scss'],
   // templateUrl: './pagenotfound.component.html'
   templateUrl: '../../../../app/pagenotfound/pagenotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 
 /**
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index f285b3618c..e912efb787 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-page/profile-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
   // styleUrls: ['./profile-page.component.scss'],
   styleUrls: ['../../../../app/profile-page/profile-page.component.scss'],
   // templateUrl: './profile-page.component.html'
-  templateUrl: '../../../../app/profile-page/profile-page.component.html'
+  templateUrl: '../../../../app/profile-page/profile-page.component.html',
 })
 /**
  * Component for a user to edit their profile information
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.html b/src/themes/custom/app/register-email-form/register-email-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
new file mode 100644
index 0000000000..b7b3798c21
--- /dev/null
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
+
+@Component({
+  selector: 'ds-register-email-form',
+  // templateUrl: './register-email-form.component.html',
+  templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
+})
+export class RegisterEmailFormComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index 0cffa3288d..1ab0ad2b21 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
 
 /**
@@ -9,7 +10,7 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi
   // styleUrls: ['./create-profile.component.scss'],
   styleUrls: ['../../../../../app/register-page/create-profile/create-profile.component.scss'],
   // templateUrl: './create-profile.component.html'
-  templateUrl: '../../../../../app/register-page/create-profile/create-profile.component.html'
+  templateUrl: '../../../../../app/register-page/create-profile/create-profile.component.html',
 })
 export class CreateProfileComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/register-email/register-email.component.ts b/src/themes/custom/app/register-page/register-email/register-email.component.ts
index 66becd1b6b..36c341ba54 100644
--- a/src/themes/custom/app/register-page/register-email/register-email.component.ts
+++ b/src/themes/custom/app/register-page/register-email/register-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { RegisterEmailComponent as BaseComponent } from '../../../../../app/register-page/register-email/register-email.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { RegisterEmailComponent as BaseComponent } from '../../../../../app/regi
   // styleUrls: ['./register-email.component.scss'],
   styleUrls: ['../../../../../app/register-page/register-email/register-email.component.scss'],
   // templateUrl: './register-email.component.html'
-  templateUrl: '../../../../../app/register-page/register-email/register-email.component.html'
+  templateUrl: '../../../../../app/register-page/register-email/register-email.component.html',
 })
 /**
  * Component responsible the email registration step when registering as a new user
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index 628b2b3f83..ba6bd27caf 100644
--- a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,15 +1,13 @@
 import { Component } from '@angular/core';
-import {
-    DenyRequestCopyComponent as BaseComponent
-} from 'src/app/request-copy/deny-request-copy/deny-request-copy.component';
+import { DenyRequestCopyComponent as BaseComponent } from 'src/app/request-copy/deny-request-copy/deny-request-copy.component';
 
 @Component({
-    selector: 'ds-deny-request-copy',
-    // styleUrls: ['./deny-request-copy.component.scss'],
-    styleUrls: [],
-    // templateUrl: './deny-request-copy.component.html',
-    templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
+  selector: 'ds-deny-request-copy',
+  // styleUrls: ['./deny-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './deny-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
 })
 export class DenyRequestCopyComponent
-    extends BaseComponent {
+  extends BaseComponent {
 }
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index a0274f6efd..55af8bf860 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,15 +1,13 @@
 import { Component } from '@angular/core';
-import {
-    EmailRequestCopyComponent as BaseComponent
-} from 'src/app/request-copy/email-request-copy/email-request-copy.component';
+import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
 @Component({
-    selector: 'ds-email-request-copy',
-    // styleUrls: ['./email-request-copy.component.scss'],
-    styleUrls: [],
-    // templateUrl: './email-request-copy.component.html',
-    templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
+  selector: 'ds-email-request-copy',
+  // styleUrls: ['./email-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './email-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
 })
 export class EmailRequestCopyComponent
-    extends BaseComponent {
+  extends BaseComponent {
 }
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index 446044942e..3a04d93a20 100644
--- a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,15 +1,13 @@
 import { Component } from '@angular/core';
-import {
-    GrantRequestCopyComponent as BaseComponent
-} from 'src/app/request-copy/grant-request-copy/grant-request-copy.component';
+import { GrantRequestCopyComponent as BaseComponent } from 'src/app/request-copy/grant-request-copy/grant-request-copy.component';
 
 @Component({
-    selector: 'ds-grant-request-copy',
-    // styleUrls: ['./grant-request-copy.component.scss'],
-    styleUrls: [],
-    // templateUrl: './grant-request-copy.component.html',
-    templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
+  selector: 'ds-grant-request-copy',
+  // styleUrls: ['./grant-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './grant-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
 })
 export class GrantRequestCopyComponent
-    extends BaseComponent {
+  extends BaseComponent {
 }
diff --git a/src/themes/custom/app/root/root.component.ts b/src/themes/custom/app/root/root.component.ts
index 6b5b0c106f..ce936263e1 100644
--- a/src/themes/custom/app/root/root.component.ts
+++ b/src/themes/custom/app/root/root.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { slideSidebarPadding } from '../../../../app/shared/animations/slide';
+
 import { RootComponent as BaseComponent } from '../../../../app/root/root.component';
+import { slideSidebarPadding } from '../../../../app/shared/animations/slide';
 
 @Component({
   selector: 'ds-root',
diff --git a/src/themes/custom/app/search-navbar/search-navbar.component.ts b/src/themes/custom/app/search-navbar/search-navbar.component.ts
index 3e4da0af7e..2bead7e102 100644
--- a/src/themes/custom/app/search-navbar/search-navbar.component.ts
+++ b/src/themes/custom/app/search-navbar/search-navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SearchNavbarComponent as BaseComponent } from '../../../../app/search-navbar/search-navbar.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { SearchNavbarComponent as BaseComponent } from '../../../../app/search-n
   // styleUrls: ['./search-navbar.component.scss'],
   styleUrls: ['../../../../app/search-navbar/search-navbar.component.scss'],
   // templateUrl: './search-navbar.component.html'
-  templateUrl: '../../../../app/search-navbar/search-navbar.component.html'
+  templateUrl: '../../../../app/search-navbar/search-navbar.component.html',
 })
 export class SearchNavbarComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts
index 159434c7a8..2e5801052c 100644
--- a/src/themes/custom/app/search-page/configuration-search-page.component.ts
+++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts
@@ -1,8 +1,12 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { pushInOut } from '../../../../app/shared/animations/push';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
 import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component';
+import { pushInOut } from '../../../../app/shared/animations/push';
 
 @Component({
   selector: 'ds-configuration-search-page',
@@ -15,9 +19,9 @@ import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../a
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
diff --git a/src/themes/custom/app/search-page/search-page.component.ts b/src/themes/custom/app/search-page/search-page.component.ts
index 44314b7183..51f8f85eb5 100644
--- a/src/themes/custom/app/search-page/search-page.component.ts
+++ b/src/themes/custom/app/search-page/search-page.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
 
 @Component({
   selector: 'ds-search-page',
@@ -11,9 +12,9 @@ import { SearchConfigurationService } from '../../../../app/core/shared/search/s
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index af54aacd44..4409e63ecd 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,19 +1,21 @@
 import { Component } from '@angular/core';
+
 import {
-  AuthNavMenuComponent as BaseComponent,
-} from '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component';
-import { fadeInOut, fadeOut } from '../../../../../app/shared/animations/fade';
+  fadeInOut,
+  fadeOut,
+} from '../../../../../app/shared/animations/fade';
+import { AuthNavMenuComponent as BaseComponent } from '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component';
 
 /**
  * Component representing the {@link AuthNavMenuComponent} of a page
  */
 @Component({
   selector: 'ds-auth-nav-menu',
-  // templateUrl: 'auth-nav-menu.component.html',
+  // templateUrl: './auth-nav-menu.component.html',
   templateUrl: '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.html',
-  // styleUrls: ['auth-nav-menu.component.scss'],
+  // styleUrls: ['./auth-nav-menu.component.scss'],
   styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
-  animations: [fadeInOut, fadeOut]
+  animations: [fadeInOut, fadeOut],
 })
 export class AuthNavMenuComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
new file mode 100644
index 0000000000..e97a4e2eda
--- /dev/null
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+
+import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component';
+
+/**
+ * Component representing the {@link UserMenuComponent} of a page
+ */
+@Component({
+  selector: 'ds-user-menu',
+  // templateUrl: 'user-menu.component.html',
+  templateUrl: '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.html',
+  // styleUrls: ['user-menu.component.scss'],
+  styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
+})
+export class UserMenuComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.html b/src/themes/custom/app/shared/browse-by/browse-by.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.scss b/src/themes/custom/app/shared/browse-by/browse-by.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.ts b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
new file mode 100644
index 0000000000..8710a854f4
--- /dev/null
+++ b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../app/shared/animations/fade';
+import { BrowseByComponent as BaseComponent } from '../../../../../app/shared/browse-by/browse-by.component';
+
+@Component({
+  selector: 'ds-browse-by',
+  // styleUrls: ['./browse-by.component.scss'],
+  styleUrls: ['../../../../../app/shared/browse-by/browse-by.component.scss'],
+  // templateUrl: './browse-by.component.html',
+  templateUrl: '../../../../../app/shared/browse-by/browse-by.component.html',
+  animations: [
+    fadeIn,
+    fadeInOut,
+  ],
+})
+export class BrowseByComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
index 4fdbd9125b..9bf6490ccb 100644
--- a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -1,13 +1,12 @@
-import {
-  CollectionDropdownComponent as BaseComponent
-} from '../../../../../app/shared/collection-dropdown/collection-dropdown.component';
 import { Component } from '@angular/core';
 
+import { CollectionDropdownComponent as BaseComponent } from '../../../../../app/shared/collection-dropdown/collection-dropdown.component';
+
 @Component({
   selector: 'ds-collection-dropdown',
   templateUrl: '../../../../../app/shared/collection-dropdown/collection-dropdown.component.html',
   // templateUrl: './collection-dropdown.component.html',
-  styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss']
+  styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'],
   // styleUrls: ['./collection-dropdown.component.scss']
 })
 export class CollectionDropdownComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index c6805175b0..b5af81bab4 100644
--- a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ComcolPageBrowseByComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
+
+import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
 
 /**
  * A component to display the "Browse By" section of a Community or Collection page
@@ -10,6 +11,6 @@ import { ComcolPageBrowseByComponent as BaseComponent} from '../../../../../app/
   // styleUrls: ['./comcol-page-browse-by.component.scss'],
   styleUrls: ['../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'],
   // templateUrl: './comcol-page-browse-by.component.html'
-  templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html'
+  templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html',
 })
 export class ComcolPageBrowseByComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
index ef68f1538f..8beb56b596 100644
--- a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ComcolPageHandleComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
+
+import { ComcolPageHandleComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
 
 
 /**
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 22d40ff539..a4315c9cf2 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    CreateCollectionParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+
+import { CreateCollectionParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 
 @Component({
   selector: 'ds-create-collection-parent-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 8b28ee1bb8..f46f4ee89e 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    CreateCommunityParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+
+import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
 
 @Component({
   selector: 'ds-create-community-parent-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index f8e3401454..e84fb2bf98 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,13 +1,12 @@
-import {Component} from '@angular/core';
-import {
-    CreateItemParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { Component } from '@angular/core';
+
+import { CreateItemParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 @Component({
-    selector: 'ds-create-item-parent-selector',
-    // styleUrls: ['./create-item-parent-selector.component.scss'],
-    // templateUrl: './create-item-parent-selector.component.html',
-    templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
+  selector: 'ds-create-item-parent-selector',
+  // styleUrls: ['./create-item-parent-selector.component.scss'],
+  // templateUrl: './create-item-parent-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 8f4a8dd5cd..a52987958e 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    EditCollectionSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+
+import { EditCollectionSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 
 @Component({
   selector: 'ds-edit-collection-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 79d52fc350..a89e702177 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    EditCommunitySelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+
+import { EditCommunitySelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 
 @Component({
   selector: 'ds-edit-item-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 398dbc933c..d2e4c4b05b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,7 +1,5 @@
 import { Component } from '@angular/core';
-import {
-    EditItemSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import { EditItemSelectorComponent as BaseComponent } from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 
 @Component({
   selector: 'ds-edit-item-selector',
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
index e6ff61f0ba..ddc51deb56 100644
--- a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  FileDownloadLinkComponent as BaseComponent
-} from '../../../../../app/shared/file-download-link/file-download-link.component';
+
+import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/shared/file-download-link/file-download-link.component';
 
 @Component({
   selector: 'ds-file-download-link',
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 569d007b4d..39f28a9d7f 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,8 +1,12 @@
-import { DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
 import { Component } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service';
-import { fadeIn, fadeInOut } from '../../../../../../../../../app/shared/animations/fade';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../../../../app/shared/animations/fade';
+import { DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-external-source-tab',
@@ -13,13 +17,13 @@ import { fadeIn, fadeInOut } from '../../../../../../../../../app/shared/animati
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
+      useClass: SearchConfigurationService,
+    },
   ],
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class DsDynamicLookupRelationExternalSourceTabComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index cd1de5d159..5d77a44df4 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -1,8 +1,7 @@
-import {
-  ExternalSourceEntryImportModalComponent as BaseComponent
-} from '../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { Component } from '@angular/core';
 
+import { ExternalSourceEntryImportModalComponent as BaseComponent } from '../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+
 @Component({
   selector: 'ds-external-source-entry-import-modal',
   styleUrls: ['../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.scss'],
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 2380cc67e8..076d052c82 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,7 +1,8 @@
-import { DsDynamicLookupRelationSearchTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
 import { Component } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { DsDynamicLookupRelationSearchTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-search-tab',
@@ -12,9 +13,9 @@ import { SearchConfigurationService } from '../../../../../../../../../app/core/
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 export class DsDynamicLookupRelationSearchTabComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.html b/src/themes/custom/app/shared/lang-switch/lang-switch.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.scss b/src/themes/custom/app/shared/lang-switch/lang-switch.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
new file mode 100644
index 0000000000..dcb13d2062
--- /dev/null
+++ b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/lang-switch/lang-switch.component';
+
+@Component({
+  selector: 'ds-lang-switch',
+  // styleUrls: ['./lang-switch.component.scss'],
+  styleUrls: ['../../../../../app/shared/lang-switch/lang-switch.component.scss'],
+  // templateUrl: './lang-switch.component.html',
+  templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
+})
+export class LangSwitchComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
index fb1a291dc0..54fa5d87ed 100644
--- a/src/themes/custom/app/shared/loading/loading.component.ts
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
 
 @Component({
   selector: 'ds-loading',
   styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
   // styleUrls: ['./loading.component.scss'],
-  templateUrl: '../../../../../app/shared/loading/loading.component.html'
+  templateUrl: '../../../../../app/shared/loading/loading.component.html',
   // templateUrl: './loading.component.html'
 })
 export class LoadingComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.html b/src/themes/custom/app/shared/log-in/log-in.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.scss b/src/themes/custom/app/shared/log-in/log-in.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.ts b/src/themes/custom/app/shared/log-in/log-in.component.ts
new file mode 100644
index 0000000000..5570f5f572
--- /dev/null
+++ b/src/themes/custom/app/shared/log-in/log-in.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { LogInComponent as BaseComponent } from '../../../../../app/shared/log-in/log-in.component';
+
+@Component({
+  selector: 'ds-log-in',
+  // templateUrl: './log-in.component.html',
+  templateUrl: '../../../../../app/shared/log-in/log-in.component.html',
+  // styleUrls: ['./log-in.component.scss'],
+  styleUrls: ['../../../../../app/shared/log-in/log-in.component.scss'],
+})
+export class LogInComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
new file mode 100644
index 0000000000..679aadb985
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+
+import { BrowseEntry } from '../../../../../../app/core/shared/browse-entry.model';
+import { Context } from '../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { BrowseEntryListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
+
+@Component({
+  selector: 'ds-browse-entry-list-element',
+  // styleUrls: ['./browse-entry-list-element.component.scss'],
+  styleUrls: ['../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss'],
+  // templateUrl: './browse-entry-list-element.component.html',
+  templateUrl: '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html',
+})
+@listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom')
+export class BrowseEntryListElementComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index 78ac59e7b8..1f60200411 100644
--- a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,14 +1,10 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
-import {Collection} from '../../../../../../app/core/shared/collection.model';
-import {
-  CollectionListElementComponent as BaseComponent
-} from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component';
-import {ViewMode} from '../../../../../../app/core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import {Context} from '../../../../../../app/core/shared/context.model';
+import { Collection } from '../../../../../../app/core/shared/collection.model';
+import { Context } from '../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { CollectionListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component';
 
 @listableObjectComponent(Collection, ViewMode.ListElement, Context.Any, 'custom')
 
@@ -17,7 +13,7 @@ import {Context} from '../../../../../../app/core/shared/context.model';
   // styleUrls: ['./collection-list-element.component.scss'],
   styleUrls: ['../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.scss'],
   // templateUrl: './collection-list-element.component.html'
-  templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html'
+  templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html',
 })
 /**
  * Component representing list element for a collection
diff --git a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
index 24e2cdcfa1..a5c3f3fc55 100644
--- a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,12 +1,10 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
 import { Community } from '../../../../../../app/core/shared/community.model';
-import {
-  CommunityListElementComponent as BaseComponent
-} from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component';
+import { Context } from '../../../../../../app/core/shared/context.model';
 import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import {Context} from '../../../../../../app/core/shared/context.model';
+import { CommunityListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component';
 
 @listableObjectComponent(Community,  ViewMode.ListElement, Context.Any, 'custom')
 
@@ -15,7 +13,7 @@ import {Context} from '../../../../../../app/core/shared/context.model';
   // styleUrls: ['./community-list-element.component.scss'],
   styleUrls: ['../../../../../../app/shared/object-list/community-list-element/community-list-element.component.scss'],
   // templateUrl: './community-list-element.component.html'
-  templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html'
+  templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html',
 })
 /**
  * Component representing a list element for a community
diff --git a/src/themes/custom/app/shared/object-list/object-list.component.ts b/src/themes/custom/app/shared/object-list/object-list.component.ts
index 49f464610f..563ed1ec51 100644
--- a/src/themes/custom/app/shared/object-list/object-list.component.ts
+++ b/src/themes/custom/app/shared/object-list/object-list.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ObjectListComponent as BaseComponent} from '../../../../../app/shared/object-list/object-list.component';
+
+import { ObjectListComponent as BaseComponent } from '../../../../../app/shared/object-list/object-list.component';
 
 /**
  * A component to display the "Browse By" section of a Community or Collection page
@@ -9,8 +10,8 @@ import { ObjectListComponent as BaseComponent} from '../../../../../app/shared/o
   selector: 'ds-object-list',
   // styleUrls: ['./object-list.component.scss'],
   styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
-  // templateUrl: 'object-list.component.html'
-  templateUrl: '../../../../../app/shared/object-list/object-list.component.html'
+  // templateUrl: './object-list.component.html'
+  templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
 })
 
 export class ObjectListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 269a6b35d2..b88f57477e 100644
--- a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,15 +1,10 @@
 import { Component } from '@angular/core';
-import {
-  listableObjectComponent
-} from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../../../../../app/core/shared/view-mode.model';
-import {
-  ItemSearchResult
-} from '../../../../../../../../../app/shared/object-collection/shared/item-search-result.model';
-import {
-  ItemSearchResultListElementComponent as BaseComponent
-} from '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+
 import { Context } from '../../../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../../../app/core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../../../../../app/shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ItemSearchResultListElementComponent as BaseComponent } from '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.Any, 'custom')
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Any, 'custom')
diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts
index 1c2a70cabf..b37abbcc34 100644
--- a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts
@@ -1,11 +1,10 @@
-import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
 import { Component } from '@angular/core';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
 import { ItemSearchResult } from '../../../../../../../app/shared/object-collection/shared/item-search-result.model';
-import {
-  PublicationSidebarSearchListElementComponent as BaseComponent
-} from '../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal, 'custom')
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom')
diff --git a/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
index 01826ec5d6..d8e772fde1 100644
--- a/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
@@ -1,13 +1,12 @@
-import {
-  ResultsBackButtonComponent as BaseComponent
-} from '../../../../../app/shared/results-back-button/results-back-button.component';
 import { Component } from '@angular/core';
 
+import { ResultsBackButtonComponent as BaseComponent } from '../../../../../app/shared/results-back-button/results-back-button.component';
+
 @Component({
   selector: 'ds-results-back-button',
   // styleUrls: ['./results-back-button.component.scss'],
   styleUrls: ['../../../../../app/shared/results-back-button/results-back-button.component.scss'],
   //templateUrl: './results-back-button.component.html',
-  templateUrl: '../../../../../app/shared/results-back-button/results-back-button.component.html'
+  templateUrl: '../../../../../app/shared/results-back-button/results-back-button.component.html',
 })
 export class ResultsBackButtonComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.ts b/src/themes/custom/app/shared/search-form/search-form.component.ts
index 5721f8196c..76047b5909 100644
--- a/src/themes/custom/app/shared/search-form/search-form.component.ts
+++ b/src/themes/custom/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  SearchFormComponent as BaseComponent,
-} from '../../../../../app/shared/search-form/search-form.component';
+
+import { SearchFormComponent as BaseComponent } from '../../../../../app/shared/search-form/search-form.component';
 
 @Component({
   selector: 'ds-search-form',
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
index ad3ec93383..a68290a71b 100644
--- a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
@@ -6,11 +6,10 @@
  * https://www.atmire.com/software-license/
  */
 import { Component } from '@angular/core';
-import {
-  SearchFiltersComponent as BaseComponent,
-} from '../../../../../../app/shared/search/search-filters/search-filters.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';
 
 
 @Component({
@@ -22,9 +21,9 @@ import { SearchConfigurationService } from '../../../../../../app/core/shared/se
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 
 })
 
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index 5084d4d405..d35dc7ca28 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,6 +1,10 @@
-import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
 import { Component } from '@angular/core';
-import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade';
+
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../app/shared/animations/fade';
+import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
 
 @Component({
   selector: 'ds-search-results',
@@ -9,8 +13,8 @@ import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade'
   // styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
index e17c2425b5..d07456d7ef 100644
--- a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
@@ -6,11 +6,10 @@
  * https://www.atmire.com/software-license/
  */
 import { Component } from '@angular/core';
-import {
-  SearchSettingsComponent as BaseComponent,
-} from '../../../../../../app/shared/search/search-settings/search-settings.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchSettingsComponent as BaseComponent } from '../../../../../../app/shared/search/search-settings/search-settings.component';
 
 
 @Component({
@@ -22,9 +21,9 @@ import { SearchConfigurationService } from '../../../../../../app/core/shared/se
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 
 })
 
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
index aed31b91e2..dcb5305c7f 100644
--- a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -6,11 +6,10 @@
  * https://www.atmire.com/software-license/
  */
 import { Component } from '@angular/core';
-import {
-  SearchSidebarComponent as BaseComponent,
-} from '../../../../../../app/shared/search/search-sidebar/search-sidebar.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchSidebarComponent as BaseComponent } from '../../../../../../app/shared/search/search-sidebar/search-sidebar.component';
 
 
 @Component({
@@ -22,9 +21,9 @@ import { SearchConfigurationService } from '../../../../../../app/core/shared/se
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 
 })
 
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
index ed7efb3ba6..22ae9cfc4c 100644
--- a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
-import { renderStartsWithFor, StartsWithType } from '../../../../../../app/shared/starts-with/starts-with-decorator';
+
+import { StartsWithDateComponent as BaseComponent } from '../../../../../../app/shared/starts-with/date/starts-with-date.component';
 import {
-  StartsWithDateComponent as BaseComponent
-} from '../../../../../../app/shared/starts-with/date/starts-with-date.component';
+  renderStartsWithFor,
+  StartsWithType,
+} from '../../../../../../app/shared/starts-with/starts-with-decorator';
 
 @Component({
   selector: 'ds-starts-with-date',
diff --git a/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts
index 9c7a721230..d9027f3e13 100644
--- a/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts
+++ b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
-import { renderStartsWithFor, StartsWithType } from '../../../../../../app/shared/starts-with/starts-with-decorator';
+
 import {
-  StartsWithTextComponent as BaseComponent
-} from '../../../../../../app/shared/starts-with/text/starts-with-text.component';
+  renderStartsWithFor,
+  StartsWithType,
+} from '../../../../../../app/shared/starts-with/starts-with-decorator';
+import { StartsWithTextComponent as BaseComponent } from '../../../../../../app/shared/starts-with/text/starts-with-text.component';
 
 @Component({
   selector: 'ds-starts-with-text',
diff --git a/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
index f3fa9d3e42..ba8e86e93c 100644
--- a/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CollectionStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/collection-statistics-page/collection-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { CollectionStatisticsPageComponent as BaseComponent } from '../../../../
   // styleUrls: ['./collection-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss'],
   // templateUrl: './collection-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
index 76aac6aa15..3e18999961 100644
--- a/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CommunityStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/community-statistics-page/community-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { CommunityStatisticsPageComponent as BaseComponent } from '../../../../.
   // styleUrls: ['./community-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/community-statistics-page/community-statistics-page.component.scss'],
   // templateUrl: './community-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
index f2adbc9c21..fa7d4038e0 100644
--- a/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ItemStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/item-statistics-page/item-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ItemStatisticsPageComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./item-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/item-statistics-page/item-statistics-page.component.scss'],
   // templateUrl: './item-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
index 30dc6502ea..398a0eeece 100644
--- a/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SiteStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/site-statistics-page/site-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { SiteStatisticsPageComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./site-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/site-statistics-page/site-statistics-page.component.scss'],
   // templateUrl: './site-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/submission/edit/submission-edit.component.ts b/src/themes/custom/app/submission/edit/submission-edit.component.ts
index 88559d30b4..c87d4a8082 100644
--- a/src/themes/custom/app/submission/edit/submission-edit.component.ts
+++ b/src/themes/custom/app/submission/edit/submission-edit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SubmissionEditComponent as BaseComponent } from '../../../../../app/submission/edit/submission-edit.component';
 
 /**
@@ -9,7 +10,7 @@ import { SubmissionEditComponent as BaseComponent } from '../../../../../app/sub
   // styleUrls: ['./submission-edit.component.scss'],
   styleUrls: ['../../../../../app/submission/edit/submission-edit.component.scss'],
   // templateUrl: './submission-edit.component.html'
-  templateUrl: '../../../../../app/submission/edit/submission-edit.component.html'
+  templateUrl: '../../../../../app/submission/edit/submission-edit.component.html',
 })
 export class SubmissionEditComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
index cf541b85c9..95f0c4dcae 100644
--- a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
+++ b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { fadeIn } from '../../../../../app/shared/animations/fade';
 import { SubmissionImportExternalComponent as BaseComponent } from '../../../../../app/submission/import-external/submission-import-external.component';
 
@@ -11,7 +12,7 @@ import { SubmissionImportExternalComponent as BaseComponent } from '../../../../
   styleUrls: ['../../../../../app/submission/import-external/submission-import-external.component.scss'],
   // templateUrl: './submission-import-external.component.html',
   templateUrl: '../../../../../app/submission/import-external/submission-import-external.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class SubmissionImportExternalComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 369af4e36c..72d43e4ff2 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,7 +1,5 @@
 import { Component } from '@angular/core';
-import {
-    SubmissionSectionUploadFileComponent as BaseComponent
-} from 'src/app/submission/sections/upload/file/section-upload-file.component';
+import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -11,8 +9,8 @@ import {
   // styleUrls: ['./section-upload-file.component.scss'],
   styleUrls: ['../../../../../../../app/submission/sections/upload/file/section-upload-file.component.scss'],
   // templateUrl: './section-upload-file.component.html'
-  templateUrl: '../../../../../../../app/submission/sections/upload/file/section-upload-file.component.html'
+  templateUrl: '../../../../../../../app/submission/sections/upload/file/section-upload-file.component.html',
 })
 export class SubmissionSectionUploadFileComponent
-    extends BaseComponent {
+  extends BaseComponent {
 }
diff --git a/src/themes/custom/app/submission/submit/submission-submit.component.ts b/src/themes/custom/app/submission/submit/submission-submit.component.ts
index 05c3389cb7..dacecb8167 100644
--- a/src/themes/custom/app/submission/submit/submission-submit.component.ts
+++ b/src/themes/custom/app/submission/submit/submission-submit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SubmissionSubmitComponent as BaseComponent } from '../../../../../app/submission/submit/submission-submit.component';
 
 /**
@@ -9,7 +10,7 @@ import { SubmissionSubmitComponent as BaseComponent } from '../../../../../app/s
   // styleUrls: ['./submission-submit.component.scss'],
   styleUrls: ['../../../../../app/submission/submit/submission-submit.component.scss'],
   // templateUrl: './submission-submit.component.html'
-  templateUrl: '../../../../../app/submission/submit/submission-submit.component.html'
+  templateUrl: '../../../../../app/submission/submit/submission-submit.component.html',
 })
 export class SubmissionSubmitComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/thumbnail/thumbnail.component.ts b/src/themes/custom/app/thumbnail/thumbnail.component.ts
index 406183c8e7..8a3fb66fec 100644
--- a/src/themes/custom/app/thumbnail/thumbnail.component.ts
+++ b/src/themes/custom/app/thumbnail/thumbnail.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThumbnailComponent as BaseComponent } from '../../../../app/thumbnail/thumbnail.component';
 
 @Component({
diff --git a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 7c4831484f..2c34b197a8 100644
--- a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
 
 @Component({
   selector: 'ds-workflow-item-delete',
   // styleUrls: ['workflow-item-delete.component.scss'],
   // templateUrl: './workflow-item-delete.component.html'
-  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html'
+  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to delete a workflow item
diff --git a/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
index 49121e64b9..6615d41857 100644
--- a/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
+++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
+
 import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 
 @Component({
   selector: 'ds-workflow-item-send-back',
-  // styleUrls: ['workflow-item-send-back.component.scss'],
+  // NOTE: the SCSS file for workflow-item-action-page does not have a corresponding file in the original
+  // implementation, so this commented out line below is a stub, here if you
+  // need it, but you probably don't need it.
+  // styleUrls: ['./workflow-item-send-back.component.scss'],
   // templateUrl: './workflow-item-send-back.component.html'
-  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html'
+  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to send back a workflow item to the submitter
diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts
index 95494d76dd..2f6cc90f05 100644
--- a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts
+++ b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { WorkspaceItemsDeletePageComponent as BaseComponent } from '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
 
 
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 7d7f5b3d8b..3ac3f48dfc 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -1,60 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { NavbarModule } from '../../app/navbar/navbar.module';
+import { RootModule } from '../../app/root.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../app/shared/shared.module';
-import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
-import { NavbarComponent } from './app/navbar/navbar.component';
-import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
+import { FooterComponent } from './app/footer/footer.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { RootModule } from '../../app/root.module';
-import { NavbarModule } from '../../app/navbar/navbar.module';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { FooterComponent } from './app/footer/footer.component';
-import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
-import {
-  JournalIssueComponent
-} from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
-import {
-  JournalVolumeComponent
-} from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
-import { ItemSharedModule } from '../../app/item-page/item-shared.module';
-import {
-    CreateCollectionParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import {
-    CreateCommunityParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import {
-    CreateItemParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import {
-    EditCollectionSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {
-    EditCommunitySelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import {
-    EditItemSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
-import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
+import { NavbarComponent } from './app/navbar/navbar.component';
+import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
-import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
-import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
+import { CreateCollectionParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import { CreateCommunityParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import { CreateItemParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { EditCollectionSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import { EditCommunitySelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import { EditItemSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 import { FileDownloadLinkComponent } from './app/shared/file-download-link/file-download-link.component';
+import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.component';
+import { LogInComponent } from './app/shared/log-in/log-in.component';
+import { BrowseEntryListElementComponent } from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { CollectionListElementComponent } from './app/shared/object-list/collection-list-element/collection-list-element.component';
+import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
+import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { PublicationSidebarSearchListElementComponent } from './app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component';
 import { StartsWithDateComponent } from './app/shared/starts-with/date/starts-with-date.component';
 import { StartsWithTextComponent } from './app/shared/starts-with/text/starts-with-text.component';
-import {
-  PublicationSidebarSearchListElementComponent
-} from './app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component';
-import {
-  ItemSearchResultListElementComponent
-} from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
-
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -64,6 +48,7 @@ const ENTRY_COMPONENTS = [
   JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
+  PersonComponent,
   PublicationComponent,
   UntypedItemComponent,
   CommunityListElementComponent,
@@ -75,6 +60,7 @@ const ENTRY_COMPONENTS = [
   PublicationSidebarSearchListElementComponent,
   ItemSearchResultListElementComponent,
   TopLevelCommunityListComponent,
+  BrowseEntryListElementComponent,
 ];
 
 const DECLARATIONS = [
@@ -91,6 +77,8 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
+  LogInComponent,
+  LangSwitchComponent,
 ];
 
 @NgModule({
@@ -107,7 +95,10 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    ...ENTRY_COMPONENTS.map((component) => ({ provide: component })),
+  ],
+  exports: [
+    ItemSearchResultListElementComponent,
   ],
 })
 /**
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index edb3f5478c..814313f46e 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -1,167 +1,148 @@
-import { NgModule } from '@angular/core';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreRouterConnectingModule } from '@ngrx/router-store';
+import { StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { IdlePreloadModule } from 'angular-idle-preload';
+import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
+
 import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
+import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
 import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
 import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module';
-import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
+import { AppModule } from '../../app/app.module';
 import { BrowseByModule } from '../../app/browse-by/browse-by.module';
 import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
+import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
+import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
 import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
+import { CommunityPageModule } from '../../app/community-page/community-page.module';
 import { CoreModule } from '../../app/core/core.module';
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
-import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
-import { IdlePreloadModule } from 'angular-idle-preload';
+import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
 import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
+import { HomePageModule } from '../../app/home-page/home-page.module';
+import { InfoModule } from '../../app/info/info.module';
+import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
 import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
-import { MenuModule } from '../../app/shared/menu/menu.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NotificationsModule } from '../../app/notifications/notifications.module';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { RootModule } from '../../app/root.module';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
+import { FormModule } from '../../app/shared/form/form.module';
+import { MenuModule } from '../../app/shared/menu/menu.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SearchModule } from '../../app/shared/search/search.module';
 import { SharedModule } from '../../app/shared/shared.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { StoreModule } from '@ngrx/store';
-import { StoreRouterConnectingModule } from '@ngrx/router-store';
-import { TranslateModule } from '@ngx-translate/core';
-import { HomePageModule } from '../../app/home-page/home-page.module';
-import { AppModule } from '../../app/app.module';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { RouterModule } from '@angular/router';
-import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
-import { InfoModule } from '../../app/info/info.module';
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
-import { CommunityPageModule } from '../../app/community-page/community-page.module';
-import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
 import { SubmissionModule } from '../../app/submission/submission.module';
-import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
-import { SearchModule } from '../../app/shared/search/search.module';
-import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../app/shared/comcol/comcol.module';
-import { RootModule } from '../../app/root.module';
-import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
-import { HomePageComponent } from './app/home-page/home-page.component';
-import { RootComponent } from './app/root/root.component';
-import { BrowseBySwitcherComponent } from './app/browse-by/browse-by-switcher/browse-by-switcher.component';
+import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
+import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
+import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
+import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
+import { BrowseByDateComponent } from './app/browse-by/browse-by-date/browse-by-date.component';
+import { BrowseByMetadataComponent } from './app/browse-by/browse-by-metadata/browse-by-metadata.component';
+import { BrowseByTaxonomyComponent } from './app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
+import { BrowseByTitleComponent } from './app/browse-by/browse-by-title/browse-by-title.component';
+import { CollectionPageComponent } from './app/collection-page/collection-page.component';
+import { EditItemTemplatePageComponent } from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
+import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
 import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component';
-import { SearchPageComponent } from './app/search-page/search-page.component';
-import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component';
-import { SearchFormComponent } from './app/shared/search-form/search-form.component';
-import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component';
-import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
-import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
+import { CommunityPageComponent } from './app/community-page/community-page.component';
+import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 import { ForbiddenComponent } from './app/forbidden/forbidden.component';
+import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component';
+import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-password-form/forgot-password-form.component';
+import { HomePageComponent } from './app/home-page/home-page.component';
+import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component';
+import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
 import { PrivacyComponent } from './app/info/privacy/privacy.component';
+import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
+import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
+import { FullFileSectionComponent } from './app/item-page/full/field-components/file-section/full-file-section.component';
+import { FullItemPageComponent } from './app/item-page/full/full-item-page.component';
+import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component';
+import { MediaViewerImageComponent } from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
+import { MediaViewerVideoComponent } from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
+import { ItemPageTitleFieldComponent } from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+import { ItemPageComponent } from './app/item-page/simple/item-page.component';
+import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
+import { LoginPageComponent } from './app/login-page/login-page.component';
+import { LogoutPageComponent } from './app/logout-page/logout-page.component';
+import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
+import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
+import { ExpandableNavbarSectionComponent } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
+import { ProfilePageComponent } from './app/profile-page/profile-page.component';
+import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
+import { CreateProfileComponent } from './app/register-page/create-profile/create-profile.component';
+import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
+import { DenyRequestCopyComponent } from './app/request-copy/deny-request-copy/deny-request-copy.component';
+import { EmailRequestCopyComponent } from './app/request-copy/email-request-copy/email-request-copy.component';
+import { GrantRequestCopyComponent } from './app/request-copy/grant-request-copy/grant-request-copy.component';
+import { RootComponent } from './app/root/root.component';
+import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component';
+import { SearchPageComponent } from './app/search-page/search-page.component';
+import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
+import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component';
+import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
+import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
+import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { ExternalSourceEntryImportModalComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { LoadingComponent } from './app/shared/loading/loading.component';
+import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
+import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
+import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
+import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
+import { ObjectListComponent } from './app/shared/object-list/object-list.component';
+import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
+import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
+import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
+import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
+import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
+import { SearchFormComponent } from './app/shared/search-form/search-form.component';
 import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
 import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
 import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
 import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
-import { CommunityPageComponent } from './app/community-page/community-page.component';
-import { CollectionPageComponent } from './app/collection-page/collection-page.component';
-import { ItemPageComponent } from './app/item-page/simple/item-page.component';
-import { FullItemPageComponent } from './app/item-page/full/full-item-page.component';
-import { LoginPageComponent } from './app/login-page/login-page.component';
-import { LogoutPageComponent } from './app/logout-page/logout-page.component';
-import { CreateProfileComponent } from './app/register-page/create-profile/create-profile.component';
-import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component';
-import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-password-form/forgot-password-form.component';
-import { ProfilePageComponent } from './app/profile-page/profile-page.component';
-import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
-import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
 import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
 import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
+import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component';
 import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
+import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
 import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
 import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
-import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
-import { FeedbackComponent } from './app/info/feedback/feedback.component';
-import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
-
-import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
-import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
-import {
-  ExpandableNavbarSectionComponent
-} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
-import {
-  EditItemTemplatePageComponent
-} from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
-import { LoadingComponent } from './app/shared/loading/loading.component';
-import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
-import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
-import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
-import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
-import { CommunityPageSubCommunityListComponent } from './app/community-page/sub-community-list/community-page-sub-community-list.component';
-import { CommunityPageSubCollectionListComponent } from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
-import { ObjectListComponent } from './app/shared/object-list/object-list.component';
-
-import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component';
-import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component';
-import { BrowseByTaxonomyPageComponent } from './app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component';
-import {
-  ExternalSourceEntryImportModalComponent
-} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
-import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
-import { ItemSharedModule } from '../../app/item-page/item-shared.module';
-import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
-import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
-import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
-import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
-import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
-import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
-import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
-import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
-import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
-import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
-import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
-import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
-import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
-import {
-  FullFileSectionComponent
-} from './app/item-page/full/field-components/file-section/full-file-section.component';
-import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
-import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
-import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
-import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
-import {
-  ItemPageTitleFieldComponent
-} from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
-import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component';
-import {
-  MediaViewerImageComponent
-} from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
-import {
-  MediaViewerVideoComponent
-} from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
-import { NgxGalleryModule } from '@kolkov/ngx-gallery';
-import {
-    DenyRequestCopyComponent
-} from './app/request-copy/deny-request-copy/deny-request-copy.component';
-import {
-    EmailRequestCopyComponent
-} from './app/request-copy/email-request-copy/email-request-copy.component';
-import {
-    GrantRequestCopyComponent
-} from './app/request-copy/grant-request-copy/grant-request-copy.component';
 import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component';
-import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
-import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component';
-import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
-import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
-import { FormModule } from '../../app/shared/form/form.module';
-import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
   HomePageComponent,
   RootComponent,
-  BrowseBySwitcherComponent,
   CommunityListPageComponent,
   SearchPageComponent,
   ConfigurationSearchPageComponent,
@@ -208,10 +189,10 @@ const DECLARATIONS = [
   SearchSettingsComponent,
   ComcolPageBrowseByComponent,
   ObjectListComponent,
-  BrowseByMetadataPageComponent,
-  BrowseByDatePageComponent,
-  BrowseByTitlePageComponent,
-  BrowseByTaxonomyPageComponent,
+  BrowseByMetadataComponent,
+  BrowseByDateComponent,
+  BrowseByTitleComponent,
+  BrowseByTaxonomyComponent,
   ExternalSourceEntryImportModalComponent,
   SearchFiltersComponent,
   SearchSidebarComponent,
@@ -239,6 +220,9 @@ const DECLARATIONS = [
   SubmissionSectionUploadFileComponent,
   ItemStatusComponent,
   EditBitstreamPageComponent,
+  UserMenuComponent,
+  BrowseByComponent,
+  RegisterEmailFormComponent,
 ];
 
 @NgModule({
@@ -299,14 +283,12 @@ const DECLARATIONS = [
     NgxGalleryModule,
     FormModule,
     RequestCopyModule,
+    NotificationsModule,
   ],
   declarations: DECLARATIONS,
-  exports: [
-    CommunityPageSubCollectionListComponent
-  ]
 })
 
-  /**
+/**
    * This module serves as an index for all the components in this theme.
    * It should import all other modules, so the compiler knows where to find any components referenced
    * from a component in this theme
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
index 091d152258..5f51689df8 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,3 +1,9 @@
-<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
+<div id="header-navbar-wrapper"><!-- [class.open]="!(isNavBarCollapsed$ | async)" -->
   <ds-themed-header></ds-themed-header>
+  <!-- Collapsible navbar (mobile only) -->
+  <div *ngIf="(isMobile$ | async)" id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+    <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
+      <ds-themed-navbar></ds-themed-navbar>
+    </nav>
+  </div>
 </div>
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index e69de29bb2..444d3a9722 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -0,0 +1,81 @@
+:host {
+  --ds-header-navbar-border-bottom-style: solid var(--ds-header-navbar-border-bottom-height) var(--ds-header-navbar-border-bottom-color);
+  --ds-expandable-navbar-border-top-style: solid var(--ds-expandable-navbar-border-top-height) var(--ds-expandable-navbar-border-top-color);
+  --ds-expandable-navbar-height: calc(100vh - var(--ds-header-height));
+
+  div#header-navbar-wrapper {
+    // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index
+    position: relative; // required by the mobile collapsible navbar
+    border-bottom: var(--ds-header-navbar-border-bottom-style); // gets covered by mobile navbar wrapper, when open
+
+    div#mobile-navbar-wrapper {
+      width: 100%;
+      background-color: var(--ds-expandable-navbar-bg);
+      position: absolute;
+      z-index: var(--ds-nav-z-index);
+      overflow: hidden;
+
+      nav#collapsible-mobile-navbar {
+        // Following parameters are changed by slideMobileNav animation
+        min-height: var(--ds-expandable-navbar-height);
+        height: auto;
+        border-bottom: var(--ds-header-navbar-border-bottom-style);
+      }
+    }
+  }
+
+  /* MENU ITEMS */
+
+  ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    nav#desktop-navbar { // in header component
+      #main-site-navigation {
+        /* Desktop menu */
+
+        .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
+          // fill navbar height (required by dropdown menus) and center content
+          display: flex;
+          align-items: center;
+          height: 100%;
+        }
+        .ds-menu-item {
+          // define here the style for top-level navbar menu items
+          padding: var(--ds-navbar-item-vertical-padding) var(--ds-navbar-item-horizontal-padding);
+        }
+        .ds-menu-item, .ds-menu-toggler-wrapper {
+          color: var(--ds-navbar-link-color) !important;
+          &:hover, &:focus {
+            color: var(--ds-navbar-link-color-hover) !important;
+          }
+        }
+
+        /* desktop submenu */
+
+        .dropdown-menu {
+          .ds-menu-item {
+            // define here the style for second-level navbar menu items
+            padding: var(--ds-navbar-dropdown-item-vertical-padding) var(--ds-navbar-dropdown-item-horizontal-padding);
+          }
+        }
+
+      }
+    }
+
+    nav#collapsible-mobile-navbar { // in header-navbar-wrapper component
+
+      border-top: var(--ds-expandable-navbar-border-top-style);
+      padding-top: var(--ds-expandable-navbar-padding-top);
+
+      #main-site-navigation {
+        .ds-menu-item {
+          padding: var(--ds-expandable-navbar-item-vertical-padding) 0;
+        }
+      }
+
+    }
+  }
+}
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 57ade022ae..7347b2ff24 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,13 +1,16 @@
 import { Component } from '@angular/core';
+
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
+import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
  */
 @Component({
   selector: 'ds-header-navbar-wrapper',
-  styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
+  styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
+  animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index dbc98098ae..51373e8cd1 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,25 +1,34 @@
-<header class="header">
-  <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="container navbar navbar-expand-md px-0">
-    <div class="d-flex flex-grow-1">
-      <a class="navbar-brand m-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
+<header id="main-site-header">
+  <div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
+    <!-- Logo and navbar wrapper -->
+    <div id="header-left"
+         [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
+         [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
+         class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
+      <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
+        <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
+      <nav *ngIf="(isMobile$ | async) !== true" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
+        <ds-themed-navbar></ds-themed-navbar>
+      </nav>
     </div>
-    <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
+    <!-- Search bar and other menus -->
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
       <ds-themed-search-navbar></ds-themed-search-navbar>
-      <ds-lang-switch></ds-lang-switch>
-      <ds-context-help-toggle></ds-context-help-toggle>
-      <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
-      <ds-impersonate-navbar></ds-impersonate-navbar>
-      <div class="pl-2">
-        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
-                aria-controls="collapsingNav"
-                aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+      <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
+        <ds-themed-lang-switch></ds-themed-lang-switch>
+        <ds-context-help-toggle></ds-context-help-toggle>
+        <ds-impersonate-navbar></ds-impersonate-navbar>
+        <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
+      </div>
+
+      <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
+        <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
+                [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
+          <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
         </button>
       </div>
-    </div>
-  </nav>
-  <ds-themed-navbar></ds-themed-navbar>
 
+    </div>
+  </div>
 </header>
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
index 2fc857826f..5aae8af017 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -1,26 +1,28 @@
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  nav.navbar {
-    display: none;
-  }
-  .header {
+:host {
+  #main-site-header {
+    min-height: var(--ds-header-height);
+
+    @include media-breakpoint-up(md) {
+      height: var(--ds-header-height);
+    }
+
     background-color: var(--ds-header-bg);
-  }
-}
 
-.navbar-brand img {
-  @media screen and (max-width: map-get($grid-breakpoints, md)) {
-    height: var(--ds-header-logo-height-xs);
+    &-container {
+      min-height: var(--ds-header-height);
+    }
   }
-}
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
 
-.navbar-toggler {
-  color: var(--ds-header-icon-color);
-
-  &:hover, &:focus {
-    color: var(--ds-header-icon-color-hover);
+  img#header-logo {
+    height: var(--ds-header-logo-height);
   }
+
+  button#navbar-toggler {
+    color: var(--ds-header-icon-color);
+
+    &:hover, &:focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+  }
+
 }
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
index 6da89b47d5..1e71ba6b20 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
 
 /**
@@ -9,5 +14,11 @@ import { HeaderComponent as BaseComponent } from '../../../../app/header/header.
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
 })
-export class HeaderComponent extends BaseComponent {
+export class HeaderComponent extends BaseComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+  }
 }
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index ef576ed99c..29711c1bf6 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="background-image-container">
+<div class="background-image-container mt-ncs">
   <div class="container">
     <div class="jumbotron jumbotron-fluid">
       <div class="d-flex flex-wrap">
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 93ec1763f3..3c3aa8b445 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -1,6 +1,5 @@
 :host {
   display: block;
-  margin-top: calc(var(--ds-content-spacing) * -1);
 
   div.background-image-container {
     color: white;
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.ts b/src/themes/dspace/app/home-page/home-news/home-news.component.ts
index d4032011dc..bccb4aa9cb 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.ts
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
   selector: 'ds-home-news',
   styleUrls: ['./home-news.component.scss'],
-  templateUrl: './home-news.component.html'
+  templateUrl: './home-news.component.html',
 })
 
 /**
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 05afac7d7e..f1c8c66847 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,24 +1,9 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-  class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-  <div class="navbar-inner-container w-100 h-100" [class.container]="!(isXsOrSm$ | async)">
-    <a class="navbar-brand my-2" routerLink="/home">
-      <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate" />
-    </a>
-
-    <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
-        <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-            <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-        </li>
-        <ng-container *ngFor="let section of (sections | async)">
-          <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-        </ng-container>
-      </ul>
-    </div>
-    <ds-search-navbar class="navbar-collapsed"></ds-search-navbar>
-    <ds-lang-switch class="navbar-collapsed"></ds-lang-switch>
-    <ds-context-help-toggle class="navbar-collapsed"></ds-context-help-toggle>
-    <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
-    <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
-  </div>
-</nav>
+<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+  <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
+</ng-container>
+<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
+  <ng-container *ngFor="let section of (sections | async)">
+    <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  </ng-container>
+</div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index d3aea9f078..32c65c8c97 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,56 +1,3 @@
-nav.navbar {
-  border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-  border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid;
-  align-items: baseline;
-}
+:host {
 
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-  .navbar {
-    width: 100%;
-    background-color: var(--bs-white);
-    position: absolute;
-    overflow: hidden;
-    height: 0;
-    &.open {
-      height: 100vh; //doesn't matter because wrapper is sticky
-    }
-  }
-}
-
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  .reset-padding-md {
-    margin-left: calc(var(--bs-spacer) / -2);
-    margin-right: calc(var(--bs-spacer) / -2);
-  }
-}
-
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
-  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-    > .navbar-inner-container {
-      padding: 0 var(--bs-spacer);
-      a.navbar-brand {
-        display: none;
-      }
-      .navbar-collapsed {
-        display: none;
-      }
-    }
-    padding: 0;
-  }
-  height: 80px;
-}
-
-a.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-}
-
-.navbar-nav {
-  ::ng-deep a.nav-link {
-    color: var(--ds-navbar-link-color);
-  }
-  ::ng-deep a.nav-link:hover {
-    color: var(--ds-navbar-link-color-hover);
-  }
 }
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 321351a933..506c146c6f 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
@@ -9,7 +10,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   selector: 'ds-navbar',
   styleUrls: ['./navbar.component.scss'],
   templateUrl: './navbar.component.html',
-  animations: [slideMobileNav]
+  animations: [slideMobileNav],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index 63dff9da31..51511ef7d7 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -1,14 +1,15 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../../app/shared/shared.module';
-import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
-import { NavbarComponent } from './app/navbar/navbar.component';
-import { HeaderComponent } from './app/header/header.component';
-import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { RootModule } from '../../app/root.module';
+import { NgModule } from '@angular/core';
+
 import { NavbarModule } from '../../app/navbar/navbar.module';
+import { RootModule } from '../../app/root.module';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SharedModule } from '../../app/shared/shared.module';
+import { HeaderComponent } from './app/header/header.component';
+import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+import { NavbarComponent } from './app/navbar/navbar.component';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -35,7 +36,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    ...ENTRY_COMPONENTS.map((component) => ({ provide: component })),
   ],
 })
 /**
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index cdaae815ad..e0d895ed3a 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -1,65 +1,54 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
-import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
-import {
-  AdminWorkflowModuleModule
-} from '../../app/admin/admin-workflow-page/admin-workflow.module';
-import {
-  BitstreamFormatsModule
-} from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
-import { BrowseByModule } from '../../app/browse-by/browse-by.module';
-import {
-  CollectionFormModule
-} from '../../app/collection-page/collection-form/collection-form.module';
-import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
-import { CoreModule } from '../../app/core/core.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
-import { FormsModule } from '@angular/forms';
+import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
-import { IdlePreloadModule } from 'angular-idle-preload';
-import {
-  JournalEntitiesModule
-} from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
-import { MenuModule } from '../../app/shared/menu/menu.module';
-import { NavbarModule } from '../../app/navbar/navbar.module';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreRouterConnectingModule } from '@ngrx/router-store';
+import { StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { IdlePreloadModule } from 'angular-idle-preload';
+import { ItemSharedModule } from 'src/app/item-page/item-shared.module';
+
+import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
+import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
+import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
+import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module';
+import { AppModule } from '../../app/app.module';
+import { BrowseByModule } from '../../app/browse-by/browse-by.module';
+import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
+import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
+import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
+import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
+import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
+import { CommunityPageModule } from '../../app/community-page/community-page.module';
+import { CoreModule } from '../../app/core/core.module';
+import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
+import { HomePageModule } from '../../app/home-page/home-page.module';
+import { InfoModule } from '../../app/info/info.module';
+import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
+import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
+import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import {
-  ResearchEntitiesModule
-} from '../../app/entity-groups/research-entities/research-entities.module';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { RootModule } from '../../app/root.module';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
+import { MenuModule } from '../../app/shared/menu/menu.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SearchModule } from '../../app/shared/search/search.module';
 import { SharedModule } from '../../app/shared/shared.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { StoreModule } from '@ngrx/store';
-import { StoreRouterConnectingModule } from '@ngrx/router-store';
-import { TranslateModule } from '@ngx-translate/core';
-import { HomePageModule } from '../../app/home-page/home-page.module';
-import { AppModule } from '../../app/app.module';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { RouterModule } from '@angular/router';
-import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
-import { InfoModule } from '../../app/info/info.module';
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
-import { CommunityPageModule } from '../../app/community-page/community-page.module';
-import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
 import { SubmissionModule } from '../../app/submission/submission.module';
-import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
-import { SearchModule } from '../../app/shared/search/search.module';
-import {
-  ResourcePoliciesModule
-} from '../../app/shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../app/shared/comcol/comcol.module';
-import { RootModule } from '../../app/root.module';
-import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
-import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
-import { ItemSharedModule } from 'src/app/item-page/item-shared.module';
 
 const DECLARATIONS = [
 ];
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index e41dae0e3f..5bd4c19bc0 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -17,7 +17,7 @@
     background-color: var(--bs-primary);
   }
 
-  h5 {
+  h4 {
     font-size: 1.1rem
   }
 }
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 516eff9f7e..63a5535d95 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -1,11 +1,28 @@
 // Override or add CSS variables for your theme here
 
 :root {
-  --ds-header-logo-height: 40px;
+
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 40px;
+    --ds-header-height: 80px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+    --ds-header-height: 90px;
+  }
+
   --ds-banner-text-background: rgba(0, 0, 0, 0.45);
   --ds-banner-background-gradient-width: 300px;
-  --ds-home-news-link-color: #{$green};
-  --ds-home-news-link-hover-color: #{darken($green, 15%)};
-  --ds-header-navbar-border-bottom-color: #{$green};
+
+  --ds-header-navbar-border-bottom-height: 5px;
+
+  /* set the next two properties as `--ds-header-navbar-border-bottom-*`
+  in order to keep the bottom border of the header when navbar is expanded */
+  --ds-expandable-navbar-border-top-color: #{$white};
+  --ds-expandable-navbar-border-top-height: 0;
+  --ds-expandable-navbar-padding-top: 0;
+
+  --ds-item-page-img-field-default-inline-height: 24px;
+  --ds-item-page-img-field-ror-inline-height: var(--ds-item-page-img-field-default-inline-height);
 }
 
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index b5799c9749..5bbcc98e04 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -1,41 +1,87 @@
 // DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
 // variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
-// still uses Sass variables internally. So if you want to override bootstrap (or other sass
-// variables) you can do so here. Their CSS counterparts will include the changes you make here
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
+
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// All SASS variables from the base theme are also included here. Do not use the '!default' flag
+// here if you want to override them.
+
+
+/*** FONT FAMILIES ***/
 
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap');
 
 $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 
-$navbar-dark-color: #FFFFFF;
 
-/* Reassign color vars to semantic color scheme */
-$blue: #2b4e72 !default;
-$green: #92C642 !default;
-$cyan: #207698 !default;
-$yellow: #ec9433 !default;
-$red: #CF4444 !default;
-$dark: #43515f !default;
+/*** SEMANTIC COLOR SCHEME ***/
 
-$gray-800: #343a40 !default;
-$gray-700: #495057 !default;
-$gray-400: #ced4da !default;
-$gray-100: #f8f9fa !default;
+// Gray scale (uncomment the variables that you want to override or that you need to use in this file)
+//$white:    #fff;
+//$gray-100: #f8f9fa;
+//$gray-200: #e9ecef;
+//$gray-300: #dee2e6;
+//$gray-400: #ced4da;
+//$gray-500: #adb5bd;
+//$gray-600: #6c757d;
+//$gray-700: #495057;
+//$gray-800: #343a40;
+//$gray-900: #212529;
+//$black:    #000;
 
-$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+// Other colors (uncomment the variables that you want to override or that you need to use in this file)
+//$blue:    #007bff !default;
+//$indigo:  #6610f2 !default;
+//$purple:  #6f42c1 !default;
+//$pink:    #e83e8c !default;
+//$red:     #dc3545 !default;
+//$orange:  #fd7e14 !default;
+//$yellow:  #ffc107 !default;
+//$green:   #28a745 !default;
+//$teal:    #20c997 !default;
+//$cyan:    #17a2b8 !default;
 
-$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
-$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
+// Define or override other colors here
+// ...
 
-$yiq-contrasted-threshold:  170 !default;
+// Override semantic colors here
+$primary:   #43515f;  // Gray
+$secondary: #495057;  // As Bootstrap $gray-700
+$success:   #92c642;  // Lime
+$info:      #1e6f90;  // Light blue
+$warning:   #ec9433;  // Orange
+$danger:    #cf4444;  // Red
+$light:     #f8f9fa;  // As Bootstrap $gray-100
+$dark:      #43515f;  // Gray
 
+// Add new semantic colors here (you don't need to add existing semantic colors)
 $theme-colors: (
-        primary: $dark,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
+  // ...
+);
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 170;
+
+$body-color: #343a40;       // As Bootstrap $gray-800
+
+$link-color: #1e6f90;       // Blue green, as DSpace $info
+$link-decoration: none;
+$link-hover-color: darken($link-color, 15%);
+$link-hover-decoration: underline;
+
+$table-accent-bg: #f8f9fa;  // As Bootstrap $gray-100
+$table-hover-bg: #ced4da;   // As Bootstrap $gray-400
+
+$navbar-dark-color: #fff;
+
+
+/*** CUSTOM DSPACE VARIABLES ***/
+
+$ds-home-news-link-color: #92c642;
+$ds-header-navbar-border-bottom-color: #92c642;
diff --git a/src/themes/eager-themes.module.ts b/src/themes/eager-themes.module.ts
index 4a46595f35..c4db7b582a 100644
--- a/src/themes/eager-themes.module.ts
+++ b/src/themes/eager-themes.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+
 import { EagerThemeModule as DSpaceEagerThemeModule } from './dspace/eager-theme.module';
 // import { EagerThemeModule as CustomEagerThemeModule } from './custom/eager-theme.module';
 
diff --git a/tsconfig.json b/tsconfig.json
index 1eed699114..4ccd727a64 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,7 +40,8 @@
       "node",
       "jasmine"
     ],
-    "useDefineForClassFields": false
+    "useDefineForClassFields": false,
+    "useUnknownInCatchVariables": true
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
diff --git a/webpack/helpers.ts b/webpack/helpers.ts
index 43855f6c72..f0b42a8a69 100644
--- a/webpack/helpers.ts
+++ b/webpack/helpers.ts
@@ -1,18 +1,49 @@
-const path = require('path');
+import { readFileSync, readdirSync, statSync, Stats } from 'fs';
+import { join, resolve } from 'path';
+
+const md5 = require('md5');
 
 export const projectRoot = (relativePath) => {
-  return path.resolve(__dirname, '..', relativePath);
+  return resolve(__dirname, '..', relativePath);
 };
 
 export const globalCSSImports = () => {
   return [
-    projectRoot(path.join('src', 'styles', '_variables.scss')),
-    projectRoot(path.join('src', 'styles', '_mixins.scss')),
+    projectRoot(join('src', 'styles', '_variables.scss')),
+    projectRoot(join('src', 'styles', '_mixins.scss')),
   ];
 };
 
+/**
+ * Calculates the md5 hash of a file
+ *
+ * @param filePath The path of the file
+ */
+export function calculateFileHash(filePath: string): string {
+  const fileContent: Buffer = readFileSync(filePath);
+  return md5(fileContent);
+}
 
-module.exports = {
-  projectRoot,
-  globalCSSImports
-};
+/**
+ * Calculate the hashes of all the files (matching the given regex) in a certain folder
+ *
+ * @param folderPath The path of the folder
+ * @param regExp A regex of the files in the folder for which a hash needs to be generated
+ */
+export function getFileHashes(folderPath: string, regExp: RegExp): { [fileName: string]: string } {
+  const files: string[] = readdirSync(folderPath);
+  let hashes: { [fileName: string]: string } = {};
+
+  for (const file of files) {
+    if (file.match(regExp)) {
+      const filePath: string = join(folderPath, file);
+      const stats: Stats = statSync(filePath);
+
+      if (stats.isFile()) {
+        hashes[file] = calculateFileHash(filePath);
+      }
+    }
+  }
+
+  return hashes;
+}
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 1a1ecfd6ef..8d433edf39 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -1,4 +1,5 @@
-import { globalCSSImports, projectRoot } from './helpers';
+import { globalCSSImports, projectRoot, getFileHashes, calculateFileHash } from './helpers';
+import { EnvironmentPlugin } from 'webpack';
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
@@ -18,12 +19,13 @@ export const copyWebpackOptions = {
         // use [\/|\\] to match both POSIX and Windows separators
         const matches = absoluteFilename.match(/.*[\/|\\]assets[\/|\\](.+)\.json5$/);
         if (matches) {
+          const fileHash: string = process.env.NODE_ENV === 'production' ? `.${calculateFileHash(absoluteFilename)}` : '';
           // matches[1] is the relative path from src/assets to the JSON5 file, without the extension
-          return path.join('assets', matches[1] + '.json');
+          return path.join('assets', `${matches[1]}${fileHash}.json`);
         }
       },
       transform(content) {
-        return JSON.stringify(JSON5.parse(content.toString()))
+        return JSON.stringify(JSON5.parse(content.toString()));
       }
     },
     {
@@ -77,6 +79,9 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
+    new EnvironmentPlugin({
+      languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
+    }),
     new CopyWebpackPlugin(copyWebpackOptions),
   ],
   module: {
diff --git a/yarn.lock b/yarn.lock
index 730966fcdb..849cbe2eda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -47,6 +47,14 @@
     "@angular-devkit/core" "15.2.6"
     rxjs "6.6.7"
 
+"@angular-devkit/architect@0.1602.12":
+  version "0.1602.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.12.tgz#a430970acd4ad9f7cc23d41facc2c04ea5770f65"
+  integrity sha512-19Fwwfx+KvJ01SyI6cstRgqT9+cwer8Ro1T27t1JqlGyOX8tY3pV78ulwxy2+wCzPjR18V6W7cb7Cv6fyK4xog==
+  dependencies:
+    "@angular-devkit/core" "16.2.12"
+    rxjs "7.8.1"
+
 "@angular-devkit/architect@^0.1202.10":
   version "0.1202.18"
   resolved "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.18.tgz"
@@ -241,6 +249,18 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
+"@angular-devkit/core@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.12.tgz#5d40e8414d5da14a4281af519d32e1241b002c89"
+  integrity sha512-o6ziQs+EcEonFezrsA46jbZqkQrs4ckS1bAQj93g5ZjGtieUz8l/U3lclvKpL/iEzWkGVViSYuP2KyW2oqTDiQ==
+  dependencies:
+    ajv "8.12.0"
+    ajv-formats "2.1.1"
+    jsonc-parser "3.2.0"
+    picomatch "2.3.1"
+    rxjs "7.8.1"
+    source-map "0.7.4"
+
 "@angular-devkit/schematics@12.2.18", "@angular-devkit/schematics@^12.2.17":
   version "12.2.18"
   resolved "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.18.tgz"
@@ -250,16 +270,16 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.6.tgz#fb5b7530f21586dbdec45cac56f8a418bcfd053d"
-  integrity sha512-f7VgnAcok7AwR/DhX0ZWskB0rFBo/KsvtIUA2qZSrpKMf8eFiwu03dv/b2mI0vnf+1FBfIQzJvO0ww45zRp6dA==
+"@angular-devkit/schematics@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.12.tgz#9dbf287b2343059792c97bbfc60a3b52253c66f1"
+  integrity sha512-lf/Nz2o875pllxGNUcI2by4rctfRsOZOxvaLq2UaH6XG6Re9tqeNfn40a8qXrr9/IYntXnlvEid/pd9e8gFBIw==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
+    "@angular-devkit/core" "16.2.12"
     jsonc-parser "3.2.0"
-    magic-string "0.29.0"
+    magic-string "0.30.1"
     ora "5.4.1"
-    rxjs "6.6.7"
+    rxjs "7.8.1"
 
 "@angular-eslint/builder@15.2.1":
   version "15.2.1"
@@ -334,29 +354,29 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.6.tgz#d5994fbd4d02e71017d4dd28ba06dc1c3cb7a976"
-  integrity sha512-wNkQ/qCVbd4pERaGVagKJPifEvjRNY5otwsd4iRVubY/XOcIHcYChUThZwgQdVfNAImfJPMZNrhbGxejuWLA9w==
+"@angular/cli@^16.0.4":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.12.tgz#f5ce4eea5409f708963a59a4ab787d6c08196fe3"
+  integrity sha512-Pcbiraoqdw4rR2Ey5Ooy0ESLS1Ffbjkb6sPfinKRkHmAvyqsmlvkfbB/qK8GrzDSFSWvAKMMXRw9l8nbjvQEXg==
   dependencies:
-    "@angular-devkit/architect" "0.1502.6"
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
-    "@schematics/angular" "15.2.6"
+    "@angular-devkit/architect" "0.1602.12"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
+    "@schematics/angular" "16.2.12"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
-    ini "3.0.1"
+    ini "4.1.1"
     inquirer "8.2.4"
     jsonc-parser "3.2.0"
     npm-package-arg "10.1.0"
     npm-pick-manifest "8.0.1"
-    open "8.4.1"
+    open "8.4.2"
     ora "5.4.1"
-    pacote "15.1.0"
-    resolve "1.22.1"
-    semver "7.3.8"
+    pacote "15.2.0"
+    resolve "1.22.2"
+    semver "7.5.4"
     symbol-observable "4.0.0"
-    yargs "17.6.2"
+    yargs "17.7.2"
 
 "@angular/common@^15.2.8":
   version "15.2.8"
@@ -451,13 +471,21 @@
   resolved "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz"
   integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"
   integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz"
@@ -535,7 +563,7 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.18.9", "@babel/generator@^7.19.3", "@babel/generator@^7.21.4":
+"@babel/generator@^7.18.9", "@babel/generator@^7.19.3":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"
   integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
@@ -545,6 +573,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+  dependencies:
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@7.18.6", "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
@@ -610,6 +648,11 @@
   resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
@@ -625,6 +668,14 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
@@ -632,6 +683,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"
@@ -715,16 +773,33 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"
@@ -758,11 +833,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.18.9", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.18.9", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
@@ -1403,19 +1492,28 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
+"@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
   dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.10.3", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -1428,6 +1526,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -1551,10 +1658,10 @@
   resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@^2.88.10":
-  version "2.88.11"
-  resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz"
-  integrity sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==
+"@cypress/request@2.88.12":
+  version "2.88.12"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
+  integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1571,7 +1678,7 @@
     performance-now "^2.1.0"
     qs "~6.10.3"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
+    tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
@@ -1610,14 +1717,14 @@
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.39.4":
+  version "0.39.4"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
+  integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
   dependencies:
     comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@esbuild/android-arm64@0.17.8":
   version "0.17.8"
@@ -1761,6 +1868,11 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
   integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
 
+"@fastify/deepmerge@^1.0.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@fastify/deepmerge/-/deepmerge-1.3.0.tgz#8116858108f0c7d9fd460d05a7d637a13fe3239a"
+  integrity sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==
+
 "@fortawesome/fontawesome-free@^6.4.0":
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe"
@@ -1851,7 +1963,7 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
@@ -2239,13 +2351,13 @@
   resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@schematics/angular@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.6.tgz#5a0face51806f6b2adf67eef73b08c31744b07bc"
-  integrity sha512-OcBUvVAxZEMBX+fi0ytybeAdmStra+GwtlvipS70yOxcAgJ84ZrnZGN7a072cCVQcq7AgqUfssnyqCx1wu+yCg==
+"@schematics/angular@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.12.tgz#13e00e7390903cfc00eb8d5c2e74986262aff6ec"
+  integrity sha512-rc6Dxo7yLnNhECxZyvwv3qL40GvMHw/gMeme8DUGN7zgcUdBJ7LOCURp7EZqOBghMVeeJvLrohitEbs9NhRLBA==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
     jsonc-parser "3.2.0"
 
 "@schematics/angular@^12.2.17":
@@ -2257,10 +2369,34 @@
     "@angular-devkit/schematics" "12.2.18"
     jsonc-parser "3.0.0"
 
-"@sigstore/protobuf-specs@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz"
-  integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
@@ -2302,13 +2438,13 @@
   resolved "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz"
   integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
 
-"@tufjs/models@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/@tufjs/models/-/models-1.0.2.tgz"
-  integrity sha512-uxarDtxTIK3f8hJS4yFhW/lvTa3tsiQU5iDCRut+NCnOXvNtEul0Ct58NIIcIx9Rkt7OFEK31Ndpqsd663nsew==
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
   dependencies:
     "@tufjs/canonical-json" "1.0.0"
-    minimatch "^8.0.3"
+    minimatch "^9.0.0"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -2457,11 +2593,16 @@
   resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.14.31", "@types/node@^14.14.9":
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.14.9":
   version "14.18.42"
   resolved "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz"
   integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==
 
+"@types/node@^16.18.39":
+  version "16.18.46"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.46.tgz#9f2102d0ba74a318fcbe170cbff5463f119eab59"
+  integrity sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
@@ -2574,6 +2715,18 @@
   dependencies:
     "@types/node" "*"
 
+"@types/yargs-parser@*":
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+
+"@types/yargs@^17.0.0":
+  version "17.0.24"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
+  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yauzl@^2.9.1":
   version "2.10.0"
   resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"
@@ -2597,6 +2750,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/experimental-utils@^5.0.0":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.6.tgz#9f4d81700dcea51a107658a44992ba1e4d8b4320"
+  integrity sha512-UIVfEaaHggOuhgqdpFlFQ7IN9UFMCiBR/N7uPBUyUlwNdJzYfAu9m4wbOj0b59oI/HSPW1N63Q7lsvfwTQY13w==
+  dependencies:
+    "@typescript-eslint/utils" "5.59.6"
+
 "@typescript-eslint/parser@^5.59.1":
   version "5.59.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.1.tgz#73c2c12127c5c1182d2e5b71a8fa2a85d215cbb4"
@@ -2631,6 +2791,14 @@
     "@typescript-eslint/types" "5.59.1"
     "@typescript-eslint/visitor-keys" "5.59.1"
 
+"@typescript-eslint/scope-manager@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.6.tgz#d43a3687aa4433868527cfe797eb267c6be35f19"
+  integrity sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/visitor-keys" "5.59.6"
+
 "@typescript-eslint/type-utils@5.48.2":
   version "5.48.2"
   resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz"
@@ -2666,6 +2834,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.1.tgz#03f3fedd1c044cb336ebc34cc7855f121991f41d"
   integrity sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==
 
+"@typescript-eslint/types@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.6.tgz#5a6557a772af044afe890d77c6a07e8c23c2460b"
+  integrity sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==
+
 "@typescript-eslint/typescript-estree@5.48.2":
   version "5.48.2"
   resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz"
@@ -2705,6 +2878,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.6.tgz#2fb80522687bd3825504925ea7e1b8de7bb6251b"
+  integrity sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/visitor-keys" "5.59.6"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.48.2":
   version "5.48.2"
   resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz"
@@ -2733,6 +2919,20 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
+"@typescript-eslint/utils@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.6.tgz#82960fe23788113fc3b1f9d4663d6773b7907839"
+  integrity sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.59.6"
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/typescript-estree" "5.59.6"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
 "@typescript-eslint/utils@^5.57.0":
   version "5.58.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz"
@@ -2771,6 +2971,14 @@
     "@typescript-eslint/types" "5.59.1"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.6.tgz#673fccabf28943847d0c8e9e8d008e3ada7be6bb"
+  integrity sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
@@ -3061,9 +3269,9 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.12.0, ajv@^8.8.0:
+ajv@8.12.0, ajv@^8.10.0, ajv@^8.8.0:
   version "8.12.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -3172,6 +3380,11 @@ arch@^2.2.0:
   resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"
@@ -3358,10 +3571,10 @@ aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axe-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.0.tgz#34ba5a48a8b564f67e103f0aa5768d76e15bbbbf"
-  integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==
+axe-core@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0"
+  integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
 
 axios@0.21.4:
   version "0.21.4"
@@ -3370,13 +3583,14 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.0"
     form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 axobject-query@3.1.1:
   version "3.1.1"
@@ -3538,6 +3752,11 @@ boolbase@^1.0.0:
   resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+boolean@^3.1.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
+
 bootstrap@^4.6.1:
   version "4.6.2"
   resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz"
@@ -3834,7 +4053,7 @@ chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -4437,14 +4656,14 @@ cypress-axe@^1.4.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.4.0.tgz#e67482bfe9e740796bf77c7823f19781a8a2faff"
   integrity sha512-Ut7NKfzjyKm0BEbt2WxuKtLkIXmx6FD2j0RwdvO/Ykl7GmB/qRQkwbKLk3VP35+83hiIr8GKD04PDdrTK5BnyA==
 
-cypress@12.10.0:
-  version "12.10.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.10.0.tgz#b6264f77c214d63530ebac2b33c4d099bd40b715"
-  integrity sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==
+cypress@12.17.4:
+  version "12.17.4"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c"
+  integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==
   dependencies:
-    "@cypress/request" "^2.88.10"
+    "@cypress/request" "2.88.12"
     "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^14.14.31"
+    "@types/node" "^16.18.39"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
@@ -4477,9 +4696,10 @@ cypress@12.10.0:
     minimist "^1.2.8"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
+    process "^0.11.10"
     proxy-from-env "1.0.0"
     request-progress "^3.0.0"
-    semver "^7.3.2"
+    semver "^7.5.3"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
@@ -4558,6 +4778,11 @@ debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+decamelize@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
+  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
+
 decimal.js@^10.2.1, decimal.js@^10.4.2:
   version "10.4.3"
   resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"
@@ -4641,6 +4866,11 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
+delay@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
+  integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
@@ -5190,6 +5420,15 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-etc@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-etc/-/eslint-etc-5.2.1.tgz#43e2554a347677ebb6386c915f374918f2efcb87"
+  integrity sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "^5.0.0"
+    tsutils "^3.17.1"
+    tsutils-etc "^1.4.1"
+
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
   resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
@@ -5215,6 +5454,11 @@ eslint-plugin-deprecation@^1.4.1:
     tslib "^2.3.1"
     tsutils "^3.21.0"
 
+eslint-plugin-import-newlines@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.1.tgz#e21705667778e8134382b50079fbb2c8d3a2fcde"
+  integrity sha512-7vyhwliGm+CTwteRw2ym+IO9OaksGYmSt63elPPBM0QJ3zwRwMKtgHOSHVtdHlrSERRTVCsWtMO8dDdAdmHMXg==
+
 eslint-plugin-import@^2.27.5:
   version "2.27.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
@@ -5236,17 +5480,18 @@ eslint-plugin-import@^2.27.5:
     semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsdoc@^39.6.4:
-  version "39.9.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz"
-  integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==
+eslint-plugin-jsdoc@^45.0.0:
+  version "45.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
+  integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
+    "@es-joy/jsdoccomment" "~0.39.4"
+    are-docs-informative "^0.0.2"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.8"
+    esquery "^1.5.0"
+    semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-jsonc@^2.6.0:
@@ -5265,6 +5510,26 @@ eslint-plugin-lodash@^7.4.0:
   dependencies:
     lodash "^4.17.21"
 
+eslint-plugin-rxjs@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-rxjs/-/eslint-plugin-rxjs-5.0.3.tgz#a7ec16549f0dd23051bb744fea5bc0cdf096131a"
+  integrity sha512-fcVkqLmYLRfRp+ShafjpUKuaZ+cw/sXAvM5dfSxiEr7M28QZ/NY7vaOr09FB4rSaZsQyLBnNPh5SL+4EgKjh8Q==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "^5.0.0"
+    common-tags "^1.8.0"
+    decamelize "^5.0.0"
+    eslint-etc "^5.1.0"
+    requireindex "~1.2.0"
+    rxjs-report-usage "^1.0.4"
+    tslib "^2.0.0"
+    tsutils "^3.0.0"
+    tsutils-etc "^1.4.1"
+
+eslint-plugin-simple-import-sort@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
+  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
+
 eslint-plugin-unused-imports@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz"
@@ -5383,7 +5648,7 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -5579,6 +5844,18 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
+fast-json-stringify@^5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.8.0.tgz#b229ed01ac5f92f3b82001a916c31324652f46d7"
+  integrity sha512-VVwK8CFMSALIvt14U8AvrSzQAwN/0vaVRiFFUVlpnXSnDGrSkOAO5MtzyN8oQNjLd5AqTW5OZRgyjoNuAuR3jQ==
+  dependencies:
+    "@fastify/deepmerge" "^1.0.0"
+    ajv "^8.10.0"
+    ajv-formats "^2.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^2.1.0"
+    rfdc "^1.2.0"
+
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
@@ -5589,6 +5866,18 @@ fast-memoize@^2.5.1:
   resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz"
   integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
 
+fast-printf@^1.6.9:
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
+  integrity sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==
+  dependencies:
+    boolean "^3.1.4"
+
+fast-uri@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.2.0.tgz#519a0f849bef714aad10e9753d69d8f758f7445a"
+  integrity sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==
+
 fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
@@ -5725,10 +6014,10 @@ flatted@^3.1.0, flatted@^3.2.7:
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -6021,9 +6310,9 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.3:
+globalthis@^1.0.2, globalthis@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
     define-properties "^1.1.3"
@@ -6372,6 +6661,16 @@ http-signature@~1.3.6:
     jsprim "^2.0.2"
     sshpk "^1.14.1"
 
+http-terminator@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/http-terminator/-/http-terminator-3.2.0.tgz#bc158d2694b733ca4fbf22a35065a81a609fb3e9"
+  integrity sha512-JLjck1EzPaWjsmIf8bziM3p9fgR1Y3JoUKAkyYEbZmFrIvJM6I8vVJfBGWlEtV9IWOvzNnaTtjuwZeBY2kwB4g==
+  dependencies:
+    delay "^5.0.0"
+    p-wait-for "^3.2.0"
+    roarr "^7.0.4"
+    type-fest "^2.3.3"
+
 https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
@@ -6531,10 +6830,10 @@ ini@2.0.0:
   resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+ini@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
+  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
 ini@^1.3.4:
   version "1.3.8"
@@ -6589,9 +6888,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -6664,7 +6963,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.8.1:
   version "2.12.0"
   resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"
   integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
@@ -7053,10 +7352,10 @@ jsbn@~0.1.0:
   resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsdom@21.1.0:
   version "21.1.0"
@@ -7682,6 +7981,13 @@ magic-string@0.29.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
+magic-string@0.30.1:
+  version "0.30.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.1.tgz#ce5cd4b0a81a5d032bd69aab4522299b2166284d"
+  integrity sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 magic-string@^0.27.0:
   version "0.27.0"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"
@@ -7752,6 +8058,27 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
+make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 manifesto.js@^4.2.0:
   version "4.2.17"
   resolved "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz"
@@ -7925,13 +8252,20 @@ minimatch@^7.4.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^8.0.2, minimatch@^8.0.3:
+minimatch@^8.0.2:
   version "8.0.4"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz"
   integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.0:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -8191,10 +8525,12 @@ ng2-file-upload@1.4.0:
   dependencies:
     tslib "^1.9.0"
 
-ng2-nouislider@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.npmjs.org/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz"
-  integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ==
+ng2-nouislider@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-2.0.0.tgz#a62fd6cf3f1561be19a2691c2f68d21a46dc6006"
+  integrity sha512-NGbF/0w0+bZqclpSPFOlWIeVJaVwRRYFJzD1x8PClbw9GIeo7fCHoBzZ81y7K7FTJg6to+cgjSTFETPZG/Dizg==
+  dependencies:
+    tslib "^2.3.0"
 
 ngx-infinite-scroll@^15.0.0:
   version "15.0.0"
@@ -8224,10 +8560,10 @@ ngx-sortablejs@^11.1.0:
   dependencies:
     tslib "^2.0.0"
 
-ngx-ui-switch@^14.0.3:
-  version "14.0.3"
-  resolved "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.0.3.tgz"
-  integrity sha512-SZ8ZnTCuNJgNWuY3/mOG3TdsRUNPCX3vGdCKKx1ZHVMTUynerJQlTWck2JrYlnrexNnd7wy4P10jDvdtDwoYeg==
+ngx-ui-switch@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"
+  integrity sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==
   dependencies:
     tslib "^2.3.0"
 
@@ -8337,10 +8673,10 @@ normalize-url@^4.5.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-nouislider@^14.6.3:
-  version "14.7.0"
-  resolved "https://registry.npmjs.org/nouislider/-/nouislider-14.7.0.tgz"
-  integrity sha512-4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ==
+nouislider@^15.7.1:
+  version "15.7.1"
+  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.7.1.tgz#77d55e47d9b4cd771728515713df43b489db9705"
+  integrity sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w==
 
 npm-bundled@^3.0.0:
   version "3.0.0"
@@ -8529,6 +8865,15 @@ open@8.4.1:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+open@8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 open@^8.0.9:
   version "8.4.0"
   resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
@@ -8609,6 +8954,11 @@ ospath@^1.2.2:
   resolved "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"
   integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
@@ -8652,15 +9002,29 @@ p-retry@^4.5.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
+p-timeout@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@15.1.0:
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz"
-  integrity sha512-FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg==
+p-wait-for@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.2.0.tgz#640429bcabf3b0dd9f492c31539c5718cb6a3f1f"
+  integrity sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==
+  dependencies:
+    p-timeout "^3.0.0"
+
+pacote@15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
   dependencies:
     "@npmcli/git" "^4.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
@@ -8668,7 +9032,7 @@ pacote@15.1.0:
     "@npmcli/run-script" "^6.0.0"
     cacache "^17.0.0"
     fs-minipass "^3.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     npm-package-arg "^10.0.0"
     npm-packlist "^7.0.0"
     npm-pick-manifest "^8.0.0"
@@ -8677,7 +9041,7 @@ pacote@15.1.0:
     promise-retry "^2.0.1"
     read-package-json "^6.0.0"
     read-package-json-fast "^3.0.0"
-    sigstore "^1.0.0"
+    sigstore "^1.3.0"
     ssri "^10.0.0"
     tar "^6.1.11"
 
@@ -8826,7 +9190,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -9207,7 +9571,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.21, postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4.19:
+postcss@8.4.21:
   version "8.4.21"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"
   integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
@@ -9233,10 +9597,10 @@ postcss@^7.0.14:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4:
-  version "8.4.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
-  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
+postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -9267,6 +9631,11 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
@@ -9310,6 +9679,11 @@ proxy-from-env@1.0.0:
   resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
@@ -9807,6 +10181,11 @@ require-from-string@^2.0.2:
   resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
+requireindex@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
+  integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
@@ -9845,16 +10224,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.1:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
+resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
   version "1.22.2"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -9894,9 +10264,9 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
+rfdc@^1.2.0, rfdc@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
 rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
@@ -9913,6 +10283,18 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+roarr@^7.0.4:
+  version "7.15.1"
+  resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.15.1.tgz#e4d93105c37b5ea7dd1200d96a3500f757ddc39f"
+  integrity sha512-0ExL9rjOXeQPvQvQo8IcV8SR2GTXmDr1FQFlY2HiAV+gdVQjaVZNOx9d4FI2RqFFsd0sNsiw2TRS/8RU9g0ZfA==
+  dependencies:
+    boolean "^3.1.4"
+    fast-json-stringify "^5.8.0"
+    fast-printf "^1.6.9"
+    globalthis "^1.0.2"
+    safe-stable-stringify "^2.4.3"
+    semver-compare "^1.0.0"
+
 rtl-css-js@^1.13.1:
   version "1.16.1"
   resolved "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.1.tgz"
@@ -9969,6 +10351,13 @@ rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
@@ -9995,15 +10384,20 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
+safe-stable-stringify@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452"
-  integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==
+sanitize-html@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
+  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -10114,33 +10508,45 @@ selfsigned@^2.1.1:
   dependencies:
     node-forge "^1"
 
-semver@7.3.8, semver@^7.3.5, semver@^7.3.8:
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+
+semver@7.3.8:
   version "7.3.8"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
-  version "7.4.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz"
-  integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==
+semver@^7.5.1:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
 semver@~7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 send@0.16.2:
@@ -10291,14 +10697,16 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-sigstore@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.2.0.tgz"
-  integrity sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA==
+sigstore@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.1.0"
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
     make-fetch-happen "^11.0.1"
-    tuf-js "^1.0.0"
 
 simple-update-notifier@^1.0.7:
   version "1.1.0"
@@ -10912,6 +11320,16 @@ tough-cookie@^4.0.0, tough-cookie@^4.1.2:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
 tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
@@ -11007,20 +11425,29 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tsutils@^3.21.0:
+tsutils-etc@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.4.2.tgz#6d6a9f33aa61867d832e4a455b2cebb6b104ebfa"
+  integrity sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==
+  dependencies:
+    "@types/yargs" "^17.0.0"
+    yargs "^17.0.0"
+
+tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.3.tgz"
-  integrity sha512-jGYi5nG/kqgfTFQSdoN6PW9eIn+XRZqdXku+fSwNk6UpWIsWaV7pzAqPgFr85edOPhoyJDyBqCS+DCnHroMvrw==
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
   dependencies:
-    "@tufjs/models" "1.0.2"
-    make-fetch-happen "^11.0.1"
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -11058,6 +11485,11 @@ type-fest@^0.21.3:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+type-fest@^2.3.3:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
@@ -11743,9 +12175,9 @@ wildcard@^2.0.0:
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
@@ -11871,10 +12303,10 @@ yargs@17.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@17.6.2:
-  version "17.6.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+yargs@17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"
@@ -11897,6 +12329,19 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.0.0:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yargs@^17.2.1, yargs@^17.3.1:
   version "17.7.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"